From 668f1173826b7dc0150bd09c804b193f4b3fa8d3 Mon Sep 17 00:00:00 2001
From: sThiebaut <sandrine.thiebaut@prestashop.com>
Date: Wed, 14 Dec 2011 09:17:50 +0000
Subject: [PATCH] // maj

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11196 b9a71923-0436-4b27-9f14-aed3839534dd
---
 modules/crossselling/crossselling.css         | 23 ++++----
 modules/favoriteproducts/my-account.tpl       |  2 +-
 .../productcomments/productcomments-extra.tpl | 54 ++++++++++---------
 modules/productscategory/productscategory.css | 10 ++--
 modules/productscategory/productscategory.tpl |  4 +-
 5 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/modules/crossselling/crossselling.css b/modules/crossselling/crossselling.css
index b596ef468..676e2d5e6 100644
--- a/modules/crossselling/crossselling.css
+++ b/modules/crossselling/crossselling.css
@@ -15,7 +15,19 @@
 #crossselling li a img {border:1px solid #ccc}
 #crossselling li p.product_name {text-align:center}
 
+#crossselling_list {overflow: hidden;}
 
+#crossselling_scroll_left,
+ #crossselling_scroll_right {
+	background: url('../../../img/thumbs_left.gif') no-repeat center;
+	text-indent: -3000px;
+	display: block;
+	width: 9px;
+	height: 18px;
+	float: left;
+	margin-top: 30px
+}
+#crossselling_scroll_right { background-image: url('../../../img/thumbs_right.gif') }
 /*
 div#crossselling {
 	padding-top: 10px;
@@ -50,15 +62,4 @@ div#crossselling {
 	overflow: hidden
 }
 #crossselling_list li a { margin: auto }
-#crossselling_scroll_left,
- #crossselling_scroll_right {
-	background: url('../../../img/thumbs_left.gif') no-repeat center;
-	text-indent: -3000px;
-	display: block;
-	width: 9px;
-	height: 18px;
-	float: left;
-	margin-top: 30px
-}
-#crossselling_scroll_right { background-image: url('../../../img/thumbs_right.gif') }
 */
\ No newline at end of file
diff --git a/modules/favoriteproducts/my-account.tpl b/modules/favoriteproducts/my-account.tpl
index ed45a0941..75586540f 100644
--- a/modules/favoriteproducts/my-account.tpl
+++ b/modules/favoriteproducts/my-account.tpl
@@ -24,4 +24,4 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<li class="favoriteproducts"><a href="{$base_dir_ssl}modules/favoriteproducts/favoriteproducts-account.php" title="{l s='My favorite products' mod='favoriteproducts'}">{l s='My favorite products' mod='favoriteproducts'}</a></li>
+<li class="favoriteproducts"><a href="{$base_dir_ssl}modules/favoriteproducts/favoriteproducts-account.php" title="{l s='My favorite products' mod='favoriteproducts'}"><img src="{$module_template_dir}img/favorites.png" class="icon" /> {l s='My favorite products' mod='favoriteproducts'}</a></li>
diff --git a/modules/productcomments/productcomments-extra.tpl b/modules/productcomments/productcomments-extra.tpl
index 4ddc5d514..3f256453e 100644
--- a/modules/productcomments/productcomments-extra.tpl
+++ b/modules/productcomments/productcomments-extra.tpl
@@ -23,22 +23,28 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
+{literal}
 <script type="text/javascript">
-	$(function(){literal}{{/literal} $('input[@type=radio].star').rating(); {literal}}{/literal});
-	$(function(){literal}{{/literal}
-		$('.auto-submit-star').rating({literal}{{/literal}
-			callback: function(value, link){literal}{{/literal}
-			{literal}}{/literal}
-		{literal}}{/literal});
-	{literal}}{/literal});
+	/*$(function(){ $('input[@type=radio].star').rating(); });
+	$(function(){
+		$('.auto-submit-star').rating({
+			callback: function(value, link){
+			}
+		});
+	});*/
 	
+	$(function(){
+		$('input[@type=radio].star').rating();
+		$('.auto-submit-star').rating(callback: function(value, link));
+	});
+		
 	//close  comment form
-	function closeCommentForm(){ldelim}
+	function closeCommentForm(){
 		$('#sendComment').slideUp('fast');
 		$('input#addCommentButton').fadeIn('slow');
-	{rdelim}
+	}
 
-	$('document').ready(function(){literal}{{/literal}
+	$('document').ready(function(){
 
 		var limitInputText = {
 				'maxCharacterSize': 200,
@@ -50,20 +56,20 @@
 		
 		$('#commentContent').textareaCount(limitInputText);
 		
-		$('#new_comment_btn').fancybox({literal}{{/literal}
+		$('#new_comment_btn').fancybox({
 			'hideOnContentClick': false,
-			'onClosed': function(){literal}{{/literal}
-			{literal}}{/literal},
-		{literal}}{/literal});
+			'onClosed': function(){
+			},
+		});
 	
-		$('a[href=#idTab5]').click(function(){literal}{{/literal}
+		$('a[href=#idTab5]').click(function(){
 			$('*[id^="idTab"]').addClass('block_hidden_only_for_screen');
 			$('div#idTab5').removeClass('block_hidden_only_for_screen');
 			
 			$('ul#more_info_tabs a[href^="#idTab"]').removeClass('selected');
 			$('a[href="#idTab5"]').addClass('selected');
-		{literal}}{/literal});
-		{literal}
+		});
+		
 		$('#submitMessage').click(function(){
 			var datas = [];
 			$('#fancybox-content').find('input, textarea, select').each(function(index){
@@ -73,7 +79,7 @@
 				datas.push(o);
 			});
 			$.ajax({
-				{/literal}url: "{$module_dir}productcomments-ajax.php",{literal}
+				url: "{/literal}{$module_dir}{literal}productcomments-ajax.php",
 				post: "POST",
 				data: {action: 'sendComment', secure_key: '{/literal}{$secure_key}{literal}', review: JSON.stringify(datas)},
 				dataType: "json",
@@ -92,7 +98,7 @@
 				datas.push(o);
 			});
 			$.ajax({
-				{/literal}url: "{$module_dir}productcomments-ajax.php",{literal}
+				url: "{/literal}{$module_dir}{literal}productcomments-ajax.php",
 				post: "POST",
 				data: {action: 'sendComment', secure_key: '{/literal}{$secure_key}{literal}', review: JSON.stringify(datas)},
 				dataType: "json",
@@ -100,10 +106,10 @@
 					$.fancybox.close();
 	 		 	}
 			});
-		});
-		{/literal}
-	{literal}}{/literal});
+		});		
+	});
 </script>
+{/literal}
 
 <div id="product_comments_block_extra">
 	{if $nbComments != 0}
@@ -125,9 +131,9 @@
 		{if $nbComments != 0}
 		<a href="#idTab5">{l s='Read user reviews' mod='productcomments'} ({$nbComments})</a><br/>
 		{/if}
-	{if ($too_early == false AND ($logged OR $allow_guests))}
+		{if ($too_early == false AND ($logged OR $allow_guests))}
 		<a id="new_comment_btn" href="#new_comment_form">{l s='Write your review' mod='productcomments'}</a>
-	{/if}
+		{/if}
 	</div>
 	<div style="display: none;">
 		<div id="new_comment_form">
diff --git a/modules/productscategory/productscategory.css b/modules/productscategory/productscategory.css
index 7f549dc98..a9ecd948d 100644
--- a/modules/productscategory/productscategory.css
+++ b/modules/productscategory/productscategory.css
@@ -6,14 +6,16 @@ h2.productscategory_h2 {
 	color:#333
 }
 
-#productscategory_list ul {list-style-type:none}
+#productscategory {overflow:auto}
+#productscategory_list ul {
+	list-style-type:none;
+	margin: 0 0 0 14px;
+}
 #productscategory_list li {
 	float:left;
-	margin-right:25px
+	margin-right:30px
 }
 #productscategory_list li a.lnk_img {display:block}
 #productscategory_list li a img {border:1px solid #ccc}
 #productscategory_list li p.product_name {text-align:center}
 
-
-
diff --git a/modules/productscategory/productscategory.tpl b/modules/productscategory/productscategory.tpl
index f1346cd72..495cde11c 100644
--- a/modules/productscategory/productscategory.tpl
+++ b/modules/productscategory/productscategory.tpl
@@ -28,7 +28,7 @@
 <div class="clearfix blockproductscategory">
 	<h2 class="productscategory_h2">{$categoryProducts|@count} {l s='other products in the same category:' mod='productscategory'}</h2>
 	<div id="{if count($categoryProducts) > 5}productscategory{else}productscategory_noscroll{/if}">
-	{if count($categoryProducts) > 5}<a id="productscategory_scroll_left" title="{l s='Previous' mod='productscategory'}" href="javascript:{ldelim}{rdelim}">{l s='Previous' mod='productscategory'}</a>{/if}
+	<!--{if count($categoryProducts) > 5}<a id="productscategory_scroll_left" title="{l s='Previous' mod='productscategory'}" href="javascript:{ldelim}{rdelim}">{l s='Previous' mod='productscategory'}</a>{/if}-->
 	<div id="productscategory_list">
 		<ul {if count($categoryProducts) > 5}style="width: {math equation="width * nbImages" width=107 nbImages=$categoryProducts|@count}px"{/if}>
 			{foreach from=$categoryProducts item='categoryProduct' name=categoryProduct}<!--{if count($categoryProducts) < 6}style="width: {math equation="width / nbImages" width=94 nbImages=$categoryProducts|@count}%"{/if}--> 
@@ -48,7 +48,7 @@
 			{/foreach}
 		</ul>
 	</div>
-	{if count($categoryProducts) > 5}<a id="productscategory_scroll_right" title="{l s='Next' mod='productscategory'}" href="javascript:{ldelim}{rdelim}">{l s='Next' mod='productscategory'}</a>{/if}
+	<!--{if count($categoryProducts) > 5}<a id="productscategory_scroll_right" title="{l s='Next' mod='productscategory'}" href="javascript:{ldelim}{rdelim}">{l s='Next' mod='productscategory'}</a>{/if}-->
 	</div>
 	<script type="text/javascript">
 		$('#productscategory_list').trigger('goto', [{$middlePosition}-3]);