Mercurial > hg > fapweb

changeset 727:399603df8c6f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move tab-related code from majax module to admin.js.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 18 Nov 2014 22:41:06 +0200
parents 9a5e1087698a
children 8b1abca34033
files admin.js admin.php majax.inc.php
diffstat 3 files changed, 66 insertions(+), 65 deletions(-) [+]
line wrap: on
line diff
--- a/admin.js	Tue Nov 18 22:00:41 2014 +0200
+++ b/admin.js	Tue Nov 18 22:41:06 2014 +0200
@@ -7,7 +7,68 @@
 var activeAttendee = -1, prevAttendee = -1, activeAttendeeTmp = "";
 var activeEntry = -1, prevEntry = -1, activeEntryTmp = "";
 
+var registeredTabs = Object();
+var activeTabs = Object();
 
+
+//
+// Tab related code
+//
+function jsUpdateTabList(tabset, extra)
+{
+  var tabs = "";
+  var content = "";
+
+  for (var id in registeredTabs[tabset])
+  {
+    var thead = registeredTabs[tabset][id];
+    tabs += "<a id=\"tabHead"+ tabset + id +
+      "\"href=\"#\" onClick=\"jsSwitchActiveTab('"+tabset+"', '"+id+
+      "')\">"+ thead.replace(/\s/g, "&nbsp;") +"</a> ";
+    
+    content += "<div id=\"tabCont"+ tabset + id +"\"></div>";
+  }
+
+  var item = document.getElementById("tabHeaders"+ tabset);
+  if (item) item.innerHTML = tabs + extra;
+
+  item = document.getElementById("tabContents"+ tabset);
+  if (item) item.innerHTML = content;
+}
+
+
+function jsRegisterTab(tabset, id, name)
+{
+  if (!registeredTabs[tabset])
+    registeredTabs[tabset] = Object();
+
+  registeredTabs[tabset][id] = name;
+}
+
+
+function jsSwitchActiveTab(tabset, tab)
+{
+  for (var id in registeredTabs[tabset])
+  {
+    var tabContent = document.getElementById("tabCont"+ tabset + id);
+    var tabHead = document.getElementById("tabHead"+ tabset + id);
+    if (tabContent && tabHead)
+    {
+      tabContent.style.display = (tab == id) ? "block" : "none";
+      tabHead.style.borderTop = (tab == id) ? "4px solid white" : "none";
+      if (tab == id)
+      {
+        activeTabs[tabset] = id;
+        setTimeout("refreshDispatch"+ tabset +"('"+ id +"');", 10);
+      }
+    }
+  }
+}
+
+
+//
+// Admin interface specific popups
+//
 function jsCloseAdminPopup()
 {
   var nitem = document.getElementById("adminPopup");
@@ -30,6 +91,9 @@
 }
 
 
+//
+// Generic element refresh
+//
 function jsRefreshItems(id,name,extra)
 {
   var msuccess = function(txt)
@@ -797,4 +861,3 @@
 {
   jsSendPOSTRequest("action=ctrl&type=skipToNextSlide");
 }
-
--- a/admin.php	Tue Nov 18 22:00:41 2014 +0200
+++ b/admin.php	Tue Nov 18 22:41:06 2014 +0200
@@ -121,7 +121,7 @@
 {
 ?>
 <script type="text/javascript">
-// <? stCreateSettingsData(); stCommonAJAX("admajax.php", "admlogout.php", FALSE, TRUE); ?>
+// <? stCreateSettingsData(); stCommonAJAX("admajax.php", "admlogout.php", FALSE); ?>
 </script>
 <script type="text/javascript" src="admin.js"></script>
 
--- a/majax.inc.php	Tue Nov 18 22:00:41 2014 +0200
+++ b/majax.inc.php	Tue Nov 18 22:41:06 2014 +0200
@@ -6,7 +6,7 @@
 //
 
 
-function stCommonAJAX($backend, $failover, $script = FALSE, $tabs = FALSE)
+function stCommonAJAX($backend, $failover, $script = FALSE)
 {
 if ($script)
   echo "<script type=\"text/javascript\">\n";
@@ -261,69 +261,7 @@
   }
 }
 
-<? if ($tabs) { ?>
-
-//
-// Tab related code
-//
-var registeredTabs = Object();
-var activeTabs = Object();
-
-
-function jsUpdateTabList(tabset, extra)
-{
-  var tabs = "";
-  var content = "";
-
-  for (var id in registeredTabs[tabset])
-  {
-    var thead = registeredTabs[tabset][id];
-    tabs += "<a id=\"tabHead"+ tabset + id +
-      "\"href=\"#\" onClick=\"jsSwitchActiveTab('"+tabset+"', '"+id+
-      "')\">"+ thead.replace(/\s/g, "&nbsp;") +"</a> ";
-    
-    content += "<div id=\"tabCont"+ tabset + id +"\"></div>";
-  }
-
-  var item = document.getElementById("tabHeaders"+ tabset);
-  if (item) item.innerHTML = tabs + extra;
-
-  item = document.getElementById("tabContents"+ tabset);
-  if (item) item.innerHTML = content;
-}
-
-
-function jsRegisterTab(tabset, id, name)
-{
-  if (!registeredTabs[tabset])
-    registeredTabs[tabset] = Object();
-
-  registeredTabs[tabset][id] = name;
-}
-
-
-function jsSwitchActiveTab(tabset, tab)
-{
-  for (var id in registeredTabs[tabset])
-  {
-    var tabContent = document.getElementById("tabCont"+ tabset + id);
-    var tabHead = document.getElementById("tabHead"+ tabset + id);
-    if (tabContent && tabHead)
-    {
-      tabContent.style.display = (tab == id) ? "block" : "none";
-      tabHead.style.borderTop = (tab == id) ? "4px solid white" : "none";
-      if (tab == id)
-      {
-        activeTabs[tabset] = id;
-        setTimeout("refreshDispatch"+ tabset +"('"+ id +"');", 10);
-      }
-    }
-  }
-}
-
 <?
-} // if (tabs)
-
 if ($script)
   echo "</script>\n";
 }