From d1e09d2a6fdd1cd4fa8697c618877b50293663a8 Mon Sep 17 00:00:00 2001
From: sThiebaut <sandrine.thiebaut@prestashop.com>
Date: Mon, 5 Dec 2011 17:22:04 +0000
Subject: [PATCH] // maj

---
 modules/blockcart/img/icon/delete.gif         | Bin 103 -> 213 bytes
 modules/blockcontact/blockcontact.css         |   2 +-
 .../blockcontactinfos/blockcontactinfos.css   |   2 +-
 modules/blocknewsletter/blocknewsletter.css   |   6 +-
 modules/blocknewsletter/blocknewsletter.tpl   |   4 +-
 modules/blockwishlist/blockwishlist-ajax.tpl  |   2 +-
 .../productcomments/productcomments-extra.tpl |  78 +++++++++---------
 modules/productcomments/productcomments.css   |   4 +-
 modules/productcomments/productcomments.php   |   1 +
 modules/sendtoafriend/sendtoafriend.php       |   1 +
 10 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/modules/blockcart/img/icon/delete.gif b/modules/blockcart/img/icon/delete.gif
index 348537e130264de1f39a9163b46e829a564b4499..6d186d193983f580cabf7efec6597a6905675718 100644
GIT binary patch
literal 213
zcmZ?wbhEHb<YC}pI3mmt5Eyj+($$Ago@;4odHeYK`T2*2g<rXTD>x+N^}A1V=PjHy
zXP&C6s;8%yo4fmu-~TUNxnX2vq@bYi|NnmmB7ovg7DfgJVFn$LT9BO#tU(V{wAc<y
zbZKz)KH1l+U=<|1Gw`)fSBT0450*(99wHo`Pd+p_$hAv1H71+o3kkpb$&tX$@bvP{
hy^LaZ3nq9>&`~py_FKMaZ;bWTl*9tXdrFE7)&RJ*L#hA(

literal 103
zcmZ?wbhEHb<YwSySj52a|Ns9}r%uh9H7hkW)zs9K0R|L*vM{m(IXWN#kXi<29S*K5
xr*%(>WeG&|oaAH<-KIHDfQQMjPHk1yo0;pD{+Z-peR!*PvpCP%$DRxf)&S}mA1eR=

diff --git a/modules/blockcontact/blockcontact.css b/modules/blockcontact/blockcontact.css
index f9d7aaaef..978615d8a 100644
--- a/modules/blockcontact/blockcontact.css
+++ b/modules/blockcontact/blockcontact.css
@@ -1,7 +1,7 @@
 /* block CONTACT ******************************************************************************* */
 #contact_block .block_content {
 	padding:10px 0 15px 0;
-   background: url(images/block_contact_bg.jpg) no-repeat left 50px transparent
+   background: url(images/block_contact_bg.jpg) no-repeat left bottom transparent
 }
 
 #contact_block p {
diff --git a/modules/blockcontactinfos/blockcontactinfos.css b/modules/blockcontactinfos/blockcontactinfos.css
index 989c0f8bd..7c552e889 100644
--- a/modules/blockcontactinfos/blockcontactinfos.css
+++ b/modules/blockcontactinfos/blockcontactinfos.css
@@ -1,6 +1,6 @@
 #block_contact_infos {padding:15px 10px;}
 #block_contact_infos li {
-	padding:0;
+	padding:0 !important;
 	line-height: 20px;
 }
 #block_contact_infos li  strong {
diff --git a/modules/blocknewsletter/blocknewsletter.css b/modules/blocknewsletter/blocknewsletter.css
index 04bed840f..7af9156b4 100644
--- a/modules/blocknewsletter/blocknewsletter.css
+++ b/modules/blocknewsletter/blocknewsletter.css
@@ -16,8 +16,8 @@
 	position: relative;
 	top: -1px;
 	padding:0 5px;
-	height:21px;
-	width:150px;
+	height:20px;
+	width:148px;
 	border:1px solid #ccc;
 	border-right:none;
 	-moz-border-radius-topleft: 3px;
@@ -32,6 +32,8 @@
 *:first-child+html #newsletter_block_left input.inputNew {position:static;}/* hack ie 7 */
 
 #newsletter_block_left input.button_mini {
+	postion:relative;
+	left:-2px;
 	height:23px;
 	width:24px;
 	border:0;
diff --git a/modules/blocknewsletter/blocknewsletter.tpl b/modules/blocknewsletter/blocknewsletter.tpl
index 259f6e56a..96e9c6b97 100644
--- a/modules/blocknewsletter/blocknewsletter.tpl
+++ b/modules/blocknewsletter/blocknewsletter.tpl
@@ -40,10 +40,10 @@
 					onfocus="javascript:if(this.value=='{l s='your e-mail' mod='blocknewsletter'}')this.value='';" 
 					onblur="javascript:if(this.value=='')this.value='{l s='your e-mail' mod='blocknewsletter'}';" 
 					class="inputNew" />
-				<select name="action">
+				<!--<select name="action">
 					<option value="0"{if isset($action) && $action == 0} selected="selected"{/if}>{l s='Subscribe' mod='blocknewsletter'}</option>
 					<option value="1"{if isset($action) && $action == 1} selected="selected"{/if}>{l s='Unsubscribe' mod='blocknewsletter'}</option>
-				</select>
+				</select>-->
 					<input type="submit" value="ok" class="button_mini" name="submitNewsletter" />
 				<input type="hidden" name="action" value="0" />
 			</p>
diff --git a/modules/blockwishlist/blockwishlist-ajax.tpl b/modules/blockwishlist/blockwishlist-ajax.tpl
index e372f5a71..37cdb3014 100644
--- a/modules/blockwishlist/blockwishlist-ajax.tpl
+++ b/modules/blockwishlist/blockwishlist-ajax.tpl
@@ -30,7 +30,7 @@
 		<dt class="{if $smarty.foreach.i.first}first_item{elseif $smarty.foreach.i.last}last_item{else}item{/if}">
 			<span class="quantity-formated"><span class="quantity">{$product.quantity|intval}</span>x</span>
 			<a class="cart_block_product_name" href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category_rewrite)}" title="{$product.name|escape:'htmlall':'UTF-8'}" style="font-weight:bold;">{$product.name|truncate:13:'...'|escape:'htmlall':'UTF-8'}</a>
-			<a class="ajax_cart_block_remove_link" href="javascript:;" onclick="javascript:WishlistCart('wishlist_block_list', 'delete', '{$product.id_product}', {$product.id_product_attribute}, '0');" title="{l s='remove this product from my wishlist' mod='blockwishlist'}"><img src="{$img_dir}icon/delete.gif" width="11" height="13" alt="{l s='Delete'}" class="icon" /></a>
+			<a class="ajax_cart_block_remove_link" href="javascript:;" onclick="javascript:WishlistCart('wishlist_block_list', 'delete', '{$product.id_product}', {$product.id_product_attribute}, '0');" title="{l s='remove this product from my wishlist' mod='blockwishlist'}"><img src="{$img_dir}icon/delete.gif" width="12" height="12" alt="{l s='Delete'}" class="icon" /></a>
 		</dt>
 		{if isset($product.attributes_small)}
 		<dd class="{if $smarty.foreach.i.first}first_item{elseif $smarty.foreach.i.last}last_item{else}item{/if}" style="font-style:italic;margin:0 0 0 10px;">
diff --git a/modules/productcomments/productcomments-extra.tpl b/modules/productcomments/productcomments-extra.tpl
index aa42b7e0e..d1e0d57d1 100644
--- a/modules/productcomments/productcomments-extra.tpl
+++ b/modules/productcomments/productcomments-extra.tpl
@@ -131,20 +131,21 @@
 	</div>
 	<div style="display: none;">
 		<div id="new_comment_form">
-				<h2 class="title">{l s='Write your review' mod='productcomments'}</h2>
-				<div class="product clearfix">
-					<img src="{$link->getImageLink($product->link_rewrite, $productcomment_cover, 'home')}" height="{$homeSize.height}" width="{$homeSize.width}" alt="{$product->name|escape:html:'UTF-8'}" />
-					<div class="product_desc">
-						<p class="product_name"><strong>{$product->name}</strong></p>
-						{$product->description_short}
-					</div>
+			<h2 class="title">{l s='Write your review' mod='productcomments'}</h2>
+			<div class="product clearfix">
+				<img src="{$link->getImageLink($product->link_rewrite, $productcomment_cover, 'home')}" height="{$homeSize.height}" width="{$homeSize.width}" alt="{$product->name|escape:html:'UTF-8'}" />
+				<div class="product_desc">
+					<p class="product_name"><strong>{$product->name}</strong></p>
+					{$product->description_short}
 				</div>
-				
-				<div class="new_comment_form_content">
-					<p class="intro_form">{l s='Write your review' mod='productcomments'}</p>
-					{if $criterions|@count > 0}
-						<div class="grade_content clearfix">
-						{section loop=$criterions name=i start=0 step=1}
+			</div>
+			
+			<div class="new_comment_form_content">
+				<p class="intro_form">{l s='Write your review' mod='productcomments'}</p>
+				{if $criterions|@count > 0}
+					<ul class="grade_content clearfix">
+					{section loop=$criterions name=i start=0 step=1}
+						<li>
 							<span>
 								<input type="hidden" name="id_product_comment_criterion_{$smarty.section.i.iteration}" value="{$criterions[i].id_product_comment_criterion|intval}" />
 								{$criterions[i].name|escape:'html':'UTF-8'}:&nbsp;
@@ -156,32 +157,33 @@
 								<input class="star" type="radio" name="{$smarty.section.i.iteration}_grade" value="4" />
 								<input class="star" type="radio" name="{$smarty.section.i.iteration}_grade" value="5" />
 							</div>
-						{/section}
-						</div>
+						</li>
+					{/section}
+					</ul>
+				{/if}
+				<div class="form_contenair">
+					<p class="text">
+						<label for="comment_title">{l s='Title' mod='productcomments'} <sup>*</sup>:</label>
+						<input id="commentTitle" name="title" type="text" value=""/>
+					</p>
+					<p class="textarea">
+						<label for="content">{l s='Comment' mod='productcomments'} <sup>*</sup>:</label>
+						<textarea id="commentContent" name="content"></textarea>
+					</p>
+					{if $allow_guests == true && $logged == 0}
+					<p class="text">
+						<label>{l s='Your name:' mod='productcomments'} <sup>*</sup>:</label>
+						<input id="commentCustomerName" name="customer_name" type="text" value=""/>
+					</p>
 					{/if}
-					<div class="form_contenair">
-						<p class="text">
-							<label for="comment_title">{l s='Title' mod='productcomments'} <sup>*</sup>:</label>
-							<input id="commentTitle" name="title" type="text" value=""/>
-						</p>
-						<p class="textarea">
-							<label for="content">{l s='Comment' mod='productcomments'} <sup>*</sup>:</label>
-							<textarea id="commentContent" name="content"></textarea>
-						</p>
-						{if $allow_guests == true && $logged == 0}
-						<p class="text">
-							<label>{l s='Your name:' mod='productcomments'} <sup>*</sup>:</label>
-							<input id="commentCustomerName" name="customer_name" type="text" value=""/>
-						</p>
-						{/if}
-						<p class="submit">
-							<input id="id_product_comment_send" name="id_product" type="hidden" value='{$id_product_comment_form}'></input>
-							<button id="submitMessage" name="submitMessage" type="submit">{l s='Send' mod='productcomments'}</button>&nbsp;
-							{l s='or' mod='productcomments'}&nbsp;<a href="#" onclick="$.fancybox.close();">{l s='Cancel' mod='productcomments'}</a>
-						</p>
-						<p class="txt_required">* {l s='Required fields' mod='productcomments'}</p>
-					</div>
-				</div><!-- /end new_comment_form_content -->
+					<p class="submit">
+						<input id="id_product_comment_send" name="id_product" type="hidden" value='{$id_product_comment_form}'></input>
+						<a href="#" onclick="$.fancybox.close();">{l s='Cancel' mod='productcomments'}</a>&nbsp;
+						{l s='or' mod='productcomments'}&nbsp;&nbsp;<button id="submitMessage" name="submitMessage" type="submit">{l s='Send' mod='productcomments'}</button>
+					</p>
+					<p class="txt_required">* {l s='Required fields' mod='productcomments'}</p>
+				</div>
+			</div><!-- /end new_comment_form_content -->
 		</div>
 	</div>
 </div>
diff --git a/modules/productcomments/productcomments.css b/modules/productcomments/productcomments.css
index 3b25e4e8f..799745a8f 100644
--- a/modules/productcomments/productcomments.css
+++ b/modules/productcomments/productcomments.css
@@ -1,8 +1,6 @@
 #product_comments_block_extra {
-	padding:10px 0;
-	padding:10px 0;
+	padding:10px 0 0 0;
 	border-top:1px solid #ccc;
-	border-bottom:1px solid #ccc;
 	font-weight: bold;
 	font-size:12px;
 	line-height:18px
diff --git a/modules/productcomments/productcomments.php b/modules/productcomments/productcomments.php
index 26d2842bd..182f24b43 100644
--- a/modules/productcomments/productcomments.php
+++ b/modules/productcomments/productcomments.php
@@ -705,6 +705,7 @@ class ProductComments extends Module
 
 		Context::getContext()->smarty->assign(array(
 			'id_product_comment_form' => (int)Tools::getValue('id_product'),
+			'product' => new Product((int)Tools::getValue('id_product'), false, Context::getContext()->language->id),
 			'secure_key' => $this->secure_key,
 			'logged' => (int)Context::getContext()->customer->isLogged(true),
 			'allow_guests' => (int)Configuration::get('PRODUCT_COMMENTS_ALLOW_GUESTS'),
diff --git a/modules/sendtoafriend/sendtoafriend.php b/modules/sendtoafriend/sendtoafriend.php
index 2900c8c23..deba72fce 100644
--- a/modules/sendtoafriend/sendtoafriend.php
+++ b/modules/sendtoafriend/sendtoafriend.php
@@ -72,6 +72,7 @@ class sendToAFriend extends Module
 
 		Context::getContext()->smarty->assign(array(
 			'stf_id_product' => (int)Tools::getValue('id_product'),
+			'stf_product' => new Product((int)Tools::getValue('id_product'), false, $this->context->language->id),
 			'stf_product_link' => $productLink,
 			'stf_product_cover' => (int)Tools::getValue('id_product').'-'.(int)$image['id_image'],
 			'stf_secure_key' => $this->secure_key,