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/02 17:11:58 UTC
svn commit: r1356286 - in /rave/trunk/rave-portal-resources/src/main/webapp:
WEB-INF/jsp/layouts/ WEB-INF/jsp/views/ WEB-INF/jsp/views/admin/
WEB-INF/tags/ static/script/
Author: carlucci
Date: Mon Jul 2 15:11:53 2012
New Revision: 1356286
URL: http://svn.apache.org/viewvc?rev=1356286&view=rev
Log:
RAVE-714: changed references of entityId property to id in rave-portal-resources client code
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/person_profile.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categories.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.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/tags/region.tag
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_api.js
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_layout.js
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/person_profile.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/person_profile.jsp?rev=1356286&r1=1356285&r2=1356286&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/person_profile.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/person_profile.jsp Mon Jul 2 15:11:53 2012
@@ -22,13 +22,13 @@
<ul class="nav nav-tabs outlined">
<!-- first render the tabs -->
<c:forEach var="subPage" items="${subPages}" varStatus="subPageStatus">
- <li><a href="#tab-${subPage.entityId}" data-toggle="tab"><c:out value="${subPage.name}"/></a></li>
+ <li><a href="#tab-${subPage.id}" data-toggle="tab"><c:out value="${subPage.name}"/></a></li>
</c:forEach>
</ul>
<!-- now render the sub page bodies -->
<div class="tab-content outlined">
<c:forEach var="subPage" items="${subPages}" varStatus="subPageStatus">
- <div class="tab-pane" id="tab-${subPage.entityId}">
+ <div class="tab-pane" id="tab-${subPage.id}">
<c:forEach var="subPageRegion" items="${subPage.regions}" varStatus="subPageRegionStatus">
<rave:region region="${subPageRegion}" regionIdx="${subPageRegionStatus.count}" />
</c:forEach>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categories.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categories.jsp?rev=1356286&r1=1356285&r2=1356286&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categories.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categories.jsp Mon Jul 2 15:11:53 2012
@@ -49,7 +49,7 @@
</thead>
<tbody>
<c:forEach items="${categories}" var="category">
- <spring:url value="/app/admin/category/edit?id=${category.entityId}" var="detaillink"/>
+ <spring:url value="/app/admin/category/edit?id=${category.id}" var="detaillink"/>
<tr data-detaillink="${detaillink}">
<td>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp?rev=1356286&r1=1356285&r2=1356286&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp Mon Jul 2 15:11:53 2012
@@ -54,7 +54,7 @@
</thead>
<tbody>
<c:forEach var="user" items="${searchResult.resultSet}">
- <spring:url value="/app/admin/userdetail/${user.entityId}" var="detaillink"/>
+ <spring:url value="/app/admin/userdetail/${user.id}" var="detaillink"/>
<tr data-detaillink="${detaillink}">
<td><a href="${detaillink}"><c:out value="${user.username}"/></a></td>
<td><c:out value="${user.email}"/></td>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp?rev=1356286&r1=1356285&r2=1356286&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp Mon Jul 2 15:11:53 2012
@@ -50,7 +50,7 @@
</thead>
<tbody>
<c:forEach var="widget" items="${searchResult.resultSet}">
- <spring:url value="/app/admin/widgetdetail/${widget.entityId}" var="detaillink"/>
+ <spring:url value="/app/admin/widgetdetail/${widget.id}" var="detaillink"/>
<tr data-detaillink="${detaillink}">
<td><a href="${detaillink}"><c:out value="${widget.title}"/></a></td>
<td><fmt:message key="widget.type.${widget.type}"/></td>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp?rev=1356286&r1=1356285&r2=1356286&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp Mon Jul 2 15:11:53 2012
@@ -34,7 +34,7 @@
</fmt:message>
<rave:navbar pageTitle="${pagetitle}"/>
- <input id="currentPageId" type="hidden" value="${page.entityId}" />
+ <input id="currentPageId" type="hidden" value="${page.id}" />
<c:set var="hasOnlyOnePage" scope="request">
<c:choose>
<c:when test="${fn:length(pages) == 1}">true</c:when>
@@ -48,12 +48,12 @@
<%-- determine if the current page in the list matches the page the user is viewing --%>
<c:set var="isCurrentPage">
<c:choose>
- <c:when test="${page.entityId == userPage.entityId}">true</c:when>
+ <c:when test="${page.id == userPage.id}">true</c:when>
<c:otherwise>false</c:otherwise>
</c:choose>
</c:set>
- <div id="tab-${userPage.entityId}" class="rave-ui-tab rave-ui-tab-mobile<c:if test="${isCurrentPage}"> rave-ui-tab-selected rave-ui-tab-selected-mobile</c:if>">
- <div id="pageTitle-${userPage.entityId}" class="page-title" onclick="rave.viewPage(${userPage.entityId});"><c:out value="${userPage.name}"/></div>
+ <div id="tab-${userPage.id}" class="rave-ui-tab rave-ui-tab-mobile<c:if test="${isCurrentPage}"> rave-ui-tab-selected rave-ui-tab-selected-mobile</c:if>">
+ <div id="pageTitle-${userPage.id}" class="page-title" onclick="rave.viewPage(${userPage.id});"><c:out value="${userPage.name}"/></div>
</div>
</c:forEach>
<%-- display the add page button at the end of the tabs --%>
@@ -64,17 +64,17 @@
<%-- the mobile view will only show one column of widgets --%>
<div id="pageContent" class="pageContent-mobile">
<c:forEach var="region" items="${page.regions}">
- <div class="region-mobile" id="region-${region.entityId}-id">
+ <div class="region-mobile" id="region-${region.id}-id">
<c:forEach var="regionWidget" items="${region.regionWidgets}">
- <div class="widget-wrapper widget-wrapper-mobile" id="widget-${regionWidget.entityId}-wrapper">
- <div class="widget-title-bar widget-title-bar-mobile" onclick="rave.toggleMobileWidget(${regionWidget.entityId});">
- <span id="widget-${regionWidget.entityId}-collapse" class="widget-toolbar-toggle-collapse" title="<fmt:message key="widget.chrome.toggle"/>"></span>
- <div id="widget-${regionWidget.entityId}-title" class="widget-title">
+ <div class="widget-wrapper widget-wrapper-mobile" id="widget-${regionWidget.id}-wrapper">
+ <div class="widget-title-bar widget-title-bar-mobile" onclick="rave.toggleMobileWidget(${regionWidget.id});">
+ <span id="widget-${regionWidget.id}-collapse" class="widget-toolbar-toggle-collapse" title="<fmt:message key="widget.chrome.toggle"/>"></span>
+ <div id="widget-${regionWidget.id}-title" class="widget-title">
<c:out value="${regionWidget.widget.title}"/>
</div>
</div>
- <div class="widget-prefs" id="widget-${regionWidget.entityId}-prefs-content"></div>
- <div class="widget widget-mobile" id="widget-${regionWidget.entityId}-body">
+ <div class="widget-prefs" id="widget-${regionWidget.id}-prefs-content"></div>
+ <div class="widget widget-mobile" id="widget-${regionWidget.id}-body">
<portal:render-widget regionWidget="${regionWidget}" />
</div>
</div>
@@ -112,8 +112,8 @@
<option value="-1"><fmt:message key="page.general.movethispage.tofirst"/></option>
</c:if>
<c:forEach var="userPage" items="${pages}">
- <c:if test="${userPage.entityId != page.entityId}">
- <option value="${userPage.entityId}">
+ <c:if test="${userPage.id != page.id}">
+ <option value="${userPage.id}">
<fmt:message key="page.general.movethispage.after">
<fmt:param><c:out value="${userPage.name}"/></fmt:param>
</fmt:message>
@@ -129,8 +129,8 @@
<form id="moveWidgetForm">
<select id="moveToPageId">
<c:forEach var="userPage" items="${pages}">
- <c:if test="${userPage.entityId != page.entityId}">
- <option value="${userPage.entityId}">
+ <c:if test="${userPage.id != page.id}">
+ <option value="${userPage.id}">
<c:out value="${userPage.name}"/>
</option>
</c:if>
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=1356286&r1=1356285&r2=1356286&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 Mon Jul 2 15:11:53 2012
@@ -37,7 +37,7 @@
</fmt:message>
<rave:navbar pageTitle="${pagetitle}"/>
-<input id="currentPageId" type="hidden" value="${page.entityId}"/>
+<input id="currentPageId" type="hidden" value="${page.id}"/>
<c:set var="hasOnlyOnePage" scope="request">
<c:choose>
<c:when test="${fn:length(pages) == 1}">true</c:when>
@@ -53,7 +53,7 @@
<%-- determine if the current page in the list matches the page the user is viewing --%>
<c:set var="isCurrentPage">
<c:choose>
- <c:when test="${page.entityId == userPage.entityId}">true</c:when>
+ <c:when test="${page.id == userPage.id}">true</c:when>
<c:otherwise>false</c:otherwise>
</c:choose>
</c:set>
@@ -75,7 +75,7 @@
<fmt:message key="sharing.page.tab.icon.tip.to" var="iconShareToolTipTo"/>
<c:choose>
<c:when test="${isCurrentPage}">
- <li id="tab-${userPage.entityId}" 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>
@@ -96,7 +96,7 @@
</li>
</c:when>
<c:otherwise>
- <li id="tab-${userPage.entityId}" onclick="rave.viewPage(${userPage.entityId});">
+ <li id="tab-${userPage.id}" onclick="rave.viewPage(${userPage.id});">
<c:choose>
<c:when test="${isSharedToMe}">
<a href="#" class="rave-ui-tab-shared-to-me">
@@ -118,7 +118,7 @@
</c:otherwise>
</c:choose>
<c:forEach var="members" items="${userPage.members}">
- <c:if test="${members.user.username == principleUsername and members.editor and userPage.entityId != page.entityId}">
+ <c:if test="${members.user.username == principleUsername and members.editor and userPage.id != page.id}">
<c:set var="canMoveWidgetsToEditablePage" scope="request" value="true"/>
</c:if>
</c:forEach>
@@ -133,7 +133,7 @@
<div class="emptyPageMessage">
<c:choose>
<c:when test="${pageUser.editor == true}">
- <a href="<spring:url value="/app/store?referringPageId=${page.entityId}" />"><fmt:message key="page.general.empty"/></a>
+ <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"/>
@@ -202,8 +202,8 @@
<option value="-1"><fmt:message key="page.general.movethispage.tofirst"/></option>
</c:if>
<c:forEach var="userPage" items="${pages}">
- <c:if test="${userPage.entityId != page.entityId}">
- <option value="${userPage.entityId}">
+ <c:if test="${userPage.id != page.id}">
+ <option value="${userPage.id}">
<fmt:message key="page.general.movethispage.after">
<fmt:param><c:out value="${userPage.name}"/></fmt:param>
</fmt:message>
@@ -236,8 +236,8 @@
<select id="moveToPageId">
<c:forEach var="userPage" items="${pages}">
<c:forEach var="members" items="${userPage.members}">
- <c:if test="${members.user.username == principleUsername and members.editor and userPage.entityId != page.entityId}">
- <option value="${userPage.entityId}">
+ <c:if test="${members.user.username == principleUsername and members.editor and userPage.id != page.id}">
+ <option value="${userPage.id}">
<c:out value="${userPage.name}"/>
</option>
</c:if>
@@ -304,7 +304,7 @@
rave.initWidgets();
rave.initUI();
rave.layout.init();
- rave.layout.searchHandler.setDefaults("<c:out value="${principleUsername}"/>","<sec:authentication property="principal.entityId" />","<c:out value="${page.entityId}"/>", "${pageUser.pageStatus}");
+ rave.layout.searchHandler.setDefaults("<c:out value="${principleUsername}"/>","<sec:authentication property="principal.id" />","<c:out value="${page.id}"/>", "${pageUser.pageStatus}");
rave.runOnPageInitializedHandlers();
});
</script>
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=1356286&r1=1356285&r2=1356286&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 Mon Jul 2 15:11:53 2012
@@ -80,7 +80,7 @@
<%--@elvariable id="widget" type="org.apache.rave.portal.model.JpaWidget"--%>
<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.entityId]}"/>
+ <c:set var="widgetStatistics" value="${widgetsStatistics[widget.id]}"/>
<c:choose>
<c:when test='${widget.featured == "true"}'>
<li class="storeItem storeItemFeatured">
@@ -97,9 +97,9 @@
width="120" height="60"/>
</c:if>
- <div id="widgetAdded_${widget.entityId}" class="storeButton">
- <button class="btn btn-small btn-primary" id="addWidget_${widget.entityId}"
- onclick="rave.api.rpc.addWidgetToPage({widgetId: ${widget.entityId}, pageId: ${referringPageId}, buttonId: this.id});">
+ <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});">
<fmt:message key="page.widget.addToPage"/>
</button>
</div>
@@ -107,9 +107,9 @@
</div>
<div class="storeItemCenter">
- <a id="widget-${widget.entityId}-title"
+ <a id="widget-${widget.id}-title"
class="secondaryPageItemTitle"
- href="<spring:url value="/app/store/widget/${widget.entityId}" />?referringPageId=${referringPageId}">
+ href="<spring:url value="/app/store/widget/${widget.id}" />?referringPageId=${referringPageId}">
<c:out value="${widget.title}"/>
</a>
<c:if test="${widget.disableRendering}">
@@ -130,16 +130,16 @@
<div class="widgetRating">
<fmt:message key="page.widget.rate"/>
<form class="hidden">
- <input type="hidden" id="rate-${widget.entityId}"
- value="${widgetsStatistics[widget.entityId]!=null?widgetsStatistics[widget.entityId].userRating:"-1"}">
+ <input type="hidden" id="rate-${widget.id}"
+ value="${widgetsStatistics[widget.id]!=null?widgetsStatistics[widget.id].userRating:"-1"}">
</form>
- <div id="rating-${widget.entityId}" class="ratingButtons btn-group" data-toggle="buttons-radio">
- <button id="like-${widget.entityId}" class="widgetLikeButton btn btn-small ${widgetsStatistics[widget.entityId].userRating==10? 'active btn-success':''}"
- ${widgetsStatistics[widget.entityId].userRating==10 ? " checked='true'":""}
- name="rating-${widget.entityId}"><i class="icon-plus"></i></button>
- <button id="dislike-${widget.entityId}" class="widgetDislikeButton btn btn-small ${widgetsStatistics[widget.entityId].userRating==0? 'active btn-danger':''}"
- ${widgetsStatistics[widget.entityId].userRating==0 ? " checked='true'":""}
- name="rating-${widget.entityId}"><i class="icon-minus"></i></button>
+ <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>
</div>
@@ -169,19 +169,19 @@
</c:if>
<span class="widgetLikeCount">
<c:set var="widgetLikes">
- ${widgetsStatistics[widget.entityId]!=null?widgetsStatistics[widget.entityId].totalLike:"0"}
+ ${widgetsStatistics[widget.id]!=null?widgetsStatistics[widget.id].totalLike:"0"}
</c:set>
<span><fmt:message key="page.widget.rate.likes"/></span>
- <span id="totalLikes-${widget.entityId}" data-rave-widget-likes="${widgetLikes}">
+ <span id="totalLikes-${widget.id}" data-rave-widget-likes="${widgetLikes}">
${widgetLikes}
</span>
</span>
<span class="widgetDislikeCount">
<c:set var="widgetDislikes">
- ${widgetsStatistics[widget.entityId]!=null?widgetsStatistics[widget.entityId].totalDislike:"0"}
+ ${widgetsStatistics[widget.id]!=null?widgetsStatistics[widget.id].totalDislike:"0"}
</c:set>
<span><fmt:message key="page.widget.rate.dislikes"/></span>
- <span id="totalDislikes-${widget.entityId}" data-rave-widget-dislikes="${widgetDislikes}">
+ <span id="totalDislikes-${widget.id}" data-rave-widget-dislikes="${widgetDislikes}">
${widgetDislikes}
</span>
</span>
@@ -190,7 +190,7 @@
<c:set var="widgetUserCountGreaterThanZero"
value="${widgetStatistics != null && widgetStatistics.totalUserCount > 0}"/>
<c:if test="${widgetUserCountGreaterThanZero}">
- <a href="javascript:void(0);" onclick="rave.displayUsersOfWidget(${widget.entityId});">
+ <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"/>
@@ -270,11 +270,11 @@
<option value="0"></option>
<c:forEach var="category" items="${categories}">
<c:choose>
- <c:when test="${selectedCategory==category.entityId}">
- <option value="${category.entityId}" selected>
+ <c:when test="${selectedCategory==category.id}">
+ <option value="${category.id}" selected>
</c:when>
<c:otherwise>
- <option value="${category.entityId}">
+ <option value="${category.id}">
</c:otherwise>
</c:choose>
<c:out value="${category.text}"/>
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=1356286&r1=1356285&r2=1356286&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 Mon Jul 2 15:11:53 2012
@@ -40,10 +40,10 @@
</c:if>
<c:choose>
<c:when test="${widget.widgetStatus eq 'PUBLISHED'}">
- <div id="widgetAdded_${widget.entityId}" class="detailWidgetAdd">
+ <div id="widgetAdded_${widget.id}" class="detailWidgetAdd">
<button class="btn btn-primary btn-large storeItemButton"
- id="addWidget_${widget.entityId}"
- onclick="rave.api.rpc.addWidgetToPage({widgetId: ${widget.entityId}, pageId: ${referringPageId}, redirectAfterAdd:true});">
+ id="addWidget_${widget.id}"
+ onclick="rave.api.rpc.addWidgetToPage({widgetId: ${widget.id}, pageId: ${referringPageId}, redirectAfterAdd:true});">
<fmt:message key="page.widget.addToPage"/>
</button>
</div>
@@ -62,7 +62,7 @@
<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.entityId}-title"><c:out value="${widget.title}"/></span>
+ <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}">
@@ -94,35 +94,35 @@
<div>
<h3><fmt:message key="page.widget.rate"/></h3>
<form class="hidden">
- <input type="hidden" id="rate-${widget.entityId}"
- value="${widgetsStatistics[widget.entityId]!=null?widgetsStatistics[widget.entityId].userRating:"-1"}">
+ <input type="hidden" id="rate-${widget.id}"
+ value="${widgetsStatistics[widget.id]!=null?widgetsStatistics[widget.id].userRating:"-1"}">
</form>
- <div id="rating-${widget.entityId}" class="ratingButtons btn-group" data-toggle="buttons-radio">
- <button id="like-${widget.entityId}" class="widgetLikeButton btn btn-small ${widgetsStatistics[widget.entityId].userRating==10? 'active btn-success':''}"
- ${widgetsStatistics[widget.entityId].userRating==10 ? " checked='true'":""}
- name="rating-${widget.entityId}"><i class="icon-plus"></i></button>
- <button id="dislike-${widget.entityId}" class="widgetDislikeButton btn btn-small ${widgetsStatistics[widget.entityId].userRating==0? 'active btn-danger':''}"
- ${widgetsStatistics[widget.entityId].userRating==0 ? " checked='true'":""}
- name="rating-${widget.entityId}"><i class="icon-minus"></i></button>
+ <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">
<c:set var="widgetLikes">
- ${widgetsStatistics[widget.entityId]!=null?widgetsStatistics[widget.entityId].totalLike:"0"}
+ ${widgetsStatistics[widget.id]!=null?widgetsStatistics[widget.id].totalLike:"0"}
</c:set>
<span><fmt:message key="page.widget.rate.likes"/></span>
- <span id="totalLikes-${widget.entityId}" data-rave-widget-likes="${widgetLikes}">
+ <span id="totalLikes-${widget.id}" data-rave-widget-likes="${widgetLikes}">
${widgetLikes}
</span>
</span>
<span class="widgetDislikeCount">
<c:set var="widgetDislikes">
- ${widgetsStatistics[widget.entityId]!=null?widgetsStatistics[widget.entityId].totalDislike:"0"}
+ ${widgetsStatistics[widget.id]!=null?widgetsStatistics[widget.id].totalDislike:"0"}
</c:set>
<span><fmt:message key="page.widget.rate.dislikes"/></span>
- <span id="totalDislikes-${widget.entityId}" data-rave-widget-dislikes="${widgetDislikes}">
+ <span id="totalDislikes-${widget.id}" data-rave-widget-dislikes="${widgetDislikes}">
${widgetDislikes}
</span>
</span>
@@ -132,7 +132,7 @@
<p><c:set var="widgetUserCountGreaterThanZero"
value="${widgetStatistics != null && widgetStatistics.totalUserCount > 0}"/>
<c:if test="${widgetUserCountGreaterThanZero}"><a href="javascript:void(0);"
- onclick="rave.displayUsersOfWidget(${widget.entityId});"></c:if>
+ 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>
@@ -154,7 +154,7 @@
<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.entityId}" class="btn tagNewButton" title="Add Tag">
+ <button id="tag-new-${widget.id}" class="btn tagNewButton" title="Add Tag">
<i class="icon-tag"></i>
</button>
</div>
@@ -179,8 +179,8 @@
<h3><fmt:message key="page.widget.comments"/></h3>
<div class="new-comment form-inline well">
<div class="row-fluid">
- <textarea id="newComment-${widget.entityId}" class="span11"></textarea>
- <button id="comment-new-${widget.entityId}" class="btn commentNewButton" title="Add Comment"><i class="icon-comment"></i></button>
+ <textarea id="newComment-${widget.id}" class="span11"></textarea>
+ <button id="comment-new-${widget.id}" class="btn commentNewButton" title="Add Comment"><i class="icon-comment"></i></button>
</div> </div>
<c:if test="${not empty widget.comments}">
<ul class="comments">
@@ -199,12 +199,12 @@
<span class="comment-date">
<c:out value=" - ${commentDate} "/>
</span>
- <c:if test="${userProfile.entityId eq comment.user.entityId}">
- <button id="comment-delete-${comment.entityId}" class="btn btn-danger btn-mini commentDeleteButton"
+ <c:if test="${userProfile.id eq comment.user.id}">
+ <button id="comment-delete-${comment.id}" class="btn btn-danger btn-mini commentDeleteButton"
value="Delete" title="Delete comment" data-widgetid="<c:out value="${comment.widgetId}"/>">
<i class="icon-remove icon-white"></i>
</button>
- <button id="comment-edit-${comment.entityId}" class="btn btn-mini commentEditButton"
+ <button id="comment-edit-${comment.id}" class="btn btn-mini commentEditButton"
value="Edit" title="Edit comment"
data-widgetid="<c:out value="${comment.widgetId}"/>"
data-toggle="modal" data-target="#editComment-dialog">
@@ -244,7 +244,7 @@
<script>
$(function () {
rave.store.init('<c:out value="${referringPageId}"/>');
- rave.store.initTags("<c:out value="${widget.entityId}"/>");
+ rave.store.initTags("<c:out value="${widget.id}"/>");
});
</script>
</portal:register-init-script>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region.tag
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region.tag?rev=1356286&r1=1356285&r2=1356286&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region.tag (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region.tag Mon Jul 2 15:11:53 2012
@@ -30,7 +30,7 @@ Template for rendering a Region on a pag
<fmt:setBundle basename="messages"/>
<%--@elvariable id="region" type="org.apache.rave.portal.model.Region"--%>
-<div class="region<c:if test="${region.locked || pageUser.editor == false}"> region-locked</c:if> <c:out value="${region.page.pageLayout.code}"/>_${regionIdx} regionNonDragging" id="region-${region.entityId}-id">
+<div class="region<c:if test="${region.locked || pageUser.editor == false}"> region-locked</c:if> <c:out value="${region.page.pageLayout.code}"/>_${regionIdx} regionNonDragging" id="region-${region.id}-id">
<c:forEach var="regionWidget" items="${region.regionWidgets}">
<rave:region_widget regionWidget="${regionWidget}"/>
</c:forEach>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag?rev=1356286&r1=1356285&r2=1356286&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag Mon Jul 2 15:11:53 2012
@@ -30,14 +30,14 @@ Template for rendering a RegionWidget in
<c:set var="isHideChrome" value="${regionWidget.hideChrome}" />
<fmt:setBundle basename="messages"/>
<%--@elvariable id="regionWidget" type="org.apache.rave.portal.model.RegionWidget"--%>
-<div class="widget-wrapper<c:if test="${isLocked}"> widget-wrapper-locked</c:if><c:if test="${isHideChrome}"> widget-wrapper-hidechrome</c:if>" id="widget-${regionWidget.entityId}-wrapper">
+<div class="widget-wrapper<c:if test="${isLocked}"> widget-wrapper-locked</c:if><c:if test="${isHideChrome}"> widget-wrapper-hidechrome</c:if>" id="widget-${regionWidget.id}-wrapper">
<c:if test="${!isHideChrome}">
<div class="widget-title-bar<c:if test="${isLocked}"> widget-title-bar-locked</c:if>">
<c:if test="${!isLocked}">
- <div id="widget-${regionWidget.entityId}-collapse" class="widget-toolbar-toggle-collapse" title="<fmt:message key="widget.chrome.toggle"/>"></div>
+ <div id="widget-${regionWidget.id}-collapse" class="widget-toolbar-toggle-collapse" title="<fmt:message key="widget.chrome.toggle"/>"></div>
</c:if>
- <div id="widget-${regionWidget.entityId}-title" class="widget-title">
+ <div id="widget-${regionWidget.id}-title" class="widget-title">
<c:choose>
<c:when test="${not empty regionWidget.widget.titleUrl}">
<a href="<c:out value="${regionWidget.widget.titleUrl}"/>" rel="external"><c:out value="${regionWidget.widget.title}"/></a>
@@ -49,39 +49,39 @@ Template for rendering a RegionWidget in
</div>
<%-- These are toolbar buttons --%>
- <div id="widget-${regionWidget.entityId}-toolbar" class="widget-toolbar <c:if test="${isLocked}">hidden</c:if>">
- <div id="widget-${regionWidget.entityId}-widget-menu-wrapper" class="dropdown widget-menu-wrapper">
- <a id="widget-${regionWidget.entityId}-menu-button" class="dropdown-toggle" data-toggle="dropdown">
+ <div id="widget-${regionWidget.id}-toolbar" class="widget-toolbar <c:if test="${isLocked}">hidden</c:if>">
+ <div id="widget-${regionWidget.id}-widget-menu-wrapper" class="dropdown widget-menu-wrapper">
+ <a id="widget-${regionWidget.id}-menu-button" class="dropdown-toggle" data-toggle="dropdown">
<i class="icon-cog"></i>
</a>
- <ul id="widget-${regionWidget.entityId}-menu" class="dropdown-menu widget-menu">
+ <ul id="widget-${regionWidget.id}-menu" class="dropdown-menu widget-menu">
<%--
By default the edit prefs item is disabled.
Each provider's widget initialization will be responsible for enabling this item
if the widget has preferences to be edited
--%>
- <li id="widget-${regionWidget.entityId}-menu-editprefs-item" class="menu-item-disabled">
+ <li id="widget-${regionWidget.id}-menu-editprefs-item" class="menu-item-disabled">
<a href="#">
<fmt:message key="widget.menu.editprefs"/>
</a>
</li>
- <li id="widget-${regionWidget.entityId}-menu-maximize-item">
+ <li id="widget-${regionWidget.id}-menu-maximize-item">
<a href="#">
<fmt:message key="widget.menu.maximize"/>
</a>
</li>
- <li id="widget-${regionWidget.entityId}-menu-move-item" <c:if test='${hasOnlyOnePage or pageUser.editor == false or canMoveWidgetsToEditablePage == false}'>class="menu-item-disabled"</c:if>>
+ <li id="widget-${regionWidget.id}-menu-move-item" <c:if test='${hasOnlyOnePage or pageUser.editor == false or canMoveWidgetsToEditablePage == false}'>class="menu-item-disabled"</c:if>>
<a href="#">
<fmt:message key="widget.menu.movetopage"/>
</a>
</li>
- <li id="widget-${regionWidget.entityId}-menu-delete-item" <c:if test='${pageUser.editor == false}'>class="menu-item-disabled"</c:if>>
+ <li id="widget-${regionWidget.id}-menu-delete-item" <c:if test='${pageUser.editor == false}'>class="menu-item-disabled"</c:if>>
<a href="#">
<fmt:message key="widget.menu.delete"/>
</a>
</li>
<li class="divider"></li>
- <li id="widget-${regionWidget.entityId}-menu-about-item">
+ <li id="widget-${regionWidget.id}-menu-about-item">
<a href="#">
<fmt:message key="widget.menu.about"/>
</a>
@@ -90,20 +90,20 @@ Template for rendering a RegionWidget in
</div>
<%-- the minimize widget button, which is hidden by default and only displays in maximized view --%>
- <span id="widget-${regionWidget.entityId}-min" class="widget-toolbar-btn widget-toolbar-btn-min">
+ <span id="widget-${regionWidget.id}-min" class="widget-toolbar-btn widget-toolbar-btn-min">
<i class="icon-resize-small"></i>
</span>
</div>
<%-- if widget is disabled then display notification in titlebar --%>
<c:if test="${regionWidget.widget.disableRendering}">
- <div id="widget-${regionWidget.entityId}-disabled" class="widget-disabled-icon ui-icon ui-icon-alert" title="<fmt:message key="widget.chrome.disabled"/>"></div>
+ <div id="widget-${regionWidget.id}-disabled" class="widget-disabled-icon ui-icon ui-icon-alert" title="<fmt:message key="widget.chrome.disabled"/>"></div>
</c:if>
</div>
</c:if>
- <div class="widget-prefs" id="widget-${regionWidget.entityId}-prefs-content"></div>
- <div class="widget" id="widget-${regionWidget.entityId}-body">
+ <div class="widget-prefs" id="widget-${regionWidget.id}-prefs-content"></div>
+ <div class="widget" id="widget-${regionWidget.id}-body">
<portal:render-widget regionWidget="${regionWidget}" />
</div>
</div>
\ No newline at end of file
Modified: rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js?rev=1356286&r1=1356285&r2=1356286&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js Mon Jul 2 15:11:53 2012
@@ -1226,7 +1226,7 @@ var rave = rave || (function () {
* View the widget detail page of a widget
*
* @param widgetId to widgetId to view
- * @param referringPageId the entityId of the page the call is coming from
+ * @param referringPageId the id of the page the call is coming from
*/
viewWidgetDetail:viewWidgetDetail,
Modified: rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_api.js
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_api.js?rev=1356286&r1=1356285&r2=1356286&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_api.js (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_api.js Mon Jul 2 15:11:53 2012
@@ -50,7 +50,7 @@ rave.api = rave.api || (function() {
error: handleError
});
}
-
+
function saveWidgetPreference(args) {
$.ajax({
type: 'PUT',
@@ -66,36 +66,36 @@ rave.api = rave.api || (function() {
error: handleError
});
}
-
+
function saveWidgetCollapsedState(args) {
$.ajax({
type: 'PUT',
url: rave.getContext() + path + "regionWidgets/" + args.regionWidgetId + "/collapsed",
- data: JSON.stringify(args.collapsed),
+ data: JSON.stringify(args.collapsed),
contentType: 'application/json',
dataType: 'json',
- success: function(result) {
- rave.doWidgetUiCollapse({"regionWidgetId": result.entityId,
- "collapsed": result.collapsed,
- "successCallback": args.successCallback});
+ success: function(result) {
+ rave.doWidgetUiCollapse({"regionWidgetId": result.id,
+ "collapsed": result.collapsed,
+ "successCallback": args.successCallback});
},
error: handleError
- });
+ });
}
-
+
function deletePage(args) {
$.ajax({
type: 'DELETE',
- url: rave.getContext() + path + "page/" + args.pageId,
+ url: rave.getContext() + path + "page/" + args.pageId,
success: function(result) {
if (typeof args.successCallback == 'function') {
args.successCallback();
}
},
error: handleError
- });
+ });
}
-
+
function deleteWidgetRating(args) {
$.ajax({
type: 'DELETE',
@@ -108,7 +108,7 @@ rave.api = rave.api || (function() {
error: handleError
})
}
-
+
function updateWidgetRating(args) {
$.ajax({
type: 'POST',
@@ -121,7 +121,7 @@ rave.api = rave.api || (function() {
error: handleError
})
}
-
+
function createWidgetComment(args) {
$.ajax({
type: 'POST',
@@ -134,7 +134,7 @@ rave.api = rave.api || (function() {
error: handleError
})
}
-
+
function deleteWidgetComment(args) {
$.ajax({
type: 'DELETE',
@@ -147,7 +147,7 @@ rave.api = rave.api || (function() {
error: handleError
})
}
-
+
function updateWidgetComment(args) {
$.ajax({
type: 'POST',
@@ -276,7 +276,7 @@ rave.api = rave.api || (function() {
}
}).error(handleError);
}
-
+
function addPage(args) {
$.post(rave.getContext() + path + "page/add",
{
@@ -286,9 +286,9 @@ rave.api = rave.api || (function() {
function(result) {
if (result.error) {
// check to see if a duplicate page name error occurred
- if (result.errorCode == 'DUPLICATE_ITEM') {
+ if (result.errorCode == 'DUPLICATE_ITEM') {
$("#pageFormErrors").html(rave.getClientMessage("page.duplicate_name"));
- } else {
+ } else {
handleRpcError(result);
}
} else {
@@ -298,7 +298,7 @@ rave.api = rave.api || (function() {
}
}).error(handleError);
}
-
+
function movePage(args) {
// the moveAfterPageId attribute could be undefined if moving
// to the first position. In that case don't send a moveAfterPageId
@@ -311,8 +311,8 @@ rave.api = rave.api || (function() {
$.post(rave.getContext() + path + "page/" + args.pageId + "/move",
data,
function(result) {
- if (result.error) {
- handleRpcError(result);
+ if (result.error) {
+ handleRpcError(result);
} else {
if (typeof args.successCallback == 'function') {
args.successCallback(result);
@@ -377,7 +377,7 @@ rave.api = rave.api || (function() {
break;
case "INTERNAL_ERROR":
alert(rave.getClientMessage("api.rpc.error.internal"));
- break;
+ break;
}
}
@@ -422,7 +422,7 @@ rave.api = rave.api || (function() {
}
}).error(handleError);
}
-
+
function getUsers(args){
var offset = args.offset;
$.get(rave.getContext() + path + "users/get",
@@ -459,7 +459,7 @@ rave.api = rave.api || (function() {
}
}).error(handleError);
}
-
+
function addMemberToPage(args) {
$.post(rave.getContext() + path + "page/" + args.pageId + "/addmember",
{"userId": args.userId},
@@ -474,7 +474,7 @@ rave.api = rave.api || (function() {
}
}).error(handleError);
}
-
+
function removeMemberFromPage(args){
$.post(rave.getContext() + path + "page/" + args.pageId + "/removemember",
{"userId": args.userId},
@@ -504,7 +504,7 @@ rave.api = rave.api || (function() {
}
}).error(handleError);
}
-
+
function updatePageEditingStatus(args){
$.post(rave.getContext() + path + "page/" + args.pageId + "/editstatus",
{"userId": args.userId,
@@ -520,7 +520,7 @@ rave.api = rave.api || (function() {
}
}).error(handleError);
}
-
+
return {
moveWidget : moveWidgetOnPage,
addWidgetToPage : addWidgetToPage,
@@ -543,78 +543,78 @@ rave.api = rave.api || (function() {
})();
/*
- * Handler functions to handle modifications on user events
+ * Handler functions to handle modifications on user events
*/
var handlerApi = (function() {
-
+
//function to handle widget rating changes
function widgetRatingHandler(widgetRating) {
-
+
//retrieving the current total likes
var likeTotalLabel = document.getElementById("totalLikes-"+ widgetRating.widgetId);
- var likeTotal = likeTotalLabel.getAttribute("data-rave-widget-likes");
-
+ var likeTotal = likeTotalLabel.getAttribute("data-rave-widget-likes");
+
//retrieving the current total dislikes
var dislikeTotalLabel = document.getElementById("totalDislikes-"+ widgetRating.widgetId);
- var dislikeTotal = dislikeTotalLabel.getAttribute("data-rave-widget-dislikes");
-
+ var dislikeTotal = dislikeTotalLabel.getAttribute("data-rave-widget-dislikes");
+
//initializing temporary variables
var incrementingTotal = -1;
var decrementingTotal = -1;
var curButton = "";
var prevButton = "";
var prevRating = -1;
-
+
//check if like rating needs to be updated
if(widgetRating.isLike) {
-
+
//set incrementing total to like total
incrementingTotal = likeTotal;
-
+
//set the incrementing total label to like total label
incrementingTotalLabel = likeTotalLabel;
-
+
//set decrementing total to dislike total
decrementingTotal = dislikeTotal;
-
+
//set the decrementing total label to dislike total label
decrementingTotalLabel = dislikeTotalLabel;
-
+
//set the current clicked button to like button
curButton = widgetRating.widgetLikeButton;
-
+
//set the previous clicked button to dislike button
prevButton = widgetRating.widgetDislikeButton;
-
- //set the previous rating to 0 to check if dislike was clicked earlier
+
+ //set the previous rating to 0 to check if dislike was clicked earlier
prevRating = 0;
}
-
+
//check if dislike rating needs to be updated
else {
-
+
//set incrementing total to dislike total
incrementingTotal = dislikeTotal;
-
+
//set the incrementing total label to dislike total label
incrementingTotalLabel = dislikeTotalLabel;
-
+
//set decrementing total to like total
decrementingTotal = likeTotal;
-
+
//set the decrementing total label to like total label
decrementingTotalLabel = likeTotalLabel;
-
+
//set the current clicked button to dislike button
curButton = widgetRating.widgetDislikeButton;
-
+
//set the previous clicked button to like button
prevButton = widgetRating.widgetLikeButton;
-
- //set the previous rating to 10 to check if like was clicked earlier
+
+ //set the previous rating to 10 to check if like was clicked earlier
prevRating = 10;
}
-
+
//update incrementing total
incrementingTotal = parseInt(incrementingTotal) + 1;
if(incrementingTotalLabel == likeTotalLabel) {
@@ -625,8 +625,8 @@ rave.api = rave.api || (function() {
incrementingTotalLabel.setAttribute("data-rave-widget-dislikes", incrementingTotal);
incrementingTotalLabel.innerHTML = incrementingTotal;
}
-
- //get the value of hidden user rating
+
+ //get the value of hidden user rating
var hiddenButton = document.getElementById("rate-"+ widgetRating.widgetId);
var userPrevRate = hiddenButton.value;
@@ -635,10 +635,10 @@ rave.api = rave.api || (function() {
//that the user had a contrary selection prior to the change event
if (prevButton.get(0).getAttribute("checked") == "true" || curButton.checked == true) {
prevButton.get(0).setAttribute("checked", "false");
-
+
//remove the previous rating made by the user if any by checking change in userRating
if(parseInt(userPrevRate) == prevRating) {
-
+
//update decrementing total
if(parseInt(decrementingTotal) - 1 > -1) {
decrementingTotal = parseInt(decrementingTotal) - 1;
@@ -652,9 +652,9 @@ rave.api = rave.api || (function() {
}
}
}
-
+
}
-
+
//flag this element as the currently checked one
curButton.setAttribute("checked", "true");
@@ -673,18 +673,18 @@ rave.api = rave.api || (function() {
var panelId = "#" + profileTab.id.substring(0, profileTab.id.indexOf("Tab")) + "Panel";
$(panelId).slideToggle("slow");
}
-
+
//function to toggle hide and show of tag pages
function userProfileTagHandler(profileTag, defaultTagPage) {
-
+
//first close any tag pages if open
$(".profile-tag-page").hide();
-
+
//show default tag page is set true
if(defaultTagPage != null) {
$(defaultTagPage).show();
}
-
+
else {
//extract the tag page id from profile tag id
var tagPageId = "#" + profileTag.id + "Page";
@@ -692,7 +692,7 @@ rave.api = rave.api || (function() {
$(tagPageId).show();
}
}
-
+
function userProfileEditHandler(isEdit) {
//get the edit element
var profileInfo = document.getElementById("profileInfo");
@@ -700,14 +700,14 @@ rave.api = rave.api || (function() {
var hiddenFields = "." + profileInfo.value + "-hidden";
//extract labels through their class
var visibleFields = "." + profileInfo.value + "-visible";
-
+
if(isEdit) {
//make hidden fields visible
$(hiddenFields).show();
//make visible fields invisible
$(visibleFields).hide();
}
-
+
else {
//make hidden fields invisible
$(hiddenFields).hide();
@@ -715,14 +715,14 @@ rave.api = rave.api || (function() {
$(visibleFields).show();
}
}
-
+
return {
widgetRatingHandler : widgetRatingHandler,
userProfileTabHandler : userProfileTabHandler,
userProfileTagHandler : userProfileTagHandler,
userProfileEditHandler : userProfileEditHandler
};
-
+
})();
return {
Modified: rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_layout.js
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_layout.js?rev=1356286&r1=1356285&r2=1356286&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_layout.js (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_layout.js Mon Jul 2 15:11:53 2012
@@ -76,7 +76,7 @@ rave.layout = rave.layout || (function()
rave.api.rpc.getPagePrefs({pageId: getCurrentPageId(),
successCallback: function(result) {
$tab_title_input.val(result.result.name);
- $tab_id.val(result.result.entityId);
+ $tab_id.val(result.result.id);
$page_layout_input.val(result.result.pageLayout.code);
$("#pageMenuDialogHeader").html(rave.getClientMessage("page.update"));
var $pageMenuUpdateButton = $("#pageMenuUpdateButton");
@@ -106,7 +106,7 @@ rave.layout = rave.layout || (function()
}
// setup the share page menu item
- if (!$menuItemShare.hasClass("menu-item-disabled")) {
+ if (!$menuItemShare.hasClass("menu-item-disabled")) {
$menuItemShare.bind('click', function(event) {
rave.api.rpc.getUsers({offset: 0,
successCallback: function(result) {
@@ -118,9 +118,9 @@ rave.layout = rave.layout || (function()
}
// setup the revoke share page menu item
- if (!$menuItemRevokeShare.hasClass("menu-item-disabled")) {
+ if (!$menuItemRevokeShare.hasClass("menu-item-disabled")) {
$menuItemRevokeShare.bind('click', function(event) {
- rave.layout.searchHandler.removeMemberFromPage(rave.layout.searchHandler.userId,
+ rave.layout.searchHandler.removeMemberFromPage(rave.layout.searchHandler.userId,
rave.layout.searchHandler.username);
});
}
@@ -229,7 +229,7 @@ rave.layout = rave.layout || (function()
$("<a/>")
.attr("href", "#")
.attr("id", userId)
- .attr("onclick", "rave.layout.searchHandler.removeMemberFromPage(" +
+ .attr("onclick", "rave.layout.searchHandler.removeMemberFromPage(" +
userId+", '" + username+"');")
.text(rave.getClientMessage("common.remove"))
)
@@ -324,8 +324,8 @@ rave.layout = rave.layout || (function()
rave.layout.searchHandler.dealWithUserResults(result);
}
});
- });
-
+ });
+
// user clicks "clear search" in the find users dialog
$("#clearSearchButton").click(function() {
$('#searchTerm').get(0).value = "";
@@ -335,9 +335,9 @@ rave.layout = rave.layout || (function()
rave.layout.searchHandler.dealWithUserResults(result);
}
});
- });
+ });
}//end of init()
-
+
function updateParamsInString(i18nStr, itemsToReplace){
for(var i=0;i<itemsToReplace.length;i++){
var token = '{'+i+'}';
@@ -353,8 +353,8 @@ rave.layout = rave.layout || (function()
$pagingDiv.append('<div class="pagination"><ul id="pagingul" >');
if(userResults.result.currentPage > 1){
offset = (userResults.result.currentPage - 2) * userResults.result.pageSize;
- $('#pagingul').append('<li><a href="#" onclick="rave.api.rpc.getUsers({offset: ' +
- offset+', successCallback: function(result)' +
+ $('#pagingul').append('<li><a href="#" onclick="rave.api.rpc.getUsers({offset: ' +
+ offset+', successCallback: function(result)' +
' {rave.layout.searchHandler.dealWithUserResults(result);}});"><</a></li>');
}
for(var i=1;i<=userResults.result.numberOfPages;i++){
@@ -362,15 +362,15 @@ rave.layout = rave.layout || (function()
$('#pagingul').append('<li class="active"><a href="#">'+i+'</a></li>');
}else{
offset = (i - 1) * userResults.result.pageSize;
- $('#pagingul').append('<li><a href="#" onclick="rave.api.rpc.getUsers({offset: ' +
- offset + ', successCallback: function(result)' +
+ $('#pagingul').append('<li><a href="#" onclick="rave.api.rpc.getUsers({offset: ' +
+ offset + ', successCallback: function(result)' +
' {rave.layout.searchHandler.dealWithUserResults(result);}});">' + i + '</a></li>');
}
}
if (userResults.result.currentPage < userResults.result.numberOfPages){
offset = (userResults.result.currentPage) * userResults.result.pageSize;
- $('#pagingul').append('<li><a href="#" onclick="rave.api.rpc.getUsers({offset: ' +
- offset + ', successCallback: function(result)' +
+ $('#pagingul').append('<li><a href="#" onclick="rave.api.rpc.getUsers({offset: ' +
+ offset + ', successCallback: function(result)' +
' {rave.layout.searchHandler.dealWithUserResults(result);}});">></a></li>');
}
$pagingDiv.append('</ul></div>')
@@ -388,8 +388,8 @@ rave.layout = rave.layout || (function()
if(userResults.result.resultSet.length < 1){
legend = rave.getClientMessage("no.results.found");
}else{
- legend = updateParamsInString(rave.getClientMessage("search.list.result.x.to.y"),
- new Array(userResults.result.offset + 1, userResults.result.resultSet.length
+ legend = updateParamsInString(rave.getClientMessage("search.list.result.x.to.y"),
+ new Array(userResults.result.offset + 1, userResults.result.resultSet.length
+ userResults.result.offset, userResults.result.totalResults));
}
// show the listheader
@@ -447,58 +447,58 @@ rave.layout = rave.layout || (function()
)
.append(
$("<td/>")
- .attr("id", "shareButtonHolder" + this.entityId)
+ .attr("id", "shareButtonHolder" + this.id)
)
.append(
$("<td/>")
- .attr("id", "pageEditorStatusHolder" + this.entityId)
+ .attr("id", "pageEditorStatusHolder" + this.id)
)
)
if(this.username != rave.layout.searchHandler.username){
- // check if already added
+ // check if already added
if(rave.layout.searchHandler.isUserAlreadyAdded(this.username)){
- $('#shareButtonHolder'+this.entityId)
+ $('#shareButtonHolder'+this.id)
.append(
$("<a/>")
.attr("href", "#")
- .attr("id", this.entityId)
- .attr("onclick", "rave.layout.searchHandler.removeMemberFromPage("+this.entityId+", '"+this.username+"');")
+ .attr("id", this.id)
+ .attr("onclick", "rave.layout.searchHandler.removeMemberFromPage("+this.id+", '"+this.username+"');")
.text(rave.getClientMessage("common.remove"))
)
if(rave.layout.searchHandler.isUserEditor(this.username)){
- $('#pageEditorStatusHolder'+this.entityId)
+ $('#pageEditorStatusHolder'+this.id)
.append(
$("<a/>")
.attr("href", "#")
- .attr("id", this.entityId)
- .attr("onclick", "rave.layout.searchHandler.removeEditingRightsFromMember("+this.entityId+", '"+this.username+"');")
+ .attr("id", this.id)
+ .attr("onclick", "rave.layout.searchHandler.removeEditingRightsFromMember("+this.id+", '"+this.username+"');")
.text(rave.getClientMessage("common.remove"))
)
}
else{
- $('#pageEditorStatusHolder'+this.entityId)
+ $('#pageEditorStatusHolder'+this.id)
.append(
$("<a/>")
.attr("href", "#")
- .attr("id", this.entityId)
- .attr("onclick", "rave.layout.searchHandler.addEditingRightsToMember("+this.entityId+", '"+this.username+"');")
+ .attr("id", this.id)
+ .attr("onclick", "rave.layout.searchHandler.addEditingRightsToMember("+this.id+", '"+this.username+"');")
.text(rave.getClientMessage("common.add"))
)
}
}else{
- $('#shareButtonHolder'+this.entityId)
+ $('#shareButtonHolder'+this.id)
.append(
$("<a/>")
.attr("href", "#")
- .attr("id", this.entityId)
- .attr("onclick", "rave.layout.searchHandler.addMemberToPage("+this.entityId+", '"+this.username+"');")
+ .attr("id", this.id)
+ .attr("onclick", "rave.layout.searchHandler.addMemberToPage("+this.id+", '"+this.username+"');")
.text(rave.getClientMessage("common.add"))
)
- }
+ }
}
-
- })//end jqueryeach
+
+ })//end jqueryeach
}//end dealwithresults
return {
@@ -686,7 +686,7 @@ rave.layout = rave.layout || (function()
rave.api.rpc.addPage({pageName: newPageTitle,
pageLayoutCode: newPageLayoutCode,
successCallback: function(result) {
- rave.viewPage(result.result.entityId);
+ rave.viewPage(result.result.id);
}
});
}
@@ -698,7 +698,7 @@ rave.layout = rave.layout || (function()
function movePage() {
var moveAfterPageId = $("#moveAfterPageId").val();
var args = { pageId: $("#currentPageId").val(),
- successCallback: function(result) { rave.viewPage(result.result.entityId); }
+ successCallback: function(result) { rave.viewPage(result.result.id); }
};
if (moveAfterPageId != MOVE_PAGE_DEFAULT_POSITION_IDX) {
@@ -716,7 +716,7 @@ rave.layout = rave.layout || (function()
title: $tab_title_input.val(),
layout: $page_layout_input.val(),
successCallback: function(result) {
- rave.viewPage(result.result.entityId);
+ rave.viewPage(result.result.id);
}});
}
}