From cb920d5d48d08134c384d7ce420bedd7d8728cdf Mon Sep 17 00:00:00 2001 From: Cameron Date: Tue, 14 Jul 2015 10:46:24 -0700 Subject: [PATCH] Admin-UI: Removed hard-coded styling from filter and batch elements. --- e107_admin/header.php | 10 ++-- e107_handlers/admin_ui.php | 20 ++++---- e107_themes/bootstrap/admin_style.css | 71 +++++++++++++++----------- e107_themes/bootstrap/admin_theme.php | 5 +- e107_themes/bootstrap3/admin_theme.php | 4 +- 5 files changed, 59 insertions(+), 51 deletions(-) diff --git a/e107_admin/header.php b/e107_admin/header.php index ecb7bf312..73f7b6212 100644 --- a/e107_admin/header.php +++ b/e107_admin/header.php @@ -50,12 +50,8 @@ function loadJSAddons() // e107::js('core', 'bootstrap/js/bootstrap-modal.js', 'jquery', 2); // Special Version see: https://github.com/twitter/bootstrap/pull/4224 - e107::css('core', 'bootstrap-editable/css/bootstrap-editable.css', 'jquery'); - e107::js('core', 'bootstrap-editable/js/bootstrap-editable.min.js', 'jquery', 2); - -// e107::css('url', "//cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap-editable/css/bootstrap-editable.css"); -// e107::js('url', "//cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap-editable/js/bootstrap-editable.min.js"); - + + e107::css('core', 'bootstrap-select/bootstrap-select.min.css', 'jquery'); e107::js('core', 'bootstrap-select/bootstrap-select.min.js', 'jquery', 2); @@ -274,7 +270,7 @@ if (isset($eplug_css) && $eplug_css) - if(e107::getPref('admincss') == "admin_dark.css" && !vartrue($_GET['configure']) && !deftrue('e_BOOTSTRAP3_ADMIN')) + if(e107::getPref('admincss') == "admin_dark.css" && !vartrue($_GET['configure']) && e107::getPref('admintheme')!='bootstrap3') { $e_js->coreCSS('bootstrap/css/darkstrap.css'); diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php index 65cf760aa..9f4c81888 100644 --- a/e107_handlers/admin_ui.php +++ b/e107_handlers/admin_ui.php @@ -5646,11 +5646,11 @@ class e_admin_form_ui extends e_form { if(empty($tabs)) { - $head = "
".$multiLangInfo."
"; + $head = "
".$multiLangInfo."
"; } else { - $head = "
".$multiLangInfo."
"; + $head = "
".$multiLangInfo."
"; } } else @@ -5897,13 +5897,13 @@ class e_admin_form_ui extends e_form } $text = "
-
+
".LAN_LABEL_LABEL_SELECTED." ".$filter_pre." -
-
+
+
".$this->text('searchquery', $current_query[0], 50, $input_options)." - ".$this->select_open('filter_options', array('class' => 'e-tip tbox select filter', 'id' => false, 'title'=>'Filter the results below'))." + ".$this->select_open('filter_options', array('class' => 'form-control e-tip tbox select filter', 'id' => false, 'title'=>'Filter the results below'))." ".$this->option(LAN_FILTER_LABEL_DISPLAYALL, '')." ".$this->option(LAN_FILTER_LABEL_CLEAR, '___reset___')." ".$this->renderBatchFilter('filter', $current_query[1])." @@ -5915,7 +5915,7 @@ class e_admin_form_ui extends e_form ".LAN_LOADING."
-
"; +
"; // Let Admin know which language table is being saved to. (avoid default table overwrites) @@ -6097,14 +6097,14 @@ class e_admin_form_ui extends e_form // TODO - core ui-batch-option class!!! REMOVE INLINE STYLE! // XXX Quick Fix for styling - correct. $text = " -
+