Author: carlucci
Date: Thu Apr 19 18:07:04 2012
New Revision: 1328058
URL: http://svn.apache.org/viewvc?rev=1328058&view=rev
Log:
RAVE-535: bootstrap titlebar. Patch supplied by Jacob Hilker
Modified:
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/header.tag
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/rave.css
Modified:
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp?rev=1328058&r1=1328057&r2=1328058&view=diff
==============================================================================
---
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp
(original)
+++
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp
Thu Apr 19 18:07:04 2012
@@ -19,46 +19,52 @@
<%@ page language="java" trimDirectiveWhitespaces="true" %>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<fmt:setBundle basename="messages"/>
-<header>
- <nav>
- <div class="navbar navbar-fixed-top">
- <a class="brand" href="#"><fmt:message
key="page.addwidget.title"/></a>
- <ul class="nav pull-right">
- <c:if test="${not empty referringPageId}">
- <li>
- <a href="<spring:url
value="/app/store?referringPageId=${referringPageId}" />">
+<div class="navbar navbar-fixed-top">
+ <div class="navbar-inner">
+ <div class="container">
+ <a class="btn btn-navbar" data-toggle="collapse"
data-target=".nav-collapse">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </a>
+ <span class="brand"><fmt:message
key="page.addwidget.title"/></span>
+ <div class="nav-collapse">
+ <ul class="nav pull-right">
+ <c:if test="${not empty referringPageId}">
+ <li>
+ <a href="<spring:url
value="/app/store?referringPageId=${referringPageId}" />">
<fmt:message key="page.widget.backToStore"/>
- </a>
- </li>
- </c:if>
- <li>
- <c:choose>
- <c:when test="${empty referringPageId}">
- <spring:url value="/index.html" var="gobackurl"/>
- </c:when>
- <c:otherwise>
- <spring:url
value="/app/page/view/${referringPageId}" var="gobackurl"/>
- </c:otherwise>
- </c:choose>
- <a href="<c:out value="${gobackurl}"/>"><fmt:message
key="page.general.back"/></a>
- </li>
- <sec:authorize url="/app/admin/">
+ </a>
+ </li>
+ </c:if>
+
<li>
- <a href="<spring:url value="/app/admin/"/>">
- <fmt:message key="page.general.toadmininterface"/>
- </a>
+ <c:choose>
+ <c:when test="${empty referringPageId}">
+ <spring:url value="/index.html"
var="gobackurl"/>
+ </c:when>
+ <c:otherwise>
+ <spring:url
value="/app/page/view/${referringPageId}" var="gobackurl"/>
+ </c:otherwise>
+ </c:choose>
+ <a href="<c:out value="${gobackurl}"/>"><fmt:message
key="page.general.back"/></a>
</li>
- </sec:authorize>
- <li>
- <a href="<spring:url value="/j_spring_security_logout"
htmlEscape="true" />">
+ <sec:authorize url="/app/admin/">
+ <li>
+ <a href="<spring:url value="/app/admin/"/>">
+ <fmt:message key="page.general.toadmininterface"/>
+ </a>
+ </li>
+ </sec:authorize>
+ <li>
+ <a href="<spring:url value="/j_spring_security_logout"
htmlEscape="true" />">
<fmt:message key="page.general.logout"/></a>
- </li>
-
- </ul>
+ </li>
+ </ul>
+ </div>
</div>
-
- </nav>
-</header>
+ </div>
+</div>
<div class="container">
<h2><fmt:message key="page.addwidget.form.header"/></h2>
Modified:
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp?rev=1328058&r1=1328057&r2=1328058&view=diff
==============================================================================
---
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
(original)
+++
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
Thu Apr 19 18:07:04 2012
@@ -23,48 +23,56 @@
<jsp:useBean id="pages"
type="java.util.List<org.apache.rave.portal.model.Page>" scope="request"/>
<jsp:useBean id="pageLayouts"
type="java.util.List<org.apache.rave.portal.model.PageLayout>" scope="request"/>
<%--@elvariable id="page" type="org.apache.rave.portal.model.Page"--%>
-<header class="navbar navbar-fixed-top">
- <nav>
- <a class="brand" href="#">
- <fmt:message key="page.home.welcome"><fmt:param>
- <c:choose>
- <c:when test="${not empty page.owner.displayName}"><c:out
value="${page.owner.displayName}"/></c:when>
- <c:otherwise><c:out
value="${page.owner.username}"/></c:otherwise>
- </c:choose>
- </fmt:param>
- </fmt:message>
-
- </a>
- <ul class="nav pull-right">
- <li>
- <c:set var="profileUrl">/app/person/<sec:authentication
property="principal.username"/>?referringPageId=${page.entityId}
- </c:set>
- <a href="<spring:url value="${profileUrl}" />">
- <fmt:message key="page.profile.title">
- <fmt:param><c:out
value="${page.owner.displayName}"/></fmt:param>
- </fmt:message>
- </a>
- </li>
- <li>
- <a href="<spring:url
value="/app/store?referringPageId=${page.entityId}" />">
- <fmt:message key="page.store.title"/>
- </a>
- </li>
- <sec:authorize url="/app/admin/">
- <li>
- <a href="<spring:url value="/app/admin/"/>">
- <fmt:message key="page.general.toadmininterface"/>
- </a>
- </li>
- </sec:authorize>
- <li>
- <a href="<spring:url value="/j_spring_security_logout"
htmlEscape="true" />">
- <fmt:message key="page.general.logout"/></a>
- </li>
- </ul>
- </nav>
-</header>
-
+<div class="navbar navbar-fixed-top">
+ <div class="navbar-inner">
+ <div class="container">
+ <a class="btn btn-navbar" data-toggle="collapse"
data-target=".nav-collapse">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </a>
+ <span class="brand">
+ <fmt:message key="page.home.welcome">
+ <fmt:param>
+ <c:choose>
+ <c:when test="${not empty
page.owner.displayName}"><c:out value="${page.owner.displayName}"/></c:when>
+ <c:otherwise><c:out
value="${page.owner.username}"/></c:otherwise>
+ </c:choose>
+ </fmt:param>
+ </fmt:message>
+ </span>
+ <div class="nav-collapse">
+ <ul class="nav pull-right">
+ <li>
+ <c:set
var="profileUrl">/app/person/<sec:authentication
property="principal.username"/>?referringPageId=${page.entityId}
+ </c:set>
+ <a href="<spring:url value="${profileUrl}" />">
+ <fmt:message key="page.profile.title">
+ <fmt:param><c:out
value="${page.owner.displayName}"/></fmt:param>
+ </fmt:message>
+ </a>
+ </li>
+ <li>
+ <a href="<spring:url
value="/app/store?referringPageId=${page.entityId}" />">
+ <fmt:message key="page.store.title"/>
+ </a>
+ </li>
+ <sec:authorize url="/app/admin/">
+ <li>
+ <a href="<spring:url value="/app/admin/"/>">
+ <fmt:message key="page.general.toadmininterface"/>
+ </a>
+ </li>
+ </sec:authorize>
+ <li>
+ <a href="<spring:url value="/j_spring_security_logout"
htmlEscape="true" />">
+ <fmt:message key="page.general.logout"/></a>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+</div>
<input id="currentPageId" type="hidden" value="${page.entityId}"/>
<c:set var="hasOnlyOnePage" scope="request">
@@ -75,7 +83,7 @@
</c:set>
-<div class="container-fluid navbar-spacer">
+<div class="container-fluid">
<nav>
<ul class="nav nav-tabs">
<c:forEach var="userPage" items="${pages}">
Modified:
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp?rev=1328058&r1=1328057&r2=1328058&view=diff
==============================================================================
---
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
(original)
+++
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
Thu Apr 19 18:07:04 2012
@@ -42,35 +42,45 @@
<!-- get the title of contact information -->
<fmt:message key="page.personProfile.contact.info" var="contactInfo"/>
-<header>
- <nav class="topnav">
- <ul class="horizontal-list">
- <li>
- <c:choose>
- <c:when test="${empty referringPageId}">
- <spring:url value="/index.html" var="gobackurl"/>
- </c:when>
- <c:otherwise>
- <spring:url value="/app/page/view/${referringPageId}"
var="gobackurl"/>
- </c:otherwise>
- </c:choose>
- <a href="<c:out value="${gobackurl}"/>"><fmt:message
key="page.general.back"/></a>
- </li>
- <sec:authorize url="/app/admin/">
- <li>
- <a href="<spring:url value="/app/admin/"/>">
- <fmt:message key="page.general.toadmininterface"/>
- </a>
- </li>
- </sec:authorize>
- <li>
- <a href="<spring:url value="/j_spring_security_logout"
htmlEscape="true" />">
- <fmt:message key="page.general.logout"/></a>
- </li>
- </ul>
- </nav>
- <h1>${pageTitle}</h1>
-</header>
+<div class="navbar navbar-fixed-top">
+ <div class="navbar-inner">
+ <div class="container">
+ <a class="btn btn-navbar" data-toggle="collapse"
data-target=".nav-collapse">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </a>
+ <span class="brand">${pageTitle}</span>
+ <div class="nav-collapse">
+ <ul class="nav pull-right">
+ <li>
+ <c:choose>
+ <c:when test="${empty referringPageId}">
+ <spring:url value="/index.html"
var="gobackurl"/>
+ </c:when>
+ <c:otherwise>
+ <spring:url
value="/app/page/view/${referringPageId}" var="gobackurl"/>
+ </c:otherwise>
+ </c:choose>
+ <a href="<c:out value="${gobackurl}"/>"><fmt:message
key="page.general.back"/></a>
+ </li>
+ <sec:authorize url="/app/admin/">
+ <li>
+ <a href="<spring:url value="/app/admin/"/>">
+ <fmt:message key="page.general.toadmininterface"/>
+ </a>
+ </li>
+ </sec:authorize>
+ <li>
+ <a href="<spring:url value="/j_spring_security_logout"
htmlEscape="true" />">
+ <fmt:message key="page.general.logout"/></a>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+</div>
+
<div id="person-profile-left">
<div id="personProfileContent">
<form:form id="editAccountForm" commandName="userProfile"
action="person?referringPageId=${referringPageId}" method="POST">
Modified:
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp?rev=1328058&r1=1328057&r2=1328058&view=diff
==============================================================================
---
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
(original)
+++
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
Thu Apr 19 18:07:04 2012
@@ -19,42 +19,49 @@
<%@ page language="java" trimDirectiveWhitespaces="true" %>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<fmt:setBundle basename="messages"/>
-<header class="navbar navbar-fixed-top">
- <nav>
- <a class="brand" href="#">${pagetitle}</a>
- <ul class="nav pull-right">
- <li>
- <a href="<spring:url
value="/app/store/widget/add?referringPageId=${referringPageId}"/>"><fmt:message
- key="page.addwidget.title"/></a>
- </li>
- <li>
- <c:choose>
- <c:when test="${empty referringPageId}">
- <spring:url value="/index.html" var="gobackurl"/>
- </c:when>
- <c:otherwise>
- <spring:url value="/app/page/view/${referringPageId}"
var="gobackurl"/>
- </c:otherwise>
- </c:choose>
- <a href="<c:out value="${gobackurl}"/>"><fmt:message
key="page.general.back"/></a>
- </li>
-
- <sec:authorize url="/app/admin/">
- <li>
- <a href="<spring:url value="/app/admin/"/>">
- <fmt:message key="page.general.toadmininterface"/>
- </a>
- </li>
- </sec:authorize>
- <li>
- <a href="<spring:url value="/j_spring_security_logout"
htmlEscape="true" />">
- <fmt:message key="page.general.logout"/></a>
- </li>
-
- </ul>
- </nav>
-</header>
+<div class="navbar navbar-fixed-top">
+ <div class="navbar-inner">
+ <div class="container">
+ <a class="btn btn-navbar" data-toggle="collapse"
data-target=".nav-collapse">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </a>
+ <span class="brand">${pagetitle}</span>
+ <div class="nav-collapse">
+ <ul class="nav pull-right">
+ <li>
+ <a href="<spring:url
value="/app/store/widget/add?referringPageId=${referringPageId}"/>"><fmt:message
+ key="page.addwidget.title"/></a>
+ </li>
+ <li>
+ <c:choose>
+ <c:when test="${empty referringPageId}">
+ <spring:url value="/index.html"
var="gobackurl"/>
+ </c:when>
+ <c:otherwise>
+ <spring:url
value="/app/page/view/${referringPageId}" var="gobackurl"/>
+ </c:otherwise>
+ </c:choose>
+ <a href="<c:out value="${gobackurl}"/>"><fmt:message
key="page.general.back"/></a>
+ </li>
+ <sec:authorize url="/app/admin/">
+ <li>
+ <a href="<spring:url value="/app/admin/"/>">
+ <fmt:message key="page.general.toadmininterface"/>
+ </a>
+ </li>
+ </sec:authorize>
+ <li>
+ <a href="<spring:url value="/j_spring_security_logout"
htmlEscape="true" />">
+ <fmt:message key="page.general.logout"/></a>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+</div>
<div class="container-fluid navbar-spacer">
<div class="row-fluid">
Modified:
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/header.tag
URL:
http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/header.tag?rev=1328058&r1=1328057&r2=1328058&view=diff
==============================================================================
---
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/header.tag
(original)
+++
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/header.tag
Thu Apr 19 18:07:04 2012
@@ -21,18 +21,25 @@
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"; %>
<%@ attribute name="pageTitle" required="false" description="The title of the
page" %>
<fmt:setBundle basename="messages"/>
-<header>
- <nav>
- <%--@elvariable id="topnav"
type="org.apache.rave.portal.web.model.NavigationMenu"--%>
- <c:if test="${not empty topnav}">
- <div class="navbar navbar-fixed-top">
- <a class="brand" href="#"><c:out value="${pageTitle}"/></a>
- <ul class="nav pull-right">
- <c:forEach items="${topnav.navigationItems}" var="navItem">
- <li><a href="<spring:url
value="${navItem.url}"/>"><fmt:message key="${navItem.name}"/></a></li>
- </c:forEach>
- </ul>
+<c:if test="${not empty topnav}">
+ <div class="navbar navbar-fixed-top">
+ <div class="navbar-inner">
+ <div class="container">
+ <%--@elvariable id="topnav"
type="org.apache.rave.portal.web.model.NavigationMenu"--%>
+ <a class="btn btn-navbar" data-toggle="collapse"
data-target=".nav-collapse">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </a>
+ <span class="brand"><c:out value="${pageTitle}"/></span>
+ <div class="nav-collapse">
+ <ul class="nav pull-right">
+ <c:forEach items="${topnav.navigationItems}"
var="navItem">
+ <li><a href="<spring:url
value="${navItem.url}"/>"><fmt:message key="${navItem.name}"/></a></li>
+ </c:forEach>
+ </ul>
+ </div>
</div>
- </c:if>
- </nav>
-</header>
+ </div>
+ </div>
+</c:if>
Modified:
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/rave.css
URL:
http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/rave.css?rev=1328058&r1=1328057&r2=1328058&view=diff
==============================================================================
--- rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/rave.css
(original)
+++ rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/rave.css
Thu Apr 19 18:07:04 2012
@@ -5,8 +5,10 @@
margin-right: auto;
}
-.navbar-spacer{
- margin-top: 50px;
+/* Overwrite setitngs for navbar to remove need for spacer */
+.navbar-fixed-top {
+ position: static;
+ margin-bottom: 18px;
}
/* page menu related styles */
