diff --git a/e107_admin/image.php b/e107_admin/image.php index 493a6a983..362fd36c3 100644 --- a/e107_admin/image.php +++ b/e107_admin/image.php @@ -1063,10 +1063,10 @@ class media_admin_ui extends e_admin_ui $text .= "
- -
"; diff --git a/e107_admin/search.php b/e107_admin/search.php index 746cd029c..006e69cd1 100644 --- a/e107_admin/search.php +++ b/e107_admin/search.php @@ -473,7 +473,7 @@ else
- + ".$frm->admin_button('update_main','no-value','update',LAN_UPDATE)."
@@ -485,13 +485,12 @@ else require_once("footer.php"); -function search_adminmenu() { - global $query; - if ($query[0] == '' || $query[0] == 'main') { - $action = "main"; - } else if ($query[0] == 'settings') { - $action = "settings"; - } +function search_adminmenu() +{ + + $query = e_QUERY; + + $action = vartrue($query,'main'); $var['main']['text'] = SEALAN_41; $var['main']['link'] = e_SELF; diff --git a/e107_handlers/media_class.php b/e107_handlers/media_class.php index d1ad9e489..a16a4e0cc 100644 --- a/e107_handlers/media_class.php +++ b/e107_handlers/media_class.php @@ -526,7 +526,7 @@ class e_media if($navMode === false) { $text .= "
Filter: "; - $text .= " "; // Manual filter, if onkeyup ajax fails for some reason. + $text .= " "; // Manual filter, if onkeyup ajax fails for some reason. // $text .= ""; // see previous page of images. $text .= ""; // see next page of images. diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php index 5c39d8485..c222cb213 100644 --- a/e107_handlers/theme_handler.php +++ b/e107_handlers/theme_handler.php @@ -538,7 +538,7 @@ class themeHandler { $itext .= " ".TPVLAN_50.": - +
"; $itext .= ($mode == 1) ? "" : ""; $itext .= " @@ -891,7 +891,7 @@ class themeHandler $text .= " - - + + "; } } diff --git a/e107_plugins/import/admin_import.php b/e107_plugins/import/admin_import.php index 9d969c888..11ce97cca 100644 --- a/e107_plugins/import/admin_import.php +++ b/e107_plugins/import/admin_import.php @@ -470,7 +470,7 @@ function showStartPage()
".'DBLAN_10'." -
Default
".TPVLAN_22.": - +
diff --git a/e107_plugins/banner/admin_banner.php b/e107_plugins/banner/admin_banner.php index 259b7e418..c1f7330b9 100644 --- a/e107_plugins/banner/admin_banner.php +++ b/e107_plugins/banner/admin_banner.php @@ -368,15 +368,15 @@ if ($action == "create") {
".($sub_action == "edit" ? BNRLAN_22 : BNRLAN_23)." -
".TPVLAN_55." ".TPVLAN_52."
+
- - + - - + - - + - - + - - + - - + - - + - - + - - + - - + @@ -634,16 +634,16 @@ if ($action == "create") {
"; - if ($sub_action == "edit" && $id) { - $text .= " - - - "; - } else { - $text .= " - - "; + if ($sub_action == "edit" && $id) + { + $text .= $frm->admin_button('updatebanner','no-value','create',LAN_UPDATE); + $text .= ""; + } + else + { + $text .= $frm->admin_button('createbanner','no-value','create',LAN_CREATE); } + $text .= "
@@ -684,21 +684,21 @@ if ($action == "menu")
".BANNER_MENU_L5." -
".BNRLAN_24."
".BNRLAN_25."
 + ".BNRLAN_24."
".BNRLAN_25."
 "; if (count($campaigns)) { @@ -414,8 +414,8 @@ if ($action == "create") {
".BNRLAN_27."
".BNRLAN_28."
 + ".BNRLAN_27."
".BNRLAN_28."
 "; if (count($clients)) { @@ -488,20 +488,20 @@ if ($action == "create") {
".BNRLAN_30." + ".BNRLAN_30."
".BNRLAN_31." + ".BNRLAN_31."
".BNRLAN_32." + ".BNRLAN_32."
@@ -550,21 +550,21 @@ if ($action == "create") {
".BNRLAN_33." + ".BNRLAN_33."
".BNRLAN_34." + ".BNRLAN_34."
0 = ".BNRLAN_35."
".BNRLAN_36." + ".BNRLAN_36."
".BNRLAN_37." + ".BNRLAN_37."
".MENLAN_4." + ".MENLAN_4." ".$e_userclass->uc_dropdown('banner_class', $_POST['banner_active'], 'public,member,guest,admin,classes,nobody,classes')."
+
- - + - - + - - + - - +
".BANNER_MENU_L3.": + ".BANNER_MENU_L3.":
".BANNER_MENU_L6." + ".BANNER_MENU_L6." "; //removed by SecretR; Reason - BAD UI, null usability //".BANNER_MENU_L7."
@@ -744,14 +744,14 @@ if ($action == "menu")
".BANNER_MENU_L19." + ".BANNER_MENU_L19."
".BANNER_MENU_L10." + ".BANNER_MENU_L10."
-
- +
". + $frm->admin_button('update_menu','no-value','update',LAN_SAVE)."
@@ -869,13 +869,12 @@ if ($action == "menu") } -function admin_banner_adminmenu() { +function admin_banner_adminmenu() +{ - global $action; - $act = $action; - if ($act == "") { - $act = "main"; - } + $qry = e_QUERY; + $act = vartrue($qry,'main'); + $var['main']['text'] = BNRLAN_58; $var['main']['link'] = e_SELF; diff --git a/e107_plugins/download/includes/admin.php b/e107_plugins/download/includes/admin.php index 8dd18c04f..ccdbf9c5a 100644 --- a/e107_plugins/download/includes/admin.php +++ b/e107_plugins/download/includes/admin.php @@ -947,8 +947,8 @@ $columnInfo = array( if(!empty($hook)) { $text .= "
".$hook['caption']."".$hook['text']."".$hook['caption']."".$hook['text']."
+
@@ -567,7 +567,7 @@ function showImportOptions($mode='csv') $text = " -
+
diff --git a/e107_plugins/linkwords/admin_config.php b/e107_plugins/linkwords/admin_config.php index 4dce46245..4206dc1f6 100644 --- a/e107_plugins/linkwords/admin_config.php +++ b/e107_plugins/linkwords/admin_config.php @@ -50,7 +50,7 @@ $lw_context_areas = array( // Yes, I know its a silly order - but that's history! $lwaction_vals = array(1=>LWLAN_51, 0=>LWLAN_52, 2=>LWLAN_53, 3=>LWLAN_54); - +$frm = e107::getForm(); // Generate dropdown for possible actions on finding a linkword function lw_act_opts($curval) { @@ -204,57 +204,58 @@ else if (($action == 'words') || ($action == 'edit')) { + + $frm = e107::getForm(); + $text = "
-
+
- - + + - - + - - + - - + - - + - - + - - - -
".LWLAN_21." +".LWLAN_21."
".LWLAN_6." +".LWLAN_6."
".LWLAN_55."
".LWLAN_50." +".LWLAN_50."
".LWLAN_62." +".LWLAN_62." ".LWLAN_63."
".LWLAN_22."".LWLAN_22."
". -(defined("LW_EDIT") ? "" : "")." -
+
+". +(defined("LW_EDIT") ? $frm->admin_button('update_linkword','no-value','update',LAN_UPDATE) . "" : $frm->admin_button('submit_linkword','no-value','submit',LAN_CREATE))." +
\n"; @@ -275,7 +276,7 @@ if (($action == 'words') || ($action == 'edit')) { $text = "
- +
@@ -286,28 +287,28 @@ if (($action == 'words') || ($action == 'edit')) - - - - - - - - + + + + + + + + \n"; while($row = $sql -> db_Fetch()) { $text .= " - - - - - - - - + + + + + + +
".LWLAN_61."".LWLAN_5."".LWLAN_6."".LWLAN_56."".LWLAN_50."".LWLAN_60."".LWLAN_7."".LWLAN_8."".LWLAN_61."".LWLAN_5."".LWLAN_6."".LWLAN_56."".LWLAN_50."".LWLAN_60."".LWLAN_7."".LWLAN_8."
{$row['linkword_id']}{$row['linkword_word']}{$row['linkword_link']}".($row['linkword_newwindow'] ? LAN_YES : LAN_NO)."{$row['linkword_tooltip']}".($row['linkword_tip_id'] > 0 ? $row['linkword_tip_id'] : '')."".$lwaction_vals[$row['linkword_active']]." + {$row['linkword_id']}{$row['linkword_word']}{$row['linkword_link']}".($row['linkword_newwindow'] ? LAN_YES : LAN_NO)."{$row['linkword_tooltip']}".($row['linkword_tip_id'] > 0 ? $row['linkword_tip_id'] : '')."".$lwaction_vals[$row['linkword_active']]."
@@ -333,57 +334,55 @@ if ($action=='options') $menu_pages = str_replace("|", "\n", $menu_pages); $AjaxEnable = varset($pref['lw_ajax_enable'],0); $text = " -
+
- +
- - + - + - - + - + "; $checked = varset($pref['lw_ajax_enable'],0) ? 'checked=checked' : ''; $text .= " - - + - + "; $checked = varset($pref['lw_notsamepage'],0) ? 'checked=checked' : ''; $text .= " - - + - + - - -
".LWLAN_26.""; + ".LWLAN_26.""; foreach ($lw_context_areas as $lw_key=>$lw_desc) { $checked = $pref['lw_context_visibility'][$lw_key] ? "checked='checked'" : ''; $text .= "{$lw_desc}
"; } $text .= "		".LWLAN_27."".LWLAN_27."
".LWLAN_28." + ".LWLAN_28." ".LWLAN_29."".LWLAN_29."
".LWLAN_59." + ".LWLAN_59." ".""."".""."
".LWLAN_64." + ".LWLAN_64." ".LWLAN_65."".LWLAN_65."
- -
+
+".$frm->admin_button('saveopts_linkword','no-value','submit',LWLAN_30)." +
\n"; diff --git a/e107_plugins/poll/admin_config.php b/e107_plugins/poll/admin_config.php index 887447b68..f1d5d2709 100644 --- a/e107_plugins/poll/admin_config.php +++ b/e107_plugins/poll/admin_config.php @@ -194,7 +194,7 @@ function poll_list() if ($poll_total = $sql->db_Select("polls", "*", "poll_type=1")) { - $text .= ""; + $text .= "
"; $text .= $frm->colGroup($fields,$fieldpref). $frm->thead($fields,$fieldpref); $text .= ""; @@ -237,10 +237,10 @@ function poll_list() function admin_config_adminmenu() { $action = varset($_GET['mode']) ? $_GET['mode'] : "list"; - $var['list']['text'] = POLLAN_1; + $var['list']['text'] = LAN_EXISTING; $var['list']['link'] = e_SELF; $var['list']['perm'] = "P"; - $var['create']['text'] = POLLAN_2 ; + $var['create']['text'] = LAN_CREATE ; $var['create']['link'] = e_SELF."?mode=create"; $var['create']['perm'] = "P"; /* $var['import']['text'] = GSLAN_23; diff --git a/e107_plugins/poll/poll_class.php b/e107_plugins/poll/poll_class.php index 5d427a17a..bc94496e8 100644 --- a/e107_plugins/poll/poll_class.php +++ b/e107_plugins/poll/poll_class.php @@ -491,6 +491,8 @@ class poll function renderPollForm($mode='admin') { $tp = e107::getParser(); + $frm = e107::getForm(); + //TODO Hardcoded FORUM code needs to be moved somewhere. if ($mode == 'forum') { @@ -550,8 +552,8 @@ class poll $text = "
-
- +
+ @@ -631,14 +633,20 @@ class poll } else { - $text .= " "; + $text .= $frm->admin_button('submit','no-value','submit',POLLAN_23); + // $text .= " "; } - } else { - $text .= " "; + } + else + { + $text .= $frm->admin_button('preview','no-value','preview',POLLAN_24); + // $text .= " "; } - if (defset('POLLID')) { - $text .= " "; + if (defset('POLLID')) + { + $text .= $frm->admin_button('reset','no-value','reset',POLLAN_25); + // $text .= " "; } $text .= " diff --git a/e107_plugins/tinymce/admin_config.php b/e107_plugins/tinymce/admin_config.php index 395e8cc91..7a666fea4 100644 --- a/e107_plugins/tinymce/admin_config.php +++ b/e107_plugins/tinymce/admin_config.php @@ -302,8 +302,8 @@ class tinymce { $text .= " - - + + "; } @@ -470,15 +470,15 @@ class tinymce - - + - - + diff --git a/e107_themes/bootstrap/admin_style.css b/e107_themes/bootstrap/admin_style.css index 4a0b4639c..f48dc7864 100644 --- a/e107_themes/bootstrap/admin_style.css +++ b/e107_themes/bootstrap/admin_style.css @@ -32,7 +32,7 @@ td.center { text-align:center } .col-label { - width:40%; + width:30%; } .sidebar-nav {
".$att['title']."".$this->renderElement($key,$row)."".$att['title']."".$this->renderElement($key,$row)."
".CUSLAN_29." + ".CUSLAN_29." ".$frm->radio_switch('listPages', $pref['listPages'])."
".CUSLAN_30." + ".CUSLAN_30." ".$frm->text('pageCookieExpire', $pref['pageCookieExpire'], 10)."