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

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source
This commit is contained in:
Kevin Granger
2013-08-20 16:40:14 +02:00
parent 44655ecdef 787bf75304
commit 17be1e7528
35 changed files with 1772 additions and 1718 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/helpers/form/form.tpl
+4 -4
View File
@@ -48,7 +48,6 @@
<div class="alert alert-info">{$field}</div>
{elseif $key == 'input'}
{foreach $field as $input}
<div class="row {if $input.type == 'hidden'}hide{/if}">
{if $input.type == 'hidden'}
<input type="hidden" name="{$input.name}" id="{$input.name}" value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" />
@@ -58,7 +57,7 @@
{/if}
{block name="label"}
{if isset($input.label)}
<label for="{if isset($input.id)}{$input.id}{if isset($input.lang) AND $input.lang}_{$language.id_lang}{/if}{else}{$input.name}{if isset($input.lang) AND $input.lang}_{$language.id_lang}{/if}{/if}" class="control-label col-lg-3 {if isset($input.required) && $input.required && $input.type != 'radio'}required{/if}">
<label for="{if isset($input.id)}{$input.id}{if isset($input.lang) AND $input.lang}_{$current_id_lang}{/if}{else}{$input.name}{if isset($input.lang) AND $input.lang}_{$current_id_lang}{/if}{/if}" class="control-label col-lg-3 {if isset($input.required) && $input.required && $input.type != 'radio'}required{/if}">
{if isset($input.hint)}
<span class="label-tooltip" data-toggle="tooltip"
title="
@@ -75,11 +74,12 @@
{/if}
">
{/if}
{$input.label}
{$input.label}
{if isset($input.hint)}
</span>
{/if}
</label>{/if}
</label>
{/if}
{/block}
{block name="field"}
admin-dev/themes/default/template/helpers/list/list_action_addstock.tpl
+1 -1
View File
@@ -22,6 +22,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<a href="{$href}" title="{$action}" class="">
<a href="{$href}" title="{$action}">
<i class="icon-circle-arrow-up"></i> {$action}
</a>
admin-dev/themes/default/template/helpers/list/list_action_default.tpl
+1 -1
View File
@@ -22,6 +22,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<a href="{$href}" class="" title="{$action}" {if isset($name)}name="{$name}"{/if}>
<a href="{$href}" title="{$action}" {if isset($name)}name="{$name}"{/if}>
<i class="icon-asterisk"></i> {$action}
</a>
admin-dev/themes/default/template/helpers/list/list_action_delete.tpl
+1 -1
View File
@@ -22,6 +22,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<a href="{$href}" class="" {if isset($confirm)}onclick="if (confirm('{$confirm}')){ return true; }else{ event.stopPropagation(); event.preventDefault();};"{/if} title="{$action}">
<a href="{$href}" {if isset($confirm)}onclick="if (confirm('{$confirm}')){ return true; }else{ event.stopPropagation(); event.preventDefault();};"{/if} title="{$action}">
<i class="icon-trash"></i> {$action}
</a>
admin-dev/themes/default/template/helpers/list/list_action_details.tpl
+1 -1
View File
@@ -23,6 +23,6 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<a href="#" class="" id="details_{$params.action}_{$id}" title="{$action}" onclick="display_action_details('{$id}', '{$controller}', '{$token}', '{$params.action}', {$json_params|escape}); return false">
<a href="#" id="details_{$params.action}_{$id}" title="{$action}" onclick="display_action_details('{$id}', '{$controller}', '{$token}', '{$params.action}', {$json_params|escape}); return false">
<i class="icon-collapse"></i> {$action}
</a>
admin-dev/themes/default/template/helpers/list/list_action_duplicate.tpl
+1 -1
View File
@@ -22,6 +22,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<a href="#" class="" title="{$action}" onclick="if (confirm('{$confirm}')) document.location = '{$location_ok}'; else document.location = '{$location_ko}'; return false;">
<a href="#" title="{$action}" onclick="if (confirm('{$confirm}')) document.location = '{$location_ok}'; else document.location = '{$location_ko}'; return false;">
<i class="icon-copy"></i> {$action}
</a>
admin-dev/themes/default/template/helpers/list/list_action_edit.tpl
+1 -1
View File
@@ -22,6 +22,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<a href="{$href}" class="" title="{$action}">
<a href="{$href}" title="{$action}" class="edit">
<i class="icon-pencil"></i> {$action}
</a>
admin-dev/themes/default/template/helpers/list/list_action_removestock.tpl
+1 -1
View File
@@ -22,6 +22,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<a href="{$href}" title="{$action}" class="">
<a href="{$href}" title="{$action}">
<i class="icon-circle-arrow-down"></i> {$action}
</a>
admin-dev/themes/default/template/helpers/list/list_action_supplier_order_receipt.tpl
+1 -1
View File
@@ -22,6 +22,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<a href="{$href}" title="{$action}" class="">
<a href="{$href}" title="{$action}">
<i class="icon-truck"></i> {$action}
</a>
admin-dev/themes/default/template/helpers/list/list_action_supply_order_change_state.tpl
+1 -1
View File
@@ -22,6 +22,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<a href="{$href}" title="{$action}" class="">
<a href="{$href}" title="{$action}">
<i class="icon-time"></i> {$action}
</a>
admin-dev/themes/default/template/helpers/list/list_action_supply_order_create_from_template.tpl
+1 -1
View File
@@ -22,6 +22,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<a href="{$href}" class="" onclick="return confirm('{$confirm}');" title="{$action}">
<a href="{$href}" onclick="return confirm('{$confirm}');" title="{$action}">
<i class="icon-copy"></i> {$action}
</a>
admin-dev/themes/default/template/helpers/list/list_action_supply_order_receipt.tpl
+1 -1
View File
@@ -22,6 +22,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<a href="{$href}" class="" title="{$action}">
<a href="{$href}" title="{$action}">
<i class="icon-truck"></i> {$action}
</a>
admin-dev/themes/default/template/helpers/list/list_action_transferstock.tpl
+1 -1
View File
@@ -22,6 +22,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<a href="{$href}" class="" title="{$action}">
<a href="{$href}" title="{$action}">
<i class="icon-exchange"></i> {$action}
</a>
admin-dev/themes/default/template/helpers/list/list_content.tpl
+2 -2
View File
@@ -27,7 +27,7 @@
{foreach $list AS $index => $tr}
<tr
{if $position_identifier}id="tr_{$id_category}_{$tr.$identifier}_{if isset($tr.position['position'])}{$tr.position['position']}{else}0{/if}"{/if}
class="{if $index is odd}alt_row{/if} {if $row_hover}row_hover{/if}"
class="{if $index is odd}alt_row{/if}{if $row_hover} row_hover{/if}{if isset($tr.class)} {$tr.class}{/if}"
{if isset($tr.color) && $color_on_bg}style="background-color: {$tr.color}"{/if}
>
<td class="center">
@@ -147,7 +147,7 @@
{/foreach}
{if $compiled_actions|count > 0}
<div class="btn-group{if $compiled_actions|count > 1} btn-group-action{/if}">
{$compiled_actions[0]|replace:'class=""':'class="btn btn-default btn-small"'}
{$compiled_actions[0]|regex_replace:'/class\s*=\s*"(\w*)"/':'class="$1 btn btn-default"'}
{if $compiled_actions|count > 1}
<button class="btn btn-default btn-small dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>&nbsp;
admin-dev/themes/default/template/helpers/list/list_footer.tpl
+1 -1
View File
@@ -45,7 +45,7 @@
<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}');">
<i class="{$params.icon}"></i>&nbsp;{$params.text}
{if isset($params.icon)}<i class="{$params.icon}"></i>{/if}&nbsp;{$params.text}
</a>
{/if}
</li>