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:
Sarah Lorenzini
2012-12-05 11:03:16 +01:00
parent 2b10fcd712 5c63deb469
commit 7897d40e22
22 changed files with 103 additions and 76 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/css/global.css
+2
View File
@@ -2079,3 +2079,5 @@ tr.subitem > td:first-child + td {
padding:0;
text-align:center
}
.ie7 #featured-products_block_center .product_image span.new {top:-20px;right:-19px}
themes/default/header.tpl
+1 -1
View File
@@ -25,7 +25,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7 lt-ie6 " lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js ie7 lt-ie9 lt-ie8" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8 ie7" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js lt-ie9 ie8" lang="en"> <![endif]-->
<!--[if gt IE 8]> <html lang="fr" class="no-js ie9" lang="en"> <![endif]-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$lang_iso}">
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>