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

[-] FO : fixed bug #PSCFV-5980 && added 'js=1' in tpl when string is in script tag

Browse Source
This commit is contained in:
vAugagneur
2012-12-12 17:38:31 +01:00
parent c3c0441316
commit cd0eb0c6a4
11 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/emails/content.tpl
+5 -5
View File
@@ -24,12 +24,12 @@
*} *}
<script type="text/javascript"> <script type="text/javascript">
var textMsg = "{l s='This is a test message, your server is now configured to send e-mail'}"; var textMsg = "{l s='This is a test message, your server is now configured to send e-mail' js=1}";
var textSubject = "{l s='Test message - Prestashop'}"; var textSubject = "{l s='Test message - Prestashop' js=1}";
var textSendOk = "{l s='A test e-mail has been sent to the e-mail address you specified'}"; var textSendOk = "{l s='A test e-mail has been sent to the e-mail address you specified' js=1}";
var textSendError= "{l s='Error: please check your configuration'}"; var textSendError= "{l s='Error: please check your configuration' js=1}";
var token_mail = '{$token}'; var token_mail = '{$token}';
var errorMail = "{l s='This e-mail address is invalid'}"; var errorMail = "{l s='This e-mail address is invalid' js=1}";
$(document).ready(function() { $(document).ready(function() {
if ($('input[name=PS_MAIL_METHOD]:checked').val() == 2) if ($('input[name=PS_MAIL_METHOD]:checked').val() == 2)
$('#smtp').show(); $('#smtp').show();
themes/default/mobile/errors.tpl
+1 -1
View File
@@ -42,7 +42,7 @@
} }
$(function() $(function()
{ {
var errorTitle = '{/literal}{if $errors|@count > 1}{l s='There are %d errors:' sprintf=$errors|@count}{else}{l s='There is %d error:' sprintf=$errors|@count}{/if}{literal}'; var errorTitle = '{/literal}{if $errors|@count > 1}{l s='There are %d errors:' js=1 sprintf=$errors|@count}{else}{l s='There is %d error:' js=1 sprintf=$errors|@count}{/if}{literal}';
var errorMessage = '<ol>'; var errorMessage = '<ol>';
{/literal} {/literal}
{foreach from=$errors key=k item=error} {foreach from=$errors key=k item=error}
themes/default/mobile/order-opc.tpl
+14 -14
View File
@@ -52,20 +52,20 @@
var countriesNeedZipCode = new Array(); var countriesNeedZipCode = new Array();
var vat_management = {$vat_management|intval}; var vat_management = {$vat_management|intval};
var txtWithTax = "{l s='(tax incl.)'}"; var txtWithTax = "{l s='(tax incl.)' js=1}";
var txtWithoutTax = "{l s='(tax excl.)'}"; var txtWithoutTax = "{l s='(tax excl.)' js=1}";
var txtHasBeenSelected = "{l s='has been selected'}"; var txtHasBeenSelected = "{l s='has been selected' js=1}";
var txtNoCarrierIsSelected = "{l s='No carrier has been selected'}"; var txtNoCarrierIsSelected = "{l s='No carrier has been selected' js=1}";
var txtNoCarrierIsNeeded = "{l s='No carrier is needed for this order'}"; var txtNoCarrierIsNeeded = "{l s='No carrier is needed for this order' js=1}";
var txtConditionsIsNotNeeded = "{l s='No terms of service must be accepted'}"; var txtConditionsIsNotNeeded = "{l s='No terms of service must be accepted' js=1}";
var txtTOSIsAccepted = "{l s='Terms of Service have been accepted'}"; var txtTOSIsAccepted = "{l s='Terms of Service have been accepted' js=1}";
var txtTOSIsNotAccepted = "{l s='Terms of service have not been accepted'}"; var txtTOSIsNotAccepted = "{l s='Terms of service have not been accepted' js=1}";
var txtThereis = "{l s='There is'}"; var txtThereis = "{l s='There is' js=1}";
var txtErrors = "{l s='error(s)'}"; var txtErrors = "{l s='error(s)' js=1}";
var txtDeliveryAddress = "{l s='Delivery address'}"; var txtDeliveryAddress = "{l s='Delivery address' js=1}";
var txtInvoiceAddress = "{l s='Invoice address'}"; var txtInvoiceAddress = "{l s='Invoice address' js=1}";
var txtModifyMyAddress = "{l s='Modify my address'}"; var txtModifyMyAddress = "{l s='Modify my address' js=1}";
var txtInstantCheckout = "{l s='Instant checkout'}"; var txtInstantCheckout = "{l s='Instant checkout' js=1}";
var errorCarrier = "{$errorCarrier}"; var errorCarrier = "{$errorCarrier}";
var errorTOS = "{$errorTOS}"; var errorTOS = "{$errorTOS}";
var checkedCarrier = "{if isset($checked)}{$checked}{else}0{/if}"; var checkedCarrier = "{if isset($checked)}{$checked}{else}0{/if}";
themes/default/order-address-multishipping.tpl
+4 -4
View File
@@ -67,9 +67,9 @@
var currencyRate = '{$currencyRate|floatval}'; var currencyRate = '{$currencyRate|floatval}';
var currencyFormat = '{$currencyFormat|intval}'; var currencyFormat = '{$currencyFormat|intval}';
var currencyBlank = '{$currencyBlank|intval}'; var currencyBlank = '{$currencyBlank|intval}';
var txtProduct = "{l s='product'}"; var txtProduct = "{l s='product' js=1}";
var txtProducts = "{l s='products'}"; var txtProducts = "{l s='products' js=1}";
var txtSelectAnAddressFirst = "{l s='Please start by selecting an address'}"; var txtSelectAnAddressFirst = "{l s='Please start by selecting an address' js=1}";
{/if} {/if}
var formatedAddressFieldsValuesList = new Array(); var formatedAddressFieldsValuesList = new Array();
@@ -112,7 +112,7 @@
dest_comp.html(''); dest_comp.html('');
li_content['title'] = adr_titles_vals[address_type]; li_content['title'] = adr_titles_vals[address_type];
li_content['update'] = '<a href="{$link->getPageLink('address', true, NULL, "id_address")}'+id_address+'&amp;back=order?step=1{if $back}&mod={$back}{/if}" title="{l s='Update'}">{l s='Update'}</a>'; li_content['update'] = '<a href="{$link->getPageLink('address', true, NULL, "id_address")}'+id_address+'&amp;back=order?step=1{if $back}&mod={$back}{/if}" title="{l s='Update' js=1}">{l s='Update' js=1}</a>';
appendAddressList(dest_comp, li_content, ordered_fields_name); appendAddressList(dest_comp, li_content, ordered_fields_name);
} }
themes/default/order-address.tpl
+5 -5
View File
@@ -71,8 +71,8 @@
var currencyRate = '{$currencyRate|floatval}'; var currencyRate = '{$currencyRate|floatval}';
var currencyFormat = '{$currencyFormat|intval}'; var currencyFormat = '{$currencyFormat|intval}';
var currencyBlank = '{$currencyBlank|intval}'; var currencyBlank = '{$currencyBlank|intval}';
var txtProduct = "{l s='product'}"; var txtProduct = "{l s='product' js=1}";
var txtProducts = "{l s='products'}"; var txtProducts = "{l s='products' js=1}";
{/if} {/if}
var addressMultishippingUrl = "{$link->getPageLink('address', true, NULL, "back={$back_order_page}?step=1{'&multi-shipping=1'|urlencode}{if $back}&mod={$back|urlencode}{/if}")}"; var addressMultishippingUrl = "{$link->getPageLink('address', true, NULL, "back={$back_order_page}?step=1{'&multi-shipping=1'|urlencode}{if $back}&mod={$back|urlencode}{/if}")}";
@@ -99,8 +99,8 @@
function getAddressesTitles() function getAddressesTitles()
{ {
return { return {
'invoice': "{l s='Your billing address'}", 'invoice': "{l s='Your billing address' js=1}",
'delivery': "{l s='Your delivery address'}" 'delivery': "{l s='Your delivery address' js=1}"
}; };
} }
@@ -118,7 +118,7 @@
dest_comp.html(''); dest_comp.html('');
li_content['title'] = adr_titles_vals[address_type]; li_content['title'] = adr_titles_vals[address_type];
li_content['update'] = '<a href="{$link->getPageLink('address', true, NULL, "id_address")}'+id_address+'&amp;back={$back_order_page}?step=1{if $back}&mod={$back}{/if}" title="{l s='Update'}">&raquo; {l s='Update'}</a>'; li_content['update'] = '<a href="{$link->getPageLink('address', true, NULL, "id_address")}'+id_address+'&amp;back={$back_order_page}?step=1{if $back}&mod={$back}{/if}" title="{l s='Update' js=1}">&raquo; {l s='Update' js=1}</a>';
appendAddressList(dest_comp, li_content, ordered_fields_name); appendAddressList(dest_comp, li_content, ordered_fields_name);
} }
themes/default/order-carrier.tpl
+2 -2
View File
@@ -30,8 +30,8 @@
var currencyRate = '{$currencyRate|floatval}'; var currencyRate = '{$currencyRate|floatval}';
var currencyFormat = '{$currencyFormat|intval}'; var currencyFormat = '{$currencyFormat|intval}';
var currencyBlank = '{$currencyBlank|intval}'; var currencyBlank = '{$currencyBlank|intval}';
var txtProduct = "{l s='product'}"; var txtProduct = "{l s='product' js=1}";
var txtProducts = "{l s='products'}"; var txtProducts = "{l s='products' js=1}";
var orderUrl = '{$link->getPageLink("order", true)}'; var orderUrl = '{$link->getPageLink("order", true)}';
var msg = "{l s='You must agree to the terms of service before continuing.' js=1}"; var msg = "{l s='You must agree to the terms of service before continuing.' js=1}";
themes/default/order-opc.tpl
+15 -15
View File
@@ -57,21 +57,21 @@
var countriesNeedZipCode = new Array(); var countriesNeedZipCode = new Array();
var vat_management = {$vat_management|intval}; var vat_management = {$vat_management|intval};
var txtWithTax = "{l s='(tax incl.)'}"; var txtWithTax = "{l s='(tax incl.)' js=1}";
var txtWithoutTax = "{l s='(tax excl.)'}"; var txtWithoutTax = "{l s='(tax excl.)' js=1}";
var txtHasBeenSelected = "{l s='has been selected'}"; var txtHasBeenSelected = "{l s='has been selected' js=1}";
var txtNoCarrierIsSelected = "{l s='No carrier has been selected'}"; var txtNoCarrierIsSelected = "{l s='No carrier has been selected' js=1}";
var txtNoCarrierIsNeeded = "{l s='No carrier is needed for this order'}"; var txtNoCarrierIsNeeded = "{l s='No carrier is needed for this order' js=1}";
var txtConditionsIsNotNeeded = "{l s='No terms of service must be accepted'}"; var txtConditionsIsNotNeeded = "{l s='No terms of service must be accepted' js=1}";
var txtTOSIsAccepted = "{l s='Terms of Service have been accepted'}"; var txtTOSIsAccepted = "{l s='Terms of Service have been accepted' js=1}";
var txtTOSIsNotAccepted = "{l s='Terms of service have not been accepted'}"; var txtTOSIsNotAccepted = "{l s='Terms of service have not been accepted' js=1}";
var txtThereis = "{l s='There is'}"; var txtThereis = "{l s='There is' js=1}";
var txtErrors = "{l s='error(s)'}"; var txtErrors = "{l s='error(s)' js=1}";
var txtDeliveryAddress = "{l s='Delivery address'}"; var txtDeliveryAddress = "{l s='Delivery address' js=1}";
var txtInvoiceAddress = "{l s='Invoice address'}"; var txtInvoiceAddress = "{l s='Invoice address'}" js=1;
var txtModifyMyAddress = "{l s='Modify my address'}"; var txtModifyMyAddress = "{l s='Modify my address' js=1}";
var txtInstantCheckout = "{l s='Instant checkout'}"; var txtInstantCheckout = "{l s='Instant checkout' js=1}";
var txtSelectAnAddressFirst = "{l s='Please start by selecting an address'}"; var txtSelectAnAddressFirst = "{l s='Please start by selecting an address' js=1}";
var errorCarrier = "{$errorCarrier}"; var errorCarrier = "{$errorCarrier}";
var errorTOS = "{$errorTOS}"; var errorTOS = "{$errorTOS}";
var checkedCarrier = "{if isset($checked)}{$checked}{else}0{/if}"; var checkedCarrier = "{if isset($checked)}{$checked}{else}0{/if}";
themes/default/order-payment.tpl
+2 -2
View File
@@ -30,8 +30,8 @@
var currencyRate = '{$currencyRate|floatval}'; var currencyRate = '{$currencyRate|floatval}';
var currencyFormat = '{$currencyFormat|intval}'; var currencyFormat = '{$currencyFormat|intval}';
var currencyBlank = '{$currencyBlank|intval}'; var currencyBlank = '{$currencyBlank|intval}';
var txtProduct = "{l s='product'}"; var txtProduct = "{l s='product' js=1}";
var txtProducts = "{l s='products'}"; var txtProducts = "{l s='products' js=1}";
// ]]> // ]]>
</script> </script>
themes/default/scenes.tpl
+1 -1
View File
@@ -28,7 +28,7 @@
<script type="text/javascript" src="{$smarty.const._PS_JS_DIR_}jquery/plugins/jquery.scrollTo.js"></script> <script type="text/javascript" src="{$smarty.const._PS_JS_DIR_}jquery/plugins/jquery.scrollTo.js"></script>
<script type="text/javascript" src="{$smarty.const._PS_JS_DIR_}jquery/plugins/jquery.serialScroll.js"></script> <script type="text/javascript" src="{$smarty.const._PS_JS_DIR_}jquery/plugins/jquery.serialScroll.js"></script>
<script type="text/javascript">// <![CDATA[ <script type="text/javascript">// <![CDATA[
i18n_scene_close = '{l s='Close'}'; i18n_scene_close = '{l s='Close' js=1}';
$(function () {ldelim} $(function () {ldelim}
li_width = parseInt({$thumbSceneImageType.width} + 10); li_width = parseInt({$thumbSceneImageType.width} + 10);
{rdelim}); {rdelim});
themes/default/shopping-cart.tpl
+2 -2
View File
@@ -48,8 +48,8 @@
var currencyRate = '{$currencyRate|floatval}'; var currencyRate = '{$currencyRate|floatval}';
var currencyFormat = '{$currencyFormat|intval}'; var currencyFormat = '{$currencyFormat|intval}';
var currencyBlank = '{$currencyBlank|intval}'; var currencyBlank = '{$currencyBlank|intval}';
var txtProduct = "{l s='product'}"; var txtProduct = "{l s='product' js=1}";
var txtProducts = "{l s='products'}"; var txtProducts = "{l s='products' js=1}";
var deliveryAddress = {$cart->id_address_delivery|intval}; var deliveryAddress = {$cart->id_address_delivery|intval};
// ]]> // ]]>
</script> </script>
themes/live_edit.tpl
+8 -8
View File
@@ -28,14 +28,14 @@
{/if} {/if}
var lastMove = ''; var lastMove = '';
var saveOK = '{l s='Module position saved'}'; var saveOK = '{l s='Module position saved'}';
var confirmClose = '{l s='Are you sure? If you close this window, its position won\'t be saved'}'; var confirmClose = '{l s='Are you sure? If you close this window, its position won\'t be saved' js=1}';
var close = '{l s='Close'}'; var close = '{l s='Close' js=1}';
var cancel = '{l s='Cancel'}'; var cancel = '{l s='Cancel' js=1}';
var confirm = '{l s='Confirm'}'; var confirm = '{l s='Confirm' js=1}';
var add = '{l s='Add this module'}'; var add = '{l s='Add this module' js=1}';
var unableToUnregisterHook = '{l s='Unable to unregister hook'}'; var unableToUnregisterHook = '{l s='Unable to unregister hook' js=1}';
var unableToSaveModulePosition = '{l s='Unable to save module position'}'; var unableToSaveModulePosition = '{l s='Unable to save module position' js=1}';
var loadFail = '{l s='Failed to load module list'}'; var loadFail = '{l s='Failed to load module list' js=1}';
</script> </script>
<div style=" background-color:000; background-color: rgba(0,0,0, 0.7); border-bottom: 1px solid #000; width:100%;height:30px; padding:5px 10px; position:fixed;top:0;left:0;z-index:9999;"> <div style=" background-color:000; background-color: rgba(0,0,0, 0.7); border-bottom: 1px solid #000; width:100%;height:30px; padding:5px 10px; position:fixed;top:0;left:0;z-index:9999;">