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:
Jerome Nadaud
2013-10-09 14:07:17 +02:00
parent 3cca8206b9 ced6554133
commit a1ced4ee32
19 changed files with 324 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/helpers/form/form.tpl
+32 -6
View File
@@ -102,10 +102,19 @@
</script>
{/literal}
{/if}
{if isset($input.maxchar)}
{if isset($input.maxchar) || isset($input.prefix) || isset($input.suffix)}
<div class="input-group">
<span id="{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}_counter" class="input-group-addon"><span class="text-count-down">{$input.maxchar}</span></span>
{/if}
{if isset($input.maxchar)}
<span id="{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}_counter" class="input-group-addon">
<span class="text-count-down">{$input.maxchar}</span>
</span>
{/if}
{if isset($input.prefix)}
<span class="input-group-addon">
{$input.prefix}
</span>
{/if}
<input type="text"
id="{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}"
name="{$input.name}_{$language.id_lang}"
@@ -118,7 +127,12 @@
{if isset($input.readonly) && $input.readonly} readonly="readonly"{/if}
{if isset($input.disabled) && $input.disabled} disabled="disabled"{/if}
{if isset($input.autocomplete) && !$input.autocomplete} autocomplete="off"{/if} />
{if isset($input.maxchar)}
{if isset($input.suffix)}
<span class="input-group-addon">
{$input.suffix}
</span>
{/if}
{if isset($input.maxchar) || isset($input.prefix) || isset($input.suffix)}
</div>
{/if}
{if $languages|count > 1}
@@ -175,10 +189,17 @@
{/literal}
{/if}
{assign var='value_text' value=$fields_value[$input.name]}
{if isset($input.maxchar)}
{if isset($input.maxchar) || isset($input.prefix) || isset($input.suffix)}
<div class="input-group">
{/if}
{if isset($input.maxchar)}
<span id="{if isset($input.id)}{$input.id}{else}{$input.name}{/if}_counter" class="input-group-addon"><span class="text-count-down">{$input.maxchar}</span></span>
{/if}
{if isset($input.prefix)}
<span class="input-group-addon">
{$input.prefix}
</span>
{/if}
<input type="text"
name="{$input.name}"
id="{if isset($input.id)}{$input.id}{else}{$input.name}{/if}"
@@ -191,8 +212,13 @@
{if isset($input.readonly) && $input.readonly} readonly="readonly"{/if}
{if isset($input.disabled) && $input.disabled} disabled="disabled"{/if}
{if isset($input.autocomplete) && !$input.autocomplete} autocomplete="off"{/if} />
{if isset($input.suffix)}{$input.suffix}{/if}
{if isset($input.maxchar)}
{if isset($input.suffix)}
<span class="input-group-addon">
{$input.suffix}
</span>
{/if}
{if isset($input.maxchar) || isset($input.prefix) || isset($input.suffix)}
</div>
{/if}
{if isset($input.maxchar)}
admin-dev/themes/default/template/helpers/kpi/kpi.tpl
+2 -2
View File
@@ -22,7 +22,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<div id="{$id|escape}" class="col-lg-3 box-stats {$color|escape}" >
<{if $href}a style="display:block" href="{$href|escape}"{else}div{/if} id="{$id|escape}" class="col-lg-3 box-stats {$color|escape}" >
{if $icon}<i class="{$icon|escape}"></i>{/if}
{if $chart}
<div class="boxchart-overlay">
@@ -32,7 +32,7 @@
{/if}
<span class="title">{$title|escape}<br /><small>{$subtitle|escape}</small></span>
<span class="value">{$value|escape}</span>
</div>
</{if $href}a{else}div{/if}>
{if $source != ''}
<script>