diff --git a/admin-dev/themes/default/css/admin.css b/admin-dev/themes/default/css/admin.css index b057f2c6e..349f6e998 100644 --- a/admin-dev/themes/default/css/admin.css +++ b/admin-dev/themes/default/css/admin.css @@ -199,7 +199,7 @@ a.module_toggle_all{color: #268CCD;} /*toolbarBox*/ .toolbar-placeholder {position:relative} -.toolbarBox {background-color: #F8F8F8; border: 1px solid #CCCCCC; margin-bottom:10px; padding: 5px 0; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;-o-border-radius:3px;position:relative;width: auto !important;} +.toolbarBox {background-color: #F8F8F8; border: 1px solid #CCCCCC; margin-bottom:10px; padding: 5px 0; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;-o-border-radius:3px;position:relative} .toolbarBox .pageTitle { margin-left:10px; line-height:48px} .toolbarBox .pageTitle h3 {font-size: 1.6em; font-weight: normal; line-height: 52px; margin: 0; padding: 0; text-shadow:0 1px 0 #fff;} .toolbarBox ul.cc_button {float:right;margin:0 5px 0 0;padding:0;} @@ -243,7 +243,7 @@ a.module_toggle_all{color: #268CCD;} .toolbarReduced {margin-right:221px} #modules_list_button {width:211px;height:63px;border:none;position:absolute;top:0;right:0;background-image:url('../img/modules_list_button.png');font-size: 1.6em;cursor:pointer;padding-left:45px} -#modules_list_container { +.toolbarBox #modules_list_container { background: none repeat scroll 0 0 #FFF; border: solid 1px #CCC; display: block; @@ -252,7 +252,7 @@ a.module_toggle_all{color: #268CCD;} width: 300px; position: absolute; right: 13px; - top: 83px; + top: 63px; z-index: 100; padding: 10px; box-shadow: 1px 5px 5px #CCCCCC; @@ -261,29 +261,29 @@ a.module_toggle_all{color: #268CCD;} opacity: 1; } -#modules_list_container #modules_list_container_content +.toolbarBox #modules_list_container #modules_list_container_content { max-height: 500px; overflow: auto; } -#modules_list_container #modules_list_container_tab {margin-top: 10px;width: auto;height: auto; } -#modules_list_container #modules_list_container_tab table {width: 100%;border-spacing: 0px; } -#modules_list_container #modules_list_container_tab tr { height: auto} -#modules_list_container #modules_list_container_tab tr.rowalt {background-color: #EEE} -#modules_list_container #modules_list_container_tab #tab_module_switch {margin-bottom: 10px;} -#modules_list_container #modules_list_loader {margin-top: 10px} -#modules_list_container .nav-tabs-modules:after {clear:both} -#modules_list_container .nav-tabs-modules > li {height: 19px;float:left} -#modules_list_container .nav-tabs-modules > li > a { +.toolbarBox #modules_list_container #modules_list_container_tab {margin-top: 10px;width: auto;height: auto; } +.toolbarBox #modules_list_container #modules_list_container_tab table {width: 100%;border-spacing: 0px; } +.toolbarBox #modules_list_container #modules_list_container_tab tr { height: auto} +.toolbarBox #modules_list_container #modules_list_container_tab tr.rowalt {background-color: #EEE} +.toolbarBox #modules_list_container #modules_list_container_tab #tab_module_switch {margin-bottom: 10px;} +.toolbarBox #modules_list_container #modules_list_loader {margin-top: 10px} +.toolbarBox #modules_list_container .nav-tabs-modules:after {clear: both;} +.toolbarBox #modules_list_container .nav-tabs-modules > li {height: 19px;} +.toolbarBox #modules_list_container .nav-tabs-modules > li > a { padding-right: 12px; padding-left: 12px; margin-right: 2px; line-height: 14px; } -#modules_list_container .nav-tabs-modules > li > a { +.toolbarBox #modules_list_container .nav-tabs-modules > li > a { padding-top: 8px; padding-bottom: 7px; border: 1px solid transparent; @@ -293,15 +293,15 @@ a.module_toggle_all{color: #268CCD;} border-radius: 4px 4px 0 0; } -#modules_list_container .nav-tabs-modules > li > a:hover { +.toolbarBox #modules_list_container .nav-tabs-modules > li > a:hover { border-color: #C0C0C0; background-color: #ffffff; } -#modules_list_container .nav-tabs-modules > li > a {border: 1px solid #ddd;border-bottom:none;} +.toolbarBox #modules_list_container .nav-tabs-modules > li > a {border: 1px solid #ddd;border-bottom:none;} -#modules_list_container .nav-tabs-modules > .active > a, -#modules_list_container .nav-tabs-modules > .active > a:hover { +.toolbarBox #modules_list_container .nav-tabs-modules > .active > a, +.toolbarBox #modules_list_container .nav-tabs-modules > .active > a:hover { color: #555555; cursor: default; background-color: #EEE; @@ -312,7 +312,7 @@ a.module_toggle_all{color: #268CCD;} -div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:500;width:90% !important;margin:auto} +div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:500;margin:auto} /*button upload files*/ #content .qq-upload-button { diff --git a/admin-dev/themes/default/template/toolbar.tpl b/admin-dev/themes/default/template/toolbar.tpl index 07b6ac9d2..d833fd276 100644 --- a/admin-dev/themes/default/template/toolbar.tpl +++ b/admin-dev/themes/default/template/toolbar.tpl @@ -24,7 +24,7 @@ *}
-
+
{block name=toolbarBox}
    {foreach from=$toolbar_btn item=btn key=k} @@ -33,6 +33,15 @@
    {$btn.desc}
    + {if $k == 'modules-list'} + + {/if} {/foreach}
@@ -108,51 +117,13 @@ } {/block} } - }); - //]]> - - {/block} -
-

{block name=pageTitle} - - {if $title} - {foreach $title as $key => $item name=title} - {* Use strip_tags because if the string already has been through htmlentities using escape will break it *} - {$item|strip_tags} - {if !$smarty.foreach.title.last} - > - {/if} - - {/foreach} - {else} -   + {if isset($tab_modules_open)} + if ({$tab_modules_open}) + openModulesList(); {/if} - - {/block} -

-
-
- {if isset($tab_modules_list)} - -
 
- - - {/if} -
\ No newline at end of file + {/if} + //]]> + + {/block} +
+

{block name=pageTitle} + + {if $title} + {foreach $title as $key => $item name=title} + {* Use strip_tags because if the string already has been through htmlentities using escape will break it *} + {$item|strip_tags} + {if !$smarty.foreach.title.last} + > + {/if} + + {/foreach} + {else} +   + {/if} + + {/block} +

+
+
+ diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 4cf15f4e7..8832def8c 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -1069,6 +1069,7 @@ class AdminControllerCore extends Controller 'desc' => $this->l('Export') ); } + $this->addToolBarModulesListButton(); } /** @@ -1466,6 +1467,7 @@ class AdminControllerCore extends Controller $this->filter_modules_list = $this->tab_modules_list['default_list']; elseif (is_array($this->tab_modules_list['slider_list']) && count($this->tab_modules_list['slider_list'])) { + $this->addToolBarModulesListButton(); $this->context->smarty->assign(array( 'tab_modules_list' => implode(',', $this->tab_modules_list['slider_list']), 'admin_module_ajax_url' => $this->context->link->getAdminLink('AdminModules'), @@ -1474,6 +1476,15 @@ class AdminControllerCore extends Controller )); } } + + protected function addToolBarModulesListButton() + { + if (is_array($this->tab_modules_list['slider_list']) && count($this->tab_modules_list['slider_list'])) + $this->toolbar_btn['modules-list'] = array( + 'href' => '#', + 'desc' => $this->l('Modules List') + ); + } /** * initialize the invalid doom page of death diff --git a/controllers/admin/AdminEmailsController.php b/controllers/admin/AdminEmailsController.php index 2fca6ae50..a29d7888f 100644 --- a/controllers/admin/AdminEmailsController.php +++ b/controllers/admin/AdminEmailsController.php @@ -173,6 +173,7 @@ class AdminEmailsControllerCore extends AdminController { $this->initTabModuleList(); $this->initToolbar(); + $this->addToolBarModulesListButton(); unset($this->toolbar_btn['save']); $back = $this->context->link->getAdminLink('AdminHome'); diff --git a/controllers/admin/AdminStatsTabController.php b/controllers/admin/AdminStatsTabController.php index 06fb26911..260573c10 100644 --- a/controllers/admin/AdminStatsTabController.php +++ b/controllers/admin/AdminStatsTabController.php @@ -37,6 +37,7 @@ abstract class AdminStatsTabControllerCore extends AdminPreferencesControllerCor public function initContent() { $this->initTabModuleList(); + $this->addToolBarModulesListButton(); $this->toolbar_title = $this->l('Stats', 'AdminStatsTab'); if ($this->display == 'view') {