integration new theme standard

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8168 b9a71923-0436-4b27-9f14-aed3839534dd

modules/productcomments/fr.php

@@ -8,6 +8,7 @@ $_MODULE['<{productcomments}prestashop>productcomments-extra_4ce7fa08d440a1e0fb3
 $_MODULE['<{productcomments}prestashop>productcomments-extra_b78a3223503896721cca1303f776159b'] = 'Titre';
 $_MODULE['<{productcomments}prestashop>productcomments-extra_0be8406951cdfda82f00f79328cf4efc'] = 'Commentaire';
 $_MODULE['<{productcomments}prestashop>productcomments-extra_a2ed44743411cf8b80e397448fce104c'] = 'Votre nom';
+$_MODULE['<{productcomments}prestashop>productcomments-extra_e699583427bd276f34244d23e6072a41'] = 'Tous les champs sont obligatoires';
 $_MODULE['<{productcomments}prestashop>productcomments-extra_94966d90747b97d1f0f206c98a8b1ac3'] = 'Envoyer';
 $_MODULE['<{productcomments}prestashop>productcomments-extra_e81c4e4f2b7b93b481e13a8553c2ae1b'] = 'ou';
 $_MODULE['<{productcomments}prestashop>productcomments-extra_ea4788705e6873b424c65e91c2846b19'] = 'Annuler';
@@ -67,7 +68,7 @@ $_MODULE['<{productcomments}prestashop>productcomments_6bf852d9850445291f5e9d474
 $_MODULE['<{productcomments}prestashop>productcomments_6d28f2900adb9e500868166f6d04da92'] = 'Vous devez attendre';
 $_MODULE['<{productcomments}prestashop>productcomments_ba8d7ae5dcadfba739f28a777378f208'] = 'secondes avant de poster un nouveau commentaire.';
 $_MODULE['<{productcomments}prestashop>productcomments_4494d00c901c9e22ff3b953177205cea'] = 'Etes vous sur de vouloir signaler ce commentaire?';
-$_MODULE['<{productcomments}prestashop>productcomments_7c3b0e9898b88deee7ea75aafd2e37e2'] = 'Note moyenne';
+$_MODULE['<{productcomments}prestashop>productcomments_4b3b9db8c9784468094acde0f8bf7071'] = 'Note';
 $_MODULE['<{productcomments}prestashop>productcomments_663fc7093256cda156e571631ddb295e'] = 'personne(s) sur';
 $_MODULE['<{productcomments}prestashop>productcomments_e759c67f646fedbee26e1e6732588a98'] = 'ont trouvé ce commentaire utile';
 $_MODULE['<{productcomments}prestashop>productcomments_39630ad6ee79b8653ea89194cdb45bec'] = 'Ce commentaire vous a-t-il été utile?';

modules/productcomments/productcomments-extra.tpl

@@ -57,8 +57,9 @@
 </script>
 
 <div id="product_comments_block_extra">
-	<div>
-		<span style="float:left;">{l s='Average grade' mod='productcomments'}&nbsp</span>
+	<div class="comments_note">
+		<span>{l s='Average grade' mod='productcomments'}&nbsp</span>
+		<div class="star_content clearfix">
 		{section name="i" start=0 loop=5 step=1}
 			{if $averageTotal le $smarty.section.i.index}
 				<div class="star"></div>
@@ -66,9 +67,9 @@
 				<div class="star star_on"></div>
 			{/if}
 		{/section}
-		<br style="clear:both"/>
+		</div>
 	</div>
-	<div>
+	<div class="comments_advices">
 		<a href="#idTab5">{l s='Read user reviews' mod='productcomments'} ({$nbComments})</a><br/>
 	{if ($too_early == false AND ($logged OR $allow_guests))}
 		<a id="new_comment_btn" href="#new_comment_form">{l s='Give your advice' mod='productcomments'}</a>
@@ -76,53 +77,59 @@
 	</div>
 	<div style="display: none;">
 		<div id="new_comment_form">
-			<div>
-				<form action="{$action_url}" method="post" id="sendComment">
-					<span class="title">{l s='Give your advice' mod='productcomments'}</span>
-					<div style="margin-top:20px">
-						<img style="float:left" src="{$link->getImageLink($product->link_rewrite, $productcomment_cover, 'medium')}" height="{$mediumSize.height}" width="{$mediumSize.width}" alt="{$product->name|escape:html:'UTF-8'}" />
-						<div style="float:left; width:300px; margin-left:10px">
-							<strong class="clearfix">{$product->name}</strong>
-							{$product->description_short}
-						</div>
+			<form action="{$action_url}" method="post" id="sendComment">
+				<h2 class="title">{l s='Give your advice' 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>
-					<br style="clear:both"/>
-					<div style="margin-top:20px">
-						{if $criterions|@count > 0}
-						<table border="0" cellspacing="0" cellpadding="0">
-						{section loop=$criterions name=i start=0 step=1}
-						<tr>
-							<th>
-								<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;
-							</th>
-							<td>
-								<input class="star" type="radio" name="{$smarty.section.i.iteration}_grade" id="{$smarty.section.i.iteration}_grade" value="1" />
-								<input class="star" type="radio" name="{$smarty.section.i.iteration}_grade" value="2" />
-								<input class="star" type="radio" name="{$smarty.section.i.iteration}_grade" value="3" checked="checked" />
-								<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" />
-							</td>
-						</tr>
-						{/section}
-						</table>
-						{/if}
-						<label for="comment_title">{l s='Title' mod='productcomments'} *:</label>
-						<input name="title" type="text" value=""/><br/>
-						<label for="content">{l s='Comment' mod='productcomments'} *:</label>
-						<textarea name="content"></textarea>
+				</div>
+				
+				<div class="new_comment_form_content">
+					<p class="intro_form">{l s='Give your advice' mod='productcomments'}</p>
+				{if $criterions|@count > 0}
+					<div class="grade_content clearfix">
+					{section loop=$criterions name=i start=0 step=1}
+						<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;
+						</span>
+						<div class="star_content">
+							<input class="star" type="radio" name="{$smarty.section.i.iteration}_grade" id="{$smarty.section.i.iteration}_grade" value="1" />
+							<input class="star" type="radio" name="{$smarty.section.i.iteration}_grade" value="2" />
+							<input class="star" type="radio" name="{$smarty.section.i.iteration}_grade" value="3" checked="checked" />
+							<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>
+					{/if}
+					<div class="form_contenair">
+						<p class="text">
+							<label for="comment_title">{l s='Title' mod='productcomments'} <sup>*</sup>:</label>
+							<input name="title" type="text" value=""/>
+						</p>
+						<p class="textarea">
+							<label for="content">{l s='Comment' mod='productcomments'} <sup>*</sup>:</label>
+							<textarea name="content"></textarea>
+						</p>
 						{if $allow_guests == true && $logged == 0}
-						<label>{l s='Your name:' mod='productcomments'} *:</label>
-						<input name="customer_name" type="text" value=""/><br/>
+						<p class="text">
+							<label>{l s='Your name:' mod='productcomments'} <sup>*</sup>:</label>
+							<input name="customer_name" type="text" value=""/>
+						</p>
 						{/if}
-						<p style="float:right">
+						<p class="submit">
+							<span class="txt_required">* {l s='All ths fields are mandatory' mod='productcomments'}</span>
 							<button 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>
-						<br style="clear:both"/>
 					</div>
-				</form>
-			</div>
+				</div><!-- /end new_comment_form_content -->
+			</form>
 		</div>
 	</div>
 </div>

modules/productcomments/productcomments.css

@@ -1,99 +1,179 @@
 #product_comments_block_extra {
-	border: 1px solid #D0D3D8;
-	background: #F1F2F4;
-	padding: 10px
+	padding-top:10px;
+	border-top:1px solid #ccc;
+	font-weight: bold;
+	font-size:12px;
+	line-height:18px
 }
 	
-#product_comments_block_extra a {
-	text-decoration: none;
-	font-weight: bold
+#product_comments_block_extra a {text-decoration: none;}
+
+#product_comments_block_extra a:hover {text-decoration: underline}
+
+#product_comments_block_extra .comments_note span,
+#product_comments_block_extra .star_content {float:left}
+
+#product_comments_block_extra div.star {background: url(img/star.gif) no-repeat scroll 0 0 transparent}
+
+#product_comments_block_extra div.star_on {background: url(img/star.gif) no-repeat scroll 0 -16px transparent}
+
+#product_comments_block_extra .comments_advices {clear:both;}
+
+/* pop-in add grade/advice ********************************************************************* */
+#fancybox-wrap {width:585px !important}
+#fancybox-content {
+	width:585px !important;
+	border-width:0 !important
 }
 
-#product_comments_block_extra a:hover {
-	text-decoration: underline
-}
-
-#product_comments_block_extra div.star {
-	background: url("img/star.gif") no-repeat scroll 0 0 transparent
-}
-
-#product_comments_block_extra div.star_on {
-	background: url("img/star.gif") no-repeat scroll 0 0 transparent;
-	background-position: 0 -16px
-}
-	
 #new_comment_form {
+	width:585px;
 	color: #333;
-	background-color: #fff;
-	padding: 10px;
-	width: 565px;
 	text-align: left;
+	background-color: #fff
 }
-
 #new_comment_form .title {
-	padding: 15px;
-	background: #333;
-	color: #fff;
+	padding:10px;
 	font-size: 13px;
-	font-weight: bold;
-	padding: 5px;
-	text-align: left;
+	color: #fff;
 	text-transform: uppercase;
-	display: block;
-	margin: 5px 0
+	background: #333
 }
 
-#new_comment_form label {
-	display: block;
-	margin: 5px 0;
-	text-align: left;
-	font-weight: bold
+#new_comment_form .product {padding:15px}
+#new_comment_form .product img {
+	float:left;
+   border: 1px solid #ccc;
+}
+#new_comment_form .product .product_desc {
+	float:left;
+	margin-left:15px;
+	width:300px;
+	line-height:18px;
+	color:#666
+}
+#new_comment_form .product .product_desc .product_name {
+	padding-bottom:5px;
+	font-size:13px;
+	color:#000
 }
 
-#new_comment_form textarea {
-	width: 100%;
-	min-height: 100px;
-	margin: 5px 0
+#new_comment_form .grade_content {margin:0 0 20px 0}
+#new_comment_form .grade_content span,
+#new_comment_form .grade_content .star_content {float:left}
+#new_comment_form .grade_content span {
+	display:inline-block;
+	padding:0 10px;
+	width:85px;/* 105 */
+	font-weight:bold
+}
+#new_comment_form .grade_content .cancel {margin-right:5px}
+
+.new_comment_form_content {
+	padding:15px;
+	background:#f8f8f8
+}
+.new_comment_form_content .intro_form {
+	padding-bottom: 10px;
+   font-weight: bold;
+   font-size: 12px
 }
 
-#new_comment_form input[type=text] {
-	width: 100%;
-	height: 30px;
-	margin: 5px 0
+
+#new_comment_form .form_contenair {
+	clear:both;
+	margin-top:20px
+}
+#new_comment_form p.text {
+	margin-bottom:0;
+	padding-bottom:0
+}
+#new_comment_form p.text label, #new_comment_form  p.textarea label {
+   display: block;
+	margin:12px 0 4px 0;
+   font-weight: bold;
+   font-size: 12px;
+}
+#new_comment_form p.text input {
+   padding: 0 5px;
+   height: 28px;
+   width: 540px;
+   border: 1px solid #ccc;
+   background: url(../img/bg_input.png) repeat-x scroll 0 0 #fff;
+}
+#new_comment_form p.textarea textarea {
+	padding: 0 5px;
+   height: 80px;
+   width: 540px;
+   border: 1px solid #ccc;
+   background: url(../img/bg_input.png) repeat-x scroll 0 0 #fff;
 }
 
-#new_comment_form th {
-	font-size: 11px;
-	text-align: left;
-	font-weight: bold;
-	color: #333
+#new_comment_form .submit {
+	padding:0;
+	font-size:13px;
+	text-align:right
 }
-
 #new_comment_form button {
-	background-color: #333;
-	border: solid 1px #BDC2C9;
-	padding: 3px 5px;
 	cursor: pointer;
-	color: #fff
+   cursor: pointer;
+   display: inline-block;
+   padding: 4px 7px 3px 7px;
+   border: 1px solid #CC9900;
+   border-radius: 3px 3px 3px 3px;
+   font-weight: bold;
+   color: #000;
+	background: url(../img/bg_bt.gif) repeat-x scroll 0 0 #F4B61B
 }
-	
+#new_comment_form .submit .txt_required {
+	float:left;
+	font-size:12px;
+	font-style:italic;
+	color:#666
+}
+
+/* TAB COMMENTS ******************************************************************************** */
+#product_comments_block_tab {margin:0 0 20px 0}
+
 #product_comments_block_tab div.comment {
-	border-bottom: solid 1px #ccc;
-	padding: 5px
+	margin:0 0 10px 0;
+	padding: 5px;
+	border-bottom: 1px dotted #ccc
 }
 
 #product_comments_block_tab div.comment div.comment_author {
 	float: left;
-	width: 200px
+	padding-right:25px;
+	width: 140px;/* 165 */
+	line-height:18px
 }
+#product_comments_block_tab div.comment div.comment_author span {font-weight:bold;}
+#product_comments_block_tab div.comment div.comment_author span,
+#product_comments_block_tab div.comment .star_content {
+	float:left;
+}
+#product_comments_block_tab div.comment .star_content {margin: 0 0 0 5px}
+#product_comments_block_tab div.star,
+#product_comments_block_tab div.star_on {
+	background: url(img/star.gif) no-repeat 0 0 transparent
+}
+#product_comments_block_tab div.star_on {background-position: 0 -16px}
+#product_comments_block_tab .comment_author_infos {clear:both}
+#product_comments_block_tab .comment_author_infos em {color:#999}
 
 #product_comments_block_tab div.comment div.comment_details {
 	float: left;
-	width: 320px
+	width: 360px
 }
-
-#product_comments_block_tab div.comment_details p{
-	padding: 0
+#product_comments_block_tab div.comment_details h4 {padding-bottom:10px}
+#product_comments_block_tab div.comment_details p {padding-bottom:10px}
+#product_comments_block_tab div.comment_details ul {
+	list-style-type:none;
+	margin:0
+}
+#product_comments_block_tab div.comment_details li {
+	padding:2px 0 2px 12px;
+	background:url(img/bg_li.png) no-repeat 1px 45% #fff
 }
 
 #product_comments_block_tab a {
@@ -101,29 +181,21 @@
 	font-weight: bold
 }
 
-#product_comments_block_tab a:hover {
-	text-decoration: underline
-}
-
-#product_comments_block_tab div.star {
-	background: url("img/star.gif") no-repeat scroll 0 0 transparent
-}
-
-#product_comments_block_tab div.star_on {
-	background: url("img/star.gif") no-repeat scroll 0 0 transparent;
-	background-position: 0 -16px
-}
+#product_comments_block_tab a:hover {text-decoration: underline}
 
 #product_comments_block_tab button.usefulness_btn {
-	background-color: #bbb;
-	border: solid 1px #999;
-	padding: 1px;
-	cursor: pointer;
-	color: #fff;
-	margin: 3px
+   cursor: pointer;
+	margin:0 0 0 5px;
+   display: inline-block;
+   padding: 0 2px;
+   border: 1px solid #CC9900;
+   border-radius: 3px 3px 3px 3px;
+   color: #000;
+   font-weight: bold;
+	background: url("img/bg_bt.gif") repeat-x scroll 0 0 #F4B61B
 }
+#product_comments_block_tab button.usefulness_btn:hover {background-position: left -50px}
+#product_comments_block_tab button.usefulness_btn:active {background-position: left -100px}
 
-#product_comments_block_tab span.report_btn {
-	cursor: pointer;
-	text-decoration: underline
-}
+#product_comments_block_tab span.report_btn {cursor: pointer}
+#product_comments_block_tab span.report_btn:hover {text-decoration:underline}

modules/productcomments/productcomments.php

@@ -66,7 +66,7 @@ class ProductComments extends Module
 				return false;
 		if (parent::install() == false OR $this->registerHook('productTab') == false
 		OR $this->registerHook('extraProductComparison') == false OR $this->registerHook('productTabContent') == false
-		OR $this->registerHook('header') == false OR $this->registerHook('extraRight') == false OR !Configuration::updateValue('PRODUCT_COMMENTS_MINIMAL_TIME', 30)
+		OR $this->registerHook('header') == false OR $this->registerHook('productOutOfStock') == false OR !Configuration::updateValue('PRODUCT_COMMENTS_MINIMAL_TIME', 30)
 		OR !Configuration::updateValue('PRODUCT_COMMENTS_ALLOW_GUESTS', 0)
 		OR !Configuration::updateValue('PRODUCT_COMMENTS_MODERATE', 1))
 			return false;
@@ -529,6 +529,7 @@ class ProductComments extends Module
 				<form action="'.$this->_baseUrl.'" method="post" name="product_criterion_form">
 					<label>'.$this->l('Criterion').'</label>
 					<div class="margin-form">
+">
 						<select name="id_product_comment_criterion" id="id_product_comment_criterion" onchange="window.location=\''.$this->_baseUrl.'&updateCriterion=\'+$(\'#id_product_comment_criterion option:selected\').val()">
 							<option value="--">-- '.$this->l('Choose a criterion').' --</option>';
 						foreach ($criterions AS $foo)
@@ -588,7 +589,7 @@ class ProductComments extends Module
 		return ($this->display(__FILE__, '/tab.tpl'));
 	}
 	
-	public function hookExtraRight($params)
+	public function hookProductOutOfStock($params)
 	{			
 		require_once(dirname(__FILE__).'/ProductComment.php');
 		require_once(dirname(__FILE__).'/ProductCommentCriterion.php');

modules/productcomments/productcomments.tpl

@@ -90,7 +90,8 @@
 			{if $comment.content}
 			<div class="comment clearfix">
 				<div class="comment_author">
-					<span style="float:left;">{l s='Average grade' mod='productcomments'}&nbsp</span>
+					<span>{l s='Grade' mod='productcomments'}&nbsp</span>
+					<div class="star_content clearfix">
 					{section name="i" start=0 loop=5 step=1}
 						{if $comment.grade le $smarty.section.i.index}
 							<div class="star"></div>
@@ -98,8 +99,8 @@
 							<div class="star star_on"></div>
 						{/if}
 					{/section}
-					<br style="clear:both"/>
-					<div>
+					</div>
+					<div class="comment_author_infos">
 						<strong>{$comment.customer_name|escape:'html':'UTF-8'}</strong><br/>
 						<em>{dateFormat date=$comment.date_add|escape:'html':'UTF-8' full=0}</em>
 					</div>