diff --git a/admin-dev/themes/default/css/admin.css b/admin-dev/themes/default/css/admin.css index 07c1f0332..574b4d501 100644 --- a/admin-dev/themes/default/css/admin.css +++ b/admin-dev/themes/default/css/admin.css @@ -194,13 +194,13 @@ a.module_toggle_all{color: #268CCD;} .multishop_toolbar .chzn-container .chzn-results .shop{padding-left: 30px;background-color: #EAF2FC;} /*toolbarBox*/ -.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;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} .toolbarBox .pageTitle { margin-left:10px; line-height:48px} .toolbarBox .pageTitle h3 {font-size: 2em; 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;} .toolbarBox ul.cc_button li {color: #666666; float: left; height: 48px; list-style: none outside none; padding: 1px 1px 3px 4px; text-align: center;} .toolbarBox a.toolbar_btn { border:1px solid #f8f8f8; min-width:50px; border-width: 1px; font-size:11px;cursor: pointer; display: block; float: left; padding: 3px 5px; white-space: nowrap; text-shadow: 0 1px 0 #ffffff;} -.toolbarBox a.toolbar_btn:hover { background-color:#fff; border:1px inset #ccc; border-radius:3px;} +.toolbarBox a.toolbar_btn:hover { background-color:#fff; border:1px inset #ccc; border-radius:3px;-moz-border-radius:3px; -webkit-border-radius:3px;-o-border-radius:3px;} .toolbarBox .toolbar_btn span{ display: block;float: none;height: 32px;margin: 0 auto;width: 32px; /*hacking ie7*/ margin:0 !ie; position:relative !ie;} .toolbarBox .process-icon-delete { background-image: url('../img/process-icon-delete.png');} .toolbarBox .process-icon-duplicate { background-image: url('../img/process-icon-duplicate.png');} @@ -246,7 +246,7 @@ a.module_toggle_all{color: #268CCD;} right: 13px; top: 63px; z-index: 100; - padding: 10px 10px 0px 10px; + padding: 10px; box-shadow: 1px 5px 5px #CCCCCC; -moz-box-shadow: 1px 5px 10px #CCCCCC; -webkit-box-shadow: 1px 5px 10px #CCCCCC; @@ -256,7 +256,7 @@ a.module_toggle_all{color: #268CCD;} .toolbarBox #modules_list_container #modules_list_container_content { max-height: 500px; - overflow: scroll; + overflow: auto; } @@ -266,15 +266,8 @@ a.module_toggle_all{color: #268CCD;} .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: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; @@ -284,10 +277,11 @@ a.module_toggle_all{color: #268CCD;} .toolbarBox #modules_list_container .nav-tabs-modules > li > a { padding-top: 8px; - padding-bottom: 8px; + padding-bottom: 7px; border: 1px solid transparent; -webkit-border-radius: 4px 4px 0 0; -moz-border-radius: 4px 4px 0 0; + -o-border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0; } @@ -296,7 +290,7 @@ a.module_toggle_all{color: #268CCD;} background-color: #ffffff; } -.toolbarBox #modules_list_container .nav-tabs-modules > li > a {border: 1px solid #ddd;} +.toolbarBox #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 { @@ -307,6 +301,9 @@ a.module_toggle_all{color: #268CCD;} border-bottom-color: transparent; } + + + div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:500;} /*button upload files*/ @@ -337,7 +334,8 @@ div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0 #productBox { position:relative; width:100%; float:left;} /*tab-pane*/ -form#product_form, form#access_form, form#cart_rule_form { background-color:#ebedf4; border:1px solid #ccced7; min-height:404px; padding: 5px 10px 10px; margin-left:140px;} +form#product_form, form#access_form, form#cart_rule_form, #modules_tab_list { background-color:#ebedf4; border:1px solid #ccced7; min-height:404px; padding: 5px 10px 10px; margin-left:140px;} +#modules_tab_list {min-height: inherit} #content form.adminstockmanagement {margin-left:0px;} form#product_form h3 { font-size:14px; font-weight:normal;} form#product_form h4 { font-size:18px; font-weight:normal;} @@ -508,7 +506,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;} #moduleContainer .setup {background-color:#6db300; font-weight:bold; font-size:10px; color:#fff; text-transform:uppercase; position:relative; left:10px; padding:0px 4px; display: inline-block; border-radius:3px;} #moduleContainer .setup.non-install { background-color:#ec7000;} #moduleContainer .setup.must-have { background-color: #ec7000;} -#moduleContainer .setup.off{ background-color:#ccc;} +#moduleContainer .setup.off{ background-color:#ccc; color:#666666} #moduleContainer .row-actions-module span {padding-right:5px;} #moduleContainer .row-actions-module span a { font-size:12px;} #moduleContainer .button.uninstalled, @@ -524,7 +522,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;} #modules_list_container_tab table tr td { font-size:12px; padding: 3px 3px 3px; border-top:1px solid #ccc; border-bottom:none;} #modules_list_container_tab table tr td tr td {border: none} #modules_list_container_tab table tr:first-child {border-top:1px solid #ccc} -#modules_list_container_tab .imgm {width:32px;} +#modules_list_container_tab .imgm {width:32px;} #modules_list_container_tab .moduleDesc { font-size:12px;} #modules_list_container_tab .moduleDesc h3 { color:#3A6EA7;margin: 0;font-size: 1.1em;text-align: left} #modules_list_container_tab .moduleDesc .metadata { float:left; display:block; margin:5px 0;} @@ -533,11 +531,11 @@ form#product_form h4 { font-size:18px; font-weight:normal;} #modules_list_container_tab .moduleDesc .metadata dl dd { padding-right:10px;} #modules_list_container_tab .moduleDesc .metadata dl dt { font-weight:bold; padding-right:5px;} #modules_list_container_tab .moduleDesc p.desc { color:#666; font-family: Georgia; font-style: italic; font-size:12px; display:block; clear:both;text-align: left} -#modules_list_container_tab .setup {background-color:#6db300; font-weight:bold; font-size:10px; color:#fff; text-transform:uppercase; position:relative; left:10px; padding:0px 4px; display: inline-block; border-radius:3px;} +#modules_list_container_tab .setup {background-color:#6db300; font-weight:bold; font-size:10px; color:#fff; text-transform:uppercase; position:relative; padding:2px 3px; display: inline-block; border-radius:3px;} #modules_list_container_tab .row-actions-module {float: right;} #modules_list_container_tab .setup.non-install { background-color:#ec7000;} #modules_list_container_tab .setup.must-have { background-color: #ec7000;} -#modules_list_container_tab .setup.off{ background-color:#ccc;} +#modules_list_container_tab .setup.off{ background-color:#ccc; color:#666666} #modules_list_container_tab .row-actions-module span { padding-right:5px;} #modules_list_container_tab .row-actions-module span a { font-size:12px;} #modules_list_container_tab ul.listing-grid-module { position:relative; margin:0; padding:0;} @@ -546,6 +544,8 @@ form#product_form h4 { font-size:18px; font-weight:normal;} #modules_list_container_tab .moduleGridDesc h3 { color:#3A6EA7; margin:0;} #modules_list_container_tab ul.listing-grid-module li select { position:absolute; top:0; right:0px; } +.default_modules_list_display_type #modules_list_container_content li table tr td{border: none} +.default_modules_list_display_type #modules_list_container_content li table {border: solid 1px #ccc; height: 115px} /*MODULE POSITION*/ .blocLiveEdit { float:right; clear:right; background-color: #EBEDF4; border: 1px solid #C2C4D9;display: block; width:250px;} diff --git a/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl b/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl index 84ec1c9b5..3a0f76fff 100644 --- a/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl +++ b/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl @@ -1,79 +1,81 @@ -{* -* 2007-2013 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2013 PrestaShop SA - -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - - - - - - - - - - - - -
- - -
-

{$module->displayName} {$module->version} - -

-

- {if isset($module->description) && $module->description ne ''} - {$module->description|truncate:100:'…'} - {else} -   - {/if} -

-
-
- {if isset($module->id) && $module->id gt 0 } - {if $module->active} - {l s='Enabled'} - {else} - {l s='Disabled'} - {/if} - {else} - {if isset($module->type) && $module->type == 'addonsMustHave'} - {l s='Must Have'} - {else} - {l s='Not installed'} - {/if} - - {/if} - - {if isset($module->type) && $module->type == 'addonsMustHave'} - -   {displayPrice price=$module->price currency=$module->id_currency} - {else if !isset($module->not_on_disk)} - {$module->optionsHtml} - Valider - {else} - {l s='Install'} - {/if} -
+{* +* 2007-2013 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2013 PrestaShop SA + +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + + + + + + + + + + + + +
+ + +
+

{$module->displayName|truncate:40:'…'} {$module->version} + +

+

+ {if isset($module->description) && $module->description ne ''} + {$module->description|truncate:100:'…'} + {else} +   + {/if} +

+
+
+ {if isset($module->id) && $module->id gt 0 } + {if $module->active} + {l s='Enabled'} + {else} + {l s='Disabled'} + {/if} + {else} + {if isset($module->type) && $module->type == 'addonsMustHave'} + {l s='Must Have'} + {else} + {l s='Not installed'} + {/if} + + {/if} + +
+ {if isset($module->type) && $module->type == 'addonsMustHave'} + +   {displayPrice price=$module->price currency=$module->id_currency} + {else if !isset($module->not_on_disk)} + {$module->optionsHtml} + Valider + {else} + {l s='Install'} + {/if} +
+
\ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl index a92fb0565..cc33620e7 100644 --- a/admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl @@ -28,9 +28,8 @@ {if !$shop_context}
{l s='You have more than one shop and must select one to configure payment.'}
{else} -

{l s='Payment modules list'}

- {if isset($url_modules)} -
+ {if isset($modules_list)} + {$modules_list} {/if}
diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl index 0a6011446..9a0f43580 100644 --- a/admin-dev/themes/default/template/header.tpl +++ b/admin-dev/themes/default/template/header.tpl @@ -23,6 +23,10 @@ * International Registered Trademark & Property of PrestaShop SA *} + + + + diff --git a/admin-dev/themes/default/template/helpers/modules_list/list.tpl b/admin-dev/themes/default/template/helpers/modules_list/list.tpl new file mode 100644 index 000000000..2bab32eb1 --- /dev/null +++ b/admin-dev/themes/default/template/helpers/modules_list/list.tpl @@ -0,0 +1,40 @@ +{* +* 2007-2013 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2013 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + +

{l s='Modules list'}

+
+
    + {if count($modules_list)} + {foreach from=$modules_list item=module} +
  • + {include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",row alt"}} +
    • + {/foreach} + {else} + {l s='No modules available in this section.'} + {/if} +
+
+
\ No newline at end of file diff --git a/admin-dev/themes/default/template/toolbar.tpl b/admin-dev/themes/default/template/toolbar.tpl index fb09f2364..ac98914e5 100644 --- a/admin-dev/themes/default/template/toolbar.tpl +++ b/admin-dev/themes/default/template/toolbar.tpl @@ -117,11 +117,12 @@ } {/block} } - - if ({$tab_modules_open}) - openModulesList(); + {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 (){ openModulesList(); }); @@ -140,7 +141,7 @@ controller : "AdminModules", action : "getTabModulesList", tab_modules_list : '{$tab_modules_list}', - back_tab_modules_list : '{$back_tab_modules_list}', + back_tab_modules_list : '{$back_tab_modules_list}' }, success : function(data) { @@ -157,6 +158,7 @@ } return false; } + {/if} //]]> {/block} diff --git a/classes/Tab.php b/classes/Tab.php index 9a5e33f63..3bf916f44 100644 --- a/classes/Tab.php +++ b/classes/Tab.php @@ -508,7 +508,7 @@ class TabCore extends ObjectModel public static function getTabModulesList($id_tab) { - $modules_list = array(); + $modules_list = array('default_list' => array(), 'slider_list' => array()); $xml_tab_modules_list = false; $db_tab_module_list = Db::getInstance()->executeS(' SELECT module @@ -520,20 +520,33 @@ class TabCore extends ObjectModel if (file_exists(_PS_ROOT_DIR_.Module::CACHE_FILE_TAB_MODULES_LIST)) $xml_tab_modules_list = @simplexml_load_file(_PS_ROOT_DIR_.Module::CACHE_FILE_TAB_MODULES_LIST); + $class_name = null; + $display_type = 'default_list'; if ($xml_tab_modules_list) - foreach ($xml_tab_modules_list->children() as $tab) + foreach($xml_tab_modules_list->tab as $tab) + { foreach($tab->attributes() as $key => $value) - if ($key == 'class_name' && Tab::getIdFromClassName((string)$value) == $id_tab) - foreach ($tab->children() as $module) - foreach ($module->attributes() as $k => $v) - if ($k == 'name') - $modules_list[] = (string)$v; + if ($key == 'class_name') + $class_name = (string)$value; + + if (Tab::getIdFromClassName((string)$class_name) == $id_tab) + { + foreach($tab->attributes() as $key => $value) + if ($key == 'display_type') + $display_type = (string)$value; + + foreach ($tab->children() as $module) + foreach ($module->attributes() as $k => $v) + if ($k == 'name') + $modules_list[$display_type][] = (string)$v; + } + } //merge tab modules preferences from db with xml foreach($db_tab_module_list as $m) if (!in_array($m, $modules_list)) - $modules_list[] = $m['module']; + $modules_list['slider_list'][] = $m['module']; return $modules_list; } -} +} \ No newline at end of file diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index d63a9b922..20a8d5331 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -96,7 +96,13 @@ class AdminControllerCore extends Controller /** @var array list to be generated */ protected $fields_list; - + + /** @var array modules list filters */ + protected $filter_modules_list = null; + + /** @var array modules list filters */ + protected $modules_list = array(); + /** @var array edit form to be generated */ protected $fields_form; @@ -227,6 +233,7 @@ class AdminControllerCore extends Controller protected $action; protected $display; protected $_includeContainer = true; + protected $tab_modules_list = array('default_list' => array(), 'slider_list' => array()); public $tpl_folder; @@ -1016,7 +1023,7 @@ class AdminControllerCore extends Controller 'desc' => $this->l('Add new') ); } - + $this->addToolBarModulesListButton(); } /** @@ -1385,6 +1392,7 @@ class AdminControllerCore extends Controller } elseif (!$this->ajax) { + $this->content .= $this->renderModulesList(); $this->content .= $this->renderList(); $this->content .= $this->renderOptions(); @@ -1404,23 +1412,32 @@ class AdminControllerCore extends Controller */ protected function initTabModuleList() { - $tab_modules_list = array(); if (!$this->isFresh(Module::CACHE_FILE_TAB_MODULES_LIST, 604800)) $this->refresh(Module::CACHE_FILE_TAB_MODULES_LIST, 'http://'.Tab::TAB_MODULE_LIST_URL); - $tab_modules_list = Tab::getTabModulesList($this->id); - if ($tab_modules_list) + $this->tab_modules_list = Tab::getTabModulesList($this->id); + + if (is_array($this->tab_modules_list['default_list']) && count($this->tab_modules_list['default_list'])) + $this->filter_modules_list = $tab_modules_list['default_list']; + else if (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') ); - - $this->context->smarty->assign(array( - 'tab_modules_list' => implode(',', $tab_modules_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') - )); } /** @@ -1448,7 +1465,17 @@ class AdminControllerCore extends Controller 'iso_is_fr' => strtoupper($this->context->language->iso_code) == 'FR', )); } - + + public function renderModulesList() + { + if ($this->getModulesList($this->filter_modules_list)) + { + $helper = new Helper(); + return $helper->renderModulesList($this->modules_list); + } + } + + /** * Function used to render the list to display for this controller */ @@ -2114,6 +2141,31 @@ class AdminControllerCore extends Controller else $this->_listTotal = Db::getInstance()->getValue('SELECT FOUND_ROWS() AS `'._DB_PREFIX_.$this->table.'`'); } + + public function getModulesList($filter_modules_list) + { + if (!is_array($filter_modules_list) && !is_null($filter_modules_list)) + $filter_modules_list = array($filter_modules_list); + + if (!count($filter_modules_list)) + return false; //if there is no modules to display just return false; + + $all_modules = Module::getModulesOnDisk(true); + $this->modules_list = array(); + foreach($all_modules as $module) + { + if (in_array($module->name, $filter_modules_list)) + { + $this->fillModuleData($module, 'select'); + $this->modules_list[] = $module; + } + } + if (count($this->modules_list)) + return true; + + return false; //no module found on disk just return false; + + } public function getLanguages() { @@ -2811,4 +2863,113 @@ class AdminControllerCore extends Controller // No content, return false return false; } + + public function fillModuleData(&$module, $output_type = 'link', $back = null) + { + $obj = null; + if ($module->onclick_option) + $obj = new $module->name(); + // Fill module data + $module->logo = '../../img/questionmark.png'; + if (file_exists('../modules/'.$module->name.'/logo.gif')) + $module->logo = 'logo.gif'; + if (file_exists('../modules/'.$module->name.'/logo.png')) + $module->logo = 'logo.png'; + $module->optionsHtml = $this->displayModuleOptions($module, $output_type); + $module->options['install_url'] = self::$currentIndex.'&install='.urlencode($module->name).'&token='.$this->token.'&tab_module='.$module->tab.'&module_name='.$module->name.'&anchor=anchor'.ucfirst($module->name); + $module->options['update_url'] = self::$currentIndex.'&update='.urlencode($module->name).'&token='.$this->token.'&tab_module='.$module->tab.'&module_name='.$module->name.'&anchor=anchor'.ucfirst($module->name); + $module->options['uninstall_url'] = self::$currentIndex.'&uninstall='.urlencode($module->name).'&token='.$this->token.'&tab_module='.$module->tab.'&module_name='.$module->name.'&anchor=anchor'.ucfirst($module->name); + + $module->options['uninstall_onclick'] = ((!$module->onclick_option) ? + ((empty($module->confirmUninstall)) ? '' : 'return confirm(\''.addslashes($module->confirmUninstall).'\');') : + $obj->onclickOption('uninstall', $module->options['uninstall_url'])); + + if ((Tools::getValue('module_name') == $module->name || in_array($module->name, explode('|', Tools::getValue('modules_list')))) && (int)Tools::getValue('conf') > 0) + $module->message = $this->_conf[(int)Tools::getValue('conf')]; + + if ((Tools::getValue('module_name') == $module->name || in_array($module->name, explode('|', Tools::getValue('modules_list')))) && (int)Tools::getValue('conf') > 0) + unset($obj); + } + + /** + * Display modules list + * + * @param $module + * @param $output_type (link or select) + * @param $back + * + * @return string + */ + protected $translationsTab = array(); + public function displayModuleOptions($module, $output_type = 'link', $back = null) + { + if (!isset($this->translationsTab['Disable this module'])) + { + $this->translationsTab['Disable this module'] = $this->l('Disable this module'); + $this->translationsTab['Enable this module for all shops'] = $this->l('Enable this module for all shops'); + $this->translationsTab['Disable'] = $this->l('Disable'); + $this->translationsTab['Enable'] = $this->l('Enable'); + $this->translationsTab['Reset'] = $this->l('Reset'); + $this->translationsTab['Configure'] = $this->l('Configure'); + $this->translationsTab['Delete'] = $this->l('Delete'); + $this->translationsTab['Install'] = $this->l('Install'); + $this->translationsTab['Uninstall'] = $this->l('Uninstall'); + $this->translationsTab['This action will permanently remove the module from the server. Are you sure you want to do this?'] = $this->l('This action will permanently remove the module from the server. Are you sure you want to do this?'); + } + + $modules_options = array( + 'configure-module' => array( + 'href' => self::$currentIndex.'&configure='.urlencode($module->name).'&token='.$this->token.'&tab_module='.$module->tab.'&module_name='.urlencode($module->name), + 'onclick' => $module->onclick_option && isset($module->onclick_option_content['configure']) ? $module->onclick_option_content['configure'] : '', + 'title' => '', + 'text' => $this->translationsTab['Configure'], + 'cond' => $module->id && isset($module->is_configurable) && $module->is_configurable, + ), + 'desactive-module' => array( + 'href' => self::$currentIndex.'&token='.$this->token.'&module_name='.urlencode($module->name).'&'.($module->active ? 'enable=0' : 'enable=1').'&tab_module='.$module->tab, + 'onclick' => $module->active && $module->onclick_option && isset($module->onclick_option_content['desactive']) ? $module->onclick_option_content['desactive'] : '' , + 'title' => Shop::isFeatureActive() ? htmlspecialchars($module->active ? $this->translationsTab['Disable this module'] : $this->translationsTab['Enable this module for all shops']) : '', + 'text' => $module->active ? $this->translationsTab['Disable'] : $this->translationsTab['Enable'], + 'cond' => $module->id, + ), + 'reset-module' => array( + 'href' => self::$currentIndex.'&token='.$this->token.'&module_name='.urlencode($module->name).'&reset&tab_module='.$module->tab, + 'onclick' => $module->onclick_option && isset($module->onclick_option_content['reset']) ? $module->onclick_option_content['reset'] : '', + 'title' => '', + 'text' => $this->translationsTab['Reset'], + 'cond' => $module->id && $module->active, + ), + 'delete-module' => array( + 'href' => self::$currentIndex.'&delete='.urlencode($module->name).'&token='.$this->token.'&tab_module='.$module->tab.'&module_name='.urlencode($module->name), + 'onclick' => $module->onclick_option && isset($module->onclick_option_content['delete']) ? $module->onclick_option_content['delete'] : 'return confirm(\''.$this->translationsTab['This action will permanently remove the module from the server. Are you sure you want to do this?'].'\');', + 'title' => '', + 'text' => $this->translationsTab['Delete'], + 'cond' => true, + ), + ); + $return = ''; + foreach($modules_options as $option_name => $option) + { + if ($option['cond']) + { + if ($output_type == 'link') + $return .= ' + '.$option['text'].' + '; + else if ($output_type == 'select') + $return .= ''; + } + } + if ($output_type == 'select') + { + if (!$module->id) + $return = ''.$return; + else + $return = ''.$return; + $return = ''; + + } + + return $return; + } } \ No newline at end of file diff --git a/classes/helper/Helper.php b/classes/helper/Helper.php index ddb9ef106..269cf2c44 100755 --- a/classes/helper/Helper.php +++ b/classes/helper/Helper.php @@ -350,6 +350,16 @@ class HelperCore return $tpl->fetch(); } + + public function renderModulesList($modules_list) + { + $this->tpl_vars = array('modules_list' => $modules_list); + + $tpl = $this->createTemplate('helpers/modules_list/list.tpl'); + $tpl->assign($this->tpl_vars); + + return $tpl->fetch(); + } public static function renderShopList() { diff --git a/config/xml/modules_list.xml b/config/xml/modules_list.xml index a1ff61374..5eac71754 100755 --- a/config/xml/modules_list.xml +++ b/config/xml/modules_list.xml @@ -102,12 +102,13 @@ + - - + + @@ -121,6 +122,7 @@ + diff --git a/controllers/admin/AdminEmailsController.php b/controllers/admin/AdminEmailsController.php index 74470c91a..788a3d3aa 100644 --- a/controllers/admin/AdminEmailsController.php +++ b/controllers/admin/AdminEmailsController.php @@ -170,9 +170,10 @@ class AdminEmailsControllerCore extends AdminController */ public function initContent() { + $this->initTabModuleList(); $this->initToolbar(); + $this->addToolBarModulesListButton(); unset($this->toolbar_btn['save']); - $back = $this->context->link->getAdminLink('AdminHome'); $this->toolbar_btn['back'] = array( diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index 58b72af7b..477514792 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -255,11 +255,11 @@ class AdminModulesControllerCore extends AdminController $modules_list['not_installed'][] = $module; } } - $this->context->smarty->assign(array( + } + $this->context->smarty->assign(array( '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; @@ -809,88 +809,6 @@ class AdminModulesControllerCore extends AdminController return $html_error; } - /** - * Display modules list - * - * @param $module - * @param $output_type (link or select) - * @param $back - * - * @return string - */ - protected $translationsTab = array(); - public function displayModuleOptions($module, $output_type = 'link', $back = null) - { - if (!isset($this->translationsTab['Disable this module'])) - { - $this->translationsTab['Disable this module'] = $this->l('Disable this module'); - $this->translationsTab['Enable this module for all shops'] = $this->l('Enable this module for all shops'); - $this->translationsTab['Disable'] = $this->l('Disable'); - $this->translationsTab['Enable'] = $this->l('Enable'); - $this->translationsTab['Reset'] = $this->l('Reset'); - $this->translationsTab['Configure'] = $this->l('Configure'); - $this->translationsTab['Delete'] = $this->l('Delete'); - $this->translationsTab['Install'] = $this->l('Install'); - $this->translationsTab['Uninstall'] = $this->l('Uninstall'); - $this->translationsTab['This action will permanently remove the module from the server. Are you sure you want to do this?'] = $this->l('This action will permanently remove the module from the server. Are you sure you want to do this?'); - } - - $modules_options = array( - 'configure-module' => array( - 'href' => self::$currentIndex.'&configure='.urlencode($module->name).'&token='.$this->token.'&tab_module='.$module->tab.'&module_name='.urlencode($module->name), - 'onclick' => $module->onclick_option && isset($module->onclick_option_content['configure']) ? $module->onclick_option_content['configure'] : '', - 'title' => '', - 'text' => $this->translationsTab['Configure'], - 'cond' => $module->id && isset($module->is_configurable) && $module->is_configurable, - ), - 'desactive-module' => array( - 'href' => self::$currentIndex.'&token='.$this->token.'&module_name='.urlencode($module->name).'&'.($module->active ? 'enable=0' : 'enable=1').'&tab_module='.$module->tab, - 'onclick' => $module->active && $module->onclick_option && isset($module->onclick_option_content['desactive']) ? $module->onclick_option_content['desactive'] : '' , - 'title' => Shop::isFeatureActive() ? htmlspecialchars($module->active ? $this->translationsTab['Disable this module'] : $this->translationsTab['Enable this module for all shops']) : '', - 'text' => $module->active ? $this->translationsTab['Disable'] : $this->translationsTab['Enable'], - 'cond' => $module->id, - ), - 'reset-module' => array( - 'href' => self::$currentIndex.'&token='.$this->token.'&module_name='.urlencode($module->name).'&reset&tab_module='.$module->tab, - 'onclick' => $module->onclick_option && isset($module->onclick_option_content['reset']) ? $module->onclick_option_content['reset'] : '', - 'title' => '', - 'text' => $this->translationsTab['Reset'], - 'cond' => $module->id && $module->active, - ), - 'delete-module' => array( - 'href' => self::$currentIndex.'&delete='.urlencode($module->name).'&token='.$this->token.'&tab_module='.$module->tab.'&module_name='.urlencode($module->name), - 'onclick' => $module->onclick_option && isset($module->onclick_option_content['delete']) ? $module->onclick_option_content['delete'] : 'return confirm(\''.$this->translationsTab['This action will permanently remove the module from the server. Are you sure you want to do this?'].'\');', - 'title' => '', - 'text' => $this->translationsTab['Delete'], - 'cond' => true, - ), - ); - $return = ''; - foreach($modules_options as $option_name => $option) - { - if ($option['cond']) - { - if ($output_type == 'link') - $return .= ' - '.$option['text'].' - '; - else if ($output_type == 'select') - $return .= ''; - } - } - if ($output_type == 'select') - { - if (!$module->id) - $return = ''.$return; - else - $return = ''.$return; - $return = ''; - - } - - return $return; - } - public function initModulesList(&$modules) { foreach ($modules as $k => $module) @@ -1144,6 +1062,8 @@ class AdminModulesControllerCore extends AdminController else { $this->fillModuleData($module); + $module->categoryName = (isset($this->list_modules_categories[$module->tab]['name']) ? $this->list_modules_categories[$module->tab]['name'] : $this->list_modules_categories['others']['name']); + if (isset($modules_preferences[$modules[$km]->name])) $modules[$km]->preferences = $modules_preferences[$modules[$km]->name]; } @@ -1203,32 +1123,4 @@ class AdminModulesControllerCore extends AdminController } $smarty->assign($tpl_vars); } - - public function fillModuleData(&$module, $output_type = 'link', $back = null) - { - $obj = null; - if ($module->onclick_option) - $obj = new $module->name(); - // Fill module data - $module->logo = '../../img/questionmark.png'; - if (file_exists('../modules/'.$module->name.'/logo.gif')) - $module->logo = 'logo.gif'; - if (file_exists('../modules/'.$module->name.'/logo.png')) - $module->logo = 'logo.png'; - $module->optionsHtml = $this->displayModuleOptions($module, $output_type, $back); - $module->categoryName = (isset($this->list_modules_categories[$module->tab]['name']) ? $this->list_modules_categories[$module->tab]['name'] : $this->list_modules_categories['others']['name']); - $module->options['install_url'] = self::$currentIndex.'&install='.urlencode($module->name).'&token='.$this->token.'&tab_module='.$module->tab.'&module_name='.$module->name.'&anchor=anchor'.ucfirst($module->name); - $module->options['update_url'] = self::$currentIndex.'&update='.urlencode($module->name).'&token='.$this->token.'&tab_module='.$module->tab.'&module_name='.$module->name.'&anchor=anchor'.ucfirst($module->name); - $module->options['uninstall_url'] = self::$currentIndex.'&uninstall='.urlencode($module->name).'&token='.$this->token.'&tab_module='.$module->tab.'&module_name='.$module->name.'&anchor=anchor'.ucfirst($module->name); - - $module->options['uninstall_onclick'] = ((!$module->onclick_option) ? - ((empty($module->confirmUninstall)) ? '' : 'return confirm(\''.addslashes($module->confirmUninstall).'\');') : - $obj->onclickOption('uninstall', $module->options['uninstall_url'])); - - if ((Tools::getValue('module_name') == $module->name || in_array($module->name, explode('|', Tools::getValue('modules_list')))) && (int)Tools::getValue('conf') > 0) - $module->message = $this->_conf[(int)Tools::getValue('conf')]; - - if ((Tools::getValue('module_name') == $module->name || in_array($module->name, explode('|', Tools::getValue('modules_list')))) && (int)Tools::getValue('conf') > 0) - unset($obj); - } } diff --git a/controllers/admin/AdminPaymentController.php b/controllers/admin/AdminPaymentController.php index a3fea4320..928ed8897 100644 --- a/controllers/admin/AdminPaymentController.php +++ b/controllers/admin/AdminPaymentController.php @@ -222,7 +222,7 @@ class AdminPaymentControllerCore extends AdminController } $this->tpl_view_vars = array( - 'url_modules' => isset($token_modules) ? 'index.php?tab=AdminModules&token='.$token_modules.'&&filterCategory=payments_gateways' : null, + 'modules_list' => $this->renderModulesList(), 'display_restrictions' => $display_restrictions, 'lists' => $lists, 'ps_base_uri' => __PS_BASE_URI__, diff --git a/controllers/admin/AdminStatsTabController.php b/controllers/admin/AdminStatsTabController.php index 84a419299..260573c10 100644 --- a/controllers/admin/AdminStatsTabController.php +++ b/controllers/admin/AdminStatsTabController.php @@ -36,8 +36,9 @@ abstract class AdminStatsTabControllerCore extends AdminPreferencesControllerCor public function initContent() { + $this->initTabModuleList(); + $this->addToolBarModulesListButton(); $this->toolbar_title = $this->l('Stats', 'AdminStatsTab'); - if ($this->display == 'view') { // Some controllers use the view action without an object diff --git a/css/admin.css b/css/admin.css index 2a9e99a39..8b98c3534 100644 --- a/css/admin.css +++ b/css/admin.css @@ -352,6 +352,8 @@ select optgroup option { #content { padding: 1.25em; padding-bottom: 0.5em; + position: relative; + z-index: 3000; } #news {