antadis/toutpratique
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Romuald 2016-11-30 15:15:21 +01:00
commit 6bd31540fd
3 changed files with 144 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/netreviews/models/NetReviewsModel.php
View File

@ -38,7 +38,7 @@ class NetReviewsModel extends ObjectModel
public $iso_lang = null;
public function __construct()
{
$this->reviews_by_page = 100;
$this->reviews_by_page = 1000;
//Be carefule, the frontcontroller pagination used in the main file in ProductTabContent
//impose a number of 100 for pagination (according to the product numbers on page)
//Changing this number will break the paginationn
@ -51,7 +51,7 @@ class NetReviewsModel extends ObjectModel
$p = 1;
}
if ($n != null && $n <= 0) {
$n = 100;
$n = 1000;
}
if ($count_reviews) {
$sql = 'SELECT COUNT(ref_product) as nbreviews FROM '._DB_PREFIX_.'av_products_reviews WHERE ref_product = '.(int)$id_product;

34
themes/toutpratique/css/global.css
View File

@ -3603,7 +3603,7 @@ main#categorycms { margin-bottom: 30px }
width: 29px;
z-index: 1;
}
#product .price-percent-reduction {
#product #image-block .price-percent-reduction {
position: absolute;
background: url('../img/reduction.png') no-repeat top center;
font-size: 18px;
@ -3792,6 +3792,7 @@ main#categorycms { margin-bottom: 30px }
#product .avail {
margin-top: 20px;
}
#product .bloc.product-container .avail { margin-top: 0; }
#product .availlability span {
font-weight: normal;
}
@ -7400,4 +7401,35 @@ div.languages>span{
@media (max-width: 650px) {
#lightbox_crossselling .button-container .btn { width: 100%; margin-bottom: 10px; }
}
/******* ticket/r11766 - masquage des avis au delà de 3 *********/
#idTabavisverifies {
overflow: hidden;
width: 100%;
position: relative;
top: -5px;
transition: all 0.5s;
-webkit-transition: all 0.5s;
-moz-transition: all 0.5s;
}
#idTabavisverifies .see-all .btn {
color: #fff;
margin-top: 15px;
}
#idTabavisverifies .reviewAV:nth-child(n+4) {
max-height: 0;
padding: 0;
overflow: hidden;
border: 0;
}
#idTabavisverifies.open .reviewAV:nth-child(n+4) {
max-height: none;
}
#idTabavisverifies.open .btn {
display: none;
}
@media(max-width: 480px) {
##idTabavisverifies #headerAV { font-size: 14px; }
}

109
themes/toutpratique/modules/netreviews/views/templates/hook/avisverifies-tab-content.tpl Normal file
View File

@ -0,0 +1,109 @@
<!--
* 2012-2015 NetReviews
*
* @author NetReviews SAS <contact@avis-verifies.com>
* @copyright 2015 NetReviews SAS
* @version Release: $Revision: 7.1.4
* @license NetReviews
* @date 25/08/2015
* International Registered Trademark & Property of NetReviews SAS
-->
{literal}
<style type="text/css">
.groupAvis{
display: none;
}
</style>
{/literal}
<div id="av_more_info_tabs"></div>
<div class="clear"></div>
<div id="idTabavisverifies">
<div id="headerAV">{l s='Product Reviews' mod='netreviews'}</div>
<div id="under-headerAV" style="background: url({$modules_dir|escape:'htmlall'}netreviews/views/img/{l s='Sceau_100_en.png' mod='netreviews'}) no-repeat #f1f1f1;background-size:45px 45px;background-repeat:no-repeat;">
<ul id="aggregateRatingAV">
<li><b>
{l s='Number of Reviews' mod='netreviews'}
</b> : {$count_reviews|intval}</li>
<li><b>{l s='Average Grade' mod='netreviews'}</b> : {$average_rate|floatval} /5 <div class="ratingWrapper" style="display:inline-block;">
<div class="ratingInner" style="width:{$average_rate_percent|intval}%"></div>
</div></li>
</ul>
<ul id="certificatAV">
<li><a href="{$url_certificat|strip}" target="_blank" class="display_certificat_review" >{l s='Show the attestation of Trust' mod='netreviews'}</a></li>
</ul>
<div class="clear"></div>
</div>
<div id="ajax_comment_content">
{foreach from=$reviews key=k_review item=review}
<div class="reviewAV">
<ul class="reviewInfosAV">
<li style="text-transform:capitalize">{$review['customer_name']|escape:'htmlall'}</li>
<li>&nbsp;{l s='the' mod='netreviews'} {$review['horodate']|escape:'htmlall'}</li>
<li class="rateAV"><img src="{$modules_dir|escape:'htmlall'}netreviews/views/img/etoile{$review['rate']}.png" width="80" height="15" /> {$review['rate']|escape:'htmlall'}/5</li>
</ul>
<div class="triangle-border top">{$review['avis']|escape:'htmlall'}</div>
{if $review['discussion']}
{foreach from=$review['discussion'] key=k_discussion item=discussion}
<div class="triangle-border top answer" {if $k_discussion > 0} review_number={$review['id_product_av']} style= "display: none" {/if}>
<span>&rsaquo; {l s='Comment from' mod='netreviews'} <b style="text-transform:capitalize; font-weight:normal">{$discussion['origine']|escape:'htmlall'}</b> {l s='the' mod='netreviews'} {$discussion['horodate']|escape:'html'}</span>
<p class="answer-bodyAV">{$discussion['commentaire']|escape:'htmlall'}</p>
</div>
{/foreach}
{if $k_discussion > 0}
<a href="javascript:switchCommentsVisibility('{$review['id_product_av']|strip}')" style="padding-left: 6px;margin-left: 30px; display: block; font-style:italic" id="display{$review['id_product_av']|strip}" class="display-all-comments" review_number={$review['id_product_av']|strip} >{l s='Show exchanges' mod='netreviews'}</a>
<a href="javascript:switchCommentsVisibility('{$review['id_product_av']|strip}')" style="padding-left: 6px;margin-left: 30px; display: none; font-style:italic" id="hide{$review['id_product_av']|strip}" class="display-all-comments" review_number={$review['id_product_av']|strip} >{l s='Hide exchanges' mod='netreviews'}</a>
</a>
{/if}
{/if}
</div>
{/foreach}
</div>
{if $count_reviews > 3}
<div class="text-center see-all">
<a href="#" class="btn "><span>{l s='Lire tous les avis' mod='netreviews'}</span></a>
</div>
{/if}
</div>
<div class="clear"></div>
{literal}
<script>
//<![CDATA[
$('#idTabavisverifies .see-all a').on('click', function(e){
e.preventDefault();
$('#idTabavisverifies').addClass('open');
$('html, body').animate({ scrollTop: $('#idTabavisverifies .reviewAV:eq(3)').offset().top }, 600);
});
//]]>
</script>
{/literal}