You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by kl...@apache.org on 2012/12/14 22:15:40 UTC
svn commit: r1422096 - in /rave/trunk/rave-portal-resources/src/main/webapp:
WEB-INF/jsp/common/ WEB-INF/jsp/templates/ WEB-INF/jsp/views/
WEB-INF/jsp/views/admin/ WEB-INF/jsp/views/includes/ WEB-INF/tags/
static/css/ static/images/
Author: klegacy
Date: Fri Dec 14 21:15:33 2012
New Revision: 1422096
URL: http://svn.apache.org/viewvc?rev=1422096&view=rev
Log:
RAVE-389: Applying skin and necessary template changes. Fixes to original template to work with said template changes.
Added:
rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-skin.less
rave/trunk/rave-portal-resources/src/main/webapp/static/images/gradient-dark.jpg (with props)
rave/trunk/rave-portal-resources/src/main/webapp/static/images/gradient-light.jpg (with props)
rave/trunk/rave-portal-resources/src/main/webapp/static/images/rave-logo-sm.png (with props)
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/common/footer.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp
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/addwidget.w3c.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/includes/login-navbar.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/admin_tabsheader.tag
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/login_navbar.tag
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/navbar.tag
rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less
rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave.less
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/common/footer.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/common/footer.jsp?rev=1422096&r1=1422095&r2=1422096&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/common/footer.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/common/footer.jsp Fri Dec 14 21:15:33 2012
@@ -23,7 +23,7 @@ under the License.
<div class="row">
<div class="span12 version">
<span>Apache Rave ${applicationProperties['portal.version']}</span>
- <a href="http://rave.apache.org"><img class="footer-logo" alt="Apache Rave" title="Apache Rave" src="<c:url value="/static/images/rave-logo.png" />" /></a>
+ <a href="http://rave.apache.org"><img class="footer-logo" alt="Apache Rave" title="Apache Rave" src="<c:url value="/static/images/rave-logo-sm.png" />" /></a>
</div>
</div>
</div>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp?rev=1422096&r1=1422095&r2=1422096&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp Fri Dec 14 21:15:33 2012
@@ -31,10 +31,13 @@ under the License.
<rave:third_party_head_js/>
</head>
<body>
+<div class="wrapper">
<%-- Header Content --%>
-<tiles:insertAttribute name="header"/>
-<%-- Main Body Content --%>
-<tiles:insertAttribute name="body"/>
+ <tiles:insertAttribute name="header"/>
+ <%-- Main Body Content --%>
+ <tiles:insertAttribute name="body"/>
+ <div class="push"></div>
+</div>
<%-- Footer Content --%>
<tiles:insertAttribute name="footer"/>
<%-- render any script that needs to execute pre-src includes --%>
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=1422096&r1=1422095&r2=1422096&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 Fri Dec 14 21:15:33 2012
@@ -24,14 +24,18 @@
<div class="container-fluid navbar-spacer">
<div class="row-fluid">
- <ul class="nav nav-tabs">
- <li class="active"><a href="<spring:url value="/app/store/widget/add?referringPageId=${referringPageId}" />">OpenSocial</a></li>
- <li><a href="<spring:url value="/app/store/widget/add/w3c?referringPageId=${referringPageId}" />">W3C</a></li>
-
- <c:if test="${not empty marketplace and not empty marketplace.value}">
- <li><a href="<spring:url value="/app/marketplace?referringPageId=${referringPageId}" />">Marketplace</a></li>
- </c:if>
- </ul>
+ <ul class="nav nav-tabs">
+ <li class="active"><a href="<spring:url value="/app/store/widget/add?referringPageId=${referringPageId}" />">OpenSocial</a></li>
+ <li><a href="<spring:url value="/app/store/widget/add/w3c?referringPageId=${referringPageId}" />">W3C</a></li>
+
+ <c:if test="${not empty marketplace and not empty marketplace.value}">
+ <li><a href="<spring:url value="/app/marketplace?referringPageId=${referringPageId}" />">Marketplace</a></li>
+ </c:if>
+ </ul>
+ </div>
+</div>
+<div class="row-fluid tab-content">
+ <div class="tab-padding">
<form:errors path="widget" cssClass="error" element="p"/>
<form:form cssClass="form-horizontal" id="newWidgetForm" action="add?referringPageId=${referringPageId}" commandName="widget" method="POST">
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.w3c.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.w3c.jsp?rev=1422096&r1=1422095&r2=1422096&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.w3c.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.w3c.jsp Fri Dec 14 21:15:33 2012
@@ -24,108 +24,110 @@
<div class="container-fluid navbar-spacer">
<div class="row-fluid">
- <ul class="nav nav-tabs">
- <li><a href="<spring:url value="/app/store/widget/add?referringPageId=${referringPageId}" />">OpenSocial</a></li>
- <li class="active"><a href="#w3c">W3C</a></li>
- <c:if test="${not empty marketplace and not empty marketplace.value}">
- <li><a href="<spring:url value="/app/marketplace?referringPageId=${referringPageId}" />">Marketplace</a></li>
- </c:if>
- </ul>
- </div>
-
- <div class="row-fluid">
- <div class="control-group">
- <fieldset>
- <a class="btn btn-primary" id="w3cBrowseLink" href="#"><fmt:message key="page.general.browse"/></a>
- </fieldset>
- </div>
- <form:errors path="widget" cssClass="error" element="p"/>
- <form:form cssClass="form-horizontal" id="newWidgetForm" action="w3c?referringPageId=${referringPageId}" commandName="widget" method="POST">
- <fieldset>
-
- <form:hidden path="type" value="W3C"/>
-
- <div id="addWidgetForm">
- <div class="control-group label label-important"><fmt:message key="form.some.fields.required"/></div>
-
-
- <div class="control-group">
- <spring:bind path="url">
- <label class="control-label" for="url"><fmt:message key="widget.url"/> *</label>
- <div class="controls"><input class="input-xlarge" type="url" name="url" id="url"
- placeholder="http://example.com/widget.xml" required="required"
- value="<c:out value="${widget.url}"/>"/></div>
- </spring:bind>
- <form:errors path="url" cssClass="error"/>
- </div>
-
- <div class="control-group">
- <form:label cssClass="control-label" path="title"> <fmt:message key="widget.title"/> *</form:label>
- <div class="controls">
- <form:input path="title" cssClass="input-xlarge" required="required" autofocus="autofocus"/></div>
- <form:errors path="title" cssClass="error"/>
- </div>
-
- <div class="control-group">
- <form:label cssClass="control-label" path="description"><fmt:message key="widget.description"/> *</form:label>
- <div class="controls"><form:textarea path="description" required="required" cssClass="input-xlarge"/></div>
- <form:errors path="description" cssClass="error"/>
- </div>
-
- <div class="control-group">
- <spring:bind path="thumbnailUrl">
- <label class="control-label" for="thumbnailUrl"><fmt:message key="widget.thumbnailUrl"/></label>
- <div class="controls"><input type="url" name="thumbnailUrl" id="thumbnailUrl"
- placeholder="http://example.com/thumbnail.png" class="input-xlarge"
- value="<c:out value="${widget.thumbnailUrl}"/>"/></div>
- </spring:bind>
- <form:errors path="thumbnailUrl" cssClass="error"/>
- </div>
-
- <div class="control-group">
- <spring:bind path="screenshotUrl">
- <label class="control-label" for="screenshotUrl"><fmt:message key="widget.screenshotUrl"/></label>
- <div class="controls">
- <input type="url" name="screenshotUrl" id="screenshotUrl" placeholder="http://example.com/screenshot.png" class="input-xlarge"
- value="<c:out value="${widget.screenshotUrl}"/>"/></div>
- </spring:bind>
- <form:errors path="screenshotUrl" cssClass="error"/>
- </div>
-
- <div class="control-group">
- <spring:bind path="titleUrl">
- <label class="control-label" for="titleUrl"><fmt:message key="widget.titleUrl"/></label>
- <div class="controls"><input type="url" name="titleUrl" id="titleUrl"
- class="input-xlarge" value="<c:out value="${widget.titleUrl}"/>"/></div>
- </spring:bind>
- <form:errors path="titleUrl" cssClass="error"/>
- </div>
-
- <div class="control-group">
- <form:label cssClass="control-label" path="author"><fmt:message key="widget.author"/></form:label>
- <div class="controls"><form:input path="author" cssClass="input-xlarge"/>
- <form:errors path="author" cssClass="error"/>
- </div>
-
- </div>
- <div class="control-group">
- <spring:bind path="authorEmail">
- <label class="control-label" for="authorEmail"><fmt:message key="widget.authorEmail"/></label>
- <div class="controls"><input type="email" name="authorEmail" id="authorEmail" class="input-xlarge"
- value="<c:out value="${widget.authorEmail}"/>"/></div>
- </spring:bind>
- <form:errors path="titleUrl" cssClass="error"/>
- </div>
- </div>
- </fieldset>
- <div id="addWidgetFormSubmit">
- <fieldset>
- <fmt:message key="page.addwidget.form.submit" var="submit"/>
- <button class="btn btn-primary" type="submit" value="${submit}">${submit}</button>
- </fieldset>
- </div>
- </form:form>
+ <ul class="nav nav-tabs">
+ <li><a href="<spring:url value="/app/store/widget/add?referringPageId=${referringPageId}" />">OpenSocial</a></li>
+ <li class="active"><a href="#w3c">W3C</a></li>
+ <c:if test="${not empty marketplace and not empty marketplace.value}">
+ <li><a href="<spring:url value="/app/marketplace?referringPageId=${referringPageId}" />">Marketplace</a></li>
+ </c:if>
+ </ul>
</div>
+</div>
+<div class="row-fluid tab-content">
+ <div class="tab-padding">
+ <div class="control-group">
+ <fieldset>
+ <a class="btn btn-primary" id="w3cBrowseLink" href="#"><fmt:message key="page.general.browse"/></a>
+ </fieldset>
+ </div>
+ <form:errors path="widget" cssClass="error" element="p"/>
+ <form:form cssClass="form-horizontal" id="newWidgetForm" action="w3c?referringPageId=${referringPageId}" commandName="widget" method="POST">
+ <fieldset>
+
+ <form:hidden path="type" value="W3C"/>
+
+ <div id="addWidgetForm">
+ <div class="control-group label label-important"><fmt:message key="form.some.fields.required"/></div>
+
+
+ <div class="control-group">
+ <spring:bind path="url">
+ <label class="control-label" for="url"><fmt:message key="widget.url"/> *</label>
+ <div class="controls"><input class="input-xlarge" type="url" name="url" id="url"
+ placeholder="http://example.com/widget.xml" required="required"
+ value="<c:out value="${widget.url}"/>"/></div>
+ </spring:bind>
+ <form:errors path="url" cssClass="error"/>
+ </div>
+
+ <div class="control-group">
+ <form:label cssClass="control-label" path="title"> <fmt:message key="widget.title"/> *</form:label>
+ <div class="controls">
+ <form:input path="title" cssClass="input-xlarge" required="required" autofocus="autofocus"/></div>
+ <form:errors path="title" cssClass="error"/>
+ </div>
+
+ <div class="control-group">
+ <form:label cssClass="control-label" path="description"><fmt:message key="widget.description"/> *</form:label>
+ <div class="controls"><form:textarea path="description" required="required" cssClass="input-xlarge"/></div>
+ <form:errors path="description" cssClass="error"/>
+ </div>
+
+ <div class="control-group">
+ <spring:bind path="thumbnailUrl">
+ <label class="control-label" for="thumbnailUrl"><fmt:message key="widget.thumbnailUrl"/></label>
+ <div class="controls"><input type="url" name="thumbnailUrl" id="thumbnailUrl"
+ placeholder="http://example.com/thumbnail.png" class="input-xlarge"
+ value="<c:out value="${widget.thumbnailUrl}"/>"/></div>
+ </spring:bind>
+ <form:errors path="thumbnailUrl" cssClass="error"/>
+ </div>
+
+ <div class="control-group">
+ <spring:bind path="screenshotUrl">
+ <label class="control-label" for="screenshotUrl"><fmt:message key="widget.screenshotUrl"/></label>
+ <div class="controls">
+ <input type="url" name="screenshotUrl" id="screenshotUrl" placeholder="http://example.com/screenshot.png" class="input-xlarge"
+ value="<c:out value="${widget.screenshotUrl}"/>"/></div>
+ </spring:bind>
+ <form:errors path="screenshotUrl" cssClass="error"/>
+ </div>
+
+ <div class="control-group">
+ <spring:bind path="titleUrl">
+ <label class="control-label" for="titleUrl"><fmt:message key="widget.titleUrl"/></label>
+ <div class="controls"><input type="url" name="titleUrl" id="titleUrl"
+ class="input-xlarge" value="<c:out value="${widget.titleUrl}"/>"/></div>
+ </spring:bind>
+ <form:errors path="titleUrl" cssClass="error"/>
+ </div>
+
+ <div class="control-group">
+ <form:label cssClass="control-label" path="author"><fmt:message key="widget.author"/></form:label>
+ <div class="controls"><form:input path="author" cssClass="input-xlarge"/>
+ <form:errors path="author" cssClass="error"/>
+ </div>
+
+ </div>
+ <div class="control-group">
+ <spring:bind path="authorEmail">
+ <label class="control-label" for="authorEmail"><fmt:message key="widget.authorEmail"/></label>
+ <div class="controls"><input type="email" name="authorEmail" id="authorEmail" class="input-xlarge"
+ value="<c:out value="${widget.authorEmail}"/>"/></div>
+ </spring:bind>
+ <form:errors path="titleUrl" cssClass="error"/>
+ </div>
+ </div>
+ </fieldset>
+ <div id="addWidgetFormSubmit">
+ <fieldset>
+ <fmt:message key="page.addwidget.form.submit" var="submit"/>
+ <button class="btn btn-primary" type="submit" value="${submit}">${submit}</button>
+ </fieldset>
+ </div>
+ </form:form>
+ </div>
+ </div>
</div>
<div id="w3cBrowseForm" title="<fmt:message key="page.general.browse"/>">
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=1422096&r1=1422095&r2=1422096&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 Fri Dec 14 21:15:33 2012
@@ -49,7 +49,6 @@
<rave:admin_paging/>
<form id="userSearchForm" class="form-horizontal search-form" action="<spring:url value="/app/admin/users/search"/>" method="get">
<fieldset>
- <br/>
<div class="input-append">
<input type="text" class="input-medium" id="searchTerm" name="searchTerm" value="<c:out value="${searchTerm}"/>" placeholder='<fmt:message key="admin.users.search"/>'
/><fmt:message key="page.store.search.button" var="searchButtonText"
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/login-navbar.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/login-navbar.jsp?rev=1422096&r1=1422095&r2=1422096&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/login-navbar.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/login-navbar.jsp Fri Dec 14 21:15:33 2012
@@ -30,14 +30,14 @@
<li>
<form class="form-inline" action="<c:url value="/app/newpassword"/>" method="get">
<fmt:message key="page.login.forgot.password.button" var="requestNewPasswordButtonText"/>
- <button class="btn btn-info" id="requestNewPasswordButton" type="submit" value="${requestNewPasswordButtonText}">${requestNewPasswordButtonText}</button>
+ <button class="btn btn-link" id="requestNewPasswordButton" type="submit" value="${requestNewPasswordButtonText}">${requestNewPasswordButtonText}</button>
</form>
</li>
<li class="divider-vertical"></li>
<li>
<form class="form-inline " action="<c:url value="/app/retrieveusername"/>" method="get">
<fmt:message key="page.login.forgot.username.button" var="requestNewUsernameButton"/>
- <button class="btn btn-info" id="requestNewUsernameButton" type="submit" value="${requestNewUsernameButton}">${requestNewUsernameButton}</button>
+ <button class="btn btn-link" id="requestNewUsernameButton" type="submit" value="${requestNewUsernameButton}">${requestNewUsernameButton}</button>
</form>
</li>
<li class="divider-vertical"></li>
@@ -46,7 +46,7 @@
<form class="form-inline" action="<c:url value="/app/newaccount.jsp"/>" method="get">
<fieldset>
<fmt:message key="page.login.createaccount.button" var="createAccountButtonText"/>
- <button class="btn btn-info" id="createNewAccountButton" type="submit" value="${createAccountButtonText}">${createAccountButtonText}</button>
+ <button class="btn btn-link" id="createNewAccountButton" type="submit" value="${createAccountButtonText}">${createAccountButtonText}</button>
</fieldset>
</form>
</li>
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=1422096&r1=1422095&r2=1422096&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 Fri Dec 14 21:15:33 2012
@@ -132,259 +132,261 @@
</nav>
</div>
- <div class="row-fluid">
- <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 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.layout.searchHandler.acceptShare()"><fmt:message key="_rave_client.common.accept"/></a>
+ </div>
+ <div>
+ <a href="#" onclick="rave.layout.searchHandler.declineShare();"><fmt:message key="_rave_client.common.decline"/></a>
+ </div>
+ <div class="clear-float"> </div>
+ </div>
+ </c:otherwise>
+ </c:choose>
+ </div>
+</div>
+
+<div id="pageMenuDialogTabbed" class="modal hide" data-backdrop="static">
+ <div id="page-tabs">
+ <div>
+ <a href="#" class="close" data-dismiss="modal">×</a>
+ <ul>
+ <li><a href="#tabs-1"><fmt:message key="page.general.addnewpage"/></a></li>
+ <li><a href="#tabs-2"><fmt:message key="page.general.importnewpage"/></a></li>
+ </ul>
+ </div>
+ <div id="tabs-1">
+ <div class="modal-body">
+ <form id="pageFormTabbed" class="form-horizontal">
+ <input type="hidden" name="tab_idTabbed" id="tab_idTabbed" value=""/>
+ <fieldset>
+ <div class="control-group error">
+ <label id="pageFormErrorsTabbed1" class="control-label"></label>
</div>
- <div> </div>
- <div>
- <a href="#" onclick="rave.layout.searchHandler.acceptShare()"><fmt:message key="_rave_client.common.accept"/></a>
+ <div class="control-group">
+ <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="" />
+ </div>
</div>
- <div>
- <a href="#" onclick="rave.layout.searchHandler.declineShare();"><fmt:message key="_rave_client.common.decline"/></a>
+ <div class="control-group">
+ <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>
+ </c:forEach>
+ </select>
+ </div>
</div>
- <div class="clear-float"> </div>
- </div>
- </c:otherwise>
- </c:choose>
- </div>
-
- <div id="pageMenuDialogTabbed" class="modal hide" data-backdrop="static">
- <div id="page-tabs">
- <div>
- <a href="#" class="close" data-dismiss="modal">×</a>
- <ul>
- <li><a href="#tabs-1"><fmt:message key="page.general.addnewpage"/></a></li>
- <li><a href="#tabs-2"><fmt:message key="page.general.importnewpage"/></a></li>
- </ul>
+ </fieldset>
+ </form>
</div>
- <div id="tabs-1">
- <div class="modal-body">
- <form id="pageFormTabbed" class="form-horizontal">
- <input type="hidden" name="tab_idTabbed" id="tab_idTabbed" value=""/>
- <fieldset>
+ </div>
+
+ <div id="tabs-2">
+ <div class="modal-body">
+ <form method="post" id="pageFormImport" class="form-horizontal" enctype="multipart/form-data">
+ <fieldset>
<div class="control-group error">
- <label id="pageFormErrorsTabbed1" class="control-label"></label>
+ <label id="pageFormErrorsTabbed2" 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_titleTabbed2"><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_titleTabbed2" name="pageName" 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="omdlFile">Browse for File</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>
- </c:forEach>
- </select>
+ <input id="omdlFile" name="omdlFile" class="input-xlarge focused required" type="file" value="" />
</div>
</div>
- </fieldset>
- </form>
- </div>
- </div>
-
- <div id="tabs-2">
- <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>
- <div class="controls">
- <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="" />
- </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>
- </fieldset>
- </form>
- </div>
- </div>
- <div class="modal-footer">
- <a id="pageMenuCloseButtonTab" href="#" class="btn"><fmt:message key="_rave_client.common.cancel"/></a>
- <a id="pageMenuUpdateButtonTab" href="#" class="btn btn-primary"></a>
+ <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>
+ </fieldset>
+ </form>
</div>
</div>
+ <div class="modal-footer">
+ <a id="pageMenuCloseButtonTab" href="#" class="btn"><fmt:message key="_rave_client.common.cancel"/></a>
+ <a id="pageMenuUpdateButtonTab" href="#" class="btn btn-primary"></a>
+ </div>
</div>
+</div>
- <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">
- <form id="pageForm" class="form-horizontal">
- <input type="hidden" name="tab_id" id="tab_id" value=""/>
- <fieldset>
- <div class="control-group error">
- <label id="pageFormErrors" class="control-label"></label>
- </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="" />
- </div>
+<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">
+ <form id="pageForm" class="form-horizontal">
+ <input type="hidden" name="tab_id" id="tab_id" value=""/>
+ <fieldset>
+ <div class="control-group error">
+ <label id="pageFormErrors" class="control-label"></label>
+ </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="" />
</div>
- <div class="control-group" id="pageLayoutGroup">
- <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}">
- <option value="${pageLayout.code}" id="${pageLayout.code}_id">
- <fmt:message key="page.general.addpage.layout.${pageLayout.code}"/></option>
- </c:forEach>
- </select>
- </div>
+ </div>
+ <div class="control-group" id="pageLayoutGroup">
+ <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}">
+ <option value="${pageLayout.code}" id="${pageLayout.code}_id">
+ <fmt:message key="page.general.addpage.layout.${pageLayout.code}"/></option>
+ </c:forEach>
+ </select>
</div>
- </fieldset>
- </form>
- </div>
- <div class="modal-footer">
- <a id="pageMenuCloseButton" href="#" class="btn"><fmt:message key="_rave_client.common.cancel"/></a>
- <a id="pageMenuUpdateButton" href="#" class="btn btn-primary"></a>
- </div>
+ </div>
+ </fieldset>
+ </form>
+ </div>
+ <div class="modal-footer">
+ <a id="pageMenuCloseButton" href="#" class="btn"><fmt:message key="_rave_client.common.cancel"/></a>
+ <a id="pageMenuUpdateButton" href="#" class="btn btn-primary"></a>
</div>
+</div>
- <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">
- <form id="movePageForm" class="form-horizontal">
- <fieldset>
- <div class="control-group">
- <div class="controls">
- <select id="moveAfterPageId">
- <c:if test="${pageUser.renderSequence != 1}">
- <option value="-1"><fmt:message key="page.general.movethispage.tofirst"/></option>
+<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">
+ <form id="movePageForm" class="form-horizontal">
+ <fieldset>
+ <div class="control-group">
+ <div class="controls">
+ <select id="moveAfterPageId">
+ <c:if test="${pageUser.renderSequence != 1}">
+ <option value="-1"><fmt:message key="page.general.movethispage.tofirst"/></option>
+ </c:if>
+ <c:forEach var="userPage" items="${pages}">
+ <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>
+ </option>
</c:if>
- <c:forEach var="userPage" items="${pages}">
- <c:if test="${userPage.id != page.id}">
+ </c:forEach>
+ </select>
+ </div>
+ </div>
+ </fieldset>
+ </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>
+ </div>
+</div>
+
+<fmt:message key="widget.menu.movetopage" var="moveWidgetToPageTitle"/>
+<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">
+ <form id="moveWidgetForm" class="form-horizontal">
+ <fieldset>
+ <div class="control-group">
+ <div class="controls">
+ <select id="moveToPageId">
+ <c:forEach var="userPage" items="${pages}">
+ <c:forEach var="members" items="${userPage.members}">
+ <c:if test="${members.userId == principalId and members.editor and 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>
+ <c:out value="${userPage.name}"/>
</option>
</c:if>
</c:forEach>
- </select>
- </div>
+ </c:forEach>
+ </select>
</div>
- </fieldset>
- </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>
- </div>
+ </div>
+ </fieldset>
+ </form>
</div>
-
- <fmt:message key="widget.menu.movetopage" var="moveWidgetToPageTitle"/>
- <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">
- <form id="moveWidgetForm" class="form-horizontal">
- <fieldset>
- <div class="control-group">
- <div class="controls">
- <select id="moveToPageId">
- <c:forEach var="userPage" items="${pages}">
- <c:forEach var="members" items="${userPage.members}">
- <c:if test="${members.userId == principalId and members.editor and userPage.id != page.id}">
- <option value="${userPage.id}">
- <c:out value="${userPage.name}"/>
- </option>
- </c:if>
- </c:forEach>
- </c:forEach>
- </select>
- </div>
- </div>
- </fieldset>
- </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>
- </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>
</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="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"/>
- </div>
- <div id="shareSearchListHeader"></div>
- <div id="shareSearchListPaging"></div>
- <div id="shareSearchResults"></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="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"/>
</div>
+ <div id="shareSearchListHeader"></div>
+ <div id="shareSearchListPaging"></div>
+ <div id="shareSearchResults"></div>
</div>
</div>
- <div class="modal-footer">
- <a href="#" class="btn" onclick="$('#sharePageDialog').modal('hide');"><fmt:message key="_rave_client.common.cancel"/></a>
- </div>
</div>
+ <div class="modal-footer">
+ <a href="#" class="btn" onclick="$('#sharePageDialog').modal('hide');"><fmt:message key="_rave_client.common.cancel"/></a>
+ </div>
+</div>
<portal:register-init-script location="${'AFTER_RAVE'}">
<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=1422096&r1=1422095&r2=1422096&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 Fri Dec 14 21:15:33 2012
@@ -21,9 +21,9 @@
<fmt:setBundle basename="messages"/>
<rave:navbar pageTitle="${pagetitle}"/>
-<div class="container-fluid navbar-spacer">
+<div class="container-fluid navbar-spacer" id="widgetStore">
<div class="row-fluid">
- <section class="span8">
+ <section class="span8 pagination-header">
<c:choose>
<c:when test="${empty searchTerm and (empty widgets or widgets.totalResults eq 0)}">
<%-- Empty db --%>
@@ -88,7 +88,9 @@
<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}"
@@ -107,11 +109,11 @@
</div>
<div class="storeItemCenter">
- <a id="widget-${widget.id}-title"
+ <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>
+ </a></h4>
<c:if test="${widget.disableRendering}">
<div class="storeWidgetDisabled">
<span class="widget-disabled-icon-store ui-icon ui-icon-alert"
@@ -245,16 +247,15 @@
<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>
+ <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></legend>
+ <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="span4">
+ <select name="tagList" id="tagList" class="x-large">
<option value=""></option>
<c:forEach var="tag" items="${tags}">
<c:choose>
@@ -277,7 +278,7 @@
<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="span4">
+ <select name="categoryList" id="categoryList" class="x-large">
<option value="0"></option>
<c:forEach var="category" items="${categories}">
<c:choose>
@@ -297,8 +298,8 @@
</c:if>
</fieldset>
</form>
- <a class="btn btn-info" href="<spring:url value="/app/store/mine?referringPageId=${referringPageId}"/>"><fmt:message key="page.store.list.widgets.mine"/></a>
- <a class="btn btn-info" href="<spring:url value="/app/store?referringPageId=${referringPageId}"/>"><fmt:message key="page.store.list.widgets.all"/></a>
+ <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>
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=1422096&r1=1422095&r2=1422096&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 Fri Dec 14 21:15:33 2012
@@ -22,7 +22,7 @@
<rave:navbar pageTitle="${widget.title}"/>
<div id="na_content" class="container">
- <div class="row detail-widget storeItem">
+ <div class="row detail-widget">
<div class="span4">
<div class="detail-widget-preview">
<c:if test="${not empty widget.screenshotUrl}">
@@ -190,12 +190,12 @@
<div class="row-fluid">
<div class="widgetComments" id="widgetComments">
<h3><fmt:message key="page.widget.comments"/></h3>
- <div class="new-comment form-inline well">
+ <div class="new-comment form-inline">
<div class="row-fluid">
- <div class="span11 pull-left">
+ <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>
- <button id="comment-new-${widget.id}" class="btn commentNewButton pull-right" title="Add Comment"><i class="icon-comment"></i></button>
</div>
</div>
<c:if test="${not empty widget.comments}">
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/admin_tabsheader.tag
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/admin_tabsheader.tag?rev=1422096&r1=1422095&r2=1422096&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/admin_tabsheader.tag (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/admin_tabsheader.tag Fri Dec 14 21:15:33 2012
@@ -23,8 +23,8 @@
<%--@elvariable id="tabs" type="org.apache.rave.portal.web.model.NavigationMenu"--%>
<c:if test="${not empty tabs}">
<nav>
- <div class="tabbable tabs-left">
- <ul class="nav nav-tabs">
+ <div class="tabbable">
+ <ul class="nav nav-tabs nav-stacked">
<c:forEach items="${tabs.navigationItems}" var="navItem">
<c:choose>
<c:when test="${navItem.selected}">
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/login_navbar.tag
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/login_navbar.tag?rev=1422096&r1=1422095&r2=1422096&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/login_navbar.tag (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/login_navbar.tag Fri Dec 14 21:15:33 2012
@@ -44,7 +44,7 @@
<li>
<form action="<c:url value="/app/newpassword"/>" method="get">
<fmt:message key="page.login.forgot.password.button" var="requestNewPasswordButtonText"/>
- <button class="btn btn-info" id="requestNewPasswordButton" type="submit" value="${requestNewPasswordButtonText}">${requestNewPasswordButtonText}</button>
+ <button class="btn btn-link" id="requestNewPasswordButton" type="submit" value="${requestNewPasswordButtonText}">${requestNewPasswordButtonText}</button>
</form>
</li>
</c:if>
@@ -52,7 +52,7 @@
<li>
<form action="<c:url value="/app/retrieveusername"/>" method="get">
<fmt:message key="page.login.forgot.username.button" var="requestNewUsernameButton"/>
- <button class="btn btn-info" id="requestNewUsernameButton" type="submit" value="${requestNewUsernameButton}">${requestNewUsernameButton}</button>
+ <button class="btn btn-link" id="requestNewUsernameButton" type="submit" value="${requestNewUsernameButton}">${requestNewUsernameButton}</button>
</form>
</li>
</c:if>
@@ -60,7 +60,7 @@
<li>
<form action="<c:url value="/app/newaccount.jsp"/>" method="get">
<fmt:message key="page.login.createaccount.button" var="createAccountButtonText"/>
- <button class="btn btn-info" id="createNewAccountButton" type="submit" value="${createAccountButtonText}">${createAccountButtonText}</button>
+ <button class="btn btn-link" id="createNewAccountButton" type="submit" value="${createAccountButtonText}">${createAccountButtonText}</button>
</form>
</li>
</c:if>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/navbar.tag
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/navbar.tag?rev=1422096&r1=1422095&r2=1422096&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/navbar.tag (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/navbar.tag Fri Dec 14 21:15:33 2012
@@ -78,4 +78,5 @@
</div>
</div>
</div>
+ <div class="logo-wrapper"></div>
</c:if>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less?rev=1422096&r1=1422095&r2=1422096&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less Fri Dec 14 21:15:33 2012
@@ -16,6 +16,29 @@
// specific language governing permissions and limitations
// under the License.
+/* Sticky footer */
+* {
+ margin: 0;
+}
+html, body {
+ height: 100%;
+}
+.wrapper {
+ min-height: 100%;
+ height: auto !important;
+ height: 100%;
+ margin: 0 auto -55px !important;
+}
+
+footer {
+ margin-top: 20px;
+ height: 35px;
+}
+.push{
+ height: 55px;
+ margin-bottom: -55px;
+}
+
///* general-use styles */
.hidden {
display: none;
@@ -177,10 +200,10 @@
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
filter: progid:dximagetransform.microsoft.gradient(enabled=false);
border-radius: 5px 5px 0 0;
+ margin-bottom: 1em;
padding: 4px 10px 4px;
}
-
.widget-title-bar:hover {
cursor: move;
}
@@ -409,15 +432,14 @@
.storeItem {
border: 1px solid #ddd;
margin: 1em auto;
- padding: 10px;
+ padding: 0 0 10px 0;
background-color: #f9f9f9;
color: black;
border-radius: 5px;
box-shadow: 2px 2px 3px rgba(0,0,0,0.4);
-moz-box-shadow: 2px 2px 2px rgba(0,0,0,0.4);
- -webkit-box-shadow: 2px 2px 4px rgba(0,0,0,0.4);
+ -webkit-box-shadow: 2px 2px 4px rgba(0,0,0,0.4);
}
-
.storeItemFeatured {
background-color: #D5EAF9;
}
@@ -534,17 +556,21 @@ ul.storeItems li span.label{
display: inline-block;
margin-right: .5em;
}
-.storeItemLeft, .storeItemCenter {
+
+.storeItemLeft,
+.storeItemCenter {
vertical-align: top;
}
.storeItemLeft {
float: left;
- width: 120px;
+ width: 130px;
+ margin-left: 10px;
}
.storeItemCenter {
- margin-left: 140px;
+ margin-right: 10px;
+ margin-left: 150px;
}
.storeWidgetThumbnail {
@@ -1197,7 +1223,8 @@ footer {
}
.footer-logo {
- height: 35px;
+ height: 22px;
+ margin: 6px 0;
}
.version {
Added: rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-skin.less
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-skin.less?rev=1422096&view=auto
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-skin.less (added)
+++ rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-skin.less Fri Dec 14 21:15:33 2012
@@ -0,0 +1,458 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+// This file contains Rave specific branding styles.
+// This adds brand css unique to Rave. Replace this file with
+// your own skin to customize style without loosing the
+// styles holding the layout together.
+
+
+
+/* GLOBAL
+=========================================================================================*/
+/* Variables
+----------------------------------------------------*/
+@imageDirPath:"../images";
+
+@lightestGray: #e3e3e3;
+@lighterGray: #DDD;
+@lightGray: mix(@lighterGray, @gray, 50%);
+@gray: #999;
+@darkGray: #777777;
+@darkerGray: #5c5c5c;
+@darkestGray: #363636;
+
+@titleBarLight: #5c5c5c;
+@titleBarMiddle: #555;
+@titleBarDark: #363636;
+
+@redLight: #CA2017;
+@redDark: #AD261F;
+@red: mix(@redLight, @redDark, 50%);
+
+@defaultBoxShadow: 1px 1px 5px rgba(0, 0, 0, 0.15);
+
+
+body{
+ background-color: @lightestGray;
+ background-image: -moz-linear-gradient(top, @white 100px, @lightestGray 700px); // FF 3.6+
+ background-image: -ms-linear-gradient(top, @white 100px, @lightestGray 700px); // IE10
+ background-image: -webkit-linear-gradient(top, @white 100px, @lightestGray 700px); // Safari 5.1+, Chrome 10+
+ background-image: -o-linear-gradient(top, @white 100px, @lightestGray 700px); // Opera 11.10
+ background-image: linear-gradient(top, @white 100px, @lightestGray 700px); // The standard
+ background-repeat: repeat-x;
+ filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@white, @lightestGray)); // IE9 and down
+}
+input, textarea, select, .uneditable-input{
+ color: @darkerGray;
+}
+.logo-wrapper{
+ width: 100%;
+ height: 35px;
+ padding: 5px 0;
+ background: url("@{imageDirPath}/rave-logo-sm.png") no-repeat 15px 0;
+}
+.well{
+ .box-shadow(inset 0 1px 3px rgba(0, 0, 0, 0.25));
+ background: @lighterGray;
+ border: 1px solid @lightGray;
+}
+.table-bordered{
+ .box-shadow(1px 1px 5px 0px rgba(0, 0, 0, 0.05));
+ background: @white;
+}
+.table tbody tr:hover td,
+.table tbody tr:hover th{
+ background-color: mix(@white, @lightestGray, 50%);
+}
+input{
+ padding-top: 7px;
+ padding-bottom: 6px;
+}
+footer{
+ background: @white;
+ position: relative;
+ z-index: 1000;
+}
+
+/* Buttons
+----------------------------------------------------*/
+.btn{
+ letter-spacing: .03em;
+ padding: .5em 1.5em;
+ .border-radius(7px);
+}
+.btn.btn-small,
+.btn.btn-mini{
+ .border-radius(5px);
+}
+.btn.btn-mini{
+ padding: 2px 6px;
+}
+.btn-primary {
+ .buttonBackground(@redLight, @redDark);
+}
+.btn.btn-link{
+ background: none;
+ padding: 0;
+ color: @redLight;
+ text-shadow: none;
+ .box-shadow(none);
+}
+
+/* Text
+----------------------------------------------------*/
+a{ color: @redLight; }
+//a:hover{ color: @redDark; }
+
+
+/* Modals
+----------------------------------------------------*/
+.modal{ .border-radius(10px); z-index: 9999;}
+.modal-header{
+ .widget-title-bar;
+ margin: 0;
+ padding: 3px 10px;
+ .border-radius(6px 6px 0 0);
+ //#gradient > .vertical( @lightGray, @lightestGray);
+ background: @lighterGray url("@{imageDirPath}/gradient-light.jpg") repeat-x 0 center;
+ border-bottom-color: @lightGray;
+
+ h3{
+ font-size: 14px;
+ line-height: 24px;
+ font-weight: normal;
+ border: none;
+ }
+ .close{
+ color: @black;
+ .opacity(100);
+ line-height: 12px;
+ }
+}
+.modal-footer{
+ border: none;
+ background: #fff;
+ padding: 0px 15px 15px;
+}
+
+
+/* Pagination
+----------------------------------------------------*/
+.pagination-header{
+ h2{
+ text-transform: uppercase;
+ color: @black;
+ font-size: 16px;
+ border-bottom: 1px solid @lighterGray;
+ }
+}
+.pagination{
+ height: 24px;
+ margin: 12px 0 18px;
+ position: relative;
+ z-index: 1000;
+
+ a,
+ li:first-child a,
+ li:last-child a{
+ border: none;
+ line-height: 14px;
+ background: @black;
+ .border-radius(0);
+ margin-right: 3px;
+ padding: .4em .65em;
+ color: @white;
+
+
+ &:hover{
+ background: @redDark;
+ }
+ }
+ li.active a,
+ li.active a:hover{
+ background: @gray;
+ color: @white;
+ }
+}
+/* Tabs
+----------------------------------------------------*/
+.nav-tabs{
+ margin-bottom: 0;
+ margin-right: 10px; // to prevent overlap over border radius
+}
+.nav-tabs > li{
+ margin-bottom: 0;
+
+ & > a,
+ & > a:hover{
+ border: 1px solid @lighterGray;
+ border-bottom-color: transparent;
+ margin-right: 6px;
+ color: @darkGray;
+ background: @white;
+ }
+}
+
+.nav-tabs > .active > a,
+.nav-tabs > .active > a:hover,
+.nav-tabs > li > a:hover,
+.tab-content{
+ background:@lightestGray;
+ color: @darkerGray;
+}
+.tab-padding{
+ padding: 1em 2em;
+}
+.nav-tabs .open .dropdown-toggle,
+.nav-pills .open .dropdown-toggle,
+.nav > li.dropdown.open.active > a:hover{
+ background:@lightestGray;
+}
+.tab-content{
+ border: 1px solid @lightestGray;
+ margin-top: -1px;
+ padding-top: 18px;
+ .border-radius(0 10px);
+}
+
+/* Outlined
+*/
+
+.nav-tabs.outlined > li{
+ margin-bottom: -1px;
+}
+
+
+.nav-tabs.outlined > li > a,
+.nav-tabs.outlined > li > a:hover,
+.tab-content.outlined{
+ border-color: @lightGray;
+ border-bottom: 1px solid @lightGray;
+ background: @lighterGray;
+ color: @black;
+ .box-shadow(3px 1px 4px -3px rgba(0,0,0,0.25));
+
+}
+.nav-tabs.outlined > .active > a,
+.nav-tabs.outlined > .active > a:hover{
+ border-color: @lightGray;
+ border-bottom-color: @white;
+ background: @white;
+}
+.tab-content.outlined{
+ background: @white;
+ .box-shadow(1px 1px 5px rgba(0,0,0,0.25));
+}
+
+/* Left */
+
+.tabs-left > .nav-tabs > li > a{
+ border-color:@lightGray;
+ border-right: none;
+ margin-right: 0;
+ color:@gray;
+ background: @lightestGray;
+}
+.tabs-left > .nav-tabs{
+ padding: 5px 0;
+ border-color:@lightGray;
+}
+.tabs-left > .nav-tabs > li > a:hover,
+.tabs-left > .nav-tabs > li.active > a,
+.tabs-left > .nav-tabs > li.active > a:hover{
+ background: @white;
+ color: @black;
+ border-color:@lightGray;
+ border-right: none;
+}
+.tabs-left > .nav-tabs > li:last-child a{
+ margin-bottom: 0;
+}
+
+/* Stacked */
+.nav-tabs.nav-stacked {
+ margin-top: 2.75em; // For admin, might need to make more specific
+ .box-shadow(1px 1px 5px 0 rgba(0, 0, 0, 0.25));
+ border: 1px solid @lightGray;
+
+ .border-radius(5px);
+ & > li{
+
+ & > a{
+ margin: 0;
+ background: @white;
+ color: @darkerGray;
+ border: none;
+ border-bottom: 1px solid @lighterGray;
+
+ &:hover{
+ background: @redDark;
+ color: @white;
+ border-top: none;
+ border-right: none;
+ border-left: none;
+ }
+ }
+ &.active > a{
+ background: @lightestGray;
+ color: @darkerGray;
+ }
+ &:last-child > a{
+ border-bottom: none;
+ }
+ }
+}
+
+
+/* Widgets
+----------------------------------------------------*/
+.widget{
+ .border-radius(0 0 8px 8px);
+}
+.widget-wrapper{
+ border-color: @lighterGray;
+ .border-radius(5px 5px 8px 8px);
+ .box-shadow(1px 1px 7px rgba(0, 0, 0, 0.35));
+}
+// Widgets need body background set to transparent as well.
+//.widget-wrapper-hidechrome { background: transparent; }
+
+.widget-title-bar{
+ .clearfix;
+/* Until IE supports gradients AND border-radius, this needs to be an image.
+
+ background-image: linear-gradient(bottom, rgb(54,54,54) 11%, rgb(85,85,85) 48%, rgb(92,92,92) 54%);
+ background-image: -o-linear-gradient(bottom, rgb(54,54,54) 11%, rgb(85,85,85) 48%, rgb(92,92,92) 54%);
+ background-image: -moz-linear-gradient(bottom, rgb(54,54,54) 11%, rgb(85,85,85) 48%, rgb(92,92,92) 54%);
+ background-image: -webkit-linear-gradient(bottom, rgb(54,54,54) 11%, rgb(85,85,85) 48%, rgb(92,92,92) 54%);
+ background-image: -ms-linear-gradient(bottom, rgb(54,54,54) 11%, rgb(85,85,85) 48%, rgb(92,92,92) 54%);
+ background-image: -webkit-gradient(
+ linear,
+ left bottom,
+ left top,
+ color-stop(0.11, rgb(54,54,54)),
+ color-stop(0.48, rgb(85,85,85)),
+ color-stop(0.54, rgb(92,92,92))
+ );
+ filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",#4e4e4e, @titleBarLight)); // IE9 and down
+*/
+ background: @titleBarMiddle url("@{imageDirPath}/gradient-dark.jpg") repeat-x 0 center;
+ text-align: left;
+ padding-left: 5px;
+ color: @lightestGray;
+ letter-spacing: 0.1em;
+ margin: -1px -1px 0;
+
+ .widget-title{ float: left; }
+
+ a, a:hover{
+ color: @lightestGray;
+
+ }
+ .widget-menu a{
+ color: @darkestGray;
+ }
+ .menu-item-disabled a{
+ color: @gray !important;
+
+ &:hover{ background: @white; cursor: default; }
+ }
+}
+
+.widget-toolbar-toggle-collapse{
+ margin-right: 5px;
+}
+.emptyPageMessage{
+ .box-shadow(@defaultBoxShadow);
+ border: 1px solid @lighterGray;
+ .border-radius(4px);
+}
+
+
+.dropdown-menu li > a:hover,
+.dropdown-menu .active > a,
+.dropdown-menu .active > a:hover{
+ background: @redDark;
+ color: @white;
+}
+/* PAGE SPECIFIC
+=========================================================================================*/
+
+/* LOGIN RELATED PAGES
+------------------------------------------------------------------------*/
+
+.navbar .btn.btn-link{
+ padding: 9px 10px 11px;
+ line-height: 19px;
+ color: @gray;
+ text-decoration: none;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+ margin: 0;
+
+ &:hover{
+ color: @white;
+ }
+}
+
+/* WIDGET STORE
+------------------------------------------------------------------------*/
+#widgetStore{
+ margin-top: 2.5em;
+}
+.storeItem{
+ padding: 0 0 10px 0;
+ background-color: @white;
+ .box-shadow(1px 1px 4px rgba(0, 0, 0, 0.2));
+
+ .widget-title-bar{
+ margin-bottom: 1em;
+ margin-left: -1px;
+ padding: 5px 15px;
+ cursor: inherit;
+ }
+ .storeItemLeft{
+ margin-left: 10px;
+ width: 130px;
+ }
+ .storeItemCenter{
+ margin-right: 10px;
+ margin-left: 150px;
+ }
+ .btn-success{
+ .buttonBackground(@darkGray, @darkestGray);
+ }
+}
+
+.secondaryPageItemTitle{ font-weight: bold; }
+
+// Right column
+legend, h3{
+ color: black;
+ font-size: 14px;
+ border-bottom: 1px solid @lighterGray;
+ text-transform: uppercase;
+}
+
+/* WIDGET DETAIL
+------------------------------------------------------------------------*/
+.detail-widget-main > div{
+ margin: 0 0 1em;
+}
+.widgetRating .ratingCounts{margin-top: .5em; }
+.commentNewButton{margin-top: 1em;}
Modified: rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave.less
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave.less?rev=1422096&r1=1422095&r2=1422096&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave.less (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave.less Fri Dec 14 21:15:33 2012
@@ -33,12 +33,12 @@
@iconSpritePath: "bootstrap/img/glyphicons-halflings.png";
@iconWhiteSpritePath: "bootstrap/img/glyphicons-halflings-white.png";
-
-
// pull in general Rave customizations
@import "rave-css.less";
+// pull in Rave branded skin (while rave-css contains layout fixes, this file contains branding & purely aesthetic styles).
+@import "rave-skin.less";
// pull in customizations that are specific to your project
@import "rave-customizations.less";
\ No newline at end of file
Added: rave/trunk/rave-portal-resources/src/main/webapp/static/images/gradient-dark.jpg
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/images/gradient-dark.jpg?rev=1422096&view=auto
==============================================================================
Binary file - no diff available.
Propchange: rave/trunk/rave-portal-resources/src/main/webapp/static/images/gradient-dark.jpg
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: rave/trunk/rave-portal-resources/src/main/webapp/static/images/gradient-light.jpg
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/images/gradient-light.jpg?rev=1422096&view=auto
==============================================================================
Binary file - no diff available.
Propchange: rave/trunk/rave-portal-resources/src/main/webapp/static/images/gradient-light.jpg
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: rave/trunk/rave-portal-resources/src/main/webapp/static/images/rave-logo-sm.png
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/images/rave-logo-sm.png?rev=1422096&view=auto
==============================================================================
Binary file - no diff available.
Propchange: rave/trunk/rave-portal-resources/src/main/webapp/static/images/rave-logo-sm.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream