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

// REVERT MERGE

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7761 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-27 13:35:06 +00:00
parent e159c925d8
commit be4811aa6e
182 changed files with 1335 additions and 6181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/prestashop/authentication.tpl
+1 -1
View File
@@ -392,7 +392,7 @@ $(function(){ldelim}
<label for="address1">{l s='Address'}</label>
<input type="text" class="text" name="address1" id="address1" value="{if isset($smarty.post.address1)}{$smarty.post.address1}{/if}" />
<sup>*</sup>
<span class="inline-infos">{l s='Street address, P.O. box, company name, c/o'}</span>
<span class="inline-infos">{l s='Street address, P.O. box, compagny name, c/o'}</span>
</p>
{elseif $field_name eq "address2"}
<p class="text">
themes/prestashop/js/order-opc.js
+3 -3
View File
@@ -59,9 +59,9 @@ function updateCarrierList(json)
if (carriers[i].img != '')
name = '<img src="'+carriers[i].img+'" alt="" />';
if (carriers[i].is_module > 0 && !isLogged)
if (!(carriers[i].is_module && !isLogged))
var extraHtml = 'disabled="disabled"';
else if (checkedCarrier == carriers[i].id_carrier)
else if (checkedCarrier == carriers[i].id_carrier || carriers.length == 1)
var extraHtml = 'checked="checked"';
html = html +
@@ -439,7 +439,7 @@ $(function() {
async: false,
cache: false,
dataType : "json",
data: 'SubmitLogin=true&ajax=true&email='+encodeURIComponent($('#login_email').val())+'&passwd='+encodeURIComponent($('#login_passwd').val())+'&token=' + static_token ,
data: 'SubmitLogin=true&ajax=true&email='+encodeURIComponent($('#login_email').val())+'&passwd='+encodeURIComponent($('#passwd').val())+'&token=' + static_token ,
success: function(jsonData)
{
if (jsonData.hasError)
themes/prestashop/js/products-comparison.js
+19 -44
View File
@@ -24,55 +24,30 @@
* International Registered Trademark & Property of PrestaShop SA
*/
$('document').ready(function(){
$('a.cmp_remove').click(function(){
function checkBeforeComparison()
{
var id_list = '';
$('.comparator:checked').each(
function()
{
id_list += $(this).val() + '|';
}
);
var idProduct = $(this).attr('rel').replace('ajax_id_product_', '');
$('.compare_product_list').val(id_list);
if ($('.comparator:checked').length == 0)
{
alert(min_item);
return false;
}
$.ajax({
url: 'products-comparison.php?ajax=1&action=remove&id_product=' + idProduct,
async: false,
success: function(){
return true;
}
});
});
$('input:checkbox.comparator').click(function(){
var idProduct = $(this).attr('value').replace('comparator_item_', '');
var checkbox = $(this);
if(checkbox.is(':checked'))
function checkForComparison(nb_max_item)
{
$.ajax({
url: 'products-comparison.php?ajax=1&action=add&id_product=' + idProduct,
async: true,
success: function(data){
if (data == '0')
{
checkbox.attr('checked', false);
if ($('.comparator:checked').length > nb_max_item)
alert(max_item);
}
},
error: function(){
checkbox.attr('checked', false);
}
});
}
else
{
$.ajax({
url: 'products-comparison.php?ajax=1&action=remove&id_product=' + idProduct,
async: true,
success: function(data){
if (data == '0')
checkbox.attr('checked', true);
},
error: function(){
checkbox.attr('checked', true);
}
});
}
});
});
themes/prestashop/lang/fr.php
+1 -1
View File
@@ -94,7 +94,7 @@ $_LANG['authentication_6335a00a08fde0fbb8f6d6630cdadd92'] = 'Vos informations pe
$_LANG['authentication_1e884e3078d9978e216a027ecd57fb34'] = 'E-mail';
$_LANG['authentication_bf2957630c4209f61a388a08c2154915'] = '(5 caractères min.)';
$_LANG['authentication_455175f3f5be6306247babb349c0515a'] = 'Votre adresse';
$_LANG['authentication_ae47812e00631626815f5f75ad1abbbd'] = 'Rue, adresse de boite postale, nom de compagnie, c / o';
$_LANG['authentication_6a1fdb6502fefe71937a62c4d03a810e'] = 'Rue, adresse de boite postale, nom de compagnie, c / o';
$_LANG['authentication_846a54955f32846032981f8fe48c35ff'] = 'Adresse (2)';
$_LANG['authentication_092daa39d2b825e4a7fe9b31c2080ecb'] = 'Appartement, suite, l\'unité, bâtiment, étage, etc';
$_LANG['authentication_0f68b904e33d9ac04605aecc958bcf52'] = 'Informations complémentaires';
themes/prestashop/order-address.tpl
-4
View File
@@ -87,16 +87,12 @@
for (var item in fields_name)
{ldelim}
var name = fields_name[item];
var value = getFieldValue(name, values);
if (value != "")
{ldelim}
var new_li = document.createElement('li');
new_li.className = 'address_'+ name;
new_li.innerHTML = getFieldValue(name, values);
dest_comp.append(new_li);
{rdelim}
{rdelim}
{rdelim}
function getFieldValue(field_name, values)
{ldelim}
themes/prestashop/order-carrier.tpl
+1 -1
View File
@@ -123,7 +123,7 @@
{foreach from=$carriers item=carrier name=myLoop}
<tr class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{/if} {if $smarty.foreach.myLoop.index % 2}alternate_item{else}item{/if}">
<td class="carrier_action radio">
<input type="radio" name="id_carrier" value="{$carrier.id_carrier|intval}" id="id_carrier{$carrier.id_carrier|intval}" {if $opc}onclick="updateCarrierSelectionAndGift();"{/if} {if !($carrier.is_module AND $opc AND !$isLogged)}{if $carrier.id_carrier == $checked}checked="checked"{/if}{else}disabled="disabled"{/if} />
<input type="radio" name="id_carrier" value="{$carrier.id_carrier|intval}" id="id_carrier{$carrier.id_carrier|intval}" {if $opc}onclick="updateCarrierSelectionAndGift();"{/if} {if !($carrier.is_module AND $opc AND !$isLogged)}{if $carrier.id_carrier == $checked || $carriers|@count == 1}checked="checked"{/if}{else}disabled="disabled"{/if} />
</td>
<td class="carrier_name">
<label for="id_carrier{$carrier.id_carrier|intval}">
themes/prestashop/order-detail.tpl
+2 -2
View File
@@ -26,7 +26,7 @@
<script type="text/javascript">
// <![CDATA[
var baseDir = '{$base_dir_ssl}';
//]]>
</script>
@@ -80,7 +80,7 @@
{/if}
</p>
{/if}
{if $order->recyclable && isset($isRecyclable) && $isRecyclable}
{if $order->recyclable}
<p><img src="{$img_dir}icon/recyclable.gif" alt="" class="icon" />&nbsp;{l s='You have given permission to receive your order in recycled packaging.'}</p>
{/if}
{if $order->gift}
themes/prestashop/order-opc-new-account.tpl
+1 -1
View File
@@ -14,7 +14,7 @@
</div>
<div style="margin-left:40px;margin-bottom:5px;float:left;width:40%;">
<label for="passwd">{l s='Password'}</label>
<span><input type="password" id="login_passwd" name="passwd" /></span>
<span><input type="password" id="passwd" name="passwd" /></span>
</div>
<p class="submit">
{if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'htmlall':'UTF-8'}" />{/if}
themes/prestashop/order-opc.tpl
+1 -1
View File
@@ -81,7 +81,7 @@
{if $productNumber}
<!-- Shopping Cart -->
{include file="$tpl_dir./shopping-cart.tpl"}
<!-- End Shopping Cart -->
<!-- Shopping Cart -->
{if $isLogged AND !$isGuest}
{include file="$tpl_dir./order-address.tpl"}
{else}
themes/prestashop/product-compare.tpl
+1 -2
View File
@@ -31,8 +31,7 @@
var max_item = "{l s='You cannot add more than' js=1} {$comparator_max_item} {l s='product(s) in the product comparator' js=1}";
//]]>
</script>
<form method="get" action="{$link->getPageLink('products-comparison', true)}" onsubmit="true">
<form method="post" action="{$link->getPageLink('products-comparison', true)}" onsubmit="return checkBeforeComparison();">
<p>
<input type="submit" class="button" value="{l s='Compare'}" style="float:right" />
<input type="hidden" name="compare_product_list" class="compare_product_list" value="" />
themes/prestashop/product-list.tpl
+1 -1
View File
@@ -57,7 +57,7 @@
{/if}
<a class="button" href="{$product.link|escape:'htmlall':'UTF-8'}" title="{l s='View'}">{l s='View'}</a>
{if isset($comparator_max_item) && $comparator_max_item}
<p class="compare"><input type="checkbox" class="comparator" id="comparator_item_{$product.id_product}" value="comparator_item_{$product.id_product}" {if isset($compareProducts) && in_array($product.id_product, $compareProducts)}checked{/if}/> <label for="comparator_item_{$product.id_product}">{l s='Select to compare'}</label></p>
<p class="compare"><input type="checkbox" onclick="checkForComparison({$comparator_max_item})" class="comparator" id="comparator_item_{$product.id_product}" value="{$product.id_product}" /> <label for="comparator_item_{$product.id_product}">{l s='Select to compare'}</label></p>
{/if}
</div>
</li>
themes/prestashop/products-comparison.tpl
+2 -3
View File
@@ -44,11 +44,10 @@
<h5><a href="{$product->getLink()}" title="{$product->name|truncate:32:'...'|escape:'htmlall':'UTF-8'}">{$product->name|truncate:27:'...'|escape:'htmlall':'UTF-8'}</a></h5>
<div class="product_desc"><a href="{$product->getLink()}" title="{l s='More'}">{$product->description_short|strip_tags|truncate:130:'...'}</a></div>
<div class="comparison_product_infos">
<center>
<a href="{$product->getLink()}" title="{$product->name|escape:html:'UTF-8'}" class="product_image" >
<img src="{$link->getImageLink($product->link_rewrite, $product->id_image, 'home')}" alt="{$product->name|escape:html:'UTF-8'}" width="{$homeSize.width}" height="{$homeSize.height}" />
</a>
</center>
{if isset($product->show_price) && $product->show_price && !isset($restricted_country_mode) && !$PS_CATALOG_MODE}
<p class="price_container"><span class="price">{convertPrice price=$product->getPrice($taxes_behavior)}</span></p>
<div class="product_discount">
@@ -83,7 +82,7 @@
</span>
{/if}
</p>
<a class="cmp_remove" href="{$link->getPageLink('products-comparison.php', true)}" rel="ajax_id_product_{$product->id}">{l s='Remove'}</a>
<a class="cmp_remove" href="{$request_uri|replace:$replace_id:''}">{l s='Remove'}</a>
<a class="button" href="{$product->getLink()}" title="{l s='View'}">{l s='View'}</a>
{if (!$product->hasAttributes() OR (isset($add_prod_display) AND ($add_prod_display == 1))) AND $product->minimal_quantity == 1 AND $product->customizable != 2 AND !$PS_CATALOG_MODE}
{if ($product->quantity > 0 OR $product->allow_oosp)}