dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// update modules list tab

Browse Source
This commit is contained in:
sLorenzini committed 2013-07-11 17:27:11 +02:00
1 parent f042d704d2
commit 40967e6525
4 files changed
+136 -74
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/template/controllers/modules/filters.tpl
+14 -7
View File
@@ -26,12 +26,19 @@
{if $add_permission eq '1'} {if $add_permission eq '1'}
{if isset($logged_on_addons)} {if isset($logged_on_addons)}
<!--start addons login--> <!--start addons login-->
<div class="filter-module" id="addons_login_div"> <div id="addons_login_div" class="row" >
<p>{l s='You are logged into PrestaShop Addons.'}</p> <div class="col-lg-12">
<div style="float:right"> <legend>{l s='You are logged into PrestaShop Addons.'}</legend>
<label><img src="themes/default/img/module-profile.png" /> {l s='Welcome'} {$username_addons}</label> <div class="row">
<label>|</label> <label class="control-label col-lg-9">
<label><a href="#" id="addons_logout_button"><img src="themes/default/img/module-logout.png" /> {l s='Log out from PrestaShop Addons.'}</a></label> <i class="icon-user"></i> {l s='Welcome'} {$username_addons}
</label>
<label class="control-label col-lg-3">
<a href="#" id="addons_logout_button">
<i class="icon-signout"></i> {l s='Log out from PrestaShop Addons.'}
</a>
</label>
</div>
</div> </div>
</div> </div>
<!--end addons login--> <!--end addons login-->
@@ -88,7 +95,7 @@
<input type="text" value="" name="filtername" autocomplete="off" class="ac_input"> <input type="text" value="" name="filtername" autocomplete="off" class="ac_input">
<span class="input-group-btn"> <span class="input-group-btn">
<button class="btn btn-default" type="submit"> <button class="btn btn-default" type="submit">
{l s='Search'} <i class="icon-search"></i> {l s='Search'}
</button> </button>
</span> </span>
</div> </div>
admin-dev/themes/default/template/controllers/modules/list.tpl
+82 -47
View File
@@ -24,15 +24,15 @@
*} *}
{if count($modules)} {if count($modules)}
<table cellspacing="0" cellpadding="0" style="width: 100%; margin-bottom:10px;" class="table" id=""> <table cellspacing="0" cellpadding="0" class="table table-striped table-hover">
<thead> <thead>
<tr class="nodrag nodrop"> <tr class="nodrag nodrop">
<th class="center"> <th class="center">
<input type="checkbox" rel="false" class="noborder" id="checkme"><br> <input type="checkbox" rel="false" class="noborder" id="checkme">
</th> </th>
<th class="center"></th> <th>{l s='Logo'}</th>
<th>{l s='Module name'}</th> <th class="center">{l s='Module name'}</th>
<th></th> <th>&nbsp;</th>
</tr> </tr>
<tbody> <tbody>
{foreach from=$modules item=module} {foreach from=$modules item=module}
@@ -44,49 +44,60 @@
class="noborder"> class="noborder">
{/if} {/if}
</td> </td>
<td><img class="imgm" alt="" src="{if isset($module->image)}{$module->image}{else}../modules/{$module->name}/{$module->logo}{/if}"></td> <td class="center">
<img width="57" alt="" src="{if isset($module->image)}{$module->image}{else}../modules/{$module->name}/{$module->logo}{/if}" />
</td>
<td> <td>
<div class="moduleDesc" id="anchor{$module->name|ucfirst}"> <div id="anchor{$module->name|ucfirst}">
<h3>{$module->displayName} <h4>{$module->displayName}
{if isset($module->type) && $module->type == 'addonsMustHave'} {if isset($module->type) && $module->type == 'addonsMustHave'}
<span class="setup must-have">{l s='Must Have'}</span> <span class="label label-danger">{l s='Must Have'}</span>
{else} {else}
{if isset($module->id) && $module->id gt 0} {if isset($module->id) && $module->id gt 0}
<span class="setup{if isset($module->active) && $module->active eq 0} off{/if}">{l s='Installed'}</span> <span class="label label-success{if isset($module->active) && $module->active eq 0} off{/if}">{l s='Installed'}</span>
{else} {else}
<span class="setup non-install">{l s='Not installed'}</span> <span class="label label-warning">{l s='Not installed'}</span>
{/if} {/if}
{/if} {/if}
</h3> </h4>
<div class="metadata"> <div class="row-fluid">
{if isset($module->author) && !empty($module->author)} <dl class="dl-horizontal">
<dl class=""> {if isset($module->author) && !empty($module->author)}
<dt>{l s='Developed by'} :</dt> <dt>{l s='Developed by'} :</dt>
<dd>{$module->author|truncate:20:'...'}</dd>| <dd>{$module->author|truncate:20:'...'}</dd>
</dl> {/if}
{/if} <dt>{l s='Version'} :</dt>
<dl class=""> <dd>{$module->version}
<dt>{l s='Version'} :</dt> {if isset($module->version_addons)}({l s='Update'} {$module->version_addons} {l s='Available on PrestaShop Addons'}){/if}
<dd>{$module->version} </dd>
{if isset($module->version_addons)}({l s='Update'} {$module->version_addons} {l s='Available on PrestaShop Addons'}){/if} <dt>{l s='Category'} :</dt>
</dd>| <dd>{$module->categoryName}</dd>
</dl> {if isset($module->description) && $module->description ne ''}
<dl class=""> <dt>{l s='Description'} :</dt>
<dt>{l s='Category'} :</dt> <dd>{$module->description}</dd>
<dd>{$module->categoryName}</dd> {else}
&nbsp;
{/if}
</dl> </dl>
</div> </div>
<p class="desc">{if isset($module->description) && $module->description ne ''}{l s='Description'} : {$module->description}{else}&nbsp;{/if}</p>
{if isset($module->message)}<div class="alert">{$module->message}</div>{/if} {if isset($module->message)}<div class="alert">{$module->message}</div>{/if}
<div class="row-actions-module"> <div class="row-fluid">
{if !isset($module->not_on_disk)} {if !isset($module->not_on_disk)}
{$module->optionsHtml} {$module->optionsHtml}
{if isset($module->preferences) && $module->preferences['favorite'] == 1} {if isset($module->preferences) && $module->preferences['favorite'] == 1}
<a class="action_module action_unfavorite toggle_favorite" data-module="{$module->name}" data-value="0" href="#">{l s='Remove from Favorites'}</a> <a class="btn btn-default btn-small action_module action_unfavorite toggle_favorite" data-module="{$module->name}" data-value="0" href="#">
<a class="action_module action_favorite toggle_favorite" data-module="{$module->name}" data-value="1" href="#" style="display: none;">{l s='Mark as Favorite'}</a> <i class="icon-star"></i> {l s='Remove from Favorites'}
</a>
<a class="btn btn-default btn-small action_module action_favorite toggle_favorite" data-module="{$module->name}" data-value="1" href="#" style="display: none;">
<i class="icon-star"></i> {l s='Mark as Favorite'}
</a>
{else} {else}
<a class="action_module action_unfavorite toggle_favorite" data-module="{$module->name}" data-value="0" href="#" style="display: none;">{l s='Remove from Favorites'}</a> <a class="btn btn-default btn-small action_module action_unfavorite toggle_favorite" data-module="{$module->name}" data-value="0" href="#" style="display: none;">
<a class="action_module action_favorite toggle_favorite" data-module="{$module->name}" data-value="1" href="#">{l s='Mark as Favorite'}</a> <i class="icon-star"></i> {l s='Remove from Favorites'}
</a>
<a class="btn btn-default btn-small action_module action_favorite toggle_favorite" data-module="{$module->name}" data-value="1" href="#">
<i class="icon-star"></i> {l s='Mark as Favorite'}
</a>
{/if} {/if}
{else} {else}
&nbsp; &nbsp;
@@ -94,23 +105,47 @@
</div> </div>
</div> </div>
</td> </td>
<td> <td class="center">
<ul id="list-action-button"> <div id="list-action-button" class="row-light">
{if isset($module->type) && $module->type == 'addonsMustHave'} {if isset($module->type) && $module->type == 'addonsMustHave'}
<li> <p>
<a href="{$module->addons_buy_url}" target="_blank" class="button updated"><span><img src="../img/admin/cart_addons.png">&nbsp;&nbsp;{if isset($module->id_currency) && isset($module->price)}{displayPrice price=$module->price currency=$module->id_currency}{/if}</span></a> <a href="{$module->addons_buy_url}" target="_blank">
</li> <span class="btn btn-default">
<i class="icon-shopping-cart"></i> &nbsp;&nbsp;{if isset($module->id_currency) && isset($module->price)}{displayPrice price=$module->price currency=$module->id_currency}{/if}
</span>
</a>
</p>
{else} {else}
{if $module->id && isset($module->version_addons) && $module->version_addons} {if $module->id && isset($module->version_addons) && $module->version_addons}
<li><a href="{$module->options.update_url}" class="button updated"><span>{l s='Update it!'}</span></a></li> <p>
{/if} <a href="{$module->options.update_url}">
<li> <span class="btn btn-default btn-warning">
<a {if isset($module->id) && $module->id gt 0 && !empty($module->options.uninstall_onclick)}onclick="{$module->options.uninstall_onclick}"{/if} href="{if isset($module->id) && $module->id gt 0}{$module->options.uninstall_url}{else}{$module->options.install_url}{/if}" class="button installed"> <i class="icon-refresh"></i> {l s='Update it!'}
<span>{if isset($module->id) && $module->id gt 0}{l s='Uninstall'}{else}{l s='Install'}{/if}</span> </span>
</a> </a>
</li> </p>
{/if}
<p>
<a {if isset($module->id) && $module->id gt 0 && !empty($module->options.uninstall_onclick)}onclick="{$module->options.uninstall_onclick}"{/if} href="{if isset($module->id) && $module->id gt 0}{$module->options.uninstall_url}{else}{$module->options.install_url}{/if}" class="button installed">
{if isset($module->id) && $module->id gt 0}
<p>
<span class="btn btn-default btn-danger">
<i class="icon-minus-sign-alt"></i>
{l s='Uninstall'}
</span>
</p>
{else}
<p>
<span class="btn btn-default btn-success">
<i class="icon-plus-sign-alt"></i>
{l s='Install'}
</span>
</p>
{/if}
</a>
</p>
{/if} {/if}
</ul> </div>
</td> </td>
</tr> </tr>
{/foreach} {/foreach}
@@ -122,5 +157,5 @@
<input type="button" class="button big" value="{l s='Uninstall the selection'}" onclick="modules_management('uninstall')" /> <input type="button" class="button big" value="{l s='Uninstall the selection'}" onclick="modules_management('uninstall')" />
</div> </div>
{else} {else}
<div style="margin-top: 12px;color: #585A69;font-size: 16px;"><p align="center">{l s='No modules available in this section.'}</p></div> <p class="help-block">{l s='No modules available in this section.'}</p>
{/if} {/if}
admin-dev/themes/default/template/controllers/modules/page.tpl
+33 -19
View File
@@ -36,36 +36,50 @@
</ul> </ul>
</div> </div>
{/if} {/if}
<ul class="view-modules">
<li class="button normal-view-disabled"><img src="themes/default/img/modules_view_layout_sidebar.png" alt="{l s='Normal view'}" border="0" /><span>{l s='Normal view'}</span></li>
<li class="button favorites-view"><a href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}&select=favorites"><img src="themes/default/img/modules_view_table_select_row.png" alt="{l s='Favorites view'}" border="0" /><span>{l s='Favorites view'}</span></a></li>
</ul>
<div class="row">
<div class="col-lg-12">
<span class="pull-right">
<a class="btn btn-default" href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}">
<i class="icon-list"></i>
{l s='Normal view'}
</a>
<a class="btn btn-default" href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}&select=favorites">
<i class="icon-star"></i>
{l s='Favorites view'}
</a>
</span>
</span>
</div>
<div id="container"> <div id="container">
<!--start sidebar module--> <!--start sidebar module-->
<div class="sidebar"> <div class="row-fluid">
<div class="categorieTitle"> <div class="categorieTitle col-lg-3">
<h3>{l s='Categories'}</h3> <legend>{l s='Categories'}</legend>
<div class="subHeadline">&nbsp;</div> <ul class="tab nav nav-pills nav-stacked">
<ul class="categorieList"> <li class="tab-row {if isset($categoryFiltered.favorites)}active{/if}">
<li {if isset($categoryFiltered.favorites)}style="background-color:#EBEDF4"{/if} class="categoryModuleFilterLink"> <a class="tab-page" href="{$currentIndex}&token={$token}&filterCategory=favorites">
<div class="categorieWidth"><a href="{$currentIndex}&token={$token}&filterCategory=favorites"><span><b>{l s='Favorites'}</b></span></a></div> {l s='Favorites'} <span class="badge pull-right">{$nb_modules_favorites}</span>
<div class="count"><b>{$nb_modules_favorites}</b></div> </a>
</li> </li>
<li {if count($categoryFiltered) lte 0}style="background-color:#EBEDF4"{/if} class="categoryModuleFilterLink"> <li class="tab-row {if count($categoryFiltered) lte 0}active{/if}">
<div class="categorieWidth"><a href="{$currentIndex}&token={$token}&unfilterCategory=yes"><span><b>{l s='Total'}</b></span></a></div> <a class="tab-page" href="{$currentIndex}&token={$token}&unfilterCategory=yes">
<div class="count"><b>{$nb_modules}</b></div> {l s='Total'} <span class="badge pull-right">{$nb_modules}</span>
</a>
</li> </li>
{foreach from=$list_modules_categories item=module_category key=module_category_key} {foreach from=$list_modules_categories item=module_category key=module_category_key}
<li {if isset($categoryFiltered[$module_category_key])}style="background-color:#EBEDF4"{/if} class="categoryModuleFilterLink"> <li class="tab-row {if isset($categoryFiltered[$module_category_key])}active{/if}">
<div class="categorieWidth"><a href="{$currentIndex}&token={$token}&{if isset($categoryFiltered[$module_category_key])}un{/if}filterCategory={$module_category_key}"><span>{$module_category.name}</span></a></div> <a class="tab-page" href="{$currentIndex}&token={$token}&{if isset($categoryFiltered[$module_category_key])}un{/if}filterCategory={$module_category_key}">
<div class="count">{$module_category.nb}</div> {$module_category.name} <span class="badge pull-right">{$module_category.nb}</span>
</a>
</li> </li>
{/foreach} {/foreach}
</ul> </ul>
</div> </div>
</div> </div>
<div id="moduleContainer"> <div id="moduleContainer" class="col-lg-9">
<legend>{l s='Modules list'}</legend>
{include file='controllers/modules/list.tpl'} {include file='controllers/modules/list.tpl'}
</div> </div>
</div> </div>
classes/controller/AdminController.php
+7 -1
View File
@@ -2964,6 +2964,7 @@ class AdminControllerCore extends Controller
'title' => '', 'title' => '',
'text' => $this->translationsTab['Configure'], 'text' => $this->translationsTab['Configure'],
'cond' => $module->id && isset($module->is_configurable) && $module->is_configurable, 'cond' => $module->id && isset($module->is_configurable) && $module->is_configurable,
'icon' => 'wrench',
), ),
'desactive-module' => array( 'desactive-module' => array(
'href' => $link_admin_modules.'&module_name='.urlencode($module->name).'&'.($module->active ? 'enable=0' : 'enable=1').'&tab_module='.$module->tab, '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']) : '', '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'], 'text' => $module->active ? $this->translationsTab['Disable'] : $this->translationsTab['Enable'],
'cond' => $module->id, 'cond' => $module->id,
'icon' => 'off',
), ),
'reset-module' => array( 'reset-module' => array(
'href' => $link_admin_modules.'&module_name='.urlencode($module->name).'&reset&tab_module='.$module->tab, 'href' => $link_admin_modules.'&module_name='.urlencode($module->name).'&reset&tab_module='.$module->tab,
@@ -2978,6 +2980,7 @@ class AdminControllerCore extends Controller
'title' => '', 'title' => '',
'text' => $this->translationsTab['Reset'], 'text' => $this->translationsTab['Reset'],
'cond' => $module->id && $module->active, 'cond' => $module->id && $module->active,
'icon' => 'share-alt',
), ),
'delete-module' => array( 'delete-module' => array(
'href' => $link_admin_modules.'&delete='.urlencode($module->name).'&tab_module='.$module->tab.'&module_name='.urlencode($module->name), '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' => '', 'title' => '',
'text' => $this->translationsTab['Delete'], 'text' => $this->translationsTab['Delete'],
'cond' => true, 'cond' => true,
'icon' => 'remove',
), ),
); );
@@ -2995,7 +2999,9 @@ class AdminControllerCore extends Controller
{ {
if ($output_type == 'link') if ($output_type == 'link')
$return .= '<span class="'.$option_name.'"> $return .= '<span class="'.$option_name.'">
<a class="action_module" href="'.$option['href'].(!is_null($back) ? '&back='.urlencode($back) : '').'" onclick="'.$option['onclick'].'" title="'.$option['title'].'">'.$option['text'].'</a> <a class="btn btn-default btn-small action_module" href="'.$option['href'].(!is_null($back) ? '&back='.urlencode($back) : '').'" onclick="'.$option['onclick'].'" title="'.$option['title'].'">
<i class="icon-'.(isset($option['icon']) && $option['icon'] ? $option['icon']:'cog' ).'"></i> '.$option['text'].'
</a>
</span>'; </span>';
elseif ($output_type == 'select') elseif ($output_type == 'select')
$return .= '<option id="'.$option_name.'" data-href="'.$option['href'].(!is_null($back) ? '&back='.urlencode($back) : '').'" data-onclick="'.$option['onclick'].'">'.$option['text'].'</option>'; $return .= '<option id="'.$option_name.'" data-href="'.$option['href'].(!is_null($back) ? '&back='.urlencode($back) : '').'" data-onclick="'.$option['onclick'].'">'.$option['text'].'</option>';