From 2a374b72516270b93157d9bd4ea94f7c1edfeafd Mon Sep 17 00:00:00 2001 From: Cameron Date: Fri, 1 Mar 2013 15:50:31 -0800 Subject: [PATCH] Batch drop-down default fix and renamed 'Execute' to 'Go'. --- e107_handlers/admin_ui.php | 4 ++-- e107_handlers/e107_class.php | 12 ++++++++++++ e107_languages/English/admin/lan_admin.php | 3 ++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php index 7ac243d03..342167548 100644 --- a/e107_handlers/admin_ui.php +++ b/e107_handlers/admin_ui.php @@ -5229,13 +5229,13 @@ class e_admin_form_ui extends e_form
".$this->select_open('etrigger_batch', array('class' => 'tbox select batch e-autosubmit reset', 'id' => false))." - ".$this->option(LAN_BATCH_LABEL_SELECTED, '', false, 'disabled=1')." + ".$this->option(LAN_BATCH_LABEL_SELECTED, '', false)." ".($allow_copy ? $this->option(LAN_COPY, 'copy', false, array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"')) : '')." ".($allow_delete ? $this->option(LAN_DELETE, 'delete', false, array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"')) : '')." ".($allow_url ? $this->option(LAN_UI_BATCH_CREATELINK, 'url', false, array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"')) : '')." ".$this->renderBatchFilter('batch')." ".$this->select_close()." - ".$this->admin_button('e__execute_batch', 'e__execute_batch', 'batch e-hide-if-js', 'Execute', array('id' => false))." + ".$this->admin_button('e__execute_batch', 'e__execute_batch', 'batch e-hide-if-js', LAN_GO, array('id' => false))."
"; diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php index f635e1a14..cfbe92a21 100644 --- a/e107_handlers/e107_class.php +++ b/e107_handlers/e107_class.php @@ -140,6 +140,7 @@ class e107 'db' => '{e_HANDLER}mysql_class.php', 'e107Email' => '{e_HANDLER}mail.php', 'e107_event' => '{e_HANDLER}event_class.php', + 'e107_db_debug' => '{e_HANDLER}db_debug_class.php', 'e107_traffic' => '{e_HANDLER}traffic_class.php', 'e107_user_extended' => '{e_HANDLER}user_extended_class.php', 'e107plugin' => '{e_HANDLER}plugin_class.php', @@ -1255,6 +1256,17 @@ class e107 return self::getSingleton('convert', true); } + + /** + * Retrieve date handler singleton object - preferred method. + * + * @return convert + */ + public static function getDebug() //XXX Discuss - possible with current setup? + { + return self::getSingleton('e107_db_debug', true); + } + /** * Retrieve notify handler singleton object * diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php index 093301617..82d57d07d 100644 --- a/e107_languages/English/admin/lan_admin.php +++ b/e107_languages/English/admin/lan_admin.php @@ -327,7 +327,8 @@ define("LAN_VISIBILITY", "Visibility"); define("LAN_ICON", "Icon"); define("LAN_LOADING", "Loading..."); define("LAN_FILE", "File"); -define("LAN_EXECUTE","Execute"); +define("LAN_GO","Go"); // Not "Execute" +define("LAN_RUN","Run"); define("LAN_SEFURL","SEF URL"); define("LAN_COPY","Copy"); define("LAN_KEYWORDS","Keywords");