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 2011/08/24 20:59:03 UTC
svn commit: r1161232 - in /incubator/rave/trunk/rave-portal/src/main/webapp:
WEB-INF/views/home.jsp css/default.css script/rave_layout.js
Author: carlucci
Date: Wed Aug 24 18:59:03 2011
New Revision: 1161232
URL: http://svn.apache.org/viewvc?rev=1161232&view=rev
Log:
RAVE-212: disable the "delete page" menu option if the user only has one page
Modified:
incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/home.jsp
incubator/rave/trunk/rave-portal/src/main/webapp/css/default.css
incubator/rave/trunk/rave-portal/src/main/webapp/script/rave_layout.js
Modified: incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/home.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/home.jsp?rev=1161232&r1=1161231&r2=1161232&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/home.jsp (original)
+++ incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/home.jsp Wed Aug 24 18:59:03 2011
@@ -22,6 +22,7 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="portal" uri="http://www.apache.org/rave/tags" %>
<%@ taglib tagdir="/WEB-INF/tags" prefix="rave"%>
<jsp:useBean id="pages" type="java.util.List<org.apache.rave.portal.model.Page>" scope="request"/>
@@ -68,16 +69,15 @@
<c:when test="${page.id == userPage.id}">true</c:when>
<c:otherwise>false</c:otherwise>
</c:choose>
- </c:set>
-
- <div id="tab-${userPage.id}" class="rave-ui-tab<c:if test="${isCurrentPage}"> rave-ui-tab-selected</c:if>" onclick="rave.viewPage(${userPage.id});">
- <span id="pageTitle-${userPage.id}" class="pageTitle"><c:out value="${userPage.name}"/></span>
+ </c:set>
+ <div id="tab-${userPage.id}" class="rave-ui-tab<c:if test="${isCurrentPage}"> rave-ui-tab-selected</c:if>">
+ <div id="pageTitle-${userPage.id}" class="page-title" onclick="rave.viewPage(${userPage.id});"><c:out value="${userPage.name}"/></div>
<c:if test="${isCurrentPage}">
<div id="pageMenuWrapper">
<span id="pageMenuButton" class="ui-icon ui-icon-circle-triangle-s"></span>
<div id="pageMenu" class="page-menu">
<div id="pageMenuEdit" class="page-menu-item">Edit Page</div>
- <div id="pageMenuDelete" class="page-menu-item">Delete Page</div>
+ <div id="pageMenuDelete" class="page-menu-item<c:if test='${fn:length(pages) == 1}'> page-menu-item-disabled</c:if>">Delete Page</div>
<div id="pageMenuMove" class="page-menu-item">Move Page</div>
</div>
</div>
Modified: incubator/rave/trunk/rave-portal/src/main/webapp/css/default.css
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/webapp/css/default.css?rev=1161232&r1=1161231&r2=1161232&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/webapp/css/default.css (original)
+++ incubator/rave/trunk/rave-portal/src/main/webapp/css/default.css Wed Aug 24 18:59:03 2011
@@ -495,11 +495,10 @@ span.error, label.error {
background-color: #FFFFFF;
border: 1px solid #B4C4CF;
color: #767676;
- cursor: pointer;
display: inline-block;
font-style: italic;
font-weight: normal;
- padding: 2px 8px 4px;
+ height: 25px;
position: relative;
top: 4px;
}
@@ -525,6 +524,15 @@ span.error, label.error {
#dialog textarea { width: 95%; }
#add_page { cursor: pointer; }
+.page-title {
+ display: inline-block;
+ padding-left: 10px;
+ padding-right: 10px;
+ padding-top: 5px;
+ padding-bottom: 5px;
+ cursor: pointer;
+}
+
/* page menu related styles */
#pageMenuWrapper {
position: relative;
@@ -540,10 +548,18 @@ span.error, label.error {
width: 80px;
background-color: #FFFFFF;
z-index: 1000;
+ cursor: pointer;
}
.page-menu-item {
padding: 3px;
}
.page-menu-item:hover {
background-color: #B4C4CF;
+}
+.page-menu-item-disabled {
+ color: #D3D3D3;
+}
+#pageMenuButton {
+ cursor: pointer;
+ margin-right: 10px;
}
\ No newline at end of file
Modified: incubator/rave/trunk/rave-portal/src/main/webapp/script/rave_layout.js
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/webapp/script/rave_layout.js?rev=1161232&r1=1161231&r2=1161232&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/webapp/script/rave_layout.js (original)
+++ incubator/rave/trunk/rave-portal/src/main/webapp/script/rave_layout.js Wed Aug 24 18:59:03 2011
@@ -53,7 +53,7 @@ rave.layout = rave.layout || (function()
var $menuItemEdit = $("#pageMenuEdit");
var $menuItemDelete = $("#pageMenuDelete");
var $menuItemMove = $("#pageMenuMove");
-
+
function hideMenu() {
$menu.hide();
}
@@ -86,16 +86,17 @@ rave.layout = rave.layout || (function()
event.stopPropagation();
});
- // setup the delete page menu item
- $menuItemDelete.bind('click', function(event) {
- // send the rpc request to delete the page
- rave.api.rest.deletePage({pageId: getCurrentPageId(), successCallback: rave.viewPage});
- pageMenu.hide();
- // prevent the menu button click event from bubbling up to parent
- // DOM object event handlers such as the page tab click event
- event.stopPropagation();
- });
-
+ // setup the delete page menu item if it is not disabled
+ if (!$menuItemDelete.hasClass("page-menu-item-disabled")) {
+ $menuItemDelete.bind('click', function(event) {
+ // send the rpc request to delete the page
+ rave.api.rest.deletePage({pageId: getCurrentPageId(), successCallback: rave.viewPage});
+ pageMenu.hide();
+ // prevent the menu button click event from bubbling up to parent
+ // DOM object event handlers such as the page tab click event
+ event.stopPropagation();
+ });
+ }
// setup the edit page menu item
$menuItemMove.bind('click', function(event) {