Changeset 11839 for trunk/themes

Timestamp:

Jul 26, 2011, 9:04:50 PM (13 years ago)

Author:

rvelices

Message:

feature 2384: improve average rating calculation (final)

Location:

trunk/themes/default

Files:

• js/rating.js (modified) (1 diff)
• template/picture.tpl (modified) (2 diffs)

trunk/themes/default/js/rating.js

@@ -70 +70 @@
                                 gUserRating = rateButton.initialRateValue;
                                 for (var i=0; i<gRatingButtons.length; i++) gRatingButtons[i].disabled=false;
+                                if (gRatingOptions.onSuccess) gRatingOptions.onSuccess(result);
                                 if (gRatingOptions.updateRateElement) gRatingOptions.updateRateElement.innerHTML = gRatingOptions.updateRateText;
                                 if (gRatingOptions.ratingSummaryElement)

trunk/themes/default/template/picture.tpl

@@ -197 +197 @@
 {if $display_info.average_rate and isset($rate_summary)}
         <tr id="Average">
-                <td class="label">{'Rating'|@translate}</td>
-                <td class="value" id="ratingSummary">
+                <td class="label">{'Rating score'|@translate}</td>
+                <td class="value">
                 {if $rate_summary.count}
-                        {assign var='rate_text' value='%.2f (rated %d times)'|@translate}
-                        {$pwg->sprintf($rate_text, $rate_summary.score, $rate_summary.count, $rate_summary.average)}
+                        <span id="ratingScore">{$rate_summary.score}</span> <span id="ratingCount">({assign var='rate_text' value='%d rates'|@translate}{$pwg->sprintf($rate_text, $rate_summary.count)})</span>
                 {else}
-                        {'no rate'|@translate}
+                        <span id="ratingScore">{'no rate'|@translate}</span> <span id="ratingCount"></span>
                 {/if}
                 </td>
@@ -229 +228 @@
                                 var _pwgRatingAutoQueue = _pwgRatingAutoQueue||[];
                                 _pwgRatingAutoQueue.push( {ldelim}rootUrl: '{$ROOT_URL}', image_id: {$current.id},
-                                        updateRateText: "{'Update your rating'|@translate|@escape:'javascript'}", updateRateElement: document.getElementById("updateRate"),
-                                        ratingSummaryText: "{'%.2f (rated %d times)'|@translate|@escape:'javascript'}", ratingSummaryElement: document.getElementById("ratingSummary"){rdelim} );
+                                        onSuccess : function(rating) {ldelim}
+                                                var e = document.getElementById("updateRate");
+                                                if (e) e.innerHTML = "{'Update your rating'|@translate|@escape:'javascript'}";
+                                                e = document.getElementById("ratingScore");
+                                                if (e) e.innerHTML = rating.score;
+                                                e = document.getElementById("ratingCount");
+                                                if (e) e.innerHTML = "({'%d rates'|@translate|@escape:'javascript'})".replace( "%d", rating.count);
+                                        {rdelim}{rdelim} );
                         {/footer_script}
                         {/strip}