// Merge -> revision 8720

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8722 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-09-22 15:45:10 +00:00
parent 69db63f26c
commit 4f2a090e24
87 changed files with 1591 additions and 724 deletions
@@ -783,8 +783,13 @@ class ProductComments extends Module
{
foreach ($criterions AS $criterion)
{
if(isset($grades[$criterion['id_product_comment_criterion']]))
{
$list_product_grades[$criterion['id_product_comment_criterion']][$id_product] = $grades[$criterion['id_product_comment_criterion']];
$grade_total += (float)($grades[$criterion['id_product_comment_criterion']]);
}
else
$list_product_grades[$criterion['id_product_comment_criterion']][$id_product] = 0;
if (!array_key_exists($criterion['id_product_comment_criterion'], $list_grades))
$list_grades[$criterion['id_product_comment_criterion']] = $criterion['name'];
+15 -11
View File
@@ -28,19 +28,23 @@
<script type="text/javascript" src="{$module_dir}js/jquery.rating.pack.js"></script>
<script type="text/javascript" src="{$smarty.const._PS_JS_DIR_}jquery/jquery.cluetip.js"></script>
<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});
{literal}
$(function()
{
$('input[@type=radio].star').rating();
});
$(function()
{
$('.auto-submit-star').rating();
});
//close comment form
function closeCommentForm(){ldelim}
function closeCommentForm()
{
$('#sendComment').slideUp('fast');
$('input#addCommentButton').fadeIn('slow');
{rdelim}
}
{/literal}
</script>
<tr class="comparison_header">
@@ -64,7 +68,7 @@
<td width="{$width}%" class="{$classname} comparison_infos ajax_block_product" align="center">
{if isset($tab_grade[$id_product]) AND $tab_grade[$id_product]}
{section loop=6 step=1 start=1 name=average}
<input class="auto-submit-star" disabled="disabled" type="radio" name="{$grade_id}_{$product_id}_{$smarty.section.average.index}" {if isset($tab_grade[$id_product]) AND $tab_grade[$id_product]|round neq 0 and $smarty.section.average.index eq $tab_grade[$id_product]|round}checked="checked"{/if} />
<input class="auto-submit-star" disabled="disabled" type="radio" name="{$grade_id}_{$id_product}_{$smarty.section.average.index}" {if isset($tab_grade[$id_product]) AND $tab_grade[$id_product]|round neq 0 and $smarty.section.average.index eq $tab_grade[$id_product]|round}checked="checked"{/if} />
{/section}
{else}
-
@@ -101,7 +105,7 @@
<div class="comment">
<div class="customer_name">
{dateFormat date=$comment.date_add|escape:'html':'UTF-8' full=0}
{$comment.firstname|escape:'html':'UTF-8'} {$comment.lastname|truncate:30:'...'|escape:'htmlall':'UTF-8'}.
{$comment.customer_name|escape:'html':'UTF-8'}.
</div>
{$comment.content|escape:'html':'UTF-8'|nl2br}
</div>