Mercurial > hg > fapweb

changeset 423:4c6e4daf9d0d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moar.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 05 Dec 2013 20:14:51 +0200
parents b7c395958728
children 8258b5ddcd7f
files admajax.php admin.php
diffstat 2 files changed, 69 insertions(+), 39 deletions(-) [+]
line wrap: on
line diff
--- a/admajax.php	Thu Dec 05 19:46:36 2013 +0200
+++ b/admajax.php	Thu Dec 05 20:14:51 2013 +0200
@@ -283,6 +283,58 @@
 }
 
 
+function stGetInfoRotationListEditFull($indent, $outer, $list_id)
+{
+  $str =
+    ($outer ? $indent."<div class=\"ctrlBox\" id=\"ctrlRotationListEdit\">\n" : "").
+    $indent."  <div class=\"ctrlTitle\">Edit rotation list</div>\n".
+    $indent."  ".stGetFormTextInput(30, SET_LEN_ROT_LIST_NAME, "ctrlEDRotationListName", "", "", "")."<br />\n".
+    stGetOptionListStart("ctrlEDDisplaySlides", $indent."  ", TRUE);
+
+  $sql = "SELECT * FROM displaySlides";
+  if (($res = stExecSQL($sql)) !== false)
+  {
+    foreach ($res as $item)
+      $str .= $indent."    ".stGetOptionListItem($item["id"], FALSE, $item["title"]);
+  }
+
+  $str .=
+    stGetOptionListEnd($indent."  ", TRUE).
+    stGetInfoRotationListEditData($indent."  ", TRUE, $list_id).
+    $indent."  <div class=\"ctrlButtons\">\n".
+    $indent."    ".stGetFormButtonInput("moveslideup", "", "", "Move Up", "moveRotationListSlide(-1)")."\n".
+    $indent."    ".stGetFormButtonInput("moveslidedn", "", "", "Move Down", "moveRotationListSlide(1)")."\n".
+    $indent."    ".stGetFormButtonInput("addslide", "", "", "Add slide", "addRotationListSlide()")."\n".
+    $indent."    ".stGetFormButtonInput("delslide", "", "", "Remove slide", "removeRotationListSlide()")."\n".
+    $indent."  </div>\n".
+    ($outer ? $indent."</div>\n" : "");
+
+  return $str;
+}
+
+
+function stGetInfoRotationListEditData($indent, $outer, $list_id)
+{
+  $sql = stPrepareSQL(
+    "SELECT displaySlides.* FROM displaySlides ".
+    "LEFT JOIN rotationListSlides ON displaySlides.id=rotationListSlides.slide_id ".
+    "WHERE rotationListSlides.list_id=%d ".
+    "ORDER BY rotationListSlides.order_num DESC",
+    $list_id);
+
+  $str = stGetOptionListStart("ctrlEDRotationList", $indent, $outer);
+
+  if (($res = stExecSQL($sql)) !== false)
+  {
+    foreach ($res as $item)
+      $str .= $indent."  ".stGetOptionListItem($item["id"], FALSE, $item["title"]);
+  }
+
+  $str .= stGetOptionListEnd($indent, $outer);
+  return $str;
+}
+
+
 function stGetSaveButton()
 {
   return "<input type=\"submit\" value=\" Save \" />\n";
@@ -633,45 +685,11 @@
         break;
     
       case "infoRotationListEdit":
-        echo
-          "<div class=\"ctrlBox\" id=\"ctrlRotationListEdit\">\n".
-          "  <div class=\"ctrlTitle\">Edit rotation list</div>\n".
-          "  ".stGetFormTextInput(30, 128, "ctrlEDRotationListName", "", "", "")."<br />\n".
-          stGetOptionListStart("ctrlEDRotationList", "  ", TRUE);
-
-        $sql = "SELECT * FROM displaySlides";
-        if (($res = stExecSQL($sql)) !== false)
-        {
-          foreach ($res as $item)
-            echo "    ".stGetOptionListItem($item["id"], FALSE, $item["title"]);
-        }
-
-        $sql = stPrepareSQL(
-          "SELECT displaySlides.* FROM displaySlides ".
-          "LEFT JOIN rotationListSlides ON displaySlides.id=rotationListSlides.slide_id ".
-          "WHERE rotationListSlides.list_id=%d ".
-          "ORDER BY rotationListSlides.order_num DESC",
-          $list_id);
+        echo stGetInfoRotationListEditFull("", FALSE);
+        break;
 
-        echo
-          stGetOptionListEnd("  ", TRUE).
-          stGetOptionListStart("ctrlEDDisplaySlides", "  ", TRUE);
-
-        if (($res = stExecSQL($sql)) !== false)
-        {
-          foreach ($res as $item)
-            echo "    ".stGetOptionListItem($item["id"], FALSE, $item["title"]);
-        }
-
-        echo
-          stGetOptionListEnd("  ", TRUE).
-          "  <div class=\"ctrlButtons\">\n".
-          "    ".stGetFormButtonInput("moveslideup", "", "", "Move Up", "moveRotationListSlide(-1)")."\n".
-          "    ".stGetFormButtonInput("moveslidedn", "", "", "Move Down", "moveRotationListSlide(1)")."\n".
-          "    ".stGetFormButtonInput("addslide", "", "", "Add slide", "addRotationListSlide()")."\n".
-          "    ".stGetFormButtonInput("delslide", "", "", "Remove slide", "removeRotationListSlide()")."\n".
-          "  </div>\n".
-          "</div>\n";
+      case "infoRotationListEditData":
+        echo stGetInfoRotationListEditData("", FALSE);
         break;
 
       case "infoEditSlide":
@@ -792,7 +810,9 @@
           "  <div class=\"ctrlDBox2\" id=\"ctrlCurrEntryData\">\n".
           stGetInfoCurrEntryData("    ").
           "  </div>\n".
-          "</div>\n";
+          "</div>\n".
+          stGetInfoRotationListEditFull("", TRUE, 0);
+
         break;
 
       case "news":
--- a/admin.php	Thu Dec 05 19:46:36 2013 +0200
+++ b/admin.php	Thu Dec 05 20:14:51 2013 +0200
@@ -575,6 +575,16 @@
 }
 
 
+function editRotationList()
+{
+}
+
+
+function newRotationList()
+{
+}
+
+
 function cancelEditDisplaySlide()
 {
   var nitem = document.getElementById("ctrlEditDisplaySlide");