You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ca...@apache.org on 2012/07/11 19:51:19 UTC
svn commit: r1360319 - in /rave/trunk/rave-portal-resources/src/main:
resources/ webapp/WEB-INF/jsp/views/ webapp/static/css/
webapp/static/css/bootstrap/img/ webapp/static/script/
Author: carlucci
Date: Wed Jul 11 17:51:19 2012
New Revision: 1360319
URL: http://svn.apache.org/viewvc?rev=1360319&view=rev
Log:
RAVE-683: Revamp like/dislike display. Patch supplied by Kristen Legacy
Modified:
rave/trunk/rave-portal-resources/src/main/resources/messages.properties
rave/trunk/rave-portal-resources/src/main/resources/messages_es.properties
rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp
rave/trunk/rave-portal-resources/src/main/webapp/static/css/bootstrap/img/glyphicons-halflings-white.png
rave/trunk/rave-portal-resources/src/main/webapp/static/css/bootstrap/img/glyphicons-halflings.png
rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_store.js
Modified: rave/trunk/rave-portal-resources/src/main/resources/messages.properties
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/resources/messages.properties?rev=1360319&r1=1360318&r2=1360319&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/resources/messages.properties (original)
+++ rave/trunk/rave-portal-resources/src/main/resources/messages.properties Wed Jul 11 17:51:19 2012
@@ -156,14 +156,14 @@ page.widget.title=Widget Detail
page.widget.addToPage=Add to Page
page.widget.backToStore=Back to Store
page.widget.widgetPreview=Widget Preview
-page.widget.rate=Rate:
-page.widget.rate.like=Like
-page.widget.rate.dislike=Dislike
page.widget.comments=Comments
page.widget.comment.edit=Edit Comment
page.widget.usercount=users
-page.widget.rate.likes=Likes:
-page.widget.rate.dislikes=Dislikes:
+page.widget.rate=Rate:
+page.widget.rate.likes=people like this widget
+page.widget.rate.dislikes=people dislike this widget
+page.widget.rate.likebtn=I <span>like</span> it
+page.widget.rate.dislikebtn=I <span>dislike</span> it
page.widget.tags.title=Tags:
page.widget.tags.add=Add New Tag:
page.widget.tags.or=--or--
Modified: rave/trunk/rave-portal-resources/src/main/resources/messages_es.properties
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/resources/messages_es.properties?rev=1360319&r1=1360318&r2=1360319&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/resources/messages_es.properties (original)
+++ rave/trunk/rave-portal-resources/src/main/resources/messages_es.properties Wed Jul 11 17:51:19 2012
@@ -167,13 +167,13 @@ page.widget.addToPage=Agregue a la pagin
page.widget.backToStore=Volver a la Tienda (Widget Store)
page.widget.widgetPreview=Widget previsualizacion
page.widget.rate=Valoracion\:
-page.widget.rate.like=Me agrada
-page.widget.rate.dislike=No me agrada
+page.widget.rate.likebtn=Me <span>agrada</span>
+page.widget.rate.dislikebtn=Me <span>desagrada</span>
page.widget.comments=Comentarios
page.widget.comment.edit=Editar comentario
page.widget.usercount=usuarios
-page.widget.rate.likes=Le agrada\:
-page.widget.rate.dislikes=No les agrada\:
+page.widget.rate.likes=personas les gusta este widget
+page.widget.rate.dislikes=personas no les gusta este widget
page.widget.tags.title=Etiquetas\:
page.widget.tags.add=Agregar nueva etiqueta\:
page.widget.tags.or=--o--
@@ -389,4 +389,4 @@ _rave_client.revoke.share.current.user.c
_rave_client.grant.editing.user.confirm=Esta seguro/a que desea dar permisos de edici\u00F3n al siguiente usuario?
_rave_client.revoke.editing.user.confirm=Esta seguro/a que desea remover los derechos de edici\u00F3n al siguiente usuario?
_rave_client.no.results.found=No fueron encontrados resultados
-_rave_client.get.metadata=Obtener metadata
\ No newline at end of file
+_rave_client.get.metadata=Obtener metadata
Modified: rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties?rev=1360319&r1=1360318&r2=1360319&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties (original)
+++ rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties Wed Jul 11 17:51:19 2012
@@ -168,13 +168,13 @@ page.widget.addToPage=Voeg toe aan pagin
page.widget.backToStore=Terug naar de winkel
page.widget.widgetPreview=Widget preview
page.widget.rate=Waardering:
-page.widget.rate.like=Leuk
-page.widget.rate.dislike=Niet leuk
+page.widget.rate.likebtn=Leuk
+page.widget.rate.dislikebtn=Niet leuk
page.widget.comments=Opmerkingen
page.widget.comment.edit=Bewerk opmerking
page.widget.usercount=gebruikers
-page.widget.rate.likes=Leuk:
-page.widget.rate.dislikes=Niet leuk:
+page.widget.rate.likes=mensen zoals deze widget
+page.widget.rate.dislikes=mensen hekel aan deze widget
page.widget.tags.title=Labels:
page.widget.tags.add=Nieuwe tag toevoegen:
page.widget.tags.or=--of--
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp?rev=1360319&r1=1360318&r2=1360319&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp Wed Jul 11 17:51:19 2012
@@ -128,18 +128,43 @@
value="${fn:substring(widget.description, 0, 200)}..."/></div>
</c:if>
<div class="widgetRating">
- <fmt:message key="page.widget.rate"/>
+ <strong><fmt:message key="page.widget.rate"/></strong>
<form class="hidden">
<input type="hidden" id="rate-${widget.id}"
value="${widgetsStatistics[widget.id]!=null?widgetsStatistics[widget.id].userRating:"-1"}">
</form>
- <div id="rating-${widget.id}" class="ratingButtons btn-group" data-toggle="buttons-radio">
- <button id="like-${widget.id}" class="widgetLikeButton btn btn-small ${widgetsStatistics[widget.id].userRating==10? 'active btn-success':''}"
- ${widgetsStatistics[widget.id].userRating==10 ? " checked='true'":""}
- name="rating-${widget.id}"><i class="icon-plus"></i></button>
- <button id="dislike-${widget.id}" class="widgetDislikeButton btn btn-small ${widgetsStatistics[widget.id].userRating==0? 'active btn-danger':''}"
- ${widgetsStatistics[widget.id].userRating==0 ? " checked='true'":""}
- name="rating-${widget.id}"><i class="icon-minus"></i></button>
+
+ <div class="ratingCounts">
+ <span class="widgetLikeCount">
+ <c:set var="widgetLikes">
+ ${widgetsStatistics[widget.id]!=null?widgetsStatistics[widget.id].totalLike:"0"}
+ </c:set>
+ <span id="totalLikes-${widget.id}" data-rave-widget-likes="${widgetLikes}">
+ <span class="like-text">${widgetLikes}</span>
+ </span>
+ <i class="icon-thumbs-up" title="${widgetLikes} <fmt:message key="page.widget.rate.likes"/>"></i>
+ </span>
+ <span class="widgetDislikeCount">
+ <c:set var="widgetDislikes">
+ ${widgetsStatistics[widget.id]!=null?widgetsStatistics[widget.id].totalDislike:"0"}
+ </c:set>
+
+ <span id="totalDislikes-${widget.id}" data-rave-widget-dislikes="${widgetDislikes}">
+ <span class="dislike-text">${widgetDislikes}</span>
+ </span>
+ <i class="icon-thumbs-down" title="${widgetDislikes} <fmt:message key="page.widget.rate.dislikes"/>"></i>
+ </span>
+ </div>
+ <div id="rating-${widget.id}" class="ratingButtons" data-toggle="buttons-radio">
+ <button id="like-${widget.id}" class="widgetLikeButton btn btn-mini ${widgetsStatistics[widget.id].userRating==10? 'active btn-success':''}"
+ ${widgetsStatistics[widget.id].userRating==10 ? " checked='true'":""} name="rating-${widget.id}">
+ <fmt:message key="page.widget.rate.likebtn"/>
+ </button>
+
+ <button id="dislike-${widget.id}" class="widgetDislikeButton btn btn-mini ${widgetsStatistics[widget.id].userRating==0? 'active btn-danger':''}"
+ ${widgetsStatistics[widget.id].userRating==0 ? " checked='true'":""} name="rating-${widget.id}">
+ <fmt:message key="page.widget.rate.dislikebtn"/>
+ </button>
<!-- Displaying the likes and dislikes rating along with total votes -->
</div>
</div>
@@ -167,24 +192,6 @@
</tr>
</table>
</c:if>
- <span class="widgetLikeCount">
- <c:set var="widgetLikes">
- ${widgetsStatistics[widget.id]!=null?widgetsStatistics[widget.id].totalLike:"0"}
- </c:set>
- <span><fmt:message key="page.widget.rate.likes"/></span>
- <span id="totalLikes-${widget.id}" data-rave-widget-likes="${widgetLikes}">
- ${widgetLikes}
- </span>
- </span>
- <span class="widgetDislikeCount">
- <c:set var="widgetDislikes">
- ${widgetsStatistics[widget.id]!=null?widgetsStatistics[widget.id].totalDislike:"0"}
- </c:set>
- <span><fmt:message key="page.widget.rate.dislikes"/></span>
- <span id="totalDislikes-${widget.id}" data-rave-widget-dislikes="${widgetDislikes}">
- ${widgetDislikes}
- </span>
- </span>
<span class="widgetUserCount">
<c:set var="widgetUserCountGreaterThanZero"
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp?rev=1360319&r1=1360318&r2=1360319&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp Wed Jul 11 17:51:19 2012
@@ -90,44 +90,49 @@
<p class="storeWidgetDesc"><c:out value="${widget.description}"/></p>
</c:if>
</div>
- <div>
- <div>
+ <div class="clearfix">
+ <div class="widgetRating">
<h3><fmt:message key="page.widget.rate"/></h3>
<form class="hidden">
<input type="hidden" id="rate-${widget.id}"
value="${widgetsStatistics[widget.id]!=null?widgetsStatistics[widget.id].userRating:"-1"}">
</form>
- <div id="rating-${widget.id}" class="ratingButtons btn-group" data-toggle="buttons-radio">
- <button id="like-${widget.id}" class="widgetLikeButton btn btn-small ${widgetsStatistics[widget.id].userRating==10? 'active btn-success':''}"
- ${widgetsStatistics[widget.id].userRating==10 ? " checked='true'":""}
- name="rating-${widget.id}"><i class="icon-plus"></i></button>
- <button id="dislike-${widget.id}" class="widgetDislikeButton btn btn-small ${widgetsStatistics[widget.id].userRating==0? 'active btn-danger':''}"
- ${widgetsStatistics[widget.id].userRating==0 ? " checked='true'":""}
- name="rating-${widget.id}"><i class="icon-minus"></i></button>
- <!-- Displaying the likes and dislikes rating along with total votes -->
- </div>
- <br>
- <div>
- <span class="widgetLikeCount">
+ <div class="ratingCounts">
+ <span class="widgetLikeCount">
<c:set var="widgetLikes">
${widgetsStatistics[widget.id]!=null?widgetsStatistics[widget.id].totalLike:"0"}
</c:set>
- <span><fmt:message key="page.widget.rate.likes"/></span>
<span id="totalLikes-${widget.id}" data-rave-widget-likes="${widgetLikes}">
- ${widgetLikes}
+ <span class="like-text">${widgetLikes}</span>
</span>
- </span>
- <span class="widgetDislikeCount">
+ <i class="icon-thumbs-up" title="${widgetLikes} <fmt:message key="page.widget.rate.likes"/>"></i>
+ </span>
+ <span class="widgetDislikeCount">
<c:set var="widgetDislikes">
${widgetsStatistics[widget.id]!=null?widgetsStatistics[widget.id].totalDislike:"0"}
</c:set>
- <span><fmt:message key="page.widget.rate.dislikes"/></span>
+
<span id="totalDislikes-${widget.id}" data-rave-widget-dislikes="${widgetDislikes}">
- ${widgetDislikes}
+ <span class="dislike-text">${widgetDislikes}</span>
</span>
+ <i class="icon-thumbs-down" title="${widgetDislikes} <fmt:message key="page.widget.rate.dislikes"/>"></i>
</span>
</div>
+ <div id="rating-${widget.id}" class="ratingButtons" data-toggle="buttons-radio">
+ <button id="like-${widget.id}" class="widgetLikeButton btn btn-mini ${widgetsStatistics[widget.id].userRating==10? 'active btn-success':''}"
+ ${widgetsStatistics[widget.id].userRating==10 ? " checked='true'":""} name="rating-${widget.id}">
+ <fmt:message key="page.widget.rate.likebtn"/>
+ </button>
+
+ <button id="dislike-${widget.id}" class="widgetDislikeButton btn btn-mini ${widgetsStatistics[widget.id].userRating==0? 'active btn-danger':''}"
+ ${widgetsStatistics[widget.id].userRating==0 ? " checked='true'":""} name="rating-${widget.id}">
+ <fmt:message key="page.widget.rate.dislikebtn"/>
+ </button>
+ <!-- Displaying the likes and dislikes rating along with total votes -->
+ </div>
</div>
+ </div>
+ <div>
<div class="detail-widget-users">
<p><c:set var="widgetUserCountGreaterThanZero"
value="${widgetStatistics != null && widgetStatistics.totalUserCount > 0}"/>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/static/css/bootstrap/img/glyphicons-halflings-white.png
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/css/bootstrap/img/glyphicons-halflings-white.png?rev=1360319&r1=1360318&r2=1360319&view=diff
==============================================================================
Files rave/trunk/rave-portal-resources/src/main/webapp/static/css/bootstrap/img/glyphicons-halflings-white.png (original) and rave/trunk/rave-portal-resources/src/main/webapp/static/css/bootstrap/img/glyphicons-halflings-white.png Wed Jul 11 17:51:19 2012 differ
Modified: rave/trunk/rave-portal-resources/src/main/webapp/static/css/bootstrap/img/glyphicons-halflings.png
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/css/bootstrap/img/glyphicons-halflings.png?rev=1360319&r1=1360318&r2=1360319&view=diff
==============================================================================
Files rave/trunk/rave-portal-resources/src/main/webapp/static/css/bootstrap/img/glyphicons-halflings.png (original) and rave/trunk/rave-portal-resources/src/main/webapp/static/css/bootstrap/img/glyphicons-halflings.png Wed Jul 11 17:51:19 2012 differ
Modified: rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less?rev=1360319&r1=1360318&r2=1360319&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less Wed Jul 11 17:51:19 2012
@@ -481,6 +481,8 @@ ul.storeItems {
ul.storeItems li {
list-style: none;
+ .clearfix;
+ position: relative;
}
.storeItemLeft, .storeItemCenter {
@@ -511,16 +513,44 @@ ul.storeItems li {
padding: 3px;
}
-.widgetRating {
+.storeItem .widgetRating {
margin: 1em 0;
+ float: left;
}
+.widgetRating {
+ .ratingCounts{ .clearfix; }
-.widgetDislikeCount {
- padding: 0 10px;
+ button{
+ display: block;
+ float: left;
+ margin-right: .75em;
+ }
+
+ .like-text, .widgetLikeCount, .widgetLikeButton span{
+ color: @green;
+ }
+ .dislike-text, .widgetDislikeCount, .widgetDislikeButton span{
+ color: @red;
+ }
+ .widgetLikeCount,
+ .widgetDislikeCount{
+ display: block;
+ float: left;
+ text-align: center;
+ margin-right: .75em;
+ }
+ .btn-success{
+ span{ color: inherit; }
+ }
+ .btn-danger{
+ span{ color: inherit; }
+ }
}
.widgetUserCount {
- float: right;
+ position: absolute;
+ bottom: 3px;
+ right: 5px;
}
.secondaryPageItemTitle {
@@ -910,6 +940,7 @@ span.error, label.error {
.storeItem {
box-shadow: none;
padding: 0 10px;
+ .clearfix;
}
.storeItemLeft, .storeItemCenter {
Modified: rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_store.js
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_store.js?rev=1360319&r1=1360318&r2=1360319&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_store.js (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_store.js Wed Jul 11 17:51:19 2012
@@ -21,6 +21,26 @@ rave.store = rave.store || (function() {
function initRatings() {
$('.ratingButtons').button();
+
+ //Adjust width's
+ $('.widgetRating').each(function(){
+ var $likeBtn = $(this).find(".widgetLikeButton"),
+ $likeCount = $(this).find(".widgetLikeCount"),
+ $dislikeBtn = $(this).find(".widgetDislikeButton"),
+ $dislikeCount = $(this).find(".widgetDislikeCount");
+
+ if($likeBtn.outerWidth() >= $likeCount.outerWidth()){
+ $likeCount.css( "width", $likeBtn.outerWidth() +"px" ); }
+ else{
+ $likeBtn.css( "width", $likeCount.outerWidth() +"px" );
+ }
+
+ if($dislikeBtn.outerWidth() >= $dislikeCount.outerWidth()){
+ $dislikeCount.css( "width", $dislikeBtn.outerWidth() +"px" );
+ }
+ else{ $dislikeBtn.css( "width", $dislikeCount.outerWidth() +"px"); }
+ });
+
$('.widgetLikeButton').click(function() {
// If not already active
if (!$(this).hasClass('active')){