diff --git a/admin-dev/themes/default/img/modules_view_layout_sidebar.png b/admin-dev/themes/default/img/modules_view_layout_sidebar.png new file mode 100755 index 000000000..fff8da0fb Binary files /dev/null and b/admin-dev/themes/default/img/modules_view_layout_sidebar.png differ diff --git a/admin-dev/themes/default/img/modules_view_layout_sidebar_grey.png b/admin-dev/themes/default/img/modules_view_layout_sidebar_grey.png new file mode 100755 index 000000000..4d8964a31 Binary files /dev/null and b/admin-dev/themes/default/img/modules_view_layout_sidebar_grey.png differ diff --git a/admin-dev/themes/default/img/modules_view_table_select_row.png b/admin-dev/themes/default/img/modules_view_table_select_row.png new file mode 100755 index 000000000..7ae398042 Binary files /dev/null and b/admin-dev/themes/default/img/modules_view_table_select_row.png differ diff --git a/admin-dev/themes/default/img/modules_view_table_select_row_grey.png b/admin-dev/themes/default/img/modules_view_table_select_row_grey.png new file mode 100755 index 000000000..92f449edc Binary files /dev/null and b/admin-dev/themes/default/img/modules_view_table_select_row_grey.png differ diff --git a/admin-dev/themes/default/template/controllers/modules/content.tpl b/admin-dev/themes/default/template/controllers/modules/content.tpl index 0accbb124..1ef1591e6 100644 --- a/admin-dev/themes/default/template/controllers/modules/content.tpl +++ b/admin-dev/themes/default/template/controllers/modules/content.tpl @@ -29,5 +29,9 @@ {$module_content} {else} {include file='controllers/modules/js.tpl'} - {include file='controllers/modules/page.tpl'} + {if isset($smarty.get.select) && $smarty.get.select eq 'favorites'} + {include file='controllers/modules/favorites.tpl'} + {else} + {include file='controllers/modules/page.tpl'} + {/if} {/if} diff --git a/admin-dev/themes/default/template/controllers/modules/favorites.tpl b/admin-dev/themes/default/template/controllers/modules/favorites.tpl new file mode 100755 index 000000000..d4f26f938 --- /dev/null +++ b/admin-dev/themes/default/template/controllers/modules/favorites.tpl @@ -0,0 +1,64 @@ +
+ + {include file='controllers/modules/header.tpl'} + + {l s='Normal view'} + {l s='Favorites view'}
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + {foreach from=$modules key=km item=module} + + + + + + + + + + + {/foreach} + +
LogoNom du moduleDescriptionEtatCatégoriesIntérêtFavori 
{$module->displayName}{$module->description|truncate:80:'…'}{if isset($module->id) && $module->id gt 0}{l s='Installed'}{else}{l s='Not Installed'}{/if}{$module->categoryName} + + + +  
+ +
+
+
\ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/modules/filters.tpl b/admin-dev/themes/default/template/controllers/modules/filters.tpl index 7a4dae8be..d2755dde6 100644 --- a/admin-dev/themes/default/template/controllers/modules/filters.tpl +++ b/admin-dev/themes/default/template/controllers/modules/filters.tpl @@ -24,6 +24,39 @@ * International Registered Trademark & Property of PrestaShop SA *} + + {if !isset($logged_on_addons)} + + {if $check_url_fopen eq 'ko' OR $check_curl eq 'ko' OR $check_openssl eq 'ko'} + +
+ {l s='If you want to be able to fully use the AdminModules pannel and have free modules available, you should enable the following configuration on your server :'}
+ {if $check_url_fopen eq 'ko'}- {l s='Enable allow_url_fopen'}
{/if} + {if $check_curl eq 'ko'}- {l s='Enable php curl extension'}
{/if} + {if $check_openssl eq 'ko'}- {l s='Enable php openssl extension'}
{/if} +
+ + {else} + + +
+ +

{l s='You have a PrestaShop Addons account ?'}

+
+ + + + +
+ +
+ + + {/if} + + {/if} + +
diff --git a/admin-dev/themes/default/template/controllers/modules/header.tpl b/admin-dev/themes/default/template/controllers/modules/header.tpl index 76ec66a71..97238daf0 100644 --- a/admin-dev/themes/default/template/controllers/modules/header.tpl +++ b/admin-dev/themes/default/template/controllers/modules/header.tpl @@ -70,34 +70,4 @@
- {if !isset($logged_on_addons)} - - {if $check_url_fopen eq 'ko' OR $check_curl eq 'ko' OR $check_openssl eq 'ko'} - -
- {l s='If you want to be able to fully use the AdminModules pannel and have free modules available, you should enable the following configuration on your server :'}
- {if $check_url_fopen eq 'ko'}- {l s='Enable allow_url_fopen'}
{/if} - {if $check_curl eq 'ko'}- {l s='Enable php curl extension'}
{/if} - {if $check_openssl eq 'ko'}- {l s='Enable php openssl extension'}
{/if} -
- - {else} - - -
- -

{l s='You have a PrestaShop Addons account ?'}

-
- - - - -
- -
- - - {/if} - - {/if} diff --git a/admin-dev/themes/default/template/controllers/modules/js.tpl b/admin-dev/themes/default/template/controllers/modules/js.tpl index 2908d0081..64cf060af 100644 --- a/admin-dev/themes/default/template/controllers/modules/js.tpl +++ b/admin-dev/themes/default/template/controllers/modules/js.tpl @@ -36,6 +36,7 @@ var ajaxCurrentIndex = '{$ajaxCurrentIndex}'; var by = '{l s='by'}'; var errorLogin = '{l s='Could not login to Addons'}'; + var confirmPreferencesSaved = '{l s='Preferences saved'}'; {if isset($smarty.get.anchor)}var anchor = '{$smarty.get.anchor|htmlentities|replace:'(':''|replace:')':''|replace:'{':''|replace:'}':''}';{else}var anchor = '';{/if} @@ -279,6 +280,48 @@ + + // Method to save favorites preferences + $('.moduleFavorite').change(function() + { + var value_pref = $(this).val(); + var module_pref = $(this).attr('name'); + var action_pref = module_pref.substring(0, 1); + module_pref = module_pref.substring(2, module_pref.length); + try + { + resAjax = $.ajax({ + type:"POST", + url : ajaxCurrentIndex, + async: true, + data : { + ajax : "1", + token : token, + controller : "AdminModules", + action : "saveFavoritePreferences", + action_pref : action_pref, + module_pref : module_pref, + value_pref : value_pref + }, + success : function(data) + { + // res.status = cache or refresh + if (data == 'OK') + $('#r_' + module_pref).html(confirmPreferencesSaved); + }, + error: function(res,textStatus,jqXHR) + { + //jAlert("TECHNICAL ERROR"+res); + } + }); + } + catch(e){} + return false; + }); + + + + }); {/literal} diff --git a/admin-dev/themes/default/template/controllers/modules/page.tpl b/admin-dev/themes/default/template/controllers/modules/page.tpl index 1e4a98124..e1c21ddfb 100644 --- a/admin-dev/themes/default/template/controllers/modules/page.tpl +++ b/admin-dev/themes/default/template/controllers/modules/page.tpl @@ -29,13 +29,25 @@ {include file='controllers/modules/header.tpl'} {include file='controllers/modules/filters.tpl'} +
+ {l s='Normal view'} + {l s='Favorites view'}
+

{l s='Categories'}

-
{$nb_modules}
+
 
    +
  • +
    {l s='Favorites'}
    +
    {$nb_modules_favorites}
    +
    • +
  • +
    {l s='Total'}
    +
    {$nb_modules}
    +
    • {foreach from=$list_modules_categories item=module_category key=module_category_key}
  • {$module_category.name}
    diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index 17d686f6c..072a586b6 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -273,7 +273,7 @@ class AdminModulesControllerCore extends AdminController public function ajaxProcessLogOnAddonsWebservices() { $content = $this->addonsRequest('check_customer', array('username_addons' => pSQL(trim(Tools::getValue('username_addons'))), 'password_addons' => pSQL(trim(Tools::getValue('password_addons'))))); - $xml = @simplexml_load_string($content, NULL, LIBXML_NOCDATA); + $xml = @simplexml_load_string($content, null, LIBXML_NOCDATA); if (!$xml) die('KO'); $result = strtoupper((string)$xml->success); @@ -305,6 +305,31 @@ class AdminModulesControllerCore extends AdminController die('OK'); } + public function ajaxProcessSaveFavoritePreferences() + { + $action = Tools::getValue('action_pref'); + $value = Tools::getValue('value_pref'); + $module = Tools::getValue('module_pref'); + $id_module_preference = (int)Db::getInstance()->getValue('SELECT `id_module_preference` FROM `'._DB_PREFIX_.'module_preference` WHERE `id_employee` = '.(int)$this->id_employee.' AND `module` = \''.pSQL($module).'\''); + if ($id_module_preference > 0) + { + if ($action == 'i') + $update = array('interest' => ($value == '' ? null : (int)$value)); + if ($action == 'f') + $update = array('favorite' => ($value == '' ? null : (int)$value)); + Db::getInstance()->update('module_preference', $update, '`id_employee` = '.(int)$this->id_employee.' AND `module` = \''.pSQL($module).'\'', 0, true); + } + else + { + $insert = array('id_employee' => (int)$this->id_employee, 'module' => pSQL($module), 'interest' => null, 'favorite' => null); + if ($action == 'i') + $insert['interest'] = ($value == '' ? null : (int)$value); + if ($action == 'f') + $insert['favorite'] = ($value == '' ? null : (int)$value); + Db::getInstance()->insert('module_preference', $insert, true); + } + die('OK'); + } @@ -570,7 +595,7 @@ class AdminModulesControllerCore extends AdminController { $file = $f['file']; $content = Tools::file_get_contents(_PS_ROOT_DIR_.$file); - $xml = @simplexml_load_string($content, NULL, LIBXML_NOCDATA); + $xml = @simplexml_load_string($content, null, LIBXML_NOCDATA); foreach ($xml->module as $modaddons) if ($name == $modaddons->name && isset($modaddons->id) && ($this->logged_on_addons || $f['loggedOnAddons'] == 0)) { @@ -817,8 +842,21 @@ class AdminModulesControllerCore extends AdminController { if (stristr($module->name, $filter_name) === false && stristr($module->displayName, $filter_name) === false && stristr($module->description, $filter_name) === false) return true; - else + return false; + } + + + // Filter on interest + if ((int)Db::getInstance()->getValue('SELECT `id_module_preference` FROM `'._DB_PREFIX_.'module_preference` WHERE `module` = \''.pSQL($module->name).'\' AND `id_employee` = '.(int)$this->id_employee.' AND `interest` = 0') > 0) + return true; + + + // Filter on favorites + if (Configuration::get('PS_SHOW_CAT_MODULES_'.(int)$this->id_employee) == 'favorites') + { + if ((int)Db::getInstance()->getValue('SELECT `id_module_preference` FROM `'._DB_PREFIX_.'module_preference` WHERE `module` = \''.pSQL($module->name).'\' AND `id_employee` = '.(int)$this->id_employee.' AND `favorite` = 1 AND (`interest` = 1 OR `interest` IS NULL)') > 0) return false; + return true; } @@ -894,11 +932,26 @@ class AdminModulesControllerCore extends AdminController $filterCategories = explode('|', Configuration::get('PS_SHOW_CAT_MODULES_'.(int)$this->id_employee)); if (count($filterCategories) > 0) foreach ($filterCategories as $fc) - $categoryFiltered[$fc] = 1; - + if (!empty($fc)) + $categoryFiltered[$fc] = 1; + foreach ($this->list_modules_categories as $k => $v) $this->list_modules_categories[$k]['nb'] = 0; - + + + // Retrieve Modules Preferences + $modules_preferences = ''; + $modules_preferences_tmp = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'module_preference` WHERE `id_employee` = '.(int)$this->id_employee); + foreach ($modules_preferences_tmp as $k => $v) + { + if ($v['interest'] == null) + unset($v['interest']); + if ($v['favorite'] == null) + unset($v['favorite']); + $modules_preferences[$v['module']] = $v; + } + + // Retrieve Modules List $modules = Module::getModulesOnDisk(true, $this->logged_on_addons); $this->initModulesList($modules); @@ -939,7 +992,7 @@ class AdminModulesControllerCore extends AdminController )).', '; // Apply filter - if ($this->isModuleFiltered($module)) + if ($this->isModuleFiltered($module) && Tools::getValue('select') != 'favorites') unset($modules[$km]); else { @@ -956,6 +1009,8 @@ class AdminModulesControllerCore extends AdminController $modules[$km]->options['uninstall_onclick'] = ((!method_exists($module, 'onclickOption')) ? ((empty($module->confirmUninstall)) ? '' : 'return confirm(\''.addslashes($module->confirmUninstall).'\');') : $module->onclickOption('uninstall', $modules[$km]->options['uninstall_url'])); if (Tools::getValue('module_name') == $module->name && (int)Tools::getValue('conf') > 0) $modules[$km]->message = $this->_conf[(int)Tools::getValue('conf')]; + if (isset($modules_preferences[$modules[$km]->name])) + $modules[$km]->preferences = $modules_preferences[$modules[$km]->name]; } unset($object); } @@ -993,6 +1048,7 @@ class AdminModulesControllerCore extends AdminController $tpl_vars['modules'] = $modules; $tpl_vars['nb_modules'] = $this->nb_modules_total; + $tpl_vars['nb_modules_favorites'] = Db::getInstance()->getValue('SELECT COUNT(`id_module_preference`) FROM `'._DB_PREFIX_.'module_preference` WHERE `id_employee` = '.(int)$this->id_employee.' AND `favorite` = 1 AND (`interest` = 1 OR `interest` IS NULL)'); $tpl_vars['nb_modules_installed'] = $this->nb_modules_installed; $tpl_vars['nb_modules_uninstalled'] = $tpl_vars['nb_modules'] - $tpl_vars['nb_modules_installed']; $tpl_vars['nb_modules_activated'] = $this->nb_modules_activated; diff --git a/install-new/data/db_structure.sql b/install-new/data/db_structure.sql index cb3b1125f..26ff7d71d 100644 --- a/install-new/data/db_structure.sql +++ b/install-new/data/db_structure.sql @@ -2374,3 +2374,13 @@ CREATE TABLE `PREFIX_category_shop` ( PRIMARY KEY (`id_category`, `id_shop`), UNIQUE KEY `id_category_shop` (`id_category`,`id_shop`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; + +CREATE TABLE `PREFIX_module_preference` ( + `id_module_preference` int(11) NOT NULL auto_increment, + `id_employee` int(11) NOT NULL, + `module` varchar(255) NOT NULL, + `interest` tinyint(1) default NULL, + `favorite` tinyint(1) default NULL, + PRIMARY KEY (`id_module_preference`), + UNIQUE KEY `employee_module` (`id_employee`, `module`) +) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; diff --git a/install-new/upgrade/sql/1.5.0.4.sql b/install-new/upgrade/sql/1.5.0.4.sql index f1eeb8029..bde8ff391 100644 --- a/install-new/upgrade/sql/1.5.0.4.sql +++ b/install-new/upgrade/sql/1.5.0.4.sql @@ -20,3 +20,14 @@ CREATE TABLE `PREFIX_category_shop` ( /* PHP:generate_root_category_for_multishop(); */; + + +CREATE TABLE `PREFIX_module_preference` ( + `id_module_preference` int(11) NOT NULL auto_increment, + `id_employee` int(11) NOT NULL, + `module` varchar(255) NOT NULL, + `interest` tinyint(1) default NULL, + `favorite` tinyint(1) default NULL, + PRIMARY KEY (`id_module_preference`), + UNIQUE KEY `employee_module` (`id_employee`, `module`) +) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; diff --git a/modules/watermark/config.xml b/modules/watermark/config.xml index 60e8bee3b..4b4e9126a 100755 --- a/modules/watermark/config.xml +++ b/modules/watermark/config.xml @@ -2,7 +2,7 @@ watermark - +