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

// Localization Bootstrap design

Browse Source
This commit is contained in:
Jerome Nadaud
2013-09-26 11:36:28 +02:00
parent 10e472e141
commit b9ccfe858b
13 changed files with 326 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_content.tpl
+117 -94
View File
@@ -22,109 +22,132 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
<tbody> <tbody>
{foreach $list AS $index => $tr} {foreach $list AS $index => $tr}
<tr <tr
{if $position_identifier}id="tr_{$id_category}_{$tr.$identifier}_{$tr.position['position']}"{/if} {if $position_identifier}id="tr_{$id_category}_{$tr.$identifier}_{$tr.position['position']}"{/if}
{if isset($tr.color) && $color_on_bg}style="background-color: {$tr.color}"{/if} {if isset($tr.color) && $color_on_bg}style="background-color: {$tr.color}"{/if}
> >
<td> <td>
{if $bulk_actions} {if $bulk_actions}
{assign var=bulkActionPossible value=true} {assign var=bulkActionPossible value=true}
{foreach $list_skip_actions as $key => $value} {foreach $list_skip_actions as $key => $value}
{if in_array($tr.$identifier, $value) == true} {if in_array($tr.$identifier, $value) == true}
{assign var=bulkActionPossible value=false} {assign var=bulkActionPossible value=false}
{/if}
{/foreach}
{if $bulkActionPossible == true}
<input type="checkbox" name="{$table}Box[]" value="{$tr.$identifier}" class="noborder" />
{/if} {/if}
{/foreach}
{if $bulkActionPossible == true}
<input type="checkbox" name="{$table}Box[]" value="{$tr.$identifier}" class="noborder" />
{/if} {/if}
</td> {/if}
{foreach $fields_display AS $key => $params} </td>
<td {foreach $fields_display AS $key => $params}
{if isset($params.position)} <td
id="td_{if $id_category}{$id_category}{else}0{/if}_{$tr.$identifier}" {if isset($params.position)}
{/if} id="td_{if $id_category}{$id_category}{else}0{/if}_{$tr.$identifier}"
class="{if !$no_link}pointer{/if} {/if}
{if isset($params.position) && $order_by == 'position'} dragHandle{/if} class="{if !$no_link}pointer{/if}
{if isset($params.align)} {$params.align}{/if}" {if isset($params.position) && $order_by == 'position'} dragHandle{/if}
{if isset($params.align)} {$params.align}{/if}"
{if (!isset($params.position) && !$no_link)} {if (!isset($params.position) && !$no_link)}
onclick="document.location = '{$current_index}&{$identifier}={$tr.$identifier}{if $view}&view{else}&update{/if}{$table}&token={$token}'">{if isset($params.prefix)}{$params.prefix}{/if} onclick="document.location = '{$current_index}&{$identifier}={$tr.$identifier}{if $view}&view{else}&update{/if}{$table}&token={$token}'">{if isset($params.prefix)}{$params.prefix}{/if}
{else}
>
{/if}
{if isset($params.active)}
{$tr.$key}
{elseif isset($params.activeVisu)}
<img src="../img/admin/{if $tr.$key}enabled.gif{else}disabled.gif{/if}"
alt="{if $tr.$key}{l s='Enabled'}{else}{l s='Disabled'}{/if}" title="{if $tr.$key}{l s='Enabled'}{else}{l s='Disabled'}{/if}" />
{elseif isset($params.position)}
{if $order_by == 'position' && $order_way != 'DESC'}
<a href="{$tr.$key.position_url_down}" {if !($tr.$key.position != $positions[count($positions) - 1])}style="display: none;"{/if}>
<img src="../img/admin/{if $order_way == 'ASC'}down{else}up{/if}.gif" alt="{l s='Down'}" title="{l s='Down'}" />
</a>
<a href="{$tr.$key.position_url_up}" {if !($tr.$key.position != $positions.0)}style="display: none;"{/if}>
<img src="../img/admin/{if $order_way == 'ASC'}up{else}down{/if}.gif" alt="{l s='Up'}" title="{l s='Up'}" />
</a>
{else} {else}
> {$tr.$key.position + 1}
{/if} {/if}
{if isset($params.active)} {elseif isset($params.image)}
{$tr.$key} {$tr.$key}
{elseif isset($params.activeVisu)} {elseif (isset($params.icon))}
<img src="../img/admin/{if $tr.$key}enabled.gif{else}disabled.gif{/if}" <img src="../img/admin/{$tr[$key]}" alt="{$tr[$key]}" title="{$tr[$key]}" />
alt="{if $tr.$key}{l s='Enabled'}{else}{l s='Disabled'}{/if}" title="{if $tr.$key}{l s='Enabled'}{else}{l s='Disabled'}{/if}" /> {elseif isset($params.price)}
{elseif isset($params.position)} {$tr.$key}
{if $order_by == 'position' && $order_way != 'DESC'} {elseif isset($params.float)}
<a href="{$tr.$key.position_url_down}" {if !($tr.$key.position != $positions[count($positions) - 1])}style="display: none;"{/if}> {$tr.$key}
<img src="../img/admin/{if $order_way == 'ASC'}down{else}up{/if}.gif" alt="{l s='Down'}" title="{l s='Down'}" /> {elseif isset($params.type) && $params.type == 'date'}
</a> {$tr.$key}
{elseif isset($params.type) && $params.type == 'datetime'}
<a href="{$tr.$key.position_url_up}" {if !($tr.$key.position != $positions.0)}style="display: none;"{/if}> {$tr.$key}
<img src="../img/admin/{if $order_way == 'ASC'}up{else}down{/if}.gif" alt="{l s='Up'}" title="{l s='Up'}" /> {elseif isset($params.callback)}
</a> {$tr.$key}
{else} {elseif isset($tr.$key)}
{$tr.$key.position + 1} {if $key == 'behavior'}
{if $tr.$key == 0}
{l s='This tax only'}
{elseif $tr.$key == 1}
{l s='Compute with others'}
{elseif $tr.$key == 2}
{l s='One after another'}
{/if} {/if}
{elseif isset($params.image)} {elseif $key == 'rate'}
{$tr.$key} {$tr.$key|string_format:"%.2f"}%
{elseif (isset($params.icon))} {elseif $key == 'zipcode'}
<img src="../img/admin/{$tr[$key]}" alt="{$tr[$key]}" title="{$tr[$key]}" /> {if $tr.$key == '0 - 0'}
{elseif isset($params.price)} --
{$tr.$key}
{elseif isset($params.float)}
{$tr.$key}
{elseif isset($params.type) && $params.type == 'date'}
{$tr.$key}
{elseif isset($params.type) && $params.type == 'datetime'}
{$tr.$key}
{elseif isset($params.callback)}
{$tr.$key}
{elseif isset($tr.$key)}
{if $key == 'behavior'}
{if $tr.$key == 0}
{l s='This tax only'}
{elseif $tr.$key == 1}
{l s='Compute with others'}
{elseif $tr.$key == 2}
{l s='One after another'}
{/if}
{elseif $key == 'rate'}
{$tr.$key|string_format:"%.2f"}%
{elseif $key == 'zipcode'}
{if $tr.$key == '0 - 0'}
--
{else}
{$tr.$key|escape:'htmlall':'UTF-8'}
{/if}
{else} {else}
{$tr.$key|escape:'htmlall':'UTF-8'} {$tr.$key|escape:'htmlall':'UTF-8'}
{/if} {/if}
{else} {else}
-- {$tr.$key|escape:'htmlall':'UTF-8'}
{/if} {/if}
{if isset($params.suffix)}{$params.suffix}{/if} {else}
</td> --
{/foreach} {/if}
{if isset($params.suffix)}{$params.suffix}{/if}
{if $shop_link_type}
<td {if $name != $tr.shop_name}title="{$tr.shop_name}"{/if}>{if isset($tr.shop_short_name)}{$tr.shop_short_name}{else}{$tr.shop_name}{/if}</td>
{/if}
{if $has_actions}
<td>
{foreach $actions AS $action}
{if isset($tr.$action)}
{$tr.$action}
{/if}
{/foreach}
</td> </td>
{/if} {/foreach}
</tr>
{/foreach} {if $shop_link_type}
</tbody> <td {if $name != $tr.shop_name}title="{$tr.shop_name}"{/if}>{if isset($tr.shop_short_name)}{$tr.shop_short_name}{else}{$tr.shop_name}{/if}</td>
{/if}
{if $has_actions}
<td class="text-right fixed-width-lg">
{assign var='compiled_actions' value=array()}
{foreach $actions AS $key => $action}
{if isset($tr.$action)}
{if $key == 0}
{assign var='action' value=$action}
{/if}
{$compiled_actions[] = $tr.$action}
{/if}
{/foreach}
{if $compiled_actions|count > 0}
<div class="btn-group{if $compiled_actions|count > 1} btn-group-action{/if}">
{$compiled_actions[0]|regex_replace:'/class\s*=\s*"(\w*)"/':'class="$1 btn btn-default"'}
{if $compiled_actions|count > 1}
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>&nbsp;
</button>
<ul class="dropdown-menu">
{foreach $compiled_actions AS $key => $action}
{if $key != 0}
<li>
{$action}
</li>
{/if}
{/foreach}
</ul>
{/if}
</div>
{/if}
</td>
{/if}
</tr>
{/foreach}
</tbody>
admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_footer.tpl
+104
View File
@@ -0,0 +1,104 @@
{*
* 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 <contact@prestashop.com>
* @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
*}
</table>
</div>
{if $bulk_actions}
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
{l s='Bulk actions'} <span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li>
<a href="#" onclick="javascript:checkDelBoxes($(this).closest('form').get(0), '{$table}Box[]', true);return false;">
<i class="icon-check-sign"></i>&nbsp;{l s='Select all'}
</a>
</li>
<li>
<a href="#" onclick="javascript:checkDelBoxes($(this).closest('form').get(0), '{$table}Box[]', false);return false;">
<i class="icon-check-empty"></i>&nbsp;{l s='Unselect all'}
</a>
</li>
<li class="divider"></li>
{foreach $bulk_actions as $key => $params}
<li{if $params.text == 'divider'} class="divider"{/if}>
{if $params.text != 'divider'}
<a href="#" onclick="{if isset($params.confirm)}if (confirm('{$params.confirm}')){/if}sendBulkAction($(this).closest('form').get(0), 'submitBulk{$key}{$table}');">
{if isset($params.icon)}<i class="{$params.icon}"></i>{/if}&nbsp;{$params.text}
</a>
{/if}
</li>
{/foreach}
</ul>
</div>
{/if}
{if !$simple_header && $list_total > 20}
<div class="table-pagination pull-right">
<span>
{if $page > 1}
<input type="image" src="../img/admin/list-prev2.gif" onclick="getE('submitFilter{$table}').value=1"/>&nbsp;
<input type="image" src="../img/admin/list-prev.gif" onclick="getE('submitFilter{$table}').value={$page - 1}"/>
{/if}
{l s='Page'} <b>{$page}</b> / {$total_pages}
{if $page < $total_pages}
<input type="image" src="../img/admin/list-next.gif" onclick="getE('submitFilter{$table}').value={$page + 1}"/>&nbsp;
<input type="image" src="../img/admin/list-next2.gif" onclick="getE('submitFilter{$table}').value={$total_pages}"/>
{/if}
</span>
<span>
&nbsp;|&nbsp;
<label >{l s='Display'}</label>
<select class="filter fixed-width-xs" name="pagination" onchange="submit()">
{* Choose number of results per page *}
{foreach $pagination AS $value}
<option value="{$value|intval}"{if $selected_pagination == $value} selected="selected" {elseif $selected_pagination == NULL && $value == $pagination[1]} selected="selected2"{/if}>{$value|intval}</option>
{/foreach}
</select>
</span>
<span> / {$list_total} {l s='result(s)'}</span>
</div>
{/if}
{if !$simple_header}
<input type="hidden" name="token" value="{$token}" />
</fieldset>
</form>
{/if}
{hook h='displayAdminListAfter'}
{if isset($name_controller)}
{capture name=hookName assign=hookName}display{$name_controller|ucfirst}ListAfter{/capture}
{hook h=$hookName}
{elseif isset($smarty.get.controller)}
{capture name=hookName assign=hookName}display{$smarty.get.controller|ucfirst|htmlentities}ListAfter{/capture}
{hook h=$hookName}
{/if}
{block name="after"}{/block}
admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
+38 -71
View File
@@ -33,81 +33,48 @@
{/if} {/if}
<form method="post" action="{$currentIndex}&{$identifier}&token={$token}&id_tax_rules_group={$id_tax_rules_group}&updatetax_rules_group#{$table}" class="form"> <form method="post" action="{$currentIndex}&{$identifier}&token={$token}&id_tax_rules_group={$id_tax_rules_group}&updatetax_rules_group#{$table}" class="form">
<fieldset>
<input type="hidden" id="submitFilter{$list_id}" name="submitFilter{$list_id}" value="0"/> <input type="hidden" id="submitFilter{$list_id}" name="submitFilter{$list_id}" value="0"/>
<table class="table_grid"> <div class="table-responsive clearfix">
<tr> <table
<td style="vertical-align: bottom;"> {if $table_id} id={$table_id}{/if}
<span style="float: left;"> class="table {if $table_dnd}tableDnD{/if} {$list_id}">
{if $page > 1} <col width="10px" />
<input type="image" src="../img/admin/list-prev2.gif" onclick="getE('submitFilter{$list_id}').value=1"/>&nbsp; {foreach $fields_display AS $key => $params}
<input type="image" src="../img/admin/list-prev.gif" onclick="getE('submitFilter{$list_id}').value={$page - 1}"/> <col {if isset($params.width) && $params.width != 'auto'}width="{$params.width}px"{/if}/>
{/if} {/foreach}
{l s='Page'} <b>{$page}</b> / {$total_pages} {if $shop_link_type}
{if $page < $total_pages} <col width="80px" />
<input type="image" src="../img/admin/list-next.gif" onclick="getE('submitFilter{$list_id}').value={$page + 1};"/>&nbsp; {/if}
<input type="image" src="../img/admin/list-next2.gif" onclick="getE('submitFilter{$list_id}').value={$total_pages}"/> {if $has_actions}
{/if} <col width="52px" />
| {l s='Display'} {/if}
<select name="{$list_id}_pagination" onchange="submit()"> <thead>
{* Choose number of results per page *} <tr class="nodrag nodrop">
{foreach $pagination AS $value} <th class="center">
<option value="{$value|intval}"{if $selected_pagination == $value} selected="selected" {elseif $selected_pagination == NULL && $value == $pagination[1]} selected="selected2"{/if}>{$value|intval}</option> </th>
{/foreach}
</select>
/ {$list_total} {l s='result(s)'}
</span>
<span style="float: right;">
<input type="submit" name="submitReset{$list_id}" value="{l s='Reset'}" class="button" />
</span>
<span class="clear"></span>
</td>
</tr>
<tr>
<td>
<table
{if $table_id} id={$table_id}{/if}
class="table {if $table_dnd}tableDnD{/if} {$list_id}"
cellpadding="0" cellspacing="0"
style="width: 100%; margin-bottom:10px;"
>
<col width="10px" />
{foreach $fields_display AS $key => $params} {foreach $fields_display AS $key => $params}
<col {if isset($params.width) && $params.width != 'auto'}width="{$params.width}px"{/if}/> <th{if isset($params.align)} align="{$params.align}"{/if}{if isset($params.class)} class="{$params.class}"{/if}>
{if isset($params.hint)}<span class="hint" name="help_box">{$params.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
<span class="title_box">
{$params.title}
</span>
</th>
{/foreach} {/foreach}
{if $shop_link_type} {if $shop_link_type}
<col width="80px" /> <th>
{if $shop_link_type == 'shop'}
{l s='Shop'}
{else}
{l s='Group shop'}
{/if}
</th>
{/if} {/if}
{if $has_actions} {if $has_actions}
<col width="52px" /> <th class="actions text-right"><button type="submit" name="submitReset{$list_id}" class="btn btn-warning">
<i class="icon-eraser"></i> {l s='Reset'}
</button>
</th>
{/if} {/if}
<thead> </tr>
<tr class="nodrag nodrop"> </thead>
<th class="center">
{if $has_bulk_actions}
<input type="checkbox" name="checkme" class="noborder" onclick="checkDelBoxes(this.form, '{$list_id}Box[]', this.checked)" />
{/if}
</th>
{foreach $fields_display AS $key => $params}
<th {if isset($params.align)} class="{$params.align}"{/if}>
{if isset($params.hint)}<span class="hint" name="help_box">{$params.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
<span class="title_box">
{$params.title}
</span>
<br />&nbsp;
</th>
{/foreach}
{if $shop_link_type}
<th>
{if $shop_link_type == 'shop'}
{l s='Shop'}
{else}
{l s='Group shop'}
{/if}
<br />&nbsp;
</th>
{/if}
{if $has_actions}
<th class="center">{l s='Actions'}<br />&nbsp;</th>
{/if}
</tr>
</thead>
admin-dev/themes/default/template/controllers/tax_rules_group/helpers/form/form.tpl
-29
View File
@@ -1,29 +0,0 @@
{*
* 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 <contact@prestashop.com>
* @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
*}
{extends file="helpers/form/form.tpl"}
{block name="after"}
<br />
{/block}
admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl
+15 -17
View File
@@ -96,22 +96,20 @@
<div class="row"> <div class="row">
<label class="control-label col-lg-3" for="language-button">{l s='Select your language:'}</label> <label class="control-label col-lg-3" for="language-button">{l s='Select your language:'}</label>
<div class="input-group col-lg-4"> <div class="input-group col-lg-4">
<div class="input-group-btn"> <button type="button" id="language-button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<button type="button" id="language-button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> {l s='Language'}
{l s='Language'} <span class="caret"></span>
<span class="caret"></span> </button>
</button> <ul class="dropdown-menu">
<ul class="dropdown-menu"> {foreach $languages as $language}
{foreach $languages as $language} <li>
<li> <a href="javascript:chooseTypeTranslation('{$language['iso_code']}');">
<a href="javascript:chooseTypeTranslation('{$language['iso_code']}');"> <img src="{$theme_lang_dir}{$language['id_lang']}.jpg" alt="{$language['iso_code']}" title="{$language['iso_code']}" />
<img src="{$theme_lang_dir}{$language['id_lang']}.jpg" alt="{$language['iso_code']}" title="{$language['iso_code']}" /> {$language['iso_code']}
{$language['iso_code']} </a>
</a> </li>
</li> {/foreach}
{/foreach} </ul>
</ul>
</div>
</div> </div>
<input type="hidden" name="token" value="{$token}" /> <input type="hidden" name="token" value="{$token}" />
</div> </div>
@@ -233,7 +231,7 @@
<p class="alert alert-warning"> <p class="alert alert-warning">
{l s='Copies data from one language to another.'}<br /> {l s='Copies data from one language to another.'}<br />
{l s='Warning: This will replace all of the existing data inside the destination language.'}<br /> {l s='Warning: This will replace all of the existing data inside the destination language.'}<br />
{l s='If necessary'}, <b><a href="{$url_create_language}">{l s='you must first create a new language.'}</a></b>. {l s='If necessary'}, <b><a href="{$url_create_language}" class="btn btn-link"><i class="icon-external-link-sign"></i> {l s='you must first create a new language.'}</a></b>.
</p> </p>
<div class="row"> <div class="row">
<label class="control-label col-lg-3 required" for="fromLang"> {l s='From:'}</label> <label class="control-label col-lg-3 required" for="fromLang"> {l s='From:'}</label>
controllers/admin/AdminCountriesController.php
+8 -4
View File
@@ -74,7 +74,8 @@ class AdminCountriesControllerCore extends AdminController
$this->fields_list = array( $this->fields_list = array(
'id_country' => array( 'id_country' => array(
'title' => $this->l('ID'), 'title' => $this->l('ID'),
'align' => 'center' 'align' => 'center',
'class' => 'fixed-width-xs'
), ),
'name' => array( 'name' => array(
'title' => $this->l('Country'), 'title' => $this->l('Country'),
@@ -82,12 +83,14 @@ class AdminCountriesControllerCore extends AdminController
), ),
'iso_code' => array( 'iso_code' => array(
'title' => $this->l('ISO code'), 'title' => $this->l('ISO code'),
'align' => 'center' 'align' => 'center',
'class' => 'fixed-width-xs'
), ),
'call_prefix' => array( 'call_prefix' => array(
'title' => $this->l('Call prefix'), 'title' => $this->l('Call prefix'),
'align' => 'center', 'align' => 'center',
'callback' => 'displayCallPrefix' 'callback' => 'displayCallPrefix',
'class' => 'fixed-width-sm'
), ),
'zone' => array( 'zone' => array(
'title' => $this->l('Zone'), 'title' => $this->l('Zone'),
@@ -103,7 +106,8 @@ class AdminCountriesControllerCore extends AdminController
'active' => 'status', 'active' => 'status',
'type' => 'bool', 'type' => 'bool',
'orderby' => false, 'orderby' => false,
'filter_key' => 'a!active' 'filter_key' => 'a!active',
'class' => 'fixed-width-sm'
) )
); );
controllers/admin/AdminCurrenciesController.php
+5 -5
View File
@@ -34,13 +34,13 @@ class AdminCurrenciesControllerCore extends AdminController
$this->lang = false; $this->lang = false;
$this->fields_list = array( $this->fields_list = array(
'id_currency' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25), 'id_currency' => array('title' => $this->l('ID'), 'align' => 'center', 'class' => 'fixed-width-xs'),
'name' => array('title' => $this->l('Currency')), 'name' => array('title' => $this->l('Currency')),
'iso_code' => array('title' => $this->l('ISO code'), 'align' => 'center', 'width' => 80), 'iso_code' => array('title' => $this->l('ISO code'), 'align' => 'center', 'class' => 'fixed-width-xs'),
'iso_code_num' => array('title' => $this->l('ISO code number'), 'align' => 'center', 'width' => 120), 'iso_code_num' => array('title' => $this->l('ISO code number'), 'align' => 'center', 'class' => 'fixed-width-xs'),
'sign' => array('title' => $this->l('Symbol'), 'width' => 20, 'align' => 'center', 'orderby' => false, 'search' => false), 'sign' => array('title' => $this->l('Symbol'), 'width' => 20, 'align' => 'center', 'orderby' => false, 'search' => false, 'class' => 'fixed-width-xs'),
'conversion_rate' => array('title' => $this->l('Exchange rate'), 'type' => 'float', 'align' => 'center', 'width' => 130, 'search' => false, 'filter_key' => 'currency_shop!conversion_rate'), 'conversion_rate' => array('title' => $this->l('Exchange rate'), 'type' => 'float', 'align' => 'center', 'width' => 130, 'search' => false, 'filter_key' => 'currency_shop!conversion_rate'),
'active' => array('title' => $this->l('Enabled'), 'width' => 25, 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false), 'active' => array('title' => $this->l('Enabled'), 'width' => 25, 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false, 'class' => 'fixed-width-sm'),
); );
$this->bulk_actions = array( $this->bulk_actions = array(
controllers/admin/AdminLanguagesController.php
+11 -6
View File
@@ -51,25 +51,29 @@ class AdminLanguagesControllerCore extends AdminController
$this->fields_list = array( $this->fields_list = array(
'id_lang' => array( 'id_lang' => array(
'title' => $this->l('ID'), 'title' => $this->l('ID'),
'align' => 'center' 'align' => 'center',
'class' => 'fixed-width-xs'
), ),
'flag' => array( 'flag' => array(
'title' => $this->l('Logo'), 'title' => $this->l('Flag'),
'align' => 'center', 'align' => 'center',
'image' => 'l', 'image' => 'l',
'orderby' => false, 'orderby' => false,
'search' => false 'search' => false,
'class' => 'fixed-width-xs'
), ),
'name' => array( 'name' => array(
'title' => $this->l('Name') 'title' => $this->l('Name')
), ),
'iso_code' => array( 'iso_code' => array(
'title' => $this->l('ISO code'), 'title' => $this->l('ISO code'),
'align' => 'center' 'align' => 'center',
'class' => 'fixed-width-xs'
), ),
'language_code' => array( 'language_code' => array(
'title' => $this->l('Language code'), 'title' => $this->l('Language code'),
'align' => 'center' 'align' => 'center',
'class' => 'fixed-width-xs'
), ),
'date_format_lite' => array( 'date_format_lite' => array(
'title' => $this->l('Date format') 'title' => $this->l('Date format')
@@ -81,7 +85,8 @@ class AdminLanguagesControllerCore extends AdminController
'title' => $this->l('Enabled'), 'title' => $this->l('Enabled'),
'align' => 'center', 'align' => 'center',
'active' => 'status', 'active' => 'status',
'type' => 'bool' 'type' => 'bool',
'class' => 'fixed-width-sm'
) )
); );
controllers/admin/AdminLocalizationController.php
+1 -2
View File
@@ -65,7 +65,7 @@ class AdminLocalizationControllerCore extends AdminController
), ),
'localization' => array( 'localization' => array(
'title' => $this->l('Localization'), 'title' => $this->l('Localization'),
'icon' => 'localization', 'icon' => 'icon-globe',
'fields' => array( 'fields' => array(
'PS_WEIGHT_UNIT' => array( 'PS_WEIGHT_UNIT' => array(
'title' => $this->l('Weight unit:'), 'title' => $this->l('Weight unit:'),
@@ -100,7 +100,6 @@ class AdminLocalizationControllerCore extends AdminController
), ),
'options' => array( 'options' => array(
'title' => $this->l('Advanced'), 'title' => $this->l('Advanced'),
'icon' => 'localization',
'fields' => array( 'fields' => array(
'PS_LOCALE_LANGUAGE' => array( 'PS_LOCALE_LANGUAGE' => array(
'title' => $this->l('Language locale:'), 'title' => $this->l('Language locale:'),
controllers/admin/AdminStatesController.php
+6 -3
View File
@@ -65,7 +65,8 @@ class AdminStatesControllerCore extends AdminController
$this->fields_list = array( $this->fields_list = array(
'id_state' => array( 'id_state' => array(
'title' => $this->l('ID'), 'title' => $this->l('ID'),
'align' => 'center' 'align' => 'center',
'class' => 'fixed-width-xs'
), ),
'name' => array( 'name' => array(
'title' => $this->l('Name'), 'title' => $this->l('Name'),
@@ -73,7 +74,8 @@ class AdminStatesControllerCore extends AdminController
), ),
'iso_code' => array( 'iso_code' => array(
'title' => $this->l('ISO code'), 'title' => $this->l('ISO code'),
'align' => 'center' 'align' => 'center',
'class' => 'fixed-width-xs'
), ),
'zone' => array( 'zone' => array(
'title' => $this->l('Zone'), 'title' => $this->l('Zone'),
@@ -97,7 +99,8 @@ class AdminStatesControllerCore extends AdminController
'filter_key' => 'a!active', 'filter_key' => 'a!active',
'align' => 'center', 'align' => 'center',
'type' => 'bool', 'type' => 'bool',
'orderby' => false 'orderby' => false,
'class' => 'fixed-width-sm'
) )
); );
controllers/admin/AdminTaxRulesGroupController.php
+14 -5
View File
@@ -42,7 +42,9 @@ class AdminTaxRulesGroupControllerCore extends AdminController
$this->fields_list = array( $this->fields_list = array(
'id_tax_rules_group' => array( 'id_tax_rules_group' => array(
'title' => $this->l('ID') 'title' => $this->l('ID'),
'align' => 'center',
'class' => 'fixed-width-xs'
), ),
'name' => array( 'name' => array(
'title' => $this->l('Name') 'title' => $this->l('Name')
@@ -52,12 +54,13 @@ class AdminTaxRulesGroupControllerCore extends AdminController
'active' => 'status', 'active' => 'status',
'type' => 'bool', 'type' => 'bool',
'orderby' => false, 'orderby' => false,
'align' => 'center' 'align' => 'center',
'class' => 'fixed-width-sm'
) )
); );
$this->bulk_actions = array( $this->bulk_actions = array(
'delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')), 'delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'), 'icon' => 'icon-trash'),
'enableSelection' => array('text' => $this->l('Enable selection')), 'enableSelection' => array('text' => $this->l('Enable selection')),
'disableSelection' => array('text' => $this->l('Disable selection')) 'disableSelection' => array('text' => $this->l('Disable selection'))
); );
@@ -95,6 +98,10 @@ class AdminTaxRulesGroupControllerCore extends AdminController
$this->toolbar_btn = null; $this->toolbar_btn = null;
$this->list_no_link = true; $this->list_no_link = true;
$this->bulk_actions = array(
'delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'), 'icon' => 'icon-trash')
);
$this->fields_list = array( $this->fields_list = array(
'country_name' => array( 'country_name' => array(
'title' => $this->l('Country') 'title' => $this->l('Country')
@@ -103,13 +110,15 @@ class AdminTaxRulesGroupControllerCore extends AdminController
'title' => $this->l('State') 'title' => $this->l('State')
), ),
'zipcode' => array( 'zipcode' => array(
'title' => $this->l('Zip Code') 'title' => $this->l('Zip Code'),
'class' => 'fixed-width-md'
), ),
'behavior' => array( 'behavior' => array(
'title' => $this->l('Behavior') 'title' => $this->l('Behavior')
), ),
'rate' => array( 'rate' => array(
'title' => $this->l('Tax') 'title' => $this->l('Tax'),
'class' => 'fixed-width-sm'
), ),
'description' => array( 'description' => array(
'title' => $this->l('Description') 'title' => $this->l('Description')
controllers/admin/AdminTaxesController.php
+3 -3
View File
@@ -42,10 +42,10 @@ class AdminTaxesControllerCore extends AdminController
); );
$this->fields_list = array( $this->fields_list = array(
'id_tax' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25), 'id_tax' => array('title' => $this->l('ID'), 'align' => 'center', 'class' => 'fixed-width-xs'),
'name' => array('title' => $this->l('Name'), 'width' => 'auto'), 'name' => array('title' => $this->l('Name'), 'width' => 'auto'),
'rate' => array('title' => $this->l('Rate'), 'align' => 'center', 'suffix' => '%', 'width' => 50), 'rate' => array('title' => $this->l('Rate'), 'align' => 'center', 'suffix' => '%' , 'class' => 'fixed-width-md'),
'active' => array('title' => $this->l('Enabled'), 'width' => 25, 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false) 'active' => array('title' => $this->l('Enabled'), 'width' => 25, 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false, 'class' => 'fixed-width-sm')
); );
$ecotax_desc = ''; $ecotax_desc = '';
controllers/admin/AdminZonesController.php
+4 -2
View File
@@ -38,7 +38,8 @@ class AdminZonesControllerCore extends AdminController
$this->fields_list = array( $this->fields_list = array(
'id_zone' => array( 'id_zone' => array(
'title' => $this->l('ID'), 'title' => $this->l('ID'),
'align' => 'center' 'align' => 'center',
'class' => 'fixed-width-xs'
), ),
'name' => array( 'name' => array(
'title' => $this->l('Zone'), 'title' => $this->l('Zone'),
@@ -48,7 +49,8 @@ class AdminZonesControllerCore extends AdminController
'align' => 'center', 'align' => 'center',
'active' => 'status', 'active' => 'status',
'type' => 'bool', 'type' => 'bool',
'orderby' => false 'orderby' => false,
'class' => 'fixed-width-sm'
) )
); );
$this->bulk_actions = array( $this->bulk_actions = array(