diff --git a/admin-dev/themes/default/template/controllers/modules/filters.tpl b/admin-dev/themes/default/template/controllers/modules/filters.tpl index ceb781a96..871882711 100644 --- a/admin-dev/themes/default/template/controllers/modules/filters.tpl +++ b/admin-dev/themes/default/template/controllers/modules/filters.tpl @@ -26,12 +26,19 @@ {if $add_permission eq '1'} {if isset($logged_on_addons)} -
-

{l s='You are logged into PrestaShop Addons.'}

-
- - - +
+
+ {l s='You are logged into PrestaShop Addons.'} +
+ + +
@@ -88,7 +95,7 @@
diff --git a/admin-dev/themes/default/template/controllers/modules/list.tpl b/admin-dev/themes/default/template/controllers/modules/list.tpl index ad438c89a..639f5e7ba 100644 --- a/admin-dev/themes/default/template/controllers/modules/list.tpl +++ b/admin-dev/themes/default/template/controllers/modules/list.tpl @@ -24,15 +24,15 @@ *} {if count($modules)} - +
- - - + + + {foreach from=$modules item=module} @@ -44,49 +44,60 @@ class="noborder"> {/if} - + - {/foreach} @@ -122,5 +157,5 @@ {else} -

{l s='No modules available in this section.'}

+

{l s='No modules available in this section.'}

{/if} diff --git a/admin-dev/themes/default/template/controllers/modules/page.tpl b/admin-dev/themes/default/template/controllers/modules/page.tpl index c74826185..c3c27d071 100644 --- a/admin-dev/themes/default/template/controllers/modules/page.tpl +++ b/admin-dev/themes/default/template/controllers/modules/page.tpl @@ -36,36 +36,50 @@ {/if} - +
+
+ + + + {l s='Normal view'} + + + + {l s='Favorites view'} + + + +
+
-
-
-

{l s='Categories'}

-
 
-
    -
  • -
    {l s='Favorites'}
    -
    {$nb_modules_favorites}
    +
    +
    + {l s='Categories'} +
    -
    +
    + {l s='Modules list'} {include file='controllers/modules/list.tpl'}
    diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 1956f4816..b758be3a0 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -2964,6 +2964,7 @@ class AdminControllerCore extends Controller 'title' => '', 'text' => $this->translationsTab['Configure'], 'cond' => $module->id && isset($module->is_configurable) && $module->is_configurable, + 'icon' => 'wrench', ), 'desactive-module' => array( 'href' => $link_admin_modules.'&module_name='.urlencode($module->name).'&'.($module->active ? 'enable=0' : 'enable=1').'&tab_module='.$module->tab, @@ -2971,6 +2972,7 @@ class AdminControllerCore extends Controller '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, + 'icon' => 'off', ), 'reset-module' => array( 'href' => $link_admin_modules.'&module_name='.urlencode($module->name).'&reset&tab_module='.$module->tab, @@ -2978,6 +2980,7 @@ class AdminControllerCore extends Controller 'title' => '', 'text' => $this->translationsTab['Reset'], 'cond' => $module->id && $module->active, + 'icon' => 'share-alt', ), 'delete-module' => array( 'href' => $link_admin_modules.'&delete='.urlencode($module->name).'&tab_module='.$module->tab.'&module_name='.urlencode($module->name), @@ -2985,6 +2988,7 @@ class AdminControllerCore extends Controller 'title' => '', 'text' => $this->translationsTab['Delete'], 'cond' => true, + 'icon' => 'remove', ), ); @@ -2995,7 +2999,9 @@ class AdminControllerCore extends Controller { if ($output_type == 'link') $return .= ' - '.$option['text'].' + + '.$option['text'].' + '; elseif ($output_type == 'select') $return .= '';
-
+ 		{l s='Module name'}{l s='Logo'}{l s='Module name'} 
+ + -
-

{$module->displayName} +
+

{$module->displayName} {if isset($module->type) && $module->type == 'addonsMustHave'} - {l s='Must Have'} + {l s='Must Have'} {else} {if isset($module->id) && $module->id gt 0} - {l s='Installed'} + {l s='Installed'} {else} - {l s='Not installed'} + {l s='Not installed'} {/if} {/if} -

-
- {if isset($module->author) && !empty($module->author)} -
-
{l s='Developed by'} :
-
{$module->author|truncate:20:'...'}
| -
- {/if} -
-
{l s='Version'} :
-
{$module->version} - {if isset($module->version_addons)}({l s='Update'} {$module->version_addons} {l s='Available on PrestaShop Addons'}){/if} -
| -
-
-
{l s='Category'} :
-
{$module->categoryName}
+

+
+
+ {if isset($module->author) && !empty($module->author)} +
{l s='Developed by'} :
+
{$module->author|truncate:20:'...'}
+ {/if} +
{l s='Version'} :
+
{$module->version} + {if isset($module->version_addons)}({l s='Update'} {$module->version_addons} {l s='Available on PrestaShop Addons'}){/if} +
+
{l s='Category'} :
+
{$module->categoryName}
+ {if isset($module->description) && $module->description ne ''} +
{l s='Description'} :
+
{$module->description}
+ {else} +   + {/if}
-

{if isset($module->description) && $module->description ne ''}{l s='Description'} : {$module->description}{else} {/if}

{if isset($module->message)}
{$module->message}
{/if} -
+
{if !isset($module->not_on_disk)} {$module->optionsHtml} {if isset($module->preferences) && $module->preferences['favorite'] == 1} - {l s='Remove from Favorites'} - + + {l s='Remove from Favorites'} + + {else} - - {l s='Mark as Favorite'} + + + {l s='Mark as Favorite'} + {/if} {else}   @@ -94,23 +105,47 @@
-
    +
+