You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by er...@apache.org on 2013/07/18 22:00:55 UTC
svn commit: r1504624 - in
/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views:
addwidget.marketplace.jsp page.jsp store.jsp widget.jsp
widget.marketplace.jsp
Author: erinnp
Date: Thu Jul 18 20:00:55 2013
New Revision: 1504624
URL: http://svn.apache.org/r1504624
Log:
RAVE-990: fixing merge errors that left several onclick bindings in the markup
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.marketplace.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
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/WEB-INF/jsp/views/widget.marketplace.jsp
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.marketplace.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.marketplace.jsp?rev=1504624&r1=1504623&r2=1504624&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.marketplace.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.marketplace.jsp Thu Jul 18 20:00:55 2013
@@ -83,22 +83,22 @@
</div>
</c:if>
- <ul class="storeItems">
+ <ul class="storeItems" id="marketplaceWidgetList">
<c:forEach var="widget" items="${widgets.resultSet}">
<li class="storeItem">
- <div class="storeItemLeft">
- <c:if test="${not empty widget.thumbnailUrl}">
- <img class="storeWidgetThumbnail" src="${widget.thumbnailUrl}"
- title="<c:out value="${widget.title}"/>" alt=""
- width="120" height="60"/>
- </c:if>
- <div id="widgetAdded_${widget.id}" class="storeButton">
- <button class="btn btn-small btn-primary" id="addWidget_${widget.id}"
- onclick="rave.store.confirmAddFromMarketplace('<c:out value="${widget.url}"/>', '<c:out value="${widget.type}"/>');">
- <fmt:message key="page.widget.marketplace.addToStore"/>
- </button>
- </div>
+ <div class="storeItemLeft">
+ <c:if test="${not empty widget.thumbnailUrl}">
+ <img class="storeWidgetThumbnail" src="${widget.thumbnailUrl}"
+ title="<c:out value="${widget.title}"/>" alt=""
+ width="120" height="60"/>
+ </c:if>
+ <div id="widgetAdded_${widget.id}" class="storeButton">
+ <button class="btn btn-small btn-primary widgetAddButton" id="addWidget_${widget.id}"
+ data-widget-url="<c:out value="${widget.url}"/>" data-widget-type="<c:out value="${widget.type}"/>">
+ <fmt:message key="page.widget.marketplace.addToStore"/>
+ </button>
+ </div>
</div>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp?rev=1504624&r1=1504623&r2=1504624&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp Thu Jul 18 20:00:55 2013
@@ -71,31 +71,42 @@
<c:otherwise>false</c:otherwise>
</c:choose>
</c:set>
- <portal:person id="${userPage.ownerId}" var="userPageOwner" />
+ <portal:person id="${userPage.ownerId}" var="userPageOwner"/>
<fmt:message key="sharing.page.tab.icon.tip.from" var="iconShareToolTipFrom">
<fmt:param value="${userPageOwner.username}"/>
</fmt:message>
<fmt:message key="sharing.page.tab.icon.tip.to" var="iconShareToolTipTo"/>
<c:choose>
<c:when test="${isCurrentPage}">
- <li id="tab-${userPage.id}" class="active dropdown" >
+ <li id="tab-${userPage.id}" class="active dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<c:if test="${isSharedToMe}">
- <b id="pageMenuSharedIcon" class="ui-icon ui-icon-person" title="<c:out value="${iconShareToolTipFrom}"/>"></b>
+ <b id="pageMenuSharedIcon" class="ui-icon ui-icon-person"
+ title="<c:out value="${iconShareToolTipFrom}"/>"></b>
</c:if>
<c:if test="${isSharedByMe}">
- <b id="pageMenuSharedIcon" class="ui-icon ui-icon-folder-open" title="<c:out value="${iconShareToolTipTo}"/>"></b>
+ <b id="pageMenuSharedIcon" class="ui-icon ui-icon-folder-open"
+ title="<c:out value="${iconShareToolTipTo}"/>"></b>
</c:if>
<c:out value="${userPage.name}"/>
<b class="caret"></b>
</a>
- <ul class="dropdown-menu" >
- <li id="pageMenuEdit" class="<c:if test="${isSharedToMe}">menu-item-disabled</c:if>"><a href="#"><fmt:message key="page.general.editpage"/></a></li>
- <li id="pageMenuDelete" class="<c:if test='${hasOnlyOnePage or isSharedToMe}'>menu-item-disabled</c:if>"><a href="#"><fmt:message key="page.general.deletepage"/></a></li>
- <li id="pageMenuMove" class="<c:if test='${hasOnlyOnePage}'>menu-item-disabled</c:if>"><a href="#"><fmt:message key="page.general.movepage"/></a></li>
- <li id="pageMenuExport" class="hidden"><a href="#"><fmt:message key="page.general.exportpage"/></a></li>
- <li id="pageMenuShare" class="<c:if test="${isSharedToMe}">menu-item-disabled</c:if>"><a href="#sharePageDialog" data-toggle="modal"><fmt:message key="page.general.sharepage"/></a></li>
- <li id="pageMenuRevokeShare" class="<c:if test="${isSharedToMe == false}">menu-item-disabled</c:if>"><a href="#"><fmt:message key="page.general.removeshare"/></a></li>
+ <ul class="dropdown-menu">
+ <li id="pageMenuEdit" class="<c:if test="${isSharedToMe}">menu-item-disabled</c:if>"><a
+ href="#"><fmt:message key="page.general.editpage"/></a></li>
+ <li id="pageMenuDelete"
+ class="<c:if test='${hasOnlyOnePage or isSharedToMe}'>menu-item-disabled</c:if>"><a
+ href="#"><fmt:message key="page.general.deletepage"/></a></li>
+ <li id="pageMenuMove" class="<c:if test='${hasOnlyOnePage}'>menu-item-disabled</c:if>">
+ <a href="#"><fmt:message key="page.general.movepage"/></a></li>
+ <li id="pageMenuExport" class="hidden"><a href="#"><fmt:message
+ key="page.general.exportpage"/></a></li>
+ <li id="pageMenuShare" class="<c:if test="${isSharedToMe}">menu-item-disabled</c:if>"><a
+ href="#sharePageDialog" data-toggle="modal"><fmt:message
+ key="page.general.sharepage"/></a></li>
+ <li id="pageMenuRevokeShare"
+ class="<c:if test="${isSharedToMe == false}">menu-item-disabled</c:if>"><a href="#"><fmt:message
+ key="page.general.removeshare"/></a></li>
</ul>
</li>
</c:when>
@@ -103,19 +114,24 @@
<li id="tab-${userPage.id}">
<c:choose>
<c:when test="${isSharedToMe}">
- <a href="<spring:url value="/app/page/view/${userPage.id}"/>" class="rave-ui-tab-shared-to-me">
- <b id="pageMenuSharedIcon" class="ui-icon ui-icon-person" title="<c:out value="${iconShareToolTipFrom}"/>"></b>
+ <a href="<spring:url value="/app/page/view/${userPage.id}"/>"
+ class="rave-ui-tab-shared-to-me">
+ <b id="pageMenuSharedIcon" class="ui-icon ui-icon-person"
+ title="<c:out value="${iconShareToolTipFrom}"/>"></b>
<c:out value="${userPage.name}"/>
</a>
</c:when>
<c:when test="${isSharedByMe}">
- <a href="<spring:url value="/app/page/view/${userPage.id}" />" class="rave-ui-tab-shared-by-me">
- <b id="pageMenuSharedIcon" class="ui-icon ui-icon-folder-open" title="<c:out value="${iconShareToolTipTo}"/>"></b>
+ <a href="<spring:url value="/app/page/view/${userPage.id}" />"
+ class="rave-ui-tab-shared-by-me">
+ <b id="pageMenuSharedIcon" class="ui-icon ui-icon-folder-open"
+ title="<c:out value="${iconShareToolTipTo}"/>"></b>
<c:out value="${userPage.name}"/>
</a>
</c:when>
<c:otherwise>
- <a href="<spring:url value="/app/page/view/${userPage.id}" />"><c:out value="${userPage.name}"/></a>
+ <a href="<spring:url value="/app/page/view/${userPage.id}" />"><c:out
+ value="${userPage.name}"/></a>
</c:otherwise>
</c:choose>
</li>
@@ -133,57 +149,58 @@
</div>
<div class="row-fluid">
-<div class=" tab-content">
- <div id="emptyPageMessageWrapper" class="emptyPageMessageWrapper hidden">
- <c:if test="${pageUser.pageStatus != 'PENDING'}">
- <div class="emptyPageMessage">
- <c:choose>
- <c:when test="${pageUser.editor == true}">
- <a href="<spring:url value="/app/store?referringPageId=${page.id}" />"><fmt:message key="page.general.empty"/></a>
- </c:when>
- <c:otherwise>
- <fmt:message key="page.general.non.editing.empty"/>
- </c:otherwise>
- </c:choose>
- </div>
- </c:if>
- </div>
- <c:choose>
- <c:when test="${pageUser.pageStatus != 'PENDING'}">
- <div class="regions">
- <%-- insert the region layout template --%>
- <tiles:insertTemplate template="${layout}"/>
- </div>
- <div class="clear-float"> </div>
- </c:when>
- <c:otherwise>
- <div class="emptyPageMessage">
- <div>
- <div id="confirmSharePageLegend">
- <c:choose>
- <c:when test="${page.ownerId == principalId}">
- <fmt:message key="cloned.page.confirm.message"/>
- </c:when>
- <c:otherwise>
- <portal:person id="${page.ownerId}" var="owner" />
- <fmt:message key="sharing.page.confirm.message">
- <fmt:param value="${owner.username}"/>
- </fmt:message>
- </c:otherwise>
- </c:choose>
- </div>
- </div>
- <div> </div>
- <div>
- <a href="#" onclick="rave.models.currentPage.acceptShare()"><fmt:message key="_rave_client.common.accept"/></a>
+ <div class=" tab-content">
+ <div id="emptyPageMessageWrapper" class="emptyPageMessageWrapper hidden">
+ <c:if test="${pageUser.pageStatus != 'PENDING'}">
+ <div class="emptyPageMessage">
+ <c:choose>
+ <c:when test="${pageUser.editor == true}">
+ <a href="<spring:url value="/app/store?referringPageId=${page.id}" />"><fmt:message
+ key="page.general.empty"/></a>
+ </c:when>
+ <c:otherwise>
+ <fmt:message key="page.general.non.editing.empty"/>
+ </c:otherwise>
+ </c:choose>
</div>
- <div>
- <a href="#" onclick="rave.models.currentPage.declineShare();"><fmt:message key="_rave_client.common.decline"/></a>
+ </c:if>
+ </div>
+ <c:choose>
+ <c:when test="${pageUser.pageStatus != 'PENDING'}">
+ <div class="regions">
+ <%-- insert the region layout template --%>
+ <tiles:insertTemplate template="${layout}"/>
</div>
<div class="clear-float"> </div>
- </div>
- </c:otherwise>
- </c:choose>
+ </c:when>
+ <c:otherwise>
+ <div class="emptyPageMessage">
+ <div>
+ <div id="confirmSharePageLegend">
+ <c:choose>
+ <c:when test="${page.ownerId == principalId}">
+ <fmt:message key="cloned.page.confirm.message"/>
+ </c:when>
+ <c:otherwise>
+ <portal:person id="${page.ownerId}" var="owner"/>
+ <fmt:message key="sharing.page.confirm.message">
+ <fmt:param value="${owner.username}"/>
+ </fmt:message>
+ </c:otherwise>
+ </c:choose>
+ </div>
+ </div>
+ <div> </div>
+ <div>
+ <a href="#" id="acceptShareLink"><fmt:message key="_rave_client.common.accept"/></a>
+ </div>
+ <div>
+ <a href="#" id="declineShareLink"><fmt:message key="_rave_client.common.decline"/></a>
+ </div>
+ <div class="clear-float"> </div>
+ </div>
+ </c:otherwise>
+ </c:choose>
</div>
</div>
@@ -205,18 +222,24 @@
<label id="pageFormErrorsTabbed1" class="control-label"></label>
</div>
<div class="control-group">
- <label class="control-label" for="tab_titleTabbed1"><fmt:message key="page.general.addpage.title"/></label>
+ <label class="control-label" for="tab_titleTabbed1"><fmt:message
+ key="page.general.addpage.title"/></label>
+
<div class="controls">
- <input id="tab_titleTabbed1" name="tab_titleTabbed1" class="input-xlarge focused required" type="text" value="" />
+ <input id="tab_titleTabbed1" name="tab_titleTabbed1"
+ class="input-xlarge focused required" type="text" value=""/>
</div>
</div>
<div class="control-group">
- <label class="control-label" for="pageLayoutTabbed"><fmt:message key="page.general.addpage.selectlayout"/></label>
+ <label class="control-label" for="pageLayoutTabbed"><fmt:message
+ key="page.general.addpage.selectlayout"/></label>
+
<div class="controls">
<select name="pageLayoutTabbed" id="pageLayoutTabbed">
<c:forEach var="pageLayoutTabbed" items="${pageLayouts}">
<option value="${pageLayoutTabbed.code}" id="${pageLayoutTabbed.code}_id">
- <fmt:message key="page.general.addpage.layout.${pageLayoutTabbed.code}"/></option>
+ <fmt:message
+ key="page.general.addpage.layout.${pageLayoutTabbed.code}"/></option>
</c:forEach>
</select>
</div>
@@ -227,26 +250,34 @@
</div>
<div id="tabs-2">
- <div class="modal-body">
+ <div class="modal-body">
<form method="post" id="pageFormImport" class="form-horizontal" enctype="multipart/form-data">
<fieldset>
<div class="control-group error">
<label id="pageFormErrorsTabbed2" class="control-label"></label>
</div>
<div class="control-group">
- <label class="control-label" for="tab_titleTabbed2"><fmt:message key="page.general.addpage.title"/></label>
+ <label class="control-label" for="tab_titleTabbed2"><fmt:message
+ key="page.general.addpage.title"/></label>
+
<div class="controls">
- <input id="tab_titleTabbed2" name="pageName" class="input-xlarge focused required" type="text" value="" />
+ <input id="tab_titleTabbed2" name="pageName" class="input-xlarge focused required"
+ type="text" value=""/>
</div>
</div>
<div class="control-group">
<label class="control-label" for="omdlFile">Browse for File</label>
+
<div class="controls">
- <input id="omdlFile" name="omdlFile" class="input-xlarge focused required" type="file" value="" />
+ <input id="omdlFile" name="omdlFile" class="input-xlarge focused required" type="file"
+ value=""/>
</div>
</div>
<div class="control-group">
- <div class="controls"><iframe id="file_upload_frame" name="file_upload_frame" src="" style="width:0;height:0;border:0px solid black;"></iframe></div>
+ <div class="controls">
+ <iframe id="file_upload_frame" name="file_upload_frame" src=""
+ style="width:0;height:0;border:0px solid black;"></iframe>
+ </div>
</div>
</fieldset>
</form>
@@ -262,6 +293,7 @@
<div id="pageMenuDialog" class="modal hide" data-backdrop="static">
<div class="modal-header">
<a href="#" class="close" data-dismiss="modal">×</a>
+
<h3 id="pageMenuDialogHeader"><fmt:message key="page.general.addnewpage"/></h3>
</div>
<div class="modal-body">
@@ -273,12 +305,16 @@
</div>
<div class="control-group">
<label class="control-label" for="tab_title"><fmt:message key="page.general.addpage.title"/></label>
+
<div class="controls">
- <input id="tab_title" name="tab_title" class="input-xlarge focused required" type="text" value="" />
+ <input id="tab_title" name="tab_title" class="input-xlarge focused required" type="text"
+ value=""/>
</div>
</div>
<div class="control-group" id="pageLayoutGroup">
- <label class="control-label" for="pageLayout"><fmt:message key="page.general.addpage.selectlayout"/></label>
+ <label class="control-label" for="pageLayout"><fmt:message
+ key="page.general.addpage.selectlayout"/></label>
+
<div class="controls">
<select name="pageLayout" id="pageLayout">
<c:forEach var="pageLayout" items="${pageLayouts}">
@@ -300,6 +336,7 @@
<div id="movePageDialog" class="modal hide" data-backdrop="static">
<div class="modal-header">
<a href="#" class="close" data-dismiss="modal">×</a>
+
<h3><fmt:message key="page.general.movethispage"/></h3>
</div>
<div class="modal-body">
@@ -327,8 +364,9 @@
</form>
</div>
<div class="modal-footer">
- <a href="#" class="btn" onclick="$('#movePageDialog').modal('hide');"><fmt:message key="_rave_client.common.cancel"/></a>
- <a href="#" class="btn btn-primary" onclick="rave.layout.movePage();"><fmt:message key="page.general.movepage"/></a>
+ <a href="#" class="btn" data-dismiss="modal" data-target="#movePageDialog"><fmt:message
+ key="_rave_client.common.cancel"/></a>
+ <a href="#" class="btn btn-primary" id="movePageButton"><fmt:message key="page.general.movepage"/></a>
</div>
</div>
@@ -336,6 +374,7 @@
<div id="moveWidgetModal" class="modal hide" data-backdrop="static">
<div class="modal-header">
<a href="#" class="close" data-dismiss="modal">×</a>
+
<h3><fmt:message key="widget.menu.movethiswidget"/></h3>
</div>
<div class="modal-body">
@@ -360,22 +399,26 @@
</form>
</div>
<div class="modal-footer">
- <a href="#" class="btn" onclick="$('#moveWidgetModal').modal('hide');"><fmt:message key="_rave_client.common.cancel"/></a>
- <a href="#" class="btn btn-primary" onclick="rave.layout.moveWidgetToPage($('#moveWidgetModal').data('regionWidgetId'));"><fmt:message key="_rave_client.common.move"/></a>
+ <a href="#" class="btn" data-dismiss="modal" data-target="#moveWidgetModal"><fmt:message
+ key="_rave_client.common.cancel"/></a>
+ <a href="#" class="btn btn-primary" id="moveWidgetToPageButton"><fmt:message
+ key="_rave_client.common.move"/></a>
</div>
</div>
<div id="sharePageDialog" class="modal hide" data-backdrop="static">
<div class="modal-header">
<a href="#" class="close" data-dismiss="modal">×</a>
+
<h3><fmt:message key="page.general.search.title"/></h3>
</div>
<div class="modal-body">
- <div id="sharePageDialogContent" >
+ <div id="sharePageDialogContent">
<div id="shareContent">
<div id="searchControls"><input id="searchTerm" name="searchTerm" type="text"/>
<input id="shareSearchButton" value="<fmt:message key="page.store.search.button"/>" type="submit"/>
- <input id="clearSearchButton" value="<fmt:message key="admin.clearsearch"/>" type="submit" class="hide"/>
+ <input id="clearSearchButton" value="<fmt:message key="admin.clearsearch"/>" type="submit"
+ class="hide"/>
</div>
<div id="shareSearchListHeader"></div>
<div id="shareSearchListPaging"></div>
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=1504624&r1=1504623&r2=1504624&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 Thu Jul 18 20:00:55 2013
@@ -22,286 +22,286 @@
<rave:navbar pageTitle="${pagetitle}"/>
<div class="container-fluid navbar-spacer" id="widgetStore">
- <div class="row-fluid">
- <section class="span8 pagination-header">
+<div class="row-fluid">
+<section class="span8 pagination-header">
+<c:choose>
+ <c:when test="${empty searchTerm and (empty widgets or widgets.totalResults eq 0)}">
+ <%-- Empty db --%>
+ <fmt:message key="page.store.list.noresult" var="listheader"/>
+ </c:when>
+ <c:when test="${empty searchTerm}">
+ <fmt:message key="page.store.list.result.x.to.y" var="listheader">
+ <fmt:param value="${widgets.offset + 1}"/>
+ <fmt:param value="${widgets.offset + fn:length(widgets.resultSet)}"/>
+ <fmt:param value="${widgets.totalResults}"/>
+ </fmt:message>
+ </c:when>
+ <c:when test="${not empty searchTerm and widgets.totalResults eq 0}">
+ <fmt:message key="page.store.list.search.noresult" var="listheader">
+ <fmt:param><c:out value="${searchTerm}"/></fmt:param>
+ </fmt:message>
+ </c:when>
+ <c:otherwise>
+ <fmt:message key="page.store.list.search.result.x.to.y" var="listheader">
+ <fmt:param value="${widgets.offset + 1}"/>
+ <fmt:param value="${widgets.offset + fn:length(widgets.resultSet)}"/>
+ <fmt:param value="${widgets.totalResults}"/>
+ <fmt:param><c:out value="${searchTerm}"/></fmt:param>
+ </fmt:message>
+ </c:otherwise>
+</c:choose>
+<h2>${listheader}</h2>
+<%--@elvariable id="widgets" type="org.apache.rave.portal.model.util.SearchResult"--%>
+<c:if test="${widgets.totalResults gt 0}">
+ <c:if test="${widgets.numberOfPages gt 1}">
+ <div>
+ <ul class="pagination">
+ <c:forEach var="i" begin="1" end="${widgets.numberOfPages}">
+ <c:url var="pageUrl" value="">
+ <c:param name="referringPageId" value="${referringPageId}"/>
+ <c:param name="searchTerm" value="${searchTerm}"/>
+ <c:param name="offset" value="${(i - 1) * widgets.pageSize}"/>
+ </c:url>
+ <c:choose>
+ <c:when test="${i eq widgets.currentPage}">
+ <li class="active"><a href="#">${i}</a></li>
+ </c:when>
+ <c:otherwise>
+ <li><a href="<c:out value="${pageUrl}"/>">${i}</a></li>
+ </c:otherwise>
+ </c:choose>
+
+ </c:forEach>
+ </ul>
+ </div>
+ </c:if>
+ <ul id="storeItems" class="storeItems">
+ <%--@elvariable id="widget" type="org.apache.rave.model.Widget"--%>
+ <c:forEach var="widget" items="${widgets.resultSet}">
+ <%--@elvariable id="widgetsStatistics" type="org.apache.rave.portal.model.util.WidgetStatistics"--%>
+ <c:set var="widgetStatistics" value="${widgetsStatistics[widget.id]}"/>
<c:choose>
- <c:when test="${empty searchTerm and (empty widgets or widgets.totalResults eq 0)}">
- <%-- Empty db --%>
- <fmt:message key="page.store.list.noresult" var="listheader"/>
- </c:when>
- <c:when test="${empty searchTerm}">
- <fmt:message key="page.store.list.result.x.to.y" var="listheader">
- <fmt:param value="${widgets.offset + 1}"/>
- <fmt:param value="${widgets.offset + fn:length(widgets.resultSet)}"/>
- <fmt:param value="${widgets.totalResults}"/>
- </fmt:message>
- </c:when>
- <c:when test="${not empty searchTerm and widgets.totalResults eq 0}">
- <fmt:message key="page.store.list.search.noresult" var="listheader">
- <fmt:param><c:out value="${searchTerm}"/></fmt:param>
- </fmt:message>
+ <c:when test='${widget.featured == "true"}'>
+ <li class="storeItem storeItemFeatured">
</c:when>
<c:otherwise>
- <fmt:message key="page.store.list.search.result.x.to.y" var="listheader">
- <fmt:param value="${widgets.offset + 1}"/>
- <fmt:param value="${widgets.offset + fn:length(widgets.resultSet)}"/>
- <fmt:param value="${widgets.totalResults}"/>
- <fmt:param><c:out value="${searchTerm}"/></fmt:param>
- </fmt:message>
+ <li class="storeItem">
</c:otherwise>
</c:choose>
- <h2>${listheader}</h2>
- <%--@elvariable id="widgets" type="org.apache.rave.portal.model.util.SearchResult"--%>
- <c:if test="${widgets.totalResults gt 0}">
- <c:if test="${widgets.numberOfPages gt 1}">
- <div>
- <ul class="pagination">
- <c:forEach var="i" begin="1" end="${widgets.numberOfPages}">
- <c:url var="pageUrl" value="">
- <c:param name="referringPageId" value="${referringPageId}"/>
- <c:param name="searchTerm" value="${searchTerm}"/>
- <c:param name="offset" value="${(i - 1) * widgets.pageSize}"/>
- </c:url>
- <c:choose>
- <c:when test="${i eq widgets.currentPage}">
- <li class="active"><a href="#">${i}</a></li>
- </c:when>
- <c:otherwise>
- <li><a href="<c:out value="${pageUrl}"/>">${i}</a></li>
- </c:otherwise>
- </c:choose>
-
- </c:forEach>
- </ul>
- </div>
+ <div class="widget-title-bar">
+ <c:out value="${widget.title}"/>
+ </div>
+ <div class="storeItemLeft">
+ <c:if test="${not empty widget.thumbnailUrl}">
+ <img class="storeWidgetThumbnail" src="${widget.thumbnailUrl}"
+ title="<c:out value="${widget.title}"/>" alt=""
+ width="120" height="60"/>
</c:if>
- <ul class="storeItems">
- <%--@elvariable id="widget" type="org.apache.rave.model.Widget"--%>
- <c:forEach var="widget" items="${widgets.resultSet}">
- <%--@elvariable id="widgetsStatistics" type="org.apache.rave.portal.model.util.WidgetStatistics"--%>
- <c:set var="widgetStatistics" value="${widgetsStatistics[widget.id]}"/>
- <c:choose>
- <c:when test='${widget.featured == "true"}'>
- <li class="storeItem storeItemFeatured">
- </c:when>
- <c:otherwise>
- <li class="storeItem">
- </c:otherwise>
- </c:choose>
- <div class="widget-title-bar">
- <c:out value="${widget.title}"/>
- </div>
- <div class="storeItemLeft">
- <c:if test="${not empty widget.thumbnailUrl}">
- <img class="storeWidgetThumbnail" src="${widget.thumbnailUrl}"
- title="<c:out value="${widget.title}"/>" alt=""
- width="120" height="60"/>
- </c:if>
-
- <div id="widgetAdded_${widget.id}" class="storeButton">
- <button class="btn btn-small btn-primary" id="addWidget_${widget.id}"
- onclick="rave.api.rpc.addWidgetToPage({widgetId: '${widget.id}', pageId: '${referringPageId}', buttonId: this.id});"
- data-success="<fmt:message key="page.widget.addedToPage"/>">
- <fmt:message key="page.widget.addToPage"/>
- </button>
- </div>
-
- </div>
- <div class="storeItemCenter">
- <h4><a id="widget-${widget.id}-title"
- class="secondaryPageItemTitle"
- href="<spring:url value="/app/store/widget/${widget.id}" />?referringPageId=${referringPageId}">
- <c:out value="${widget.title}"/>
- </a></h4>
- <c:if test="${widget.disableRendering}">
- <div class="storeWidgetDisabled">
+ <div id="widgetAdded_${widget.id}" class="storeButton">
+ <button class="btn btn-small btn-primary widgetAddButton" id="addWidget_${widget.id}"
+ data-widget-id="${widget.id}" data-referring-page-id="${referringPageId}"
+ data-success="<fmt:message key="page.widget.addedToPage"/>">
+ <fmt:message key="page.widget.addToPage"/>
+ </button>
+ </div>
+
+ </div>
+
+ <div class="storeItemCenter">
+ <h4><a id="widget-${widget.id}-title"
+ class="secondaryPageItemTitle"
+ href="<spring:url value="/app/store/widget/${widget.id}" />?referringPageId=${referringPageId}">
+ <c:out value="${widget.title}"/>
+ </a></h4>
+ <c:if test="${widget.disableRendering}">
+ <div class="storeWidgetDisabled">
<span class="widget-disabled-icon-store ui-icon ui-icon-alert"
title="<fmt:message key="widget.chrome.disabled"/>"></span>
- <c:out value="${widget.disableRenderingMessage}" escapeXml="true"/>
- </div>
- </c:if>
- <c:if test="${not empty widget.author}">
- <div class="storeWidgetAuthor"><fmt:message key="widget.author"/>: <c:out
- value="${widget.author}"/></div>
- </c:if>
- <c:if test="${not empty widget.description}">
- <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">
+ <c:out value="${widget.disableRenderingMessage}" escapeXml="true"/>
+ </div>
+ </c:if>
+ <c:if test="${not empty widget.author}">
+ <div class="storeWidgetAuthor"><fmt:message key="widget.author"/>: <c:out
+ value="${widget.author}"/></div>
+ </c:if>
+ <c:if test="${not empty widget.description}">
+ <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">
- ${widgetsStatistics[widget.id]!=null?widgetsStatistics[widget.id].totalLike:"0"}
- </c:set>
+ ${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>
<span class="widgetDislikeCount">
<c:set var="widgetDislikes">
- ${widgetsStatistics[widget.id]!=null?widgetsStatistics[widget.id].totalDislike:"0"}
- </c:set>
+ ${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>
- </div>
- <div class="clearfix">
- <c:if test="${not empty widget.tags}">
- <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>
- </c:forEach>
- </div>
- </c:if>
- </div>
- <c:if test="${not empty widget.categories}">
- <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>
+ </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 class="clearfix">
+ <c:if test="${not empty widget.tags}">
+ <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>
+ </c:forEach>
+ </div>
+ </c:if>
+ </div>
+ <c:if test="${not empty widget.categories}">
+ <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}"/>
<c:if test="${widgetUserCountGreaterThanZero}">
- <a href="javascript:void(0);" onclick="rave.displayUsersOfWidget('${widget.id}');">
- </c:if>
- <fmt:formatNumber groupingUsed="true"
- value="${widgetStatistics!=null?widgetStatistics.totalUserCount:0}"/> <fmt:message key="page.widget.usercount"/>
- <c:if test="${widgetUserCountGreaterThanZero}"></a></c:if>
+ <a href="javascript:void(0);" class="displayUsersLink" data-widget-id="${widget.id}">
+ </c:if>
+ <fmt:formatNumber groupingUsed="true"
+ value="${widgetStatistics!=null?widgetStatistics.totalUserCount:0}"/> <fmt:message key="page.widget.usercount"/>
+ <c:if test="${widgetUserCountGreaterThanZero}"></a></c:if>
</span>
- </div>
+ </div>
- <div class="clear-float"></div>
- </li>
- </c:forEach>
- </ul>
-
- <c:if test="${widgets.numberOfPages gt 1}">
- <div >
- <ul class="pagination">
- <c:forEach var="i" begin="1" end="${widgets.numberOfPages}">
- <c:url var="pageUrl" value="">
- <c:param name="referringPageId" value="${referringPageId}"/>
- <c:param name="searchTerm" value="${searchTerm}"/>
- <c:param name="offset" value="${(i - 1) * widgets.pageSize}"/>
- </c:url>
+ <div class="clear-float"></div>
+ </li>
+ </c:forEach>
+ </ul>
+
+ <c:if test="${widgets.numberOfPages gt 1}">
+ <div >
+ <ul class="pagination">
+ <c:forEach var="i" begin="1" end="${widgets.numberOfPages}">
+ <c:url var="pageUrl" value="">
+ <c:param name="referringPageId" value="${referringPageId}"/>
+ <c:param name="searchTerm" value="${searchTerm}"/>
+ <c:param name="offset" value="${(i - 1) * widgets.pageSize}"/>
+ </c:url>
+ <c:choose>
+ <c:when test="${i eq widgets.currentPage}">
+ <li class="active"><a href="#">${i}</a></li>
+ </c:when>
+ <c:otherwise>
+ <li> <a href="<c:out value="${pageUrl}"/>">${i}</a></li>
+ </c:otherwise>
+ </c:choose>
+ </c:forEach>
+ </ul>
+ </div>
+ </c:if>
+</c:if>
+</section>
+<section class="span4">
+ <form class="form-inline" action="<c:url value="/app/store/search"/>" method="GET">
+ <fieldset>
+ <input type="hidden" name="referringPageId" value="${referringPageId}">
+ <legend style="margin-bottom: 0;"><fmt:message key="page.store.search"/></legend>
+ <div class="control-group" style="margin-bottom: 18px;">
+ <div class="input-append">
+ <fmt:message key="page.store.search.button" var="searchButtonText"/>
+ <input type="search" id="searchTerm" name="searchTerm" value="<c:out value="${searchTerm}"/>"/><button class="btn btn-primary" type="submit" value="${searchButtonText}">${searchButtonText}</button>
+ </div>
+ </div>
+ <legend>Filter Widget Store</legend>
+ <c:if test="${not empty tags}">
+ <div class="control-group">
+ <label class="control-label" for="categoryList"><fmt:message key="page.store.list.widgets.tag"/></label>
+ <div class="controls">
+ <select name="tagList" id="tagList" class="x-large">
+ <option value=""></option>
+ <c:forEach var="tag" items="${tags}">
<c:choose>
- <c:when test="${i eq widgets.currentPage}">
- <li class="active"><a href="#">${i}</a></li>
+ <c:when test="${selectedTag==tag.keyword}">
+ <option selected>
</c:when>
<c:otherwise>
- <li> <a href="<c:out value="${pageUrl}"/>">${i}</a></li>
+ <option>
</c:otherwise>
</c:choose>
+ <c:out value="${tag.keyword}"/>
+ </option>
</c:forEach>
- </ul>
+ </select>
</div>
- </c:if>
+ </div>
</c:if>
- </section>
- <section class="span4">
- <form class="form-inline" action="<c:url value="/app/store/search"/>" method="GET">
- <fieldset>
- <input type="hidden" name="referringPageId" value="${referringPageId}">
- <legend style="margin-bottom: 0;"><fmt:message key="page.store.search"/></legend>
- <div class="control-group" style="margin-bottom: 18px;">
- <div class="input-append">
- <fmt:message key="page.store.search.button" var="searchButtonText"/>
- <input type="search" id="searchTerm" name="searchTerm" value="<c:out value="${searchTerm}"/>"/><button class="btn btn-primary" type="submit" value="${searchButtonText}">${searchButtonText}</button>
- </div>
- </div>
- <legend>Filter Widget Store</legend>
- <c:if test="${not empty tags}">
- <div class="control-group">
- <label class="control-label" for="categoryList"><fmt:message key="page.store.list.widgets.tag"/></label>
- <div class="controls">
- <select name="tagList" id="tagList" class="x-large">
- <option value=""></option>
- <c:forEach var="tag" items="${tags}">
- <c:choose>
- <c:when test="${selectedTag==tag.keyword}">
- <option selected>
- </c:when>
- <c:otherwise>
- <option>
- </c:otherwise>
- </c:choose>
- <c:out value="${tag.keyword}"/>
- </option>
- </c:forEach>
- </select>
- </div>
- </div>
- </c:if>
- <c:if test="${not empty categories}">
- <div class="control-group">
- <label class="control-label" for="categoryList"><fmt:message key="page.store.list.widgets.category"/></label>
- <div class="controls">
- <select name="categoryList" id="categoryList" class="x-large">
- <option value="0"></option>
- <c:forEach var="category" items="${categories}">
- <c:choose>
- <c:when test="${selectedCategory==category.id}">
- <option value="${category.id}" selected>
- </c:when>
- <c:otherwise>
- <option value="${category.id}">
- </c:otherwise>
- </c:choose>
- <c:out value="${category.text}"/>
- </option>
- </c:forEach>
- </select>
- </div>
- </div>
- </c:if>
- </fieldset>
- </form>
- <a href="<spring:url value="/app/store/mine?referringPageId=${referringPageId}"/>"><fmt:message key="page.store.list.widgets.mine"/></a><br/>
- <a href="<spring:url value="/app/store?referringPageId=${referringPageId}"/>"><fmt:message key="page.store.list.widgets.all"/></a>
- </section>
- </div>
+ <c:if test="${not empty categories}">
+ <div class="control-group">
+ <label class="control-label" for="categoryList"><fmt:message key="page.store.list.widgets.category"/></label>
+ <div class="controls">
+ <select name="categoryList" id="categoryList" class="x-large">
+ <option value="0"></option>
+ <c:forEach var="category" items="${categories}">
+ <c:choose>
+ <c:when test="${selectedCategory==category.id}">
+ <option value="${category.id}" selected>
+ </c:when>
+ <c:otherwise>
+ <option value="${category.id}">
+ </c:otherwise>
+ </c:choose>
+ <c:out value="${category.text}"/>
+ </option>
+ </c:forEach>
+ </select>
+ </div>
+ </div>
+ </c:if>
+ </fieldset>
+ </form>
+ <a href="<spring:url value="/app/store/mine?referringPageId=${referringPageId}"/>"><fmt:message key="page.store.list.widgets.mine"/></a><br/>
+ <a href="<spring:url value="/app/store?referringPageId=${referringPageId}"/>"><fmt:message key="page.store.list.widgets.all"/></a>
+</section>
+</div>
</div>
<portal:register-init-script location="${'AFTER_RAVE'}">
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=1504624&r1=1504623&r2=1504624&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 Thu Jul 18 20:00:55 2013
@@ -22,83 +22,83 @@
<rave:navbar pageTitle="${widget.title}"/>
<div id="na_content" class="container">
- <div class="row detail-widget">
- <div class="span4">
- <div class="detail-widget-preview">
- <c:if test="${not empty widget.screenshotUrl}">
- <div class="detailWidgetScreenshot">
- <img src="${widget.screenshotUrl}"
- alt="<fmt:message key="page.general.screenshot"/>"
- title="<c:out value="${widget.title}"/> <fmt:message key="page.general.screenshot"/>"/>
- </div>
- </c:if>
- <c:if test="${not empty widget.thumbnailUrl}">
- <div class="detailWidgetThumbnail">
- <img src="<c:out value="${widget.thumbnailUrl}"/>" title="<c:out value="${widget.title}"/>"
- alt="<fmt:message key="page.general.thumbnail"/>"/>
- </div>
- </c:if>
- <c:choose>
- <c:when test="${widget.widgetStatus eq 'PUBLISHED'}">
- <div id="widgetAdded_${widget.id}" class="detailWidgetAdd">
- <button class="btn btn-primary btn-large storeItemButton"
- id="addWidget_${widget.id}"
- onclick="rave.api.rpc.addWidgetToPage({widgetId: '${widget.id}', pageId: '${referringPageId}', redirectAfterAdd:true});"
- data-success="<fmt:message key="page.widget.addedToPage"/>">
- <fmt:message key="page.widget.addToPage"/>
- </button>
- </div>
- </c:when>
- <c:when test="${widget.widgetStatus eq 'PREVIEW'}">
- <div class="alert-message info">
- <p><fmt:message key="widget.widgetStatus.PREVIEW"/></p>
- </div>
- </c:when>
- </c:choose>
+<div class="row detail-widget">
+<div class="span4">
+ <div class="detail-widget-preview">
+ <c:if test="${not empty widget.screenshotUrl}">
+ <div class="detailWidgetScreenshot">
+ <img src="${widget.screenshotUrl}"
+ alt="<fmt:message key="page.general.screenshot"/>"
+ title="<c:out value="${widget.title}"/> <fmt:message key="page.general.screenshot"/>"/>
</div>
- </div>
- <div class="span7 detail-widget-main">
- <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">
- </c:if>
- <span id="widget-${widget.id}-title"><c:out value="${widget.title}"/></span>
- <c:if test="${widgetHasTitleUrl}"></a></c:if>
- </h2>
- <c:if test="${widget.disableRendering}">
- <div class="storeWidgetDisabled">
+ </c:if>
+ <c:if test="${not empty widget.thumbnailUrl}">
+ <div class="detailWidgetThumbnail">
+ <img src="<c:out value="${widget.thumbnailUrl}"/>" title="<c:out value="${widget.title}"/>"
+ alt="<fmt:message key="page.general.thumbnail"/>"/>
+ </div>
+ </c:if>
+ <c:choose>
+ <c:when test="${widget.widgetStatus eq 'PUBLISHED'}">
+ <div id="widgetAdded_${widget.id}" class="detailWidgetAdd">
+ <button class="btn btn-primary btn-large storeItemButton widgetJspAddWidgetButton"
+ id="addWidget_${widget.id}"
+ data-widget-id="${widget.id}" data-page-id="${referringPageId}"
+ data-success="<fmt:message key="page.widget.addedToPage"/>">
+ <fmt:message key="page.widget.addToPage"/>
+ </button>
+ </div>
+ </c:when>
+ <c:when test="${widget.widgetStatus eq 'PREVIEW'}">
+ <div class="alert-message info">
+ <p><fmt:message key="widget.widgetStatus.PREVIEW"/></p>
+ </div>
+ </c:when>
+ </c:choose>
+ </div>
+</div>
+<div class="span7 detail-widget-main">
+ <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">
+ </c:if>
+ <span id="widget-${widget.id}-title"><c:out value="${widget.title}"/></span>
+ <c:if test="${widgetHasTitleUrl}"></a></c:if>
+ </h2>
+ <c:if test="${widget.disableRendering}">
+ <div class="storeWidgetDisabled">
<span class="widget-disabled-icon-store ui-icon ui-icon-alert"
title="<fmt:message key="widget.chrome.disabled"/>"></span>
- <c:out value="${widget.disableRenderingMessage}" escapeXml="true"/>
- </div>
- </c:if>
- <c:if test="${not empty widget.author}">
- <p class="storeWidgetAuthor">
- <fmt:message key="widget.author"/>
- <c:out value=" "/><%-- intentional empty String in the c:out --%>
- <c:choose>
- <c:when test="${not empty widget.authorEmail}">
- <a href="mailto:<c:out value="${widget.authorEmail}"/>"><c:out
- value="${widget.author}"/></a>
- </c:when>
- <c:otherwise><c:out value="${widget.author}"/></c:otherwise>
- </c:choose>
- </p>
- </c:if>
-
- <c:if test="${not empty widget.description}">
- <p class="storeWidgetDesc"><c:out value="${widget.description}"/></p>
- </c:if>
- </div>
- <div class="row-fluid">
- <div class="widgetRating" id="widgetRatings">
- <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 class="ratingCounts">
+ <c:out value="${widget.disableRenderingMessage}" escapeXml="true"/>
+ </div>
+ </c:if>
+ <c:if test="${not empty widget.author}">
+ <p class="storeWidgetAuthor">
+ <fmt:message key="widget.author"/>
+ <c:out value=" "/><%-- intentional empty String in the c:out --%>
+ <c:choose>
+ <c:when test="${not empty widget.authorEmail}">
+ <a href="mailto:<c:out value="${widget.authorEmail}"/>"><c:out
+ value="${widget.author}"/></a>
+ </c:when>
+ <c:otherwise><c:out value="${widget.author}"/></c:otherwise>
+ </c:choose>
+ </p>
+ </c:if>
+
+ <c:if test="${not empty widget.description}">
+ <p class="storeWidgetDesc"><c:out value="${widget.description}"/></p>
+ </c:if>
+ </div>
+ <div class="row-fluid">
+ <div class="widgetRating" id="widgetRatings">
+ <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 class="ratingCounts">
<span class="widgetLikeCount">
<c:set var="widgetLikes">
${widgetsStatistics[widget.id]!=null?widgetsStatistics[widget.id].totalLike:"0"}
@@ -107,7 +107,7 @@
<span class="like-text">${widgetLikes}</span>
</span>
<i class="icon-thumbs-up" title="${widgetLikes} <fmt:message key="page.widget.rate.likes"/>"></i>
- </span>
+ </span>
<span class="widgetDislikeCount">
<c:set var="widgetDislikes">
${widgetsStatistics[widget.id]!=null?widgetsStatistics[widget.id].totalDislike:"0"}
@@ -118,93 +118,93 @@
</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 class="row-fluid">
- <div class="detail-widget-users">
- <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>
- </div>
- </div>
+ </div>
+ <div id="rating-${widget.id}" 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 class="row-fluid">
+ <div class="detail-widget-users">
+ <c:set var="widgetUserCountGreaterThanZero"
+ value="${widgetStatistics != null && widgetStatistics.totalUserCount > 0}"/>
+ <c:if test="${widgetUserCountGreaterThanZero}"><a href="javascript:void(0);" id="displayUsersOfWidgetLink"
+ data-widget-id="${widget.id}"></c:if>
+ <fmt:formatNumber groupingUsed="true" value="${widgetStatistics.totalUserCount}"/> <fmt:message
+ key="page.widget.usercount"/>
+ <c:if test="${widgetUserCountGreaterThanZero}"></a></c:if>
+ </div>
+ </div>
- <div class="row-fluid">
- <%--//Tag section--%>
- <div class="widgetTags">
- <c:if test="${not empty widget.tags}">
- <h3><fmt:message key="page.widget.tags.title"/></h3>
- <div class="detail-widget-tags">
- <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>
- </c:forEach>
- </div>
- </c:if>
- <div id="tagInput" class="form-inline hide">
- <label for="tags"><fmt:message key="page.widget.tags.add"/> </label>
- <input type="text" id="tags" data-provide="typeahead" />
- <button id="tag-new-${widget.id}" class="btn tagNewButton" title="Add Tag">
- <i class="icon-tag"></i>
- </button>
- </div>
- <a href="#tagInput" data-toggle="basic-slide" data-toggle-text="Hide tag form">Add tags <i class="icon-arrow-right"></i></a>
+ <div class="row-fluid">
+ <%--//Tag section--%>
+ <div class="widgetTags">
+ <c:if test="${not empty widget.tags}">
+ <h3><fmt:message key="page.widget.tags.title"/></h3>
+ <div class="detail-widget-tags">
+ <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>
+ </c:forEach>
</div>
- </div>
- <c:if test="${not empty widget.categories}">
- <div class="row-fluid">
- <div class="widgetCategories">
- <h3><fmt:message key="widget.categories"/></h3>
- <div id="categoriesRow">
- <div>
- <c:forEach var="category" items="${widget.categories}">
- <span class="storeWidgetDesc"><c:out value="${category.text}"/></span>
- </c:forEach>
- </div>
- </div>
+ </c:if>
+ <div id="tagInput" class="form-inline hide">
+ <label for="tags"><fmt:message key="page.widget.tags.add"/> </label>
+ <input type="text" id="tags" data-provide="typeahead" />
+ <button id="tag-new-${widget.id}" class="btn tagNewButton" title="Add Tag">
+ <i class="icon-tag"></i>
+ </button>
+ </div>
+ <a href="#tagInput" data-toggle="basic-slide" data-toggle-text="Hide tag form">Add tags <i class="icon-arrow-right"></i></a>
+ </div>
+ </div>
+ <c:if test="${not empty widget.categories}">
+ <div class="row-fluid">
+ <div class="widgetCategories">
+ <h3><fmt:message key="widget.categories"/></h3>
+ <div id="categoriesRow">
+ <div>
+ <c:forEach var="category" items="${widget.categories}">
+ <span class="storeWidgetDesc"><c:out value="${category.text}"/></span>
+ </c:forEach>
</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">
- <div class="row-fluid">
- <div class="span12">
- <textarea id="newComment-${widget.id}"></textarea>
- <button id="comment-new-${widget.id}" class="btn commentNewButton" title="Add Comment"><i class="icon-comment"></i></button>
- </div>
- </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">
+ <div class="row-fluid">
+ <div class="span12">
+ <textarea id="newComment-${widget.id}"></textarea>
+ <button id="comment-new-${widget.id}" class="btn commentNewButton" title="Add Comment"><i class="icon-comment"></i></button>
</div>
- <c:if test="${not empty widget.comments}">
- <ul class="comments">
- <c:forEach var="comment" items="${widget.comments}">
- <portal:person id="${comment.userId}" var="commenter" />
- <li class="comment">
- <fmt:formatDate value="${comment.createdDate}" type="both" var="commentDate"/>
- <p class="comment-heading">
+ </div>
+ </div>
+ <c:if test="${not empty widget.comments}">
+ <ul class="comments">
+ <c:forEach var="comment" items="${widget.comments}">
+ <portal:person id="${comment.userId}" var="commenter" />
+ <li class="comment">
+ <fmt:formatDate value="${comment.createdDate}" type="both" var="commentDate"/>
+ <p class="comment-heading">
<span class="commenter">
<c:choose>
<c:when test="${not empty commenter.username}">
@@ -216,30 +216,30 @@
<span class="comment-date">
<c:out value=" - ${commentDate} "/>
</span>
- <c:if test="${userProfile.id eq comment.userId}">
- <button id="comment-delete-${comment.id}" class="btn btn-danger btn-mini commentDeleteButton"
- value="Delete" title="Delete comment" data-widgetid="<c:out value="${widget.id}"/>">
- <i class="icon-remove icon-white"></i>
- </button>
- <button id="comment-edit-${comment.id}" class="btn btn-mini commentEditButton"
- value="Edit" title="Edit comment"
- data-widgetid="<c:out value="${widget.id}"/>"
- data-toggle="modal" data-target="#editComment-dialog">
- <i class="icon-pencil"></i>
- </button>
- </c:if>
- </p>
- <p class="commentText"><c:out value="${comment.text}"/></p>
-
- </li>
- </c:forEach>
- </ul>
- </c:if>
- </div>
- </div>
+ <c:if test="${userProfile.id eq comment.userId}">
+ <button id="comment-delete-${comment.id}" class="btn btn-danger btn-mini commentDeleteButton"
+ value="Delete" title="Delete comment" data-widgetid="<c:out value="${widget.id}"/>">
+ <i class="icon-remove icon-white"></i>
+ </button>
+ <button id="comment-edit-${comment.id}" class="btn btn-mini commentEditButton"
+ value="Edit" title="Edit comment"
+ data-widgetid="<c:out value="${widget.id}"/>"
+ data-toggle="modal" data-target="#editComment-dialog">
+ <i class="icon-pencil"></i>
+ </button>
+ </c:if>
+ </p>
+ <p class="commentText"><c:out value="${comment.text}"/></p>
+
+ </li>
+ </c:forEach>
+ </ul>
+ </c:if>
</div>
</div>
</div>
+</div>
+</div>
<!--@Atom Group: replace with twitter modal-->
<fmt:message key="page.widget.comment.edit" var="editCommentTitle"/>
<div id="editComment-dialog" title="<c:out value="${editCommentTitle}"/>" class="modal hide">
@@ -252,7 +252,7 @@
</div>
<div class="modal-footer">
<a href="#" class="btn" data-dismiss="modal">Cancel</a>
- <button id="updateComment" value="Update" class="btn btn-primary">Update</button>
+ <button id="updateComment" value="Update" class="btn btn-primary">Update</button>
</a>
</div>
</div>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.marketplace.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.marketplace.jsp?rev=1504624&r1=1504623&r2=1504624&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.marketplace.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.marketplace.jsp Thu Jul 18 20:00:55 2013
@@ -32,7 +32,8 @@
<fmt:message key="page.widget.title"/>
</h2>
<br/>
- <span id="widget-0-title"><fmt:message key="page.widget.marketplace.showdetail.notavailable"/></span>
+ <span id="widget-0-title"><fmt:message
+ key="page.widget.marketplace.showdetail.notavailable"/></span>
</div>
</div>
</div>
@@ -40,70 +41,74 @@
</div>
</div>
</c:when>
-<c:otherwise>
-<rave:navbar pageTitle="${widget.title}"/>
-<div id="na_content" class="container">
- <div class="row detail-widget storeItem">
- <div class="span3">
- <div class="detail-widget-preview">
- <c:if test="${not empty widget.screenshotUrl}">
- <div class="detailWidgetScreenshot">
- <img src="${widget.screenshotUrl}"
- alt="<fmt:message key="page.general.screenshot"/>"
- title="<c:out value="${widget.title}"/> <fmt:message key="page.general.screenshot"/>"/>
- </div>
- </c:if>
- <c:if test="${not empty widget.thumbnailUrl}">
- <div >
- <img src="<c:out value="${widget.thumbnailUrl}"/>" title="<c:out value="${widget.title}"/>"
- alt="<fmt:message key="page.general.thumbnail"/>"/>
- </div>
- </c:if>
+ <c:otherwise>
+ <rave:navbar pageTitle="${widget.title}"/>
+ <div id="na_content" class="container">
+ <div class="row detail-widget storeItem">
+ <div class="span3">
+ <div class="detail-widget-preview">
+ <c:if test="${not empty widget.screenshotUrl}">
+ <div class="detailWidgetScreenshot">
+ <img src="${widget.screenshotUrl}"
+ alt="<fmt:message key="page.general.screenshot"/>"
+ title="<c:out value="${widget.title}"/> <fmt:message key="page.general.screenshot"/>"/>
+ </div>
+ </c:if>
+ <c:if test="${not empty widget.thumbnailUrl}">
+ <div>
+ <img src="<c:out value="${widget.thumbnailUrl}"/>"
+ title="<c:out value="${widget.title}"/>"
+ alt="<fmt:message key="page.general.thumbnail"/>"/>
+ </div>
+ </c:if>
<div id="widgetAdded_${widget.id}" class="detailWidgetAdd">
<button class="btn btn-primary btn-large storeItemButton"
- onclick="rave.store.confirmAddFromMarketplace('<c:out value="${widget.url}"/>', '<c:out value="${widget.type}"/>');">
- <fmt:message key="page.widget.marketplace.addToStore"/>
+ id="widgetMarketplaceConfirmAddButton"
+ data-widget-url="<c:out value='${widget.url}'/>"
+ data-widget-type="<c:out value='${widget.type}'/>">
+ <fmt:message key="page.widget.marketplace.addToStore"/>
</button>
</div>
- </div>
- </div>
- <div class="span8 detail-widget-main">
- <div>
- <h2>
- <c:set var="widgetHasTitleUrl" value="${not empty widget.titleUrl}"/>
- <c:if test="${widgetHasTitleUrl}"><a href="<c:out value="${widget.titleUrl}"/>" rel="external">
- </c:if>
- <span id="widget-${widget.id}-title"><c:out value="${widget.title}"/></span>
- <c:if test="${widgetHasTitleUrl}"></a></c:if>
- </h2>
- <c:if test="${widget.disableRendering}">
- <div class="storeWidgetDisabled">
+ </div>
+ </div>
+ <div class="span8 detail-widget-main">
+ <div>
+ <h2>
+ <c:set var="widgetHasTitleUrl" value="${not empty widget.titleUrl}"/>
+ <c:if test="${widgetHasTitleUrl}"><a href="<c:out value="${widget.titleUrl}"/>"
+ rel="external">
+ </c:if>
+ <span id="widget-${widget.id}-title"><c:out value="${widget.title}"/></span>
+ <c:if test="${widgetHasTitleUrl}"></a></c:if>
+ </h2>
+ <c:if test="${widget.disableRendering}">
+ <div class="storeWidgetDisabled">
<span class="widget-disabled-icon-store ui-icon ui-icon-alert"
title="<fmt:message key="widget.chrome.disabled"/>"></span>
- <c:out value="${widget.disableRenderingMessage}" escapeXml="true"/>
- </div>
- </c:if>
- <c:if test="${not empty widget.author}">
- <p class="storeWidgetAuthor">
- <fmt:message key="widget.author"/>
- <c:out value=" "/><%-- intentional empty String in the c:out --%>
- <c:choose>
- <c:when test="${not empty widget.authorEmail}">
- <a href="mailto:<c:out value="${widget.authorEmail}"/>"><c:out
- value="${widget.author}"/></a>
- </c:when>
- <c:otherwise><c:out value="${widget.author}"/></c:otherwise>
- </c:choose>
- </p>
- </c:if>
+ <c:out value="${widget.disableRenderingMessage}" escapeXml="true"/>
+ </div>
+ </c:if>
+ <c:if test="${not empty widget.author}">
+ <p class="storeWidgetAuthor">
+ <fmt:message key="widget.author"/>
+ <c:out value=" "/><%-- intentional empty String in the c:out --%>
+ <c:choose>
+ <c:when test="${not empty widget.authorEmail}">
+ <a href="mailto:<c:out value="${widget.authorEmail}"/>"><c:out
+ value="${widget.author}"/></a>
+ </c:when>
+ <c:otherwise><c:out value="${widget.author}"/></c:otherwise>
+ </c:choose>
+ </p>
+ </c:if>
- <c:if test="${not empty widget.description}">
- <p class="storeWidgetDesc"><c:out value="${widget.description}"/></p>
- </c:if>
- </div>
+ <c:if test="${not empty widget.description}">
+ <p class="storeWidgetDesc"><c:out value="${widget.description}"/></p>
+ </c:if>
+ </div>
+ </div>
+ </div>
</div>
- </div>
-</div>
<portal:register-init-script location="${'AFTER_RAVE'}">