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

// Modules page + Warning

Browse Source
This commit is contained in:
Kevin Granger
2013-08-26 11:38:10 +02:00
parent b2f0a8aea9
commit f8f2c99d28
36 changed files with 159 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/modules/filters.tpl
+46 -72
View File
@@ -24,78 +24,52 @@
*}
<!--start filter module-->
<div class="well">
<div class="row">
<div class="col-lg-6">
<form id="filternameForm" method="post" class="form-horizontal">
<div class="input-group col-lg-12">
<input type="text" value="" name="filtername" autocomplete="off" class="ac_input">
<span class="input-group-btn">
<button class="btn btn-default" type="submit">
<i class="icon-search"></i> {l s='Search'}
</button>
</span>
</div>
</form>
</div>
<div class="col-lg-6">
<form method="post" class="form-inline pull-right">
<label>{l s='Sort by'}</label>
<form method="post" class="form-inline pull-right">
<!-- <span>
<select class="filter fixed-width-L" name="module_type" id="module_type_filter" {if $showTypeModules ne 'allModules' && $showTypeModules ne ''}style="background-color:#49B2FF;color:white;"{/if}>
<option value="allModules" {if $showTypeModules eq 'allModules'}selected="selected"{/if}>{l s='All Modules'}</option>
<option value="nativeModules" {if $showTypeModules eq 'nativeModules'}selected="selected"{/if}>{l s='Free Modules'}</option>
<option value="partnerModules" {if $showTypeModules eq 'partnerModules'}selected="selected"{/if}>{l s='Partner Modules (Free)'}</option>
<option value="mustHaveModules" {if $showTypeModules eq 'mustHaveModules'}selected="selected"{/if}>{l s='Must Have'}</option>
{if isset($logged_on_addons)}<option value="addonsModules" {if $showTypeModules eq 'addonsModules'}selected="selected"{/if}>{l s='Modules purchased on Addons'}</option>{/if}
<optgroup label="{l s='Authors'}">
{foreach from=$list_modules_authors key=module_author item=status}
<option value="authorModules[{$module_author}]" {if $status eq "selected"}selected{/if}>{$module_author|truncate:20:'...'}</option>
{/foreach}
</optgroup>
<option value="otherModules" {if $showTypeModules eq 'otherModules'}selected="selected"{/if}>{l s='Other Modules'}</option>
</select>
</span> -->
<span>
<select class="filter fixed-width-L" name="module_install" id="module_install_filter" {if $showInstalledModules ne 'installedUninstalled' && $showInstalledModules ne ''}style="background-color:#49B2FF;color:white;"{/if}>
<option value="installedUninstalled" {if $showInstalledModules eq 'installedUninstalled'}selected="selected"{/if}>{l s='Installed & Not Installed'}</option>
<option value="installed" {if $showInstalledModules eq 'installed'}selected="selected"{/if}>{l s='Installed Modules'}</option>
<option value="uninstalled" {if $showInstalledModules eq 'uninstalled'}selected="selected"{/if}>{l s='Modules Not Installed '}</option>
</select>
</span>
<span>
<select class="filter fixed-width-L" name="module_status" id="module_status_filter" {if $showEnabledModules ne 'enabledDisabled' && $showEnabledModules ne ''}style="background-color:#49B2FF;color:white;"{/if}>
<option value="enabledDisabled" {if $showEnabledModules eq 'enabledDisabled'}selected="selected"{/if}>{l s='Enabled & Disabled'}</option>
<option value="enabled" {if $showEnabledModules eq 'enabled'}selected="selected"{/if}>{l s='Enabled Modules'}</option>
<option value="disabled" {if $showEnabledModules eq 'disabled'}selected="selected"{/if}>{l s='Disabled Modules'}</option>
</select>
</span>
<!-- <span>
<select class="filter fixed-width-XL" name="country_module_value" id="country_module_value_filter" {if $showCountryModules eq 1}style="background-color:#49B2FF;color:white;"{/if}>
<option value="0" >{l s='All countries'}</option>
<option value="1" {if $showCountryModules eq 1}selected="selected"{/if}>{l s='Current country:'} {$nameCountryDefault}</option>
</select>
</span> -->
<!-- <span class="pull-right">
<button class="btn btn-default btn-small" type="submit" name="resetFilterModules">
<i class="icon-eraser"></i>
{l s='Reset'}
</button>
<button class="btn btn-default btn-small" name="filterModules" id="filterModulesButton" type="submit">
<i class="icon-filter"></i>
{l s='Filter'}
</button>
</span> -->
</form>
</div>
<select class="filter fixed-width-L" name="module_type" id="module_type_filter" {if $showTypeModules ne 'allModules' && $showTypeModules ne ''}style="background-color:#49B2FF;color:white;"{/if}>
<option value="allModules" {if $showTypeModules eq 'allModules'}selected="selected"{/if}>{l s='All Modules'}</option>
<option value="nativeModules" {if $showTypeModules eq 'nativeModules'}selected="selected"{/if}>{l s='Free Modules'}</option>
<option value="partnerModules" {if $showTypeModules eq 'partnerModules'}selected="selected"{/if}>{l s='Partner Modules (Free)'}</option>
<option value="mustHaveModules" {if $showTypeModules eq 'mustHaveModules'}selected="selected"{/if}>{l s='Must Have'}</option>
{if isset($logged_on_addons)}<option value="addonsModules" {if $showTypeModules eq 'addonsModules'}selected="selected"{/if}>{l s='Modules purchased on Addons'}</option>{/if}
<optgroup label="{l s='Authors'}">
{foreach from=$list_modules_authors key=module_author item=status}
<option value="authorModules[{$module_author}]" {if $status eq "selected"}selected{/if}>{$module_author|truncate:20:'...'}</option>
{/foreach}
</optgroup>
<option value="otherModules" {if $showTypeModules eq 'otherModules'}selected="selected"{/if}>{l s='Other Modules'}</option>
</select>
</span> -->
<label>{l s='Sort by'}</label>
<div class="form-group">
<select name="module_install" id="module_install_filter" class="form-control" {if $showInstalledModules ne 'installedUninstalled' && $showInstalledModules ne ''}style="background-color:#49B2FF;color:white;"{/if}>
<option value="installedUninstalled" {if $showInstalledModules eq 'installedUninstalled'}selected="selected"{/if}>{l s='Installed & Not Installed'}</option>
<option value="installed" {if $showInstalledModules eq 'installed'}selected="selected"{/if}>{l s='Installed Modules'}</option>
<option value="uninstalled" {if $showInstalledModules eq 'uninstalled'}selected="selected"{/if}>{l s='Modules Not Installed '}</option>
</select>
</div>
</div>
<div class="form-group">
<select name="module_status" id="module_status_filter" class="form-control" {if $showEnabledModules ne 'enabledDisabled' && $showEnabledModules ne ''}style="background-color:#49B2FF;color:white;"{/if}>
<option value="enabledDisabled" {if $showEnabledModules eq 'enabledDisabled'}selected="selected"{/if}>{l s='Enabled & Disabled'}</option>
<option value="enabled" {if $showEnabledModules eq 'enabled'}selected="selected"{/if}>{l s='Enabled Modules'}</option>
<option value="disabled" {if $showEnabledModules eq 'disabled'}selected="selected"{/if}>{l s='Disabled Modules'}</option>
</select>
</div>
<!-- <span>
<select class="filter fixed-width-XL" name="country_module_value" id="country_module_value_filter" {if $showCountryModules eq 1}style="background-color:#49B2FF;color:white;"{/if}>
<option value="0" >{l s='All countries'}</option>
<option value="1" {if $showCountryModules eq 1}selected="selected"{/if}>{l s='Current country:'} {$nameCountryDefault}</option>
</select>
</span> -->
<!-- <span class="pull-right">
<button class="btn btn-default btn-small" type="submit" name="resetFilterModules">
<i class="icon-eraser"></i>
{l s='Reset'}
</button>
<button class="btn btn-default btn-small" name="filterModules" id="filterModulesButton" type="submit">
<i class="icon-filter"></i>
{l s='Filter'}
</button>
</span> -->
</form>
<!--end filter module-->
admin-dev/themes/default/template/controllers/modules/header.tpl
+17 -14
View File
@@ -45,25 +45,28 @@
{if $add_permission eq '1'}
<div id="module_install" class="row" style="{if !isset($smarty.post.downloadflag)}display: none;{/if}">
<div class="col-lg-12">
<div class="panel col-lg-12">
<form action="{$currentIndex}&token={$token}" method="post" enctype="multipart/form-data" class="form-horizontal">
<legend>{l s='Add a new module'}</legend>
<p>{l s='The module must either be a zip file or a tarball.'}</p>
<label class="control-label col-lg-3">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Upload a module from your computer.'}">
{l s='Module file'}
</span>
</label>
<div class="col-lg-9">
<p>
<input type="file" name="file" />
</p>
<p>
<h3>{l s='Add a new module'}</h3>
<p class="alert alert-info">{l s='The module must either be a zip file or a tarball.'}</p>
<div class="form-group">
<label for="file" class="control-label col-lg-3">
<span class="label-tooltip" data-toggle="tooltip" title="{l s='Upload a module from your computer.'}">
{l s='Module file'}
</span>
</label>
<div class="col-lg-3">
<input type="file" name="file" class="form-control" />
</div>
</div>
<div class="form-group">
<div class="col-lg-9 col-lg-push-3">
<button class="btn btn-default" type="submit" name="download">
<i class="icon-upload-alt" ></i>
{l s='Upload this module'}
</button>
</p>
</div>
</div>
</form>
</div>
admin-dev/themes/default/template/controllers/modules/list.tpl
+10 -7
View File
@@ -28,9 +28,12 @@
<thead>
<tr>
<th width="1%">
<input type="checkbox" rel="false" class="noborder" id="checkme">
<!-- <input type="checkbox" rel="false" class="noborder" id="checkme"> -->
</th>
<th colspan="3">
<div class="pull-left">
{include file='controllers/modules/filters.tpl'}
</div>
<div class="btn-group pull-right">
<a class="btn btn-default {if !isset($smarty.get.select)} active{/if}" href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}">
<i class="icon-list"></i>
@@ -68,10 +71,10 @@
{elseif $module->active == 1}
<span class="label label-info">{l s='Active'}</span>
{elseif $module->active == 0}
<span class="label label-disabled">{l s='Inactive'}</span>
<span class="label label-warning">{l s='Inactive'}</span>
{/if}
{else}
<span class="label label-disabled">{l s='Not installed'}</span>
<span class="label label-warning">{l s='Not installed'}</span>
{/if}
<!-- {if isset($module->id) && $module->id gt 0}
<span class="label label-success{if isset($module->active) && $module->active eq 0} off{/if}">{l s='Installed'}</span>
@@ -79,9 +82,9 @@
<span class="label label-warning">{l s='Not installed'}</span>
{/if} -->
</h3>
<div class="row-fluid">
<div class="row">
<p class="module-infos">
<span>{$module->categoryName}</span> -
<strong>{$module->categoryName}</strong> -
{if isset($module->author) && !empty($module->author)}
{l s='Developed by'} {$module->author|truncate:20:'...'}
{/if}
@@ -92,14 +95,14 @@
</p>
<p class="module-description">
{if isset($module->description) && $module->description ne ''}
{l s='Description'} : {$module->description}
{$module->description}
{/if}
</p>
</div>
{if isset($module->message) && (!isset($module->type) || ($module->type != 'addonsMustHave' || $module->type !== 'addonsNative'))}<div class="alert alert-success">{$module->message}</div>{/if}
</div>
</td>
<td width="180px">
<td>
<div id="list-action-button" class="btn-group">
{if isset($module->type) && $module->type == 'addonsMustHave'}
<a class="btn btn-default" href="{$module->addons_buy_url}" target="_blank">
admin-dev/themes/default/template/controllers/modules/login_addons.tpl
+16 -18
View File
@@ -40,7 +40,7 @@
<!--end addons login-->
{else}
{if $check_url_fopen eq 'ko' OR $check_openssl eq 'ko'}
<div class="alert alert-block">
<div class="alert alert-warning">
{l s='If you want to be able to fully use the AdminModules panel and have free modules available, you should enable the following configuration on your server:'}
<br />
{if $check_url_fopen eq 'ko'}- {l s='Enable allow_url_fopen'}<br />{/if}
@@ -50,31 +50,29 @@
<!--start addons login-->
<div class="panel-heading">
<i class="icon-user"></i>
{l s='Do you have a %s account?' sprintf='<a target="_blank" href="http://addons.prestashop.com/">PrestaShop Addons</a>'}
<a target="_blank" href="http://addons.prestashop.com/">PrestaShop Addons</a>
</div>
<form id="addons_login_form" method="post" class="form-horizontal">
<div class="row">
<label class="control-label col-lg-3">{l s='Addons Login'} :</label>
<div class="input-group col-lg-4">
<form id="addons_login_form" method="post" >
<div class="form-group">
<label for="username_addons">{l s='Addons Login'} :</label>
<div class="input-group">
<span class="input-group-addon"><i class="icon-user"></i></span>
<input type="text" value="" id="username_addons" autocomplete="off" class="form-control ac_input">
<input id="username_addons" class="form-control" name="username_addons" type="text" value="" autocomplete="off" class="form-control ac_input">
</div>
</div>
<div class="row">
<label class="control-label col-lg-3">{l s= 'Password Addons'} :</label>
<div class="input-group col-lg-4">
<div class="form-group">
<label for="password_addons">{l s= 'Password Addons'} :</label>
<div class="input-group">
<span class="input-group-addon"><i class="icon-key"></i></span>
<input type="password" value="" id="password_addons" autocomplete="off" class="form-control ac_input">
<input id="password_addons" class="form-control" name="password_addons" type="password" value="" autocomplete="off" class="form-control ac_input">
</div>
</div>
<div class="row">
<div class="col-lg-9 col-offset-3">
<button class="btn btn-default" id="addons_login_button" type="submit">
<i class="icon-unlock"></i> {l s='Log in'}
</button>
<div id="addons_loading" class="help-block"></div>
</div>
<div class="form-group">
<button id="addons_login_button" class="btn btn-default" type="submit">
<i class="icon-unlock"></i> {l s='Log in'}
</button>
</div>
<div id="addons_loading" class="help-block"></div>
</form>
<!--end addons login-->
{/if}
admin-dev/themes/default/template/controllers/modules/page.tpl
+14 -10
View File
@@ -26,9 +26,6 @@
{include file='controllers/modules/header.tpl'}
{include file='controllers/modules/login_addons.tpl'}
{if $upgrade_available|@count}
<div class="alert alert-info">
{l s='An upgrade is available for some of your modules!'}
@@ -44,16 +41,23 @@
<i class="icon-list-ul"></i>
{l s='Modules list'}
</div>
{include file='controllers/modules/filters.tpl'}
<!--start sidebar module-->
<div class="row">
<div class="categorieTitle col col-lg-3">
<div class="categorieTitle col-lg-3">
<div class="list-group">
<form id="filternameForm" method="post" class="list-group-item form-horizontal">
<div class="input-group col-lg-12">
<input type="text" value="" name="filtername" autocomplete="off" class="ac_input">
<span class="input-group-btn">
<button class="btn btn-default" type="submit">
<i class="icon-search"></i> {l s='Search'}
</button>
</span>
</div>
</form>
<a class="list-group-item {if isset($categoryFiltered.favorites)}active{/if}" href="{$currentIndex}&token={$token}&filterCategory=favorites">
<i class="icon-star"></i> {l s='Favorites'} <span class="badge pull-right">{$nb_modules_favorites}</span>
{l s='Favorites'} <span class="badge pull-right">{$nb_modules_favorites}</span>
</a>
<a class="list-group-item {if count($categoryFiltered) lte 0}active{/if}" href="{$currentIndex}&token={$token}&unfilterCategory=yes">
{l s='All'} <span class="badge pull-right">{$nb_modules}</span>
</a>
@@ -63,9 +67,9 @@
</a>
{/foreach}
</div>
{include file='controllers/modules/login_addons.tpl'}
</div>
<div id="moduleContainer" class="col col-lg-9">
<div id="moduleContainer" class="col-lg-9">
{include file='controllers/modules/list.tpl'}
</div>
</div>
admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl
+1 -1
View File
@@ -66,6 +66,6 @@
</div>
</div>
{/if}
<div class="alert alert-block">
<div class="alert alert-warning">
<a href="{$admin_module_favorites_view}">{l s='More options'}</a>
</div>