# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1485272270 -7200
# Node ID e23057465ca2adfc0fa12ca916f64bb1e968c4e5
# Parent  5f92fa5e683a0c7e3da2a34cba71f8d59283b728
Some more AJAX fixes.

diff -r 5f92fa5e683a -r e23057465ca2 admajax.js.php
--- a/admajax.js.php	Tue Jan 24 17:25:48 2017 +0200
+++ b/admajax.js.php	Tue Jan 24 17:37:50 2017 +0200
@@ -1011,3 +1011,20 @@
 {
   jsSendPOSTRequest("action=ctrl&type=skipToNextSlide");
 }
+
+
+document.addEventListener("DOMContentLoaded",
+function ()
+{
+  jsRegisterTab("CC", "Settings", "Settings");
+  jsRegisterTab("CC", "News", "News");
+  jsRegisterTab("CC", "Attendees", "Attendees");
+  jsRegisterTab("CC", "Voting", "Voting");
+  jsRegisterTab("CC", "Compos", "Compos");
+  jsRegisterTab("CC", "Entries", "Entries");
+  jsRegisterTab("CC", "InfoSys", "Infosystem");
+  jsUpdateTabList("CC",
+    "<a class=\"admin\" href=\"admlogout.php\">Logout</a> " +
+    "<a class=\"admin\" href=\"about\">Mainpage</a>");
+  jsSwitchActiveTab("CC", "Settings");
+});
diff -r 5f92fa5e683a -r e23057465ca2 admin.php
--- a/admin.php	Tue Jan 24 17:25:48 2017 +0200
+++ b/admin.php	Tue Jan 24 17:37:50 2017 +0200
@@ -32,9 +32,7 @@
 // Start output
 $pageCSS = "css/admin.css";
 cmPrintPageHeader("FAPWeb Administration",
-  "  <meta http-equiv=\"Pragma\" content=\"no-cache\" />\n".
-  "  <script type=\"text/javascript\" src=\"admajax.js.php\"></script>\n".
-  "  <script type=\"text/javascript\" src=\"genajax.js\"></script>\n",
+  "  <meta http-equiv=\"Pragma\" content=\"no-cache\" />\n",
   FALSE);
 
 
@@ -82,9 +80,8 @@
 else
 {
 ?>
-<script type="text/javascript" src="admin.js"></script>
-
-<!-- ========================== -->
+<script type="text/javascript" src="admajax.js.php"></script>
+<script type="text/javascript" src="genajax.js"></script>
 
 <div id="adminPopup"></div>
 <div id="adminContent">
@@ -96,21 +93,6 @@
 <h1>Ehm, you need to enable JavaScript to use the admin interface.</h1>
 </noscript>
 </div>
-
-
-<script type="text/javascript">
-  jsRegisterTab("CC", "Settings", "Settings");
-  jsRegisterTab("CC", "News", "News");
-  jsRegisterTab("CC", "Attendees", "Attendees");
-  jsRegisterTab("CC", "Voting", "Voting");
-  jsRegisterTab("CC", "Compos", "Compos");
-  jsRegisterTab("CC", "Entries", "Entries");
-  jsRegisterTab("CC", "InfoSys", "Infosystem");
-  jsUpdateTabList("CC",
-    "<a class=\"admin\" href=\"admlogout.php\">Logout</a> " +
-    "<a class=\"admin\" href=\"about\">Mainpage</a>");
-  jsSwitchActiveTab("CC", "Settings");
-</script>
 <?
 }