Author: carlucci
Date: Thu May 10 20:14:19 2012
New Revision: 1336873
URL: http://svn.apache.org/viewvc?rev=1336873&view=rev
Log:
RAVE-592: rename header.tag to navbar.tag
Added:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/navbar.tag
- copied unchanged from r1336861,
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/header.tag
Removed:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/header.tag
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.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/categoryDetail.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/home.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/newaccount.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.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/widgetdetail.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/page.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.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
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp?rev=1336873&r1=1336872&r2=1336873&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp
Thu May 10 20:14:19 2012
@@ -20,7 +20,7 @@
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<fmt:setBundle basename="messages"/>
<fmt:message key="page.addwidget.title" var="pagetitle"/>
-<rave:header pageTitle="${pagetitle}"/>
+<rave:navbar pageTitle="${pagetitle}"/>
<div class="container">
<h2><fmt:message key="page.addwidget.form.header"/></h2>
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=1336873&r1=1336872&r2=1336873&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
Thu May 10 20:14:19 2012
@@ -22,7 +22,7 @@
<fmt:message key="${pageTitleKey}" var="pagetitle"/>
-<rave:header pageTitle="${pagetitle}"/>
+<rave:navbar pageTitle="${pagetitle}"/>
<div class="container-fluid">
<div class="span2">
<rave:admin_tabsheader/>
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categoryDetail.jsp
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categoryDetail.jsp?rev=1336873&r1=1336872&r2=1336873&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categoryDetail.jsp
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categoryDetail.jsp
Thu May 10 20:14:19 2012
@@ -21,7 +21,7 @@
<fmt:setBundle basename="messages"/>
<fmt:message key="${pageTitleKey}" var="pagetitle"/>
-<rave:header pageTitle="${pagetitle}"/>
+<rave:navbar pageTitle="${pagetitle}"/>
<div class="container-fluid">
<div class="span2">
<rave:admin_tabsheader/>
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/home.jsp
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/home.jsp?rev=1336873&r1=1336872&r2=1336873&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/home.jsp
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/home.jsp
Thu May 10 20:14:19 2012
@@ -21,7 +21,7 @@
<fmt:setBundle basename="messages"/>
<fmt:message key="${pageTitleKey}" var="pagetitle"/>
-<rave:header pageTitle="${pagetitle}"/>
+<rave:navbar pageTitle="${pagetitle}"/>
<div class="container-fluid">
<div class="span2">
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/newaccount.jsp
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/newaccount.jsp?rev=1336873&r1=1336872&r2=1336873&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/newaccount.jsp
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/newaccount.jsp
Thu May 10 20:14:19 2012
@@ -22,7 +22,7 @@
<fmt:message key="${pageTitleKey}" var="pagetitle"/>
<c:set var="canChangeUserStatus" value="${user.username ne loggedInUser}"/>
-<rave:header pageTitle="${pagetitle}"/>
+<rave:navbar pageTitle="${pagetitle}"/>
<div class="container-fluid">
<div class="row-fluid">
<div class="span1">
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp?rev=1336873&r1=1336872&r2=1336873&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp
Thu May 10 20:14:19 2012
@@ -21,7 +21,7 @@
<fmt:setBundle basename="messages"/>
<fmt:message key="${pageTitleKey}" var="pagetitle"/>
-<rave:header pageTitle="${pagetitle}"/>
+<rave:navbar pageTitle="${pagetitle}"/>
<div class="container-fluid">
<div class="span2">
<rave:admin_tabsheader/>
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp?rev=1336873&r1=1336872&r2=1336873&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp
Thu May 10 20:14:19 2012
@@ -21,7 +21,7 @@
<fmt:setBundle basename="messages"/>
<fmt:message key="${pageTitleKey}" var="pagetitle"/>
-<rave:header pageTitle="${pagetitle}"/>
+<rave:navbar pageTitle="${pagetitle}"/>
<div class="container-fluid">
<div class="span2">
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp?rev=1336873&r1=1336872&r2=1336873&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp
Thu May 10 20:14:19 2012
@@ -22,7 +22,7 @@
<fmt:message key="${pageTitleKey}" var="pagetitle"/>
<c:set var="canChangeUserStatus" value="${user.username ne loggedInUser}"/>
-<rave:header pageTitle="${pagetitle}"/>
+<rave:navbar pageTitle="${pagetitle}"/>
<div class="container-fluid">
<div class="span2">
<rave:admin_tabsheader/>
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=1336873&r1=1336872&r2=1336873&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
Thu May 10 20:14:19 2012
@@ -22,7 +22,7 @@
<%--@elvariable id="searchResult"
type="org.apache.rave.portal.model.util.SearchResult<org.apache.rave.portal.model.User>"--%>
<fmt:message key="${pageTitleKey}" var="pagetitle"/>
-<rave:header pageTitle="${pagetitle}"/>
+<rave:navbar pageTitle="${pagetitle}"/>
<div class="container-fluid">
<div class="span2">
<rave:admin_tabsheader/>
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgetdetail.jsp
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgetdetail.jsp?rev=1336873&r1=1336872&r2=1336873&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgetdetail.jsp
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgetdetail.jsp
Thu May 10 20:14:19 2012
@@ -21,7 +21,7 @@
<fmt:setBundle basename="messages"/>
<fmt:message key="${pageTitleKey}" var="pagetitle"/>
-<rave:header pageTitle="${pagetitle}"/>
+<rave:navbar pageTitle="${pagetitle}"/>
<div class="container-fluid">
<div class="span2">
<rave:admin_tabsheader/>
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=1336873&r1=1336872&r2=1336873&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
Thu May 10 20:14:19 2012
@@ -21,7 +21,7 @@
<fmt:setBundle basename="messages"/>
<%--@elvariable id="searchResult"
type="org.apache.rave.portal.model.util.SearchResult<org.apache.rave.portal.model.Widget>"--%>
<fmt:message key="${pageTitleKey}" var="pagetitle"/>
-<rave:header pageTitle="${pagetitle}"/>
+<rave:navbar pageTitle="${pagetitle}"/>
<div class="container-fluid">
<div class="span2">
<rave:admin_tabsheader/>
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=1336873&r1=1336872&r2=1336873&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 May 10 20:14:19 2012
@@ -35,7 +35,7 @@
</c:choose>
</fmt:param>
</fmt:message>
-<rave:header pageTitle="${pagetitle}"/>
+<rave:navbar pageTitle="${pagetitle}"/>
<input id="currentPageId" type="hidden" value="${page.entityId}"/>
<c:set var="hasOnlyOnePage" scope="request">
@@ -113,7 +113,7 @@
<a href="#"><c:out
value="${userPage.name}"/></a>
</c:otherwise>
</c:choose>
-
+
</li>
</c:otherwise>
</c:choose>
@@ -262,7 +262,7 @@
<div class="modal-footer">
<a href="#" class="btn"
onclick="$('#sharePageDialog').modal('hide');"><fmt:message
key="_rave_client.common.cancel"/></a>
</div>
- </div>
+ </div>
<div id="confirmSharePageDialog" class="modal hide" data-backdrop="static">
<div class="modal-header">
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp?rev=1336873&r1=1336872&r2=1336873&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
Thu May 10 20:14:19 2012
@@ -49,7 +49,7 @@
</c:choose>
</fmt:param>
</fmt:message>
-<rave:header pageTitle="${pagetitle}"/>
+<rave:navbar pageTitle="${pagetitle}"/>
<div id="pageContent" class="container-fluid navbar-spacer">
<div class="row-fluid">
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=1336873&r1=1336872&r2=1336873&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 May 10 20:14:19 2012
@@ -19,7 +19,7 @@
<%@ page language="java" trimDirectiveWhitespaces="true" %>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<fmt:setBundle basename="messages"/>
-<rave:header pageTitle="${pagetitle}"/>
+<rave:navbar pageTitle="${pagetitle}"/>
<div class="container-fluid navbar-spacer">
<div class="row-fluid">
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=1336873&r1=1336872&r2=1336873&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 May 10 20:14:19 2012
@@ -19,7 +19,7 @@
<%@ page language="java" trimDirectiveWhitespaces="true" %>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<fmt:setBundle basename="messages"/>
-<rave:header pageTitle="${widget.title}"/>
+<rave:navbar pageTitle="${widget.title}"/>
<div id="na_content" class="container-fluid">
<div class="row-fluid detail-widget">
