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-10-04 19:13:13 +02:00
parent c2ea0be841 d141f5bdc0
commit 2ab3f08eab
31 changed files with 349 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/cart_rules/informations.tpl
+17 -13
View File
@@ -7,25 +7,29 @@
</label>
<div class="col-lg-8">
{foreach from=$languages item=language}
{if $languages|count > 1}
<div class="row">
<div class="translatable-field lang-{$language.id_lang}" {if $language.id_lang != $id_lang_default}style="display:none"{/if}>
<div class="input-group col-lg-12">
<div class="col-lg-9">
{/if}
<input id="name_{$language.id_lang|intval}" type="text" name="name_{$language.id_lang|intval}" value="{$currentTab->getFieldValue($currentObject, 'name', $language.id_lang|intval)|escape:html:'UTF-8'}">
<div class="input-group-btn">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt="">
{$language.iso_code}
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
{foreach from=$languages item=language}
<li><a href="javascript:hideOtherLanguage({$language.id_lang});" tabindex="-1"><img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt=""> {$language.name}</a></li>
{/foreach}
</ul>
</div>
{if $languages|count > 1}
</div>
<div class="col-lg-2">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt="">
{$language.iso_code}
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
{foreach from=$languages item=language}
<li><a href="javascript:hideOtherLanguage({$language.id_lang});" tabindex="-1"><img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt=""> {$language.name}</a></li>
{/foreach}
</ul>
</div>
</div>
</div>
{/if}
{/foreach}
</div>
</div>
admin-dev/themes/default/template/controllers/products/features.tpl
+6 -1
View File
@@ -68,14 +68,17 @@
</td>
<td>
{foreach from=$languages key=k item=language}
{if $languages|count > 1}
<div class="row translatable-field lang-{$language.id_lang}">
<div class="col-lg-9">
{/if}
<textarea
class="custom_{$available_feature.id_feature}_{$language.id_lang}"
class="custom_{$available_feature.id_feature}_{$language.id_lang} textarea-autosize"
name="custom_{$available_feature.id_feature}_{$language.id_lang}"
cols="40"
rows="1"
onkeyup="if (isArrowKey(event)) return ;$('#feature_{$available_feature.id_feature}_value').val(0);" >{$available_feature.val[$k].value|escape:'htmlall':'UTF-8'|default:""}</textarea>
{if $languages|count > 1}
</div>
<div class="col-lg-3">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
@@ -93,6 +96,7 @@
</ul>
</div>
</div>
{/if}
{/foreach}
</td>
@@ -112,4 +116,5 @@
{/if}
<script type="text/javascript">
hideOtherLanguage({$default_language});
$(".textarea-autosize").autosize();
</script>
admin-dev/themes/default/template/helpers/kpi/kpi.tpl
+2 -2
View File
@@ -45,9 +45,9 @@
success: function(jsonData){
if (!jsonData.has_errors)
{
if (jsonData.value)
if (jsonData.value != undefined)
$('#{$id|addslashes} .value').html(jsonData.value);
if (jsonData.data)
if (jsonData.data != undefined)
{
$("#{$id|addslashes} .boxchart svg").remove();
set_d3_{$id|str_replace:'-':'_'|addslashes}(jsonData.data);
admin-dev/themes/default/template/helpers/options/options.tpl
+8
View File
@@ -230,13 +230,18 @@
<div class="col-lg-9">
<div class="row">
{foreach $field['languages'] AS $id_lang => $value}
{if $field['languages']|count > 1}
<div class="translatable-field lang-{$id_lang}" {if $id_lang != $current_id_lang}style="display:none;"{/if}>
<div class="col-lg-9">
{else}
<div class="col-lg-12">
{/if}
<input type="text"
name="{$key}_{$id_lang}"
value="{$value|escape:'htmlall':'UTF-8'}"
{if isset($input.class)}class="{$input.class}"{/if}
/>
{if $field['languages']|count > 1}
</div>
<div class="col-lg-2">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
@@ -253,6 +258,9 @@
</ul>
</div>
</div>
{else}
</div>
{/if}
{/foreach}
</div>
</div>