Mercurial > hg > fapweb

changeset 397:d8fd57e7b90e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moar work.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 05 Dec 2013 13:56:00 +0200
parents 2b77599d0324
children e6223ab525fc
files admajax.php admin.css
diffstat 2 files changed, 24 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/admajax.php	Thu Dec 05 13:40:24 2013 +0200
+++ b/admajax.php	Thu Dec 05 13:56:00 2013 +0200
@@ -546,7 +546,7 @@
         echo
           "<div class=\"ctrlBox\" id=\"ctrlCompoControl\">\n".
           "<div class=\"ctrlTitle\">Competition control:</div>\n".
-          "<div class=\"ctrlDBox\">\n".
+          "<div class=\"ctrlDBox1\">\n".
           stGetOptionList("ctrlCompoList",
             "SELECT * FROM compos ORDER BY id DESC",
             "name",
@@ -556,7 +556,7 @@
           "    ".stGetFormButtonInput("setcompo", "", "", "Change compo", "activateCompo()")."\n".
           "  </div>\n".
           "</div>\n".
-          "<div class=\"ctrlDBox\">\n".
+          "<div class=\"ctrlDBox1\">\n".
           stGetOptionList("ctrlEntryList",
             "SELECT * FROM entries WHERE compo_id=3 ORDER BY show_id ASC",
             "name",
@@ -568,8 +568,12 @@
           "    ".stGetFormButtonInput("preventry", "", "", "Next entry", "gotoNextEntry()")."\n".
           "  </div>\n".
           "</div>\n".
+          "<div class=\"ctrlDBox2\">\n".
+          "  <p>Current compo: <b>"."</b></p>\n".
+          "  <p>Current entry: <b>"."</b></p>\n".
+          "  <p>Previous entry: <b>"."</b></p>\n".
+          "</div>\n".
           "</div>\n";
-
         break;
 
       case "news":
--- a/admin.css	Thu Dec 05 13:40:24 2013 +0200
+++ b/admin.css	Thu Dec 05 13:56:00 2013 +0200
@@ -160,6 +160,8 @@
 	border: 2px solid green;
 	padding: 1em;
 	border-radius: 1em;
+	min-height: 12em;
+	vertical-align: top;
 }
 
 div.ctrlButtons {
@@ -168,7 +170,6 @@
 }
 
 #ctrlEditRotationList {
-	min-height: 10em;
 	width: 40em;
 }
 
@@ -177,23 +178,31 @@
 }
 
 #ctrlListRotationLists {
-	min-height: 10em;
 	width: 20em;
 }
 
 #ctrlListDisplaySlides {
-	min-height: 10em;
-	width: 20em;
+	width: 25em;
 }
 
 #ctrlCompoControl {
 	display: block;
-	min-height: 10em;
+}
+
+div.ctrlDBox1, div.ctrlDBox2 {
+	vertical-align: top;
+	border-radius: 0.5em;
+	display: inline-block;
 }
 
-div.ctrlDBox {
-	max-width: 50%;
-	display: inline-block;
+div.ctrlDBox1 {
+	background: #060;
+}
+
+div.ctrlDBox2 {
+	width: 20em;
+	border: 2pt solid #060;
+	padding: 0.5em;
 }
 
 div.ctrlBox .selectBox {