From ac73da11fe124fc23155fde151c0540a63fd3059 Mon Sep 17 00:00:00 2001 From: Tijn Kuyper Date: Fri, 7 Dec 2012 14:58:27 +0100 Subject: [PATCH] More Event calendar admin GUI clean-up --- e107_plugins/calendar_menu/admin_config.php | 83 +++++++++++-------- .../languages/English_admin_calendar_menu.php | 2 +- 2 files changed, 48 insertions(+), 37 deletions(-) diff --git a/e107_plugins/calendar_menu/admin_config.php b/e107_plugins/calendar_menu/admin_config.php index 2e9030a53..6c4c45f3b 100644 --- a/e107_plugins/calendar_menu/admin_config.php +++ b/e107_plugins/calendar_menu/admin_config.php @@ -227,32 +227,38 @@ if (isset($_POST['confirmdelcache']) && ($action == 'cachedel')) if ($action == 'confdel') { $old_string = strftime("%d %B %Y",$ec_qs[1]); - $text = "
+ $text = "
- +
- + - -
".EC_ADLAN_A150.$old_string." ".EC_ADLAN_A150.$old_string."
".$frm->admin_button('confirmdeleteold', EC_ADLAN_A205, 'submit')."
"; + +
+ ".$frm->admin_button('confirmdeleteold', EC_ADLAN_A205, 'delete')." +
+ + "; - $ns->tablerender("
".EC_ADLAN_A205."
", $text); // TODO + $ns->tablerender(EC_ADLAN_A205, $text); } // Prompt to clear cache if ($action == 'confcache') { - $text = "
+ $text = "
- +
- + - -
".EC_ADLAN_A162." ".EC_ADLAN_A162."
"; + +
+ ".$frm->admin_button('confirmdelcache', EC_ADLAN_A205, 'delete')." + "; - $ns->tablerender("
".EC_ADLAN_A205."
", $text); // TODO + $ns->tablerender(EC_ADLAN_A205, $text); } @@ -268,7 +274,7 @@ if (isset($ec_qs[2]) && isset($ec_qs[3]) && ($action == 'subs') && ($ec_qs[2] == if (isset($message) && ($message != "")) { - $ns->tablerender('', "
{$message}
"); // TODO + $ns->tablerender('', "
{$message}
"); // TODO v2 style $message = ''; } @@ -469,7 +475,7 @@ if($action == 'cat') {$calendarmenu_msg} - ".EC_ADLAN_A21." + ".EC_ADLAN_A21." @@ -532,7 +538,7 @@ if($action == 'cat') ".EC_ADLAN_A84; if ($calendarmenu_do == 1) - $calendarmenu_text .= "


"; + $calendarmenu_text .= "


"; // TODO / FIX v2 style $calendarmenu_text .= " "; if ($event_cat_name != EC_DEFAULT_CATEGORY) @@ -543,7 +549,7 @@ if($action == 'cat') ".EC_ADLAN_A117; if ($calendarmenu_do == 1) - $calendarmenu_text .= "


"; + $calendarmenu_text .= "


"; // TODO / FIX v2 style $calendarmenu_text .= " "; if ($event_cat_name != EC_DEFAULT_CATEGORY) @@ -710,8 +716,6 @@ if($action == 'forthcoming') $text .= " - -
@@ -731,12 +735,10 @@ if($action == 'forthcoming') if(($action == 'maint')) { - $text = "
+ $text = "
- - - +
".EC_ADLAN_A144."
- -
".EC_ADLAN_A142." @@ -757,21 +759,30 @@ if(($action == 'maint')) ".EC_ADLAN_A143."


"; + +
+ ".$frm->admin_button('deleteold', EC_ADLAN_A145, 'delete')." +
+ + +

"; - $ns->tablerender("
".EC_ADLAN_1." - ".EC_ADLAN_A141."
", $text); + $ns->tablerender(EC_ADLAN_1." - ".EC_ADLAN_A141, $text); - $text = "
+ $text = "
- - - - -
".EC_ADLAN_A160."
"; + + + + +
".EC_ADLAN_A160."
+
+ ".$frm->admin_button('cache_clear', EC_ADLAN_A161, 'delete')." + + "; - $ns->tablerender("
".EC_ADLAN_1." - ".EC_ADLAN_A159."
", $text); + $ns->tablerender(EC_ADLAN_1." - ".EC_ADLAN_A159, $text); } @@ -793,7 +804,7 @@ if($action == 'subs') ORDER BY u.user_id LIMIT {$from}, {$amount} "; - $text = "
+ $text = "
@@ -834,7 +845,7 @@ if($action == 'subs') "; - } // End while + } // End while // TODO / FIX admin_images to ad_links constant? // Next-Previous. ========================== if ($num_entry > $amount) @@ -847,7 +858,7 @@ if($action == 'subs') $text .= "   ".str_replace("--NUM--", $num_entry, EC_ADLAN_A182); - $ns->tablerender("
".EC_ADLAN_1." - ".EC_ADLAN_A173.'
', $text); + $ns->tablerender(EC_ADLAN_1." - ".EC_ADLAN_A173, $text); } @@ -1118,7 +1129,7 @@ $text .= "
".LAN_DELETE."
- ".$frm->admin_button('updatesettings',LAN_UPDATE, 'update')." + ".$frm->admin_button('updatesettings', LAN_UPDATE, 'update')."
diff --git a/e107_plugins/calendar_menu/languages/English_admin_calendar_menu.php b/e107_plugins/calendar_menu/languages/English_admin_calendar_menu.php index 477a86bd4..8646259d8 100644 --- a/e107_plugins/calendar_menu/languages/English_admin_calendar_menu.php +++ b/e107_plugins/calendar_menu/languages/English_admin_calendar_menu.php @@ -299,7 +299,7 @@ define('EC_ADLAN_A140', "Show number of events for this month in Calendar Menu") define('EC_ADLAN_A141', "Maintenance"); define('EC_ADLAN_A142', "Remove past events ending more than x months ago"); define('EC_ADLAN_A143', "timed from beginning of current month"); -define('EC_ADLAN_A144', "Event Calendar Maintenance"); +//define('EC_ADLAN_A144', "Event Calendar Maintenance"); define('EC_ADLAN_A145', "Delete old entries"); define('EC_ADLAN_A146', "Events older than "); define('EC_ADLAN_A147', " deleted");