diff --git a/admin-dev/themes/default/css/admin.css b/admin-dev/themes/default/css/admin.css index 301846673..71585de0e 100644 --- a/admin-dev/themes/default/css/admin.css +++ b/admin-dev/themes/default/css/admin.css @@ -235,7 +235,10 @@ a.module_toggle_all{color: #268CCD;} .toolbarBox .process-icon-help-new{ background-image: url('../img/process-icon-help-new.png');} .toolbarBox .process-icon-modules-list{ background-image: url('../img/process-icon-modules-list.png');} -.toolbarBox #modules_list_container { +.toolbarReduced {margin-right:221px} +#modules_list_button {width:211px;height:63px;border:none;float:right;background-image:url('../img/modules_list_button.png');font-size: 1.6em;cursor:pointer;padding-left:45px;margin-top:-73px} + +#modules_list_container { background: none repeat scroll 0 0 #FFF; border: solid 1px #CCC; display: block; @@ -244,7 +247,7 @@ a.module_toggle_all{color: #268CCD;} width: 300px; position: absolute; right: 13px; - top: 63px; + top: 83px; z-index: 100; padding: 10px; box-shadow: 1px 5px 5px #CCCCCC; @@ -253,29 +256,29 @@ a.module_toggle_all{color: #268CCD;} opacity: 1; } -.toolbarBox #modules_list_container #modules_list_container_content +#modules_list_container #modules_list_container_content { max-height: 500px; overflow: auto; } -.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 { +#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 { padding-right: 12px; padding-left: 12px; margin-right: 2px; line-height: 14px; } -.toolbarBox #modules_list_container .nav-tabs-modules > li > a { +#modules_list_container .nav-tabs-modules > li > a { padding-top: 8px; padding-bottom: 7px; border: 1px solid transparent; @@ -285,15 +288,15 @@ a.module_toggle_all{color: #268CCD;} border-radius: 4px 4px 0 0; } -.toolbarBox #modules_list_container .nav-tabs-modules > li > a:hover { +#modules_list_container .nav-tabs-modules > li > a:hover { border-color: #C0C0C0; background-color: #ffffff; } -.toolbarBox #modules_list_container .nav-tabs-modules > li > a {border: 1px solid #ddd;border-bottom:none;} +#modules_list_container .nav-tabs-modules > li > a {border: 1px solid #ddd;border-bottom:none;} -.toolbarBox #modules_list_container .nav-tabs-modules > .active > a, -.toolbarBox #modules_list_container .nav-tabs-modules > .active > a:hover { +#modules_list_container .nav-tabs-modules > .active > a, +#modules_list_container .nav-tabs-modules > .active > a:hover { color: #555555; cursor: default; background-color: #EEE; diff --git a/admin-dev/themes/default/template/toolbar.tpl b/admin-dev/themes/default/template/toolbar.tpl index ac98914e5..07b6ac9d2 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,15 +33,6 @@
    {$btn.desc}
    - {if $k == 'modules-list'} - - {/if} {/foreach}
@@ -117,13 +108,51 @@ } {/block} } - {if isset($tab_modules_open)} - if ({$tab_modules_open}) - openModulesList(); - {/if} }); - {if isset($tab_modules_list)} - $('.process-icon-modules-list').parent('a').unbind().bind('click', function (){ + //]]> + + {/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} +

+
+
+ {if isset($tab_modules_list)} + +
 
+ + - {/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} -

-
-
-
+ {/if} + //]]> + + {/if} + \ No newline at end of file diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index a04323983..a6ffccaff 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -1069,7 +1069,6 @@ class AdminControllerCore extends Controller 'desc' => $this->l('Export') ); } - $this->addToolBarModulesListButton(); } /** @@ -1465,26 +1464,16 @@ class AdminControllerCore extends Controller if (is_array($this->tab_modules_list['default_list']) && count($this->tab_modules_list['default_list'])) $this->filter_modules_list = $this->tab_modules_list['default_list']; - else if (is_array($this->tab_modules_list['slider_list']) && count($this->tab_modules_list['slider_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'), 'back_tab_modules_list' => $this->context->link->getAdminLink(Tools::getValue('controller')), 'tab_modules_open' => (int)Tools::getValue('tab_modules_open') - )); + )); } } - - 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 63a298d17..0ca2b6fc6 100644 --- a/controllers/admin/AdminEmailsController.php +++ b/controllers/admin/AdminEmailsController.php @@ -173,7 +173,6 @@ 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/AdminModulesController.php b/controllers/admin/AdminModulesController.php index 675735b77..43bdfef4e 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -259,9 +259,9 @@ class AdminModulesControllerCore extends AdminController } } $this->context->smarty->assign(array( - 'tab_modules_list' => $modules_list, - 'admin_module_favorites_view' => $this->context->link->getAdminLink('AdminModules').'&select=favorites' - )); + 'tab_modules_list' => $modules_list, + 'admin_module_favorites_view' => $this->context->link->getAdminLink('AdminModules').'&select=favorites' + )); $this->smartyOutputContent('controllers/modules/tab_modules_list.tpl'); exit; diff --git a/controllers/admin/AdminStatsTabController.php b/controllers/admin/AdminStatsTabController.php index 260573c10..06fb26911 100644 --- a/controllers/admin/AdminStatsTabController.php +++ b/controllers/admin/AdminStatsTabController.php @@ -37,7 +37,6 @@ abstract class AdminStatsTabControllerCore extends AdminPreferencesControllerCor public function initContent() { $this->initTabModuleList(); - $this->addToolBarModulesListButton(); $this->toolbar_title = $this->l('Stats', 'AdminStatsTab'); if ($this->display == 'view') {