# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1385251119 -7200
# Node ID 08b292dd12ff47ba758f5980001e916576706356
# Parent  ef9a007c08769e7190b6ae8f4a09bee2a2d153c8
More work on entry admin.

diff -r ef9a007c0876 -r 08b292dd12ff admajax.php
--- a/admajax.php	Sun Nov 24 01:42:50 2013 +0200
+++ b/admajax.php	Sun Nov 24 01:58:39 2013 +0200
@@ -115,7 +115,7 @@
     "   <td>".stGetFormTextInput(20, SET_LEN_ENTRY_FILENAME, "filename", $eid, $prefix, $item["filename"])."</td>\n".
     "   <td>".stGetFormTextInput(20, SET_LEN_ENTRY_INFO, "info", $eid, $prefix, $item["info"])."</td>\n".
     "   <td>".
-    stGetFormButtonInput("delete", $eid, $prefix, "Del", "deleteEntry(".$eid.")").
+    stGetFormButtonInput("delete", $eid, $prefix, "Del", "deleteEntry(".$item["compo_id"].",".$eid.")").
     stGetFormTextInput(3, 3, "compo_id", $eid, $prefix, $item["compo_id"]).
     stGetFormButtonInput("update", $eid, $prefix, "Upd", "updateEntry(".$eid.")").
     "</td>\n";
diff -r ef9a007c0876 -r 08b292dd12ff admin.php
--- a/admin.php	Sun Nov 24 01:42:50 2013 +0200
+++ b/admin.php	Sun Nov 24 01:58:39 2013 +0200
@@ -95,7 +95,12 @@
 // <? stCreateSettingsData(); stCommonAJAX("admajax.php", "admlogout.php", FALSE); ?>
 
 
-function refreshItems(id,name,msgname,extra)
+var activeAttendee = -1, prevAttendee = -1;
+var activeTmp = "";
+var registeredTabs = Object();
+
+
+function refreshItems(id,name,extra)
 {
   var msuccess = function(txt)
   {
@@ -137,11 +142,11 @@
 {
   switch (id)
   {
-    case "Settings": refreshItems("tabContCCSettings", "settings", "General settings", ""); break;
-    case "News": refreshItems("tabContCCNews", "news", "News list", ""); break;
-    case "Attendees": refreshItems("tabContCCAttendees", "attendees", "Attendees list", ""); break;
-    case "Voters": refreshItems("tabContCCVoters", "voters", "Voters list", ""); break;
-    case "Compos": refreshItems("tabContCCCompos", "compos", "Compo list", ""); break;
+    case "Settings": refreshItems("tabContCCSettings", "settings", ""); break;
+    case "News": refreshItems("tabContCCNews", "news", ""); break;
+    case "Attendees": refreshItems("tabContCCAttendees", "attendees", ""); break;
+    case "Voters": refreshItems("tabContCCVoters", "voters", ""); break;
+    case "Compos": refreshItems("tabContCCCompos", "compos", ""); break;
     case "Entries": refreshCCEntries(); break;
   }
 }
@@ -149,7 +154,7 @@
 
 function refreshCCAttendee(id)
 {
-  refreshItems("attendee"+ id, "attendee", "Attendee", "&id="+ id);
+  refreshItems("attendee"+ id, "attendee", "&id="+ id);
 }
 
 
@@ -165,7 +170,6 @@
         var tmp = JSON.parse("{"+ txt +"}");
         registeredTabs["CM"] = tmp;
         updateTabList("CM", "");
-        switchActiveTab("CM", "Compo1");
       }
       catch (err) {
         alert("JSON.parse("+ txt +") failure: "+ err);
@@ -179,13 +183,13 @@
 
 function refreshCMEntry(id)
 {
-  refreshItems("entry"+ id, "entry", "Entry", "&id="+ id);
+  refreshItems("entry"+ id, "entry", "&id="+ id);
 }
 
 
 function refreshDispatchCM(id)
 {
-  refreshItems("tabContCM"+ id, "entries", "Compo entries", "&id="+ id);
+  refreshItems("tabContCM"+ id, "entries", "&id="+ id);
 }
 
 
@@ -218,7 +222,7 @@
 
   var msuccess = function(txt)
   {
-    refreshItems("news"+id, "newsitem", "News #"+id, "&id="+id);
+    refreshItems("news"+id, "newsitem", "&id="+id);
   }
 
   if (args != "")
@@ -254,7 +258,7 @@
 
   var msuccess = function(txt)
   {
-    refreshItems("attendee"+id, "attendee", "Attendee #"+id, "&id="+id+"&edit=1");
+    refreshItems("attendee"+id, "attendee", "&id="+id+"&edit=1");
   }
 
   if (args != "")
@@ -262,9 +266,6 @@
 }
 
 
-var activeAttendee = -1, prevAttendee = -1;
-var activeTmp = "";
-
 function activateAttendee(id)
 {
   var msuccess1 = function(txt)
@@ -323,7 +324,7 @@
 
   var msuccess = function(txt)
   {
-    refreshItems("compo"+id, "compo", "Compo #"+id, "&id="+id);
+    refreshItems("compo"+id, "compo", "&id="+id);
   }
 
   if (args != "")
@@ -361,14 +362,12 @@
 }
 
 
-function deleteEntry(id)
+function deleteEntry(cid, id)
 {
-  deleteItem(id, "entry", "entries", "refreshCCEntries();", "entry");
+  deleteItem(id, "entry", "entries", "refreshDispatchCM("+ cid +");", "entry");
 }
 
 
-var registeredTabs = Object();
-
 
 function updateTabList(tabset, extra)
 {
@@ -377,9 +376,10 @@
 
   for (var id in registeredTabs[tabset])
   {
+    var thead = registeredTabs[tabset][id];
     tabs += "<a id=\"tabHead"+ tabset + id +
       "\"href=\"#\" onClick=\"switchActiveTab('"+tabset+"', '"+id+
-      "')\">"+ registeredTabs[tabset][id] +"</a>";
+      "')\">"+ thead.replace(/\s/g, "&nbsp;") +"</a>";
     
     content += "<div id=\"tabCont"+ tabset + id +"\"></div>";
   }