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

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

Browse Source
This commit is contained in:
sLorenzini
2012-12-05 10:59:47 +01:00
parent babded4d29 6e9ea91ae7
commit 4844914b0a
36 changed files with 343 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/address.tpl
+1 -1
View File
@@ -214,7 +214,7 @@ $(function(){ldelim}
<label for="other">{l s='Additional information'}</label>
<textarea id="other" name="other" cols="26" rows="3">{if isset($smarty.post.other)}{$smarty.post.other}{else}{if isset($address->other)}{$address->other}{/if}{/if}</textarea>
</p>
{if $onr_phone_at_least}
{if $one_phone_at_least}
<p class="inline-infos required">{l s='You must register at least one phone number'} <sup class="required">*</sup></p>
{/if}
<p class="text">
themes/default/authentication.tpl
+2 -2
View File
@@ -548,7 +548,7 @@ $(function(){ldelim}
<label for="other">{l s='Additional information'}</label>
<textarea name="other" id="other" cols="26" rows="3">{if isset($smarty.post.other)}{$smarty.post.other}{/if}</textarea>
</p>
{if $onr_phone_at_least}
{if $one_phone_at_least}
<p class="inline-infos">{l s='You must register at least one phone number'}</p>
{/if}
<p class="text">
@@ -556,7 +556,7 @@ $(function(){ldelim}
<input type="text" class="text" name="phone" id="phone" value="{if isset($smarty.post.phone)}{$smarty.post.phone}{/if}" />
</p>
<p class="text">
<label for="phone_mobile">{l s='Mobile phone'} {if $onr_phone_at_least}<sup>*</sup>{/if}</label>
<label for="phone_mobile">{l s='Mobile phone'} {if $one_phone_at_least}<sup>*</sup>{/if}</label>
<input type="text" class="text" name="phone_mobile" id="phone_mobile" value="{if isset($smarty.post.phone_mobile)}{$smarty.post.phone_mobile}{/if}" />
</p>
<p class="required text" id="address_alias">
themes/default/js/product.js
+3 -2
View File
@@ -147,7 +147,7 @@ function findCombination(firstTime)
//update display of the availability of the product AND the prices of the product
function updateDisplay()
{
if (!selectedCombination['unavailable'] && quantityAvailable > 0 && productAvailableForOrder === 1)
if (!selectedCombination['unavailable'] && quantityAvailable > 0 && parseInt(productAvailableForOrder) === 1)
{
//show the choice of quantities
$('#quantity_wanted_p:hidden').show('slow');
@@ -165,6 +165,7 @@ function updateDisplay()
//availability value management
if (availableNowValue !== '')
{
//update the availability statut of the product
$('#availability_value').removeClass('warning_inline');
$('#availability_value').text(availableNowValue);
@@ -689,7 +690,7 @@ function initLocationChange(time)
function checkUrl()
{
if (original_url !== window.location || first_url_check)
if (original_url != window.url || first_url_check)
{
first_url_check = false;
url = window.location+'';
themes/default/mobile/product.tpl
+1 -1
View File
@@ -72,7 +72,7 @@
<div id="product_reference" {if isset($groups) OR !$product->reference}style="display: none;"{/if}>
<br />
<label for="product_reference">{l s='Reference:'} </label>
<label>{l s='Reference:'} </label>
<span class="editable">{$product->reference|escape:'htmlall':'UTF-8'}</span>
<br />
</div>