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

// Release branch merged

Browse Source
This commit is contained in:
François Gaillard
2013-04-25 17:00:56 +02:00
parent f0da3fa2ae 056709f2dd
commit 6106066ef1
53 changed files with 1086 additions and 905 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
+2 -2
View File
@@ -207,12 +207,12 @@
<br />
<input type="checkbox" id="product_restriction" name="product_restriction" value="1" {if $product_rule_groups|@count}checked="checked"{/if} /> <strong>{l s='Product selection'}</strong>
<div id="product_restriction_div">
<table id="product_rule_group_table" style="border:1px solid #AAAAAA;margin:10px 0 10px 0;padding:10px 10px 10px 10px;background-color:#FFF5D3;width:600px" cellpadding="0" cellspacing="0">
<table id="product_rule_group_table" style="border:1px solid #AAAAAA;margin:10px 0 10px 0;padding:10px 10px 10px 10px;background-color:#FFF5D3;width:600px;display:none" cellpadding="0" cellspacing="0">
{foreach from=$product_rule_groups item='product_rule_group'}
{$product_rule_group}
{/foreach}
</table>
<a href="javascript:addProductRuleGroup();">
<a href="javascript:addProductRuleGroup();" style="margin-top:5px;display:block">
<img src="../img/admin/add.gif" alt="{l s='Add'}" title="{l s='Add'}" /> {l s='Product selection'}
</a>
</div>
admin-dev/themes/default/template/controllers/cart_rules/form.js
+1
View File
@@ -25,6 +25,7 @@
function addProductRuleGroup()
{
$('#product_rule_group_table').show();
product_rule_groups_counter += 1;
product_rule_counters[product_rule_groups_counter] = 0;
admin-dev/themes/default/template/controllers/images/content.tpl
+1 -1
View File
@@ -76,7 +76,7 @@
</form>
{/if}
{if isset($display_move)}
{if isset($display_move) && $display_move}
<br /><h2 class="space">{l s='Move images'}</h2>
{l s='PrestaShop now uses a new storage system for product images. It offers better performance if your shop has a large number of products.'}<br />
<br />
admin-dev/themes/default/template/controllers/stores/helpers/options/options.tpl
+1 -1
View File
@@ -38,7 +38,7 @@
if (html == 'false')
{
$("#conf_id_PS_SHOP_STATE_ID").fadeOut();
$('#id_state option[value=0]').attr("selected", "selected");
$('#PS_SHOP_STATE_ID option[value=0]').attr("selected", "selected");
}
else
{
admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl
+16 -9
View File
@@ -33,22 +33,29 @@
document.getElementById('typeTranslationForm').submit();
}
function addThemeSelect(el)
function addThemeSelect()
{
var list_type_for_theme = [{foreach $translations_type_for_theme as $type}'{$type}', {/foreach}];
var type = el.value;
var list_type_for_theme = ['front', 'modules', 'pdf', 'mails'];
var type = $('select[name=type]').val();
$('select[name=theme]').hide();
for (i=0; i < list_type_for_theme.length; i++)
if (list_type_for_theme[i] == type)
{
$('select[name=theme]').show();
if (type == 'front')
$('select[name=theme]').children('option[value=""]').attr('disabled', true)
else
$('select[name=theme]').children('option[value=""]').attr('disabled', false)
}
else
$('select[name=theme]').val('{$theme_default}');
}
$(document).ready(function(){
addThemeSelect();
$('select[name=type]').change(function() {
addThemeSelect(this);
addThemeSelect();
});
});
</script>
@@ -60,15 +67,15 @@
<form method="get" action="index.php" id="typeTranslationForm">
<input type="hidden" name="controller" value="AdminTranslations" />
<input type="hidden" name="lang" id="translation_lang" value="0" />
<select name="type" style="float:left; margin-right:10px;">
<select name="type" style="float:left;margin-right:10px">
{foreach $translations_type as $type => $array}
<option value="{$type}">{$array.name} &nbsp;</option>
<option value="{$type}">{$array.name}</option>
{/foreach}
</select>
<select name="theme" style="float:left; margin-right:10px;">
<select name="theme" style="float:left;margin-right:10px">
<option value="">{l s='Core (no theme selected)'}</option>
{foreach $themes as $theme}
<option value="{$theme->directory}" {if $id_theme_current == $theme->id}selected=selected{/if}>{$theme->name} &nbsp;</option>
<option value="{$theme->directory}" {if $id_theme_current == $theme->id}selected=selected{/if}>{$theme->name}</option>
{/foreach}
</select>
{foreach $languages as $language}
admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl
+1 -1
View File
@@ -117,7 +117,7 @@
<td style="width: 40%">{$key|stripslashes}</td>
<td>=
{* Prepare name string for md5() *}
{capture assign="name"}{strtolower($module_name)}_{strtolower($theme_name)}_{strtolower($template_name)}_{md5($key)}{/capture}
{capture assign="name"}{strtolower($module_name)}{if $theme_name}_{strtolower($theme_name)}{/if}_{strtolower($template_name)}_{md5($key)}{/capture}
{if $key|strlen < $textarea_sized}
<input type="text"
style="width: 450px{if empty($value.trad)};background:#FBB{/if}"
admin-dev/themes/default/template/layout-export.tpl
+1 -1
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
*}
{foreach from=$export_headers item=header}{$header};{/foreach}
{$export_precontent}{foreach from=$export_headers item=header}{$header};{/foreach}
{foreach from=$export_content item=line}
{foreach from=$line item=content}{$content};{/foreach}