You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by kl...@apache.org on 2012/12/14 15:49:57 UTC
svn commit: r1421907 - in /rave/trunk/rave-portal-resources/src/main/webapp:
WEB-INF/jsp/views/store.jsp WEB-INF/jsp/views/widget.jsp
static/css/rave-css.less
Author: klegacy
Date: Fri Dec 14 14:49:35 2012
New Revision: 1421907
URL: http://svn.apache.org/viewvc?rev=1421907&view=rev
Log:
RAVE-858: Updated styles and markup in widget store and widget (tables to divs).
Modified:
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/rave-css.less
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=1421907&r1=1421906&r2=1421907&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 Fri Dec 14 14:49:35 2012
@@ -74,7 +74,6 @@
</c:forEach>
</ul>
</div>
-
</c:if>
<ul class="storeItems">
<%--@elvariable id="widget" type="org.apache.rave.portal.model.JpaWidget"--%>
@@ -127,13 +126,14 @@
<div class="storeWidgetDesc"><c:out
value="${fn:substring(widget.description, 0, 200)}..."/></div>
</c:if>
+
+ <div class="clearfix">
<div class="widgetRating">
<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 class="ratingCounts">
<span class="widgetLikeCount">
<c:set var="widgetLikes">
@@ -168,38 +168,34 @@
<!-- Displaying the likes and dislikes rating along with total votes -->
</div>
</div>
+ </div>
+ <div class="clearfix">
<c:if test="${not empty widget.tags}">
- <table class="widgetTags">
- <tr>
- <td>
- <fmt:message key="page.widget.tags.title"/>
- </td>
- <c:forEach var="widgettag" items="${widget.tags}">
- <c:forEach var="tag" items="${tags}">
- <c:set var="tagMatched">
- ${tag.id==widgettag.tagId?true:false}
- </c:set>
- <c:if test="${tagMatched}">
- <td class="storeWidgetDesc"><c:out value="${tag.keyword}"/></td>
- </c:if>
- </c:forEach>
+ <div class="widgetTags">
+ <strong><fmt:message key="page.widget.tags.title"/></strong><br/>
+ <c:forEach var="widgettag" items="${widget.tags}">
+ <c:forEach var="tag" items="${tags}">
+ <c:set var="tagMatched">
+ ${tag.id==widgettag.tagId?true:false}
+ </c:set>
+ <c:if test="${tagMatched}">
+ <span class="label"><c:out value="${tag.keyword}"/></span>
+ </c:if>
</c:forEach>
- </tr>
- </table>
+ </c:forEach>
+ </div>
</c:if>
+ </div>
<c:if test="${not empty widget.categories}">
- <table class="widgetCategories">
- <tr>
- <td>
- <fmt:message key="widget.categories"/>
- </td>
- <c:forEach var="category" items="${widget.categories}">
- <td class="storeWidgetDesc"><c:out value="${category.text}"/></td>
- </c:forEach>
- </tr>
- </table>
+ <div class="clearfix">
+ <div class="widgetCategories">
+ <strong><fmt:message key="widget.categories"/></strong><br/>
+ <c:forEach var="category" items="${widget.categories}">
+ <span class="storeWidgetDesc"><c:out value="${category.text}"/></span>
+ </c:forEach>
+ </div>
+ </div>
</c:if>
-
<span class="widgetUserCount">
<c:set var="widgetUserCountGreaterThanZero"
value="${widgetStatistics != null && widgetStatistics.totalUserCount > 0}"/>
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=1421907&r1=1421906&r2=1421907&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 Fri Dec 14 14:49:35 2012
@@ -57,7 +57,7 @@
</div>
</div>
<div class="span7 detail-widget-main">
- <div>
+ <div class="row-fluid">
<h2>
<c:set var="widgetHasTitleUrl" value="${not empty widget.titleUrl}"/>
<c:if test="${widgetHasTitleUrl}"><a href="<c:out value="${widget.titleUrl}"/>" rel="external">
@@ -90,7 +90,7 @@
<p class="storeWidgetDesc"><c:out value="${widget.description}"/></p>
</c:if>
</div>
- <div class="clearfix">
+ <div class="row-fluid">
<div class="widgetRating" id="widgetRatings">
<h3><fmt:message key="page.widget.rate"/></h3>
<form class="hidden">
@@ -132,20 +132,19 @@
</div>
</div>
</div>
- <div>
+ <div class="row-fluid">
<div class="detail-widget-users">
- <p><c:set var="widgetUserCountGreaterThanZero"
+ <c:set var="widgetUserCountGreaterThanZero"
value="${widgetStatistics != null && widgetStatistics.totalUserCount > 0}"/>
<c:if test="${widgetUserCountGreaterThanZero}"><a href="javascript:void(0);"
onclick="rave.displayUsersOfWidget(${widget.id});"></c:if>
<fmt:formatNumber groupingUsed="true" value="${widgetStatistics.totalUserCount}"/> <fmt:message
key="page.widget.usercount"/>
<c:if test="${widgetUserCountGreaterThanZero}"></a></c:if>
- </p>
</div>
</div>
- <div>
+ <div class="row-fluid">
<%--//Tag section--%>
<div class="widgetTags">
<c:if test="${not empty widget.tags}">
@@ -172,21 +171,22 @@
</div>
<a href="#tagInput" data-toggle="basic-slide" data-toggle-text="Hide tag form">Add tags <i class="icon-arrow-right"></i></a>
</div>
- <c:if test="${not empty widget.categories}">
+ </div>
+ <c:if test="${not empty widget.categories}">
+ <div class="row-fluid">
<div class="widgetCategories">
- <fmt:message key="widget.categories"/>
- <table id="categoriesRow">
- <tr>
+ <h3><fmt:message key="widget.categories"/></h3>
+ <div id="categoriesRow">
+ <div>
<c:forEach var="category" items="${widget.categories}">
- <td class="storeWidgetDesc"><c:out value="${category.text}"/></td>
+ <span class="storeWidgetDesc"><c:out value="${category.text}"/></span>
</c:forEach>
- </tr>
- </table>
+ </div>
+ </div>
</div>
- </c:if>
- </div>
-
- <div>
+ </div>
+ </c:if>
+ <div class="row-fluid">
<div class="widgetComments" id="widgetComments">
<h3><fmt:message key="page.widget.comments"/></h3>
<div class="new-comment form-inline well">
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=1421907&r1=1421906&r2=1421907&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 Fri Dec 14 14:49:35 2012
@@ -463,7 +463,8 @@
.detail-widget-tags {
margin-bottom: 20px;
}
-.detail-widget-tags .label{
+.detail-widget-tags .label,
+.widgetTags span.label{
width: auto;
float: none;
display: inline;
@@ -527,7 +528,12 @@ ul.storeItems li {
.clearfix;
position: relative;
}
-
+ul.storeItems li span.label{
+ width: auto;
+ float: none;
+ display: inline-block;
+ margin-right: .5em;
+}
.storeItemLeft, .storeItemCenter {
vertical-align: top;
}
@@ -546,7 +552,7 @@ ul.storeItems li {
}
.storeWidgetDesc {
- margin: 1em 0;
+ margin: 1em 0 0;
}
.storeWidgetDisabled {
@@ -556,8 +562,10 @@ ul.storeItems li {
padding: 3px;
}
-.storeItem .widgetRating {
- margin: 1em 0;
+ul.storeItems .widgetRating,
+ul.storeItems .widgetTags,
+ul.storeItems .widgetCategories {
+ margin: 0 0 1em;
float: left;
}
.widgetRating {
@@ -596,6 +604,10 @@ ul.storeItems li {
right: 5px;
}
+.widgetCategories .storeWidgetDesc{
+ display: inline-block;
+ margin: .5em 1.5em .5em 0;
+}
.secondaryPageItemTitle {
font-size: 1.2em;
}