You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2012/04/10 18:56:13 UTC
svn commit: r1311865 [2/7] - in /rave/branches/bootstrap: ./
rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/
rave-portal-resources/src/main/resources/
rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/
rave-portal-reso...
Modified: rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp?rev=1311865&r1=1311864&r2=1311865&view=diff
==============================================================================
--- rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp (original)
+++ rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp Tue Apr 10 16:56:11 2012
@@ -22,64 +22,60 @@
<fmt:message key="${pageTitleKey}" var="pagetitle"/>
<rave:header pageTitle="${pagetitle}"/>
-<rave:admin_tabsheader/>
-<div class="pageContent">
- <article class="admincontent">
- <ul class="horizontal-list goback">
- <li><a href="<spring:url value="/app/admin/preferences"/>">
- <fmt:message key="admin.preferencedetail.goback"/></a>
+<div class="container-fluid">
+ <div class="span3">
+ <rave:admin_tabsheader/>
+ </div>
+ <article class="span12">
+ <ul class="pager">
+ <li class="previous">
+ <a href="<spring:url value="/app/admin/preferences"/>"><fmt:message key="admin.preferencedetail.goback"/></a>
</li>
</ul>
- <h2><fmt:message key="admin.preferences.shorttitle"/></h2>
-
- <div class="leftcolumn">
- <section class="formbox">
- <spring:url value="/app/admin/preferencedetail/update" var="formAction"/>
- <form:form action="${formAction}" method="POST" modelAttribute="preferenceForm">
- <form:errors cssClass="error" element="p"/>
- <fieldset>
- <input type="hidden" name="token" value="<c:out value="${tokencheck}"/>"/>
- <p><fmt:message key="form.some.fields.required"/></p>
- <p>
- <form:label path="titleSuffix.value"><fmt:message key="admin.preferencedetail.titleSuffix"/></form:label>
- <form:input path="titleSuffix.value"/>
- <form:errors path="titleSuffix.value" cssClass="error"/>
- </p>
- </fieldset>
- <fieldset>
- <p>
- <spring:bind path="pageSize.value">
- <label for="pageSize"><fmt:message key="admin.preferencedetail.pageSize"/> *</label>
- <input id="pageSize" name="pageSize.value" type="number" step="1"
- value="<c:out value="${status.value}"/>"/>
- </spring:bind>
- <form:errors path="pageSize.value" cssClass="error"/>
- </p>
- </fieldset>
- <fieldset>
- <p>
- <spring:bind path="javaScriptDebugMode.value">
- <form:label path="javaScriptDebugMode.value"><fmt:message key="admin.preferencedetail.javaScriptDebugMode"/> *</form:label>
- <form:select id="javaScriptDebugMode" path="javaScriptDebugMode.value">
- <form:option value="0"><fmt:message key="admin.preferencedetail.javaScriptDebugMode.false"/></form:option>
- <form:option value="1"><fmt:message key="admin.preferencedetail.javaScriptDebugMode.true"/></form:option>
- </form:select>
- <form:errors path="javaScriptDebugMode.value" cssClass="error"/>
- </spring:bind>
- </p>
- </fieldset>
-
- <fieldset>
- <fmt:message key="admin.preferencedetail.updateButton" var="updateButtonText"/>
- <input type="submit" value="${updateButtonText}"/>
- </fieldset>
- </form:form>
- </section>
- <div class="clear-float">
+ <h2><fmt:message key="admin.preferences.shorttitle"/></h2>
- </div>
+ <section class="span6">
+ <spring:url value="/app/admin/preferencedetail/update" var="formAction"/>
+ <form:form action="${formAction}" method="POST" modelAttribute="preferenceForm">
+ <form:errors cssClass="error" element="p"/>
+ <fieldset>
+ <input type="hidden" name="token" value="<c:out value="${tokencheck}"/>"/>
+ <p><fmt:message key="form.some.fields.required"/></p>
+
+ <p>
+ <form:label path="titleSuffix.value"><fmt:message key="admin.preferencedetail.titleSuffix"/></form:label>
+ <form:input path="titleSuffix.value"/>
+ <form:errors path="titleSuffix.value" cssClass="error"/>
+ </p>
+ </fieldset>
+ <fieldset>
+ <p>
+ <spring:bind path="pageSize.value">
+ <label for="pageSize"><fmt:message key="admin.preferencedetail.pageSize"/> *</label>
+ <input id="pageSize" name="pageSize.value" type="number" step="1" value="<c:out value="${status.value}"/>"/>
+ </spring:bind>
+ <form:errors path="pageSize.value" cssClass="error"/>
+ </p>
+ </fieldset>
+ <fieldset>
+ <p>
+ <spring:bind path="javaScriptDebugMode.value">
+ <form:label path="javaScriptDebugMode.value"><fmt:message key="admin.preferencedetail.javaScriptDebugMode"/> *</form:label>
+ <form:select id="javaScriptDebugMode" path="javaScriptDebugMode.value">
+ <form:option value="0"><fmt:message key="admin.preferencedetail.javaScriptDebugMode.false"/></form:option>
+ <form:option value="1"><fmt:message key="admin.preferencedetail.javaScriptDebugMode.true"/></form:option>
+ </form:select>
+ <form:errors path="javaScriptDebugMode.value" cssClass="error"/>
+ </spring:bind>
+ </p>
+ </fieldset>
+ <fieldset>
+ <fmt:message key="admin.preferencedetail.updateButton" var="updateButtonText"/>
+ <button class="btn btn-primary" type="submit" value="${updateButtonText}">${updateButtonText}</button>
+ </fieldset>
+ </form:form>
+ </section>
- </div>
</article>
</div>
\ No newline at end of file
Modified: rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp?rev=1311865&r1=1311864&r2=1311865&view=diff
==============================================================================
--- rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp (original)
+++ rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp Tue Apr 10 16:56:11 2012
@@ -22,37 +22,37 @@
<fmt:message key="${pageTitleKey}" var="pagetitle"/>
<rave:header pageTitle="${pagetitle}"/>
-<rave:admin_tabsheader/>
-<div class="pageContent">
- <article class="admincontent">
+
+<div class="container-fluid">
+ <div class="span3">
+ <rave:admin_tabsheader/>
+ </div>
+ <article class="span12">
<%--@elvariable id="actionresult" type="java.lang.String"--%>
<c:if test="${actionresult eq 'delete' or actionresult eq 'update'}">
- <div class="alert-message success">
- <p>
- <fmt:message key="admin.preferencedetail.action.${actionresult}.success"/>
- </p>
+ <div class="alert alert-info">
+ <fmt:message key="admin.preferencedetail.action.${actionresult}.success"/>
</div>
</c:if>
<h2><fmt:message key="admin.preferences.shorttitle"/></h2>
<spring:url value="/app/admin/preferencedetail/edit" var="detaillink"/>
-
- <%--@elvariable id="preferenceMap" type="java.util.Map<java.lang.String, org.apache.rave.portal.model.PortalPreference>"--%>
+ <%--@elvariable id="preferenceMap" type="java.util.Map<java.lang.String, org.apache.rave.portal.model.PortalPreference>"--%>
<c:choose>
<c:when test="${fn:length(preferenceMap) eq 0}">
- <a href="<c:out value="${detaillink}"/>"><fmt:message key="admin.preferences.edit"/></a>
+ <a class="btn btn-primary" href="<c:out value="${detaillink}"/>"><fmt:message key="admin.preferences.edit"/></a>
</c:when>
<c:otherwise>
- <table class="datatable preferencestable">
+ <table class="table table-striped table-bordered table-condensed">
<tbody>
<c:forEach items="${preferenceMap}" var="entry">
<c:set value="${entry.value}" var="portalPreference"/>
<tr data-detaillink="<c:out value="${detaillink}"/>">
- <th scope="row" class="largetextcell">
- <fmt:message key="admin.preferencedetail.${portalPreference.key}"/>
+ <th scope="row">
+ <a href="${detaillink}"><fmt:message key="admin.preferencedetail.${portalPreference.key}"/></a>
</th>
- <td class="largetextcell">
+ <td>
<ul>
<c:forEach items="${portalPreference.values}" var="value">
<li><c:out value="${value}"/></li>
Modified: rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp?rev=1311865&r1=1311864&r2=1311865&view=diff
==============================================================================
--- rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp (original)
+++ rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp Tue Apr 10 16:56:11 2012
@@ -23,73 +23,72 @@
<fmt:message key="${pageTitleKey}" var="pagetitle"/>
<c:set var="canChangeUserStatus" value="${user.username ne loggedInUser}"/>
<rave:header pageTitle="${pagetitle}"/>
-<rave:admin_tabsheader/>
-<div class="pageContent">
- <article class="admincontent">
- <ul class="horizontal-list goback">
- <li><a href="<spring:url value="/app/admin/users"/>"><fmt:message key="admin.userdetail.goback"/></a>
- </li>
+<div class="container-fluid">
+ <div class="span3">
+ <rave:admin_tabsheader/>
+ </div>
+ <article class="span12">
+ <ul class="pager">
+ <li class="previous"><a href="<spring:url value="/app/admin/users"/>"><fmt:message key="admin.userdetail.goback"/></a></li>
</ul>
<h2><c:out value="${user.username}"/></h2>
-
- <div class="rightcolumn">
+ <div class="span6">
<c:if test="${canChangeUserStatus}">
- <section class="formbox">
- <h3><fmt:message key="admin.delete"/> <c:out value=" ${user.username}"/></h3>
- <form:form id="deleteUserProfile" action="delete" commandName="user" method="POST">
- <fieldset>
- <input type="hidden" name="token" value="<c:out value="${tokencheck}"/>"/>
-
- <div>
- <ul class="checkboxlist">
- <li>
- <input type="checkbox" name="confirmdelete" id="confirmdelete" value="true"/>
- <label for="confirmdelete"><fmt:message
- key="admin.userdetail.action.delete.confirm"/></label>
- <c:if test="${missingConfirm}">
- <p class="error"><fmt:message
- key="admin.userdetail.action.delete.confirm.required"/></p>
- </c:if>
- </li>
- </ul>
- </div>
- </fieldset>
- <fieldset>
- <p>
- <input type="submit" value="Delete the user"/>
- </p>
- </fieldset>
- </form:form>
- </section>
+ <section>
+ <h3><fmt:message key="admin.delete"/> <c:out value=" ${user.username}"/></h3>
+ <form:form cssClass="form-horizontal" id="deleteUserProfile" action="delete" commandName="user" method="POST">
+ <fieldset>
+ <input type="hidden" name="token" value="<c:out value="${tokencheck}"/>"/>
+ <div>
+ <ul class="checkboxlist">
+ <li>
+ <input type="checkbox" name="confirmdelete" id="confirmdelete" value="true"/>
+ <label for="confirmdelete"><fmt:message key="admin.userdetail.action.delete.confirm"/></label>
+ <c:if test="${missingConfirm}">
+ <p class="error"><fmt:message key="admin.userdetail.action.delete.confirm.required"/></p>
+ </c:if>
+ </li>
+ </ul>
+ </div>
+ </fieldset>
+ <fieldset>
+ <p>
+ <input type="submit" value="Delete the user"/>
+ </p>
+ </fieldset>
+ </form:form>
+ </section>
</c:if>
</div>
- <div class="leftcolumn">
- <section class="formbox">
- <h3><fmt:message key="admin.userdetail.editdata"/></h3>
- <form:form id="updateUserProfile" action="update" commandName="user" method="POST">
+ <div class="span5">
+ <section>
+
+ <form:form cssClass="form-horizontal" id="updateUserProfile" action="update" commandName="user" method="POST">
<form:errors cssClass="error" element="p"/>
<fieldset>
+ <legend><fmt:message key="admin.userdetail.editdata"/></legend>
<input type="hidden" name="token" value="<c:out value="${tokencheck}"/>"/>
- <p>
- <label for="email"><fmt:message key="page.general.email"/></label>
- <spring:bind path="email">
+ <div class="control-group">
+ <label class="control-label" for="email"><fmt:message key="page.general.email"/></label>
+ <div class="controls"><spring:bind path="email">
<input type="email" name="email" id="email" value="<c:out value="${status.value}"/>"
class="long"/>
- </spring:bind>
+ </spring:bind></div>
<form:errors path="email" cssClass="error"/>
- </p>
+ </div>
- <p>
- <label for="openIdField"><fmt:message key="page.userprofile.openid.url"/></label>
- <spring:bind path="openId">
- <input type="url" id="openIdField" name="openId"
- value="<c:out value="${status.value}"/>" class="long"/>
- </spring:bind>
+ <div class="control-group">
+ <label class="control-label" for="openIdField"><fmt:message key="page.userprofile.openid.url"/></label>
+ <div class="controls">
+ <spring:bind path="openId">
+ <input type="url" id="openIdField" name="openId" value="<c:out value="${status.value}"/>" class="long"/>
+ </spring:bind>
+ </div>
<form:errors path="openId" cssClass="error"/>
- </p>
+ </div>
- <div>
+ <div class="control-group">
<span class="label"><fmt:message key="admin.userdata.accountstatus"/></span>
<ul class="checkboxlist">
<li>
@@ -112,15 +111,14 @@
</fieldset>
<fieldset>
<span class="label"><fmt:message key="admin.userdata.authorities"/></span>
- <%--@elvariable id="authorities" type="org.apache.rave.portal.model.util.SearchResult<org.apache.rave.portal.model.Authority>"--%>
+ <%--@elvariable id="authorities" type="org.apache.rave.portal.model.util.SearchResult<org.apache.rave.portal.model.Authority>"--%>
<ul class="checkboxlist">
- <form:checkboxes path="authorities" items="${authorities.resultSet}"
- itemLabel="authority" itemValue="authority" element="li" />
+ <form:checkboxes path="authorities" items="${authorities.resultSet}" itemLabel="authority" itemValue="authority" element="li"/>
</ul>
</fieldset>
<fieldset>
<fmt:message key="page.userprofile.button" var="updateButtonText"/>
- <input type="submit" value="${updateButtonText}"/>
+ <button class="btn btn-primary" type="submit" value="${updateButtonText}">${updateButtonText}</button>
</fieldset>
</form:form>
</section>
Modified: rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp?rev=1311865&r1=1311864&r2=1311865&view=diff
==============================================================================
--- rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp (original)
+++ rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp Tue Apr 10 16:56:11 2012
@@ -23,66 +23,68 @@
<fmt:message key="${pageTitleKey}" var="pagetitle"/>
<rave:header pageTitle="${pagetitle}"/>
-<rave:admin_tabsheader/>
-<div class="pageContent">
- <article class="admincontent">
+<div class="container-fluid">
+ <div class="span3">
+ <rave:admin_tabsheader/>
+ </div>
+ <article class="span12">
<c:if test="${actionresult eq 'delete' or actionresult eq 'update'}">
- <div class="alert-message success">
+ <div class="alert alert-info">
<p>
<fmt:message key="admin.userdetail.action.${actionresult}.success"/>
</p>
</div>
</c:if>
<c:if test="${not empty message}">
- <div class="alert-message success"><p>${message}</p></div>
+ <div class="alert alert-info"><p>${message}</p></div>
</c:if>
- <ul class="horizontal-list searchbox">
- <li><a href="<spring:url value="/app/admin/adduser"/>"><fmt:message key="admin.users.add"/></a></li>
- <li>
- <form action="<spring:url value="/app/admin/users/search"/>" method="GET">
- <fieldset>
- <label for="searchTerm"><fmt:message key="admin.users.search"/></label>
- <input type="search" id="searchTerm" name="searchTerm"
- value="<c:out value="${searchTerm}"/>"/>
- <fmt:message key="page.store.search.button" var="searchButtonText"/>
- <input type="submit" value="${searchButtonText}"/>
- </fieldset>
- </form>
- </li>
- <c:if test="${not empty searchTerm}">
- <li><a href="<spring:url value="/app/admin/users"/>"><fmt:message key="admin.clearsearch"/></a></li>
- </c:if>
- </ul>
+
<rave:admin_listheader/>
<rave:admin_paging/>
<c:if test="${searchResult.totalResults > 0}">
- <table class="datatable userstable">
- <thead>
- <tr>
- <th class="textcell"><fmt:message key="admin.userdata.username"/></th>
- <th class="largetextcell"><fmt:message key="admin.userdata.email"/></th>
- <th class="booleancell"><fmt:message key="admin.userdata.enabled"/></th>
- </tr>
- </thead>
- <tbody>
- <c:forEach var="user" items="${searchResult.resultSet}">
- <spring:url value="/app/admin/userdetail/${user.entityId}" var="detaillink"/>
- <tr data-detaillink="${detaillink}">
- <td><c:out value="${user.username}"/></td>
- <td><c:out value="${user.email}"/></td>
- <td>${user.enabled}</td>
+ <table class="table table-striped table-bordered table-condensed">
+ <thead>
+ <tr>
+ <th><fmt:message key="admin.userdata.username"/></th>
+ <th><fmt:message key="admin.userdata.email"/></th>
+ <th><fmt:message key="admin.userdata.enabled"/></th>
</tr>
- </c:forEach>
- </tbody>
- </table>
+ </thead>
+ <tbody>
+ <c:forEach var="user" items="${searchResult.resultSet}">
+ <spring:url value="/app/admin/userdetail/${user.entityId}" var="detaillink"/>
+ <tr data-detaillink="${detaillink}">
+ <td><a href="${detaillink}"><c:out value="${user.username}"/></a></td>
+ <td><c:out value="${user.email}"/></td>
+ <td>${user.enabled}</td>
+ </tr>
+ </c:forEach>
+ </tbody>
+ </table>
</c:if>
<rave:admin_paging/>
</article>
+ <div class="span6">
+ <a class="btn btn-success" href="<spring:url value="/app/admin/adduser"/>"><fmt:message key="admin.users.add"/></a>
+
+ <form class="form-horizontal" action="<spring:url value="/app/admin/users/search"/>" method="get">
+ <fieldset>
+ <label for="searchTerm"><fmt:message key="admin.users.search"/></label>
+ <input class="search-query" type="search" id="searchTerm" name="searchTerm" value="<c:out value="${searchTerm}"/>"/>
+ <fmt:message key="page.store.search.button" var="searchButtonText"/>
+ <button class="btn btn-primary" type="submit" value="${searchButtonText}">${searchButtonText}</button>
+ </fieldset>
+ </form>
+ <c:if test="${not empty searchTerm}">
+ <a class="btn btn-success" href="<spring:url value="/app/admin/users"/>"><fmt:message key="admin.clearsearch"/></a>
+ </c:if>
+
+ </div>
</div>
<portal:register-init-script location="${'AFTER_RAVE'}">
<script>
Modified: rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgetdetail.jsp
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgetdetail.jsp?rev=1311865&r1=1311864&r2=1311865&view=diff
==============================================================================
--- rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgetdetail.jsp (original)
+++ rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgetdetail.jsp Tue Apr 10 16:56:11 2012
@@ -16,85 +16,92 @@
specific language governing permissions and limitations
under the License.
--%>
-<%@ page language="java" trimDirectiveWhitespaces="true"%>
-<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp"%>
-<fmt:setBundle basename="messages" />
-
-<fmt:message key="${pageTitleKey}" var="pagetitle" />
-<rave:header pageTitle="${pagetitle}" />
-<rave:admin_tabsheader />
-<div class="pageContent">
- <article class="admincontent">
- <ul class="horizontal-list goback">
- <li><a href="<spring:url value="/app/admin/widgets"/>"><fmt:message
- key="admin.widgetdetail.goback" /> </a>
- </li>
- </ul>
- <h2>
- <c:out value="${widget.title}" />
- </h2>
-
- <div class="rightcolumn">
- <c:if
- test="${not empty widget.screenshotUrl or not empty widget.thumbnailUrl}">
- <section class="formbox"> <c:if
- test="${not empty widget.screenshotUrl}">
- <figure class="screenshot"> <img
- src="<c:out value="${widget.screenshotUrl}"/>" alt=""> <figcaption>
- <fmt:message key="widget.screenshotUrl" /></figcaption> </figure>
- </c:if> <c:if test="${not empty widget.thumbnailUrl}">
- <figure> <img src="<c:out value="${widget.thumbnailUrl}"/>"
- alt=""> <figcaption> <fmt:message
- key="widget.thumbnailUrl" /></figcaption> </figure>
- </c:if> </section>
- </c:if>
- </div>
-
- <div class="leftcolumn">
- <section class="formbox">
- <h3>
- <fmt:message key="admin.widgetdetail.editdata" />
- </h3>
- <form:form id="updateWidget" action="update" commandName="widget"
- method="POST">
- <form:errors cssClass="error" element="p" />
- <fieldset>
- <input type="hidden" name="token"
- value="<c:out value="${tokencheck}"/>" />
- <p>
- <fmt:message key="form.some.fields.required" />
- </p>
-
- <p>
- <form:label path="title">
- <fmt:message key="widget.title" /> *</form:label>
- <form:input path="title" cssClass="long" required="required"
- autofocus="autofocus" />
- <form:errors path="title" cssClass="error" />
- </p>
-
- <p>
- <spring:bind path="url">
- <label for="url"><fmt:message key="widget.url" /> *</label>
- <input type="url" name="url" id="url"
- placeholder="http://example.com/widget.xml" required="required"
- class="long" value="<c:out value="${widget.url}"/>" />
- </spring:bind>
- <form:errors path="url" cssClass="error" />
- </p>
-
- <p>
- <label for="type1"><fmt:message key="widget.type" /> *</label> <label
- for="type1" class="formradio"><form:radiobutton
- path="type" value="OpenSocial" /> <fmt:message
- key="widget.type.OpenSocial" /> </label> <label for="type2"
- class="formradio"><form:radiobutton path="type"
- value="W3C" /> <fmt:message key="widget.type.W3C" /> </label>
- <form:errors path="type" cssClass="error" />
- </p>
- <p>
- <a href="#" class="storeItemButton" id="fetchMetadataButton"
- onclick="rave.api.rpc.getWidgetMetadata({
+<%@ page language="java" trimDirectiveWhitespaces="true" %>
+<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
+<fmt:setBundle basename="messages"/>
+
+<fmt:message key="${pageTitleKey}" var="pagetitle"/>
+<rave:header pageTitle="${pagetitle}"/>
+<div class="container-fluid">
+<div class="span3">
+ <rave:admin_tabsheader/>
+</div>
+<article class="span12">
+
+<ul class="pager">
+ <li class="previous">
+ <a href="<spring:url value="/app/admin/widgets"/>"><fmt:message key="admin.widgetdetail.goback"/> </a></li>
+</ul>
+ <h2>
+ <c:out value="${widget.title}"/>
+ </h2>
+
+ <div class="rightcolumn">
+ <c:if
+ test="${not empty widget.screenshotUrl or not empty widget.thumbnailUrl}">
+ <section class="formbox"><c:if
+ test="${not empty widget.screenshotUrl}">
+ <figure class="screenshot"><img
+ src="<c:out value="${widget.screenshotUrl}"/>" alt="">
+ <figcaption>
+ <fmt:message key="widget.screenshotUrl"/></figcaption>
+ </figure>
+ </c:if> <c:if test="${not empty widget.thumbnailUrl}">
+ <figure><img src="<c:out value="${widget.thumbnailUrl}"/>"
+ alt="">
+ <figcaption><fmt:message
+ key="widget.thumbnailUrl"/></figcaption>
+ </figure>
+ </c:if></section>
+ </c:if>
+ </div>
+
+ <div class="leftcolumn">
+ <section class="formbox">
+ <h3>
+ <fmt:message key="admin.widgetdetail.editdata"/>
+ </h3>
+ <form:form id="updateWidget" action="update" commandName="widget"
+ method="POST">
+ <form:errors cssClass="error" element="p"/>
+ <fieldset>
+ <input type="hidden" name="token"
+ value="<c:out value="${tokencheck}"/>"/>
+ <p>
+ <fmt:message key="form.some.fields.required"/>
+ </p>
+
+ <p>
+ <form:label path="title">
+ <fmt:message key="widget.title"/> *</form:label>
+ <form:input path="title" cssClass="long" required="required"
+ autofocus="autofocus"/>
+ <form:errors path="title" cssClass="error"/>
+ </p>
+
+ <p>
+ <spring:bind path="url">
+ <label for="url"><fmt:message key="widget.url"/> *</label>
+ <input type="url" name="url" id="url"
+ placeholder="http://example.com/widget.xml" required="required"
+ class="long" value="<c:out value="${widget.url}"/>"/>
+ </spring:bind>
+ <form:errors path="url" cssClass="error"/>
+ </p>
+
+ <p>
+ <label for="type1"><fmt:message key="widget.type"/> *</label> <label
+ for="type1" class="formradio"><form:radiobutton
+ path="type" value="OpenSocial"/> <fmt:message
+ key="widget.type.OpenSocial"/> </label> <label for="type2"
+ class="formradio"><form:radiobutton path="type"
+ value="W3C"/>
+ <fmt:message key="widget.type.W3C"/> </label>
+ <form:errors path="type" cssClass="error"/>
+ </p>
+ <p>
+ <a href="#" class="storeItemButton" id="fetchMetadataButton"
+ onclick="rave.api.rpc.getWidgetMetadata({
url: $('#url').get(0).value,
providerType: $('input:radio[name=type]:checked').val(),
successCallback: function(result) {
@@ -108,117 +115,117 @@
$('#authorEmail').val(widget.authorEmail);
}
});">
- <fmt:message key="page.updateWidgetMetadata.button" /> </a>
+ <fmt:message key="page.updateWidgetMetadata.button"/> </a>
- </p>
- <p>
- <form:label path="description">
- <fmt:message key="widget.description" /> *</form:label>
- <form:textarea path="description" required="required"
- cssClass="long" />
- <form:errors path="description" cssClass="error" />
- </p>
-
- <p>
- <form:label path="featured">
- <fmt:message key="page.general.checkBox.featured" />
- </form:label>
- <form:checkbox path="featured" id="featured" />
- <form:errors path="featured" cssClass="error" />
- </p>
-
- <p>
- <form:label path="disableRendering">
- <fmt:message key="widget.disableRendering" />
- </form:label>
- <form:checkbox path="disableRendering" id="disableRendering" />
- <form:errors path="disableRendering" cssClass="error" />
- </p>
-
- <p>
- <form:label path="disableRenderingMessage">
- <fmt:message key="widget.disableRenderingMessage" />
- </form:label>
- <form:input path="disableRenderingMessage" cssClass="long"
- autofocus="autofocus" />
- <form:errors path="disableRenderingMessage" cssClass="error" />
- </p>
-
- <p>
- <form:label path="widgetStatus">
- <fmt:message key="widget.widgetStatus" />
- </form:label>
- <form:select path="widgetStatus" items="${widgetStatus}" />
- </p>
-
- <p>
- <form:label path="categories">
- <fmt:message key="widget.categories" />
- </form:label>
- <form:select path="categories" items="${categories}" multiple="true" itemLabel="text" size="10" />
- </p>
-
- <p>
- <spring:bind path="thumbnailUrl">
- <label for="thumbnailUrl"><fmt:message
- key="widget.thumbnailUrl" /> </label>
- <input type="url" name="thumbnailUrl" id="thumbnailUrl"
- placeholder="http://example.com/thumbnail.png" class="long"
- value="<c:out value="${widget.thumbnailUrl}"/>" />
- </spring:bind>
- <form:errors path="thumbnailUrl" cssClass="error" />
- </p>
-
- <p>
- <spring:bind path="screenshotUrl">
- <label for="screenshotUrl"><fmt:message
- key="widget.screenshotUrl" /> </label>
- <input type="url" name="screenshotUrl" id="screenshotUrl"
- placeholder="http://example.com/screenshot.png" class="long"
- value="<c:out value="${widget.screenshotUrl}"/>" />
- </spring:bind>
- <form:errors path="screenshotUrl" cssClass="error" />
- </p>
-
- <p>
- <spring:bind path="titleUrl">
- <label for="titleUrl"><fmt:message key="widget.titleUrl" />
- </label>
- <input type="url" name="titleUrl" id="titleUrl" class="long"
- value="<c:out value="${widget.titleUrl}"/>" />
- </spring:bind>
- <form:errors path="titleUrl" cssClass="error" />
- </p>
-
- <p>
- <form:label path="author">
- <fmt:message key="widget.author" />
- </form:label>
- <form:input path="author" cssClass="long" />
- <form:errors path="author" cssClass="error" />
- </p>
- <p>
- <spring:bind path="authorEmail">
- <label for="authorEmail"><fmt:message
- key="widget.authorEmail" /> </label>
- <input type="email" name="authorEmail" id="authorEmail"
- class="long" value="<c:out value="${widget.authorEmail}"/>" />
- </spring:bind>
- <form:errors path="titleUrl" cssClass="error" />
- </p>
-
- </fieldset>
- <fieldset>
- <fmt:message key="admin.widgetdetail.updatebutton"
- var="updateButtonText" />
- <input type="submit" value="${updateButtonText}" />
- </fieldset>
- </form:form> </section>
+ </p>
+ <p>
+ <form:label path="description">
+ <fmt:message key="widget.description"/> *</form:label>
+ <form:textarea path="description" required="required"
+ cssClass="long"/>
+ <form:errors path="description" cssClass="error"/>
+ </p>
+
+ <p>
+ <form:label path="featured">
+ <fmt:message key="page.general.checkBox.featured"/>
+ </form:label>
+ <form:checkbox path="featured" id="featured"/>
+ <form:errors path="featured" cssClass="error"/>
+ </p>
+
+ <p>
+ <form:label path="disableRendering">
+ <fmt:message key="widget.disableRendering"/>
+ </form:label>
+ <form:checkbox path="disableRendering" id="disableRendering"/>
+ <form:errors path="disableRendering" cssClass="error"/>
+ </p>
+
+ <p>
+ <form:label path="disableRenderingMessage">
+ <fmt:message key="widget.disableRenderingMessage"/>
+ </form:label>
+ <form:input path="disableRenderingMessage" cssClass="long"
+ autofocus="autofocus"/>
+ <form:errors path="disableRenderingMessage" cssClass="error"/>
+ </p>
+
+ <p>
+ <form:label path="widgetStatus">
+ <fmt:message key="widget.widgetStatus"/>
+ </form:label>
+ <form:select path="widgetStatus" items="${widgetStatus}"/>
+ </p>
+
+ <p>
+ <form:label path="categories">
+ <fmt:message key="widget.categories"/>
+ </form:label>
+ <form:select path="categories" items="${categories}" multiple="true" itemLabel="text" size="10"/>
+ </p>
+
+ <p>
+ <spring:bind path="thumbnailUrl">
+ <label for="thumbnailUrl"><fmt:message
+ key="widget.thumbnailUrl"/> </label>
+ <input type="url" name="thumbnailUrl" id="thumbnailUrl"
+ placeholder="http://example.com/thumbnail.png" class="long"
+ value="<c:out value="${widget.thumbnailUrl}"/>"/>
+ </spring:bind>
+ <form:errors path="thumbnailUrl" cssClass="error"/>
+ </p>
+
+ <p>
+ <spring:bind path="screenshotUrl">
+ <label for="screenshotUrl"><fmt:message
+ key="widget.screenshotUrl"/> </label>
+ <input type="url" name="screenshotUrl" id="screenshotUrl"
+ placeholder="http://example.com/screenshot.png" class="long"
+ value="<c:out value="${widget.screenshotUrl}"/>"/>
+ </spring:bind>
+ <form:errors path="screenshotUrl" cssClass="error"/>
+ </p>
+
+ <p>
+ <spring:bind path="titleUrl">
+ <label for="titleUrl"><fmt:message key="widget.titleUrl"/>
+ </label>
+ <input type="url" name="titleUrl" id="titleUrl" class="long"
+ value="<c:out value="${widget.titleUrl}"/>"/>
+ </spring:bind>
+ <form:errors path="titleUrl" cssClass="error"/>
+ </p>
+
+ <p>
+ <form:label path="author">
+ <fmt:message key="widget.author"/>
+ </form:label>
+ <form:input path="author" cssClass="long"/>
+ <form:errors path="author" cssClass="error"/>
+ </p>
+ <p>
+ <spring:bind path="authorEmail">
+ <label for="authorEmail"><fmt:message
+ key="widget.authorEmail"/> </label>
+ <input type="email" name="authorEmail" id="authorEmail"
+ class="long" value="<c:out value="${widget.authorEmail}"/>"/>
+ </spring:bind>
+ <form:errors path="titleUrl" cssClass="error"/>
+ </p>
+
+ </fieldset>
+ <fieldset>
+ <fmt:message key="admin.widgetdetail.updatebutton"
+ var="updateButtonText"/>
+ <button class="btn btn-primary" type="submit" value="${updateButtonText}">${updateButtonText}</button>
+ </fieldset>
+ </form:form></section>
- </div>
+ </div>
- <div class="clear-float"></div>
+ <div class="clear-float"></div>
- </article>
+</article>
</div>
Modified: rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp?rev=1311865&r1=1311864&r2=1311865&view=diff
==============================================================================
--- rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp (original)
+++ rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp Tue Apr 10 16:56:11 2012
@@ -22,73 +22,82 @@
<%--@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:admin_tabsheader/>
-<div class="pageContent">
- <article class="admincontent">
+<div class="container-fluid">
+ <div class="span3">
+ <rave:admin_tabsheader/>
+ </div>
+ <article class="span12">
<c:if test="${actionresult eq 'delete' or actionresult eq 'update'}">
- <div class="alert-message success">
+ <div class="alert alert-info">
<p>
<fmt:message key="admin.widgetdetail.action.${actionresult}.success"/>
</p>
</div>
</c:if>
- <ul class="horizontal-list searchbox">
- <li>
- <form action="<spring:url value="/app/admin/widgets/search"/>" method="GET">
- <fieldset>
- <label for="searchTerm" class="hidden"><fmt:message key="admin.widgets.search"/></label>
- <input type="search" id="searchTerm" name="searchTerm"
- value="<c:out value="${searchTerm}"/>"/>
- <label for="widgettype" class="hidden"><fmt:message key="widget.type"/></label>
- <select name="widgettype" id="widgettype">
- <option value=""><fmt:message key="admin.widgets.search.choosetype"/></option>
- <option value="OpenSocial" <c:if test="${selectedWidgetType eq 'OpenSocial'}"> selected="selected"</c:if>><fmt:message key="widget.type.OpenSocial"/></option>
- <option value="W3C" <c:if test="${selectedWidgetType eq 'W3C'}"> selected="selected"</c:if>><fmt:message key="widget.type.W3C"/></option>
- </select>
- <label for="widgetstatus" class="hidden"><fmt:message key="widget.widgetStatus"/></label>
- <select name="widgetstatus" id="widgetstatus">
- <option value=""><fmt:message key="admin.widgets.search.choosestatus"/></option>
- <c:forEach items="${widgetStatus}" var="wStatus">
- <option value="<c:out value="${wStatus.widgetStatus}"/>" <c:if test="${wStatus.widgetStatus eq selectedWidgetStatus}"> selected="selected"</c:if>><c:out value="${wStatus.widgetStatus}"/></option>
- </c:forEach>
- </select>
- <fmt:message key="page.store.search.button" var="searchButtonText"/>
- <input type="submit" value="${searchButtonText}"/>
- </fieldset>
- </form>
- </li>
- <c:if test="${not empty searchTerm or not empty selectedWidgetType or not empty selectedWidgetStatus}">
- <li><a href="<spring:url value="/app/admin/widgets"/>"><fmt:message key="admin.clearsearch"/></a></li>
- </c:if>
- </ul>
+
<rave:admin_listheader/>
<rave:admin_paging/>
<c:if test="${searchResult.totalResults > 0}">
- <table class="datatable widgetstable">
- <thead>
- <tr>
- <th class="largetextcell"><fmt:message key="widget.title"/></th>
- <th class="textcell"><fmt:message key="widget.type"/></th>
- <th class="textcell"><fmt:message key="widget.widgetStatus"/></th>
- </tr>
- </thead>
- <tbody>
+ <table class="table table-striped table-bordered table-condensed">
+ <thead>
+ <tr>
+ <th><fmt:message key="widget.title"/></th>
+ <th><fmt:message key="widget.type"/></th>
+ <th><fmt:message key="widget.widgetStatus"/></th>
+ </tr>
+ </thead>
+ <tbody>
<c:forEach var="widget" items="${searchResult.resultSet}">
<spring:url value="/app/admin/widgetdetail/${widget.entityId}" var="detaillink"/>
<tr data-detaillink="${detaillink}">
- <td><c:out value="${widget.title}"/></td>
- <td><fmt:message key="widget.type.${widget.type}" /></td>
+ <td><a href="${detaillink}"><c:out value="${widget.title}"/></a></td>
+ <td><fmt:message key="widget.type.${widget.type}"/></td>
<td><c:out value="${widget.widgetStatus}"/></td>
</tr>
</c:forEach>
- </tbody>
- </table>
+ </tbody>
+ </table>
</c:if>
<rave:admin_paging/>
</article>
+ <div class="span6">
+ <form class="form-horizontal" action="<spring:url value="/app/admin/widgets/search"/>" method="get">
+ <fieldset>
+ <label for="searchTerm" class="hidden"><fmt:message key="admin.widgets.search"/></label>
+ <input class="search-query" type="search" id="searchTerm" name="searchTerm"
+ value="<c:out value="${searchTerm}"/>"/>
+ <fmt:message key="page.store.search.button" var="searchButtonText"/>
+ <button class="btn btn-primary" type="submit" value="${searchButtonText}">${searchButtonText}</button>
+ <div class="control-group"></div>
+ <div class="control-group">
+ <label for="widgettype" class="hidden"><fmt:message key="widget.type"/></label>
+ <select name="widgettype" id="widgettype">
+ <option value=""><fmt:message key="admin.widgets.search.choosetype"/></option>
+ <option value="OpenSocial"
+ <c:if test="${selectedWidgetType eq 'OpenSocial'}"> selected="selected"</c:if>>
+ <fmt:message key="widget.type.OpenSocial"/></option>
+ <option value="W3C" <c:if test="${selectedWidgetType eq 'W3C'}"> selected="selected"</c:if>>
+ <fmt:message key="widget.type.W3C"/></option>
+ </select></div>
+ <label for="widgetstatus" class="hidden"><fmt:message key="widget.widgetStatus"/></label>
+ <select name="widgetstatus" id="widgetstatus">
+ <option value=""><fmt:message key="admin.widgets.search.choosestatus"/></option>
+ <c:forEach items="${widgetStatus}" var="wStatus">
+ <option value="<c:out value="${wStatus.widgetStatus}"/>"
+ <c:if test="${wStatus.widgetStatus eq selectedWidgetStatus}"> selected="selected"</c:if>>
+ <c:out value="${wStatus.widgetStatus}"/></option>
+ </c:forEach>
+ </select>
+
+ </fieldset>
+ </form>
+ <c:if test="${not empty searchTerm or not empty selectedWidgetType or not empty selectedWidgetStatus}">
+ <a href="<spring:url value="/app/admin/widgets"/>"><fmt:message key="admin.clearsearch"/></a>
+ </c:if>
+ </div>
</div>
<portal:register-init-script location="${'AFTER_RAVE'}">
Modified: rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/login.jsp
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/login.jsp?rev=1311865&r1=1311864&r2=1311865&view=diff
==============================================================================
--- rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/login.jsp (original)
+++ rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/login.jsp Tue Apr 10 16:56:11 2012
@@ -7,7 +7,7 @@
~ "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
+ ~ 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
@@ -26,107 +26,145 @@
<tiles:importAttribute name="pageTitleKey" scope="request"/>
<tiles:putAttribute name="body">
- <div id="content">
-
+ <div class="container">
<c:if test="${not empty message}">
- <div class="topbar-message">${message}</div>
+ <div class="alert alert-info">${message}</div>
</c:if>
<h1><fmt:message key="${pageTitleKey}"/></h1>
- <h2><fmt:message key="page.login.usernamepassword"/></h2>
-
- <form id="loginForm" name="loginForm" action="j_spring_security_check" method="post">
- <c:if test="${param['authfail'] eq 'form'}">
- <p class="error"><fmt:message key="page.login.usernamepassword.fail"/></p>
- </c:if>
- <fieldset>
- <p>
- <label for="usernameField"><fmt:message key="page.general.username"/></label>
- <input id="usernameField" type="text" name="j_username" autofocus="autofocus"/>
- </p>
-
- <p>
- <label for="passwordField"><fmt:message key="page.general.password"/></label>
- <input id="passwordField" type="password" name="j_password"/>
- </p>
-
- <p>
- <label for="remember_me" class="checkboxLabel">
- <input type='checkbox' name='_spring_security_remember_me' id="remember_me"
- value="true"/>
- <fmt:message key="page.login.rememberme"/>
- </label>
- </p>
- </fieldset>
- <fieldset>
- <fmt:message key="page.login.usernamepassword.login" var="loginButtonText"/>
- <input type="submit" value="${loginButtonText}"/>
- </fieldset>
- </form>
-
- <h2><fmt:message key="page.login.forgot.password"/></h2>
-
- <form id="newPassword" action="<c:url value="/app/newpassword"/>" method="get">
- <fieldset>
- <p>
- <label for="requestNewPasswordButton"><fmt:message
- key="page.login.forgot.password.label"/></label>
- <fmt:message key="page.login.forgot.password.button" var="requestNewPasswordButtonText"/>
- <input id="requestNewPasswordButton" type="submit" value="${requestNewPasswordButtonText}"/>
- </p>
- </fieldset>
- </form>
- <h2><fmt:message key="page.login.forgot.username"/></h2>
-
- <form id="newPassword" action="<c:url value="/app/retrieveusername"/>" method="get">
- <fieldset>
- <p>
- <label for="requestNewUsernameButton"><fmt:message
- key="page.login.forgot.username.label"/></label>
- <fmt:message key="page.login.forgot.username.button" var="requestNewUsernameButton"/>
- <input id="requestNewUsernameButton" type="submit" value="${requestNewUsernameButton}"/>
- </p>
- </fieldset>
- </form>
- <h2><fmt:message key="page.login.createaccount"/></h2>
-
- <form id="newAccount" action="<c:url value="/app/newaccount.jsp"/>" method="get">
- <fieldset>
- <p>
- <label for="createNewAccountButton"><fmt:message key="page.login.createaccount.label"/></label>
- <fmt:message key="page.login.createaccount.button" var="createAccountButtonText"/>
- <input id="createNewAccountButton" type="submit" value="${createAccountButtonText}"/>
- </p>
- </fieldset>
- </form>
-
- <h2><fmt:message key="page.login.openid"/></h2>
-
- <form id="oidForm" name='oidf' action='j_spring_openid_security_check' method='POST'>
- <c:if test="${param['authfail'] eq 'openid'}">
- <p class="error"><fmt:message key="page.login.openid.fail"/></p>
- </c:if>
- <fieldset>
- <p>
- <label for="openid_identifier"><fmt:message key="page.login.openid.identifier"/></label>
- <input type='text' id="openid_identifier" name='openid_identifier' class="long"/>
- </p>
-
- <p>
- <label for="remember_me_openid" class="checkboxLabel">
- <input type='checkbox' name='_spring_security_remember_me' id="remember_me_openid"
- value="true"/>
- <fmt:message key="page.login.rememberme"/>
- </label>
- </p>
- </fieldset>
- <fieldset>
- <fmt:message key="page.login.openid.button" var="openidButtonText"/>
- <input type="submit" value="${openidButtonText}"/>
- </fieldset>
- </form>
+ <div class="row well">
+ <div class="span6">
+ <%--
+ //############################################
+ // LOGIN FORM
+ //############################################
+ --%>
+ <form class="form-horizontal" id="loginForm" name="loginForm" action="j_spring_security_check" method="post">
+
+ <c:if test="${param['authfail'] eq 'form'}">
+ <p class="error"><fmt:message key="page.login.usernamepassword.fail"/></p>
+ </c:if>
+ <fieldset>
+ <legend><fmt:message key="page.login.usernamepassword"/></legend>
+ <div class="control-group">
+ <label class="control-label" for="usernameField"><fmt:message key="page.general.username"/></label>
+ <div class="controls">
+ <input class="input-large" id="usernameField" type="text" name="j_username" autofocus="autofocus"/>
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label" for="passwordField"><fmt:message key="page.general.password"/></label>
+ <div class="controls">
+ <input class="input-large" id="passwordField" type="password" name="j_password"/>
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label" for="remember_me">
+ <fmt:message key="page.login.rememberme"/>
+ </label>
+ <div class="controls">
+ <input type='checkbox' name='_spring_security_remember_me' id="remember_me" value="true"/>
+ </div>
+ </div>
+ </fieldset>
+ <fieldset>
+ <fmt:message key="page.login.usernamepassword.login" var="loginButtonText"/>
+ <div class="controls">
+ <button class="btn btn-primary" type="submit" value="${loginButtonText}">${loginButtonText}</button>
+ </div>
+ </fieldset>
+ </form>
+ </div>
+ <div class="span4">
+ <%--
+ //############################################
+ // OPENID LOGIN
+ //############################################
+ --%>
+
+ <form class="form-horizontal" name='oidf' action='j_spring_openid_security_check' method='POST'>
+ <c:if test="${param['authfail'] eq 'openid'}">
+ <p class="error"><fmt:message key="page.login.openid.fail"/></p>
+ </c:if>
+ <fieldset>
+ <legend><fmt:message key="page.login.openid"/></legend>
+ <div class="control-group">
+ <label class="control-label" for="openid_identifier"><fmt:message key="page.login.openid.identifier"/></label>
+ <div class="controls">
+ <input class="input-large" type="text" id="openid_identifier" name='openid_identifier'/>
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label" for="remember_me">
+ <fmt:message key="page.login.rememberme"/>
+ </label>
+ <div class="controls">
+ <input type='checkbox' name='_spring_security_remember_me' id="remember_me_openid" value="true"/>
+ </div>
+ </div>
+ </fieldset>
+ <fieldset>
+ <fmt:message key="page.login.openid.button" var="openidButtonText"/>
+ <div class="controls">
+ <button class="btn btn-primary" type="submit" value="${openidButtonText}">${openidButtonText}</button>
+ </div>
+ </fieldset>
+
+ </form>
+ </div>
+ </div>
+ <div class="row">
+ <%--
+ //############################################
+ // PASSWORD REMINDER
+ //############################################
+ --%>
+
+ <form class="form-horizontal well" action="<c:url value="/app/newpassword"/>" method="get">
+ <fieldset>
+ <legend><fmt:message key="page.login.forgot.password"/></legend>
+ <fmt:message key="page.login.forgot.password.button" var="requestNewPasswordButtonText"/>
+
+ <label for="requestNewPasswordButton"><fmt:message key="page.login.forgot.password.label"/></label>
+ <div class="controls">
+ <button class="btn btn-primary" id="requestNewPasswordButton" type="submit" value="${requestNewPasswordButtonText}">${requestNewPasswordButtonText}</button>
+ </div>
+ </fieldset>
+ </form>
+ <%--
+ //############################################
+ // ACCOUNT REMINDER
+ //############################################
+ --%>
+ <form class="form-horizontal well" action="<c:url value="/app/retrieveusername"/>" method="get">
+ <fieldset>
+ <legend><fmt:message key="page.login.forgot.username"/></legend>
+ <label for="requestNewUsernameButton"><fmt:message key="page.login.forgot.username.label"/></label>
+ <fmt:message key="page.login.forgot.username.button" var="requestNewUsernameButton"/>
+ <div class="controls">
+ <button class="btn btn-primary" id="requestNewUsernameButton" type="submit" value="${requestNewUsernameButton}">${requestNewUsernameButton}</button>
+ </div>
+ </fieldset>
+ </form>
+
+ <%--
+ //############################################
+ // NEW ACCOUNT REQUEST
+ //############################################
+ --%>
+ <form class="form-horizontal well" action="<c:url value="/app/newaccount.jsp"/>" method="get">
+ <fieldset>
+ <legend><fmt:message key="page.login.createaccount"/></legend>
+ <label for="createNewAccountButton"><fmt:message key="page.login.createaccount.label"/></label>
+ <fmt:message key="page.login.createaccount.button" var="createAccountButtonText"/>
+ <div class="controls">
+ <button class="btn btn-primary" id="createNewAccountButton" type="submit" value="${createAccountButtonText}">${createAccountButtonText}</button>
+ </div>
+ </fieldset>
+ </form>
+ </div>
</div>
</tiles:putAttribute>
</tiles:insertDefinition>
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=1311865&r1=1311864&r2=1311865&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 Tue Apr 10 16:56:11 2012
@@ -22,20 +22,31 @@
<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>
- <nav class="topnav">
- <ul class="horizontal-list">
- <li>
- <c:set var="profileUrl">/app/person/<sec:authentication property="principal.username" />?referringPageId=${page.entityId}</c:set>
+<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>
+ <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"/>
+ <fmt:message key="page.store.title"/>
</a>
</li>
<sec:authorize url="/app/admin/">
@@ -47,124 +58,157 @@
</sec:authorize>
<li>
<a href="<spring:url value="/j_spring_security_logout" htmlEscape="true" />">
- <fmt:message key="page.general.logout"/></a>
+ <fmt:message key="page.general.logout"/></a>
</li>
</ul>
</nav>
- <h1>
- <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>
- </h1>
</header>
-<input id="currentPageId" type="hidden" value="${page.entityId}" />
+
+
+<input id="currentPageId" type="hidden" value="${page.entityId}"/>
<c:set var="hasOnlyOnePage" scope="request">
<c:choose>
<c:when test="${fn:length(pages) == 1}">true</c:when>
<c:otherwise>false</c:otherwise>
</c:choose>
</c:set>
-<div id="tabsHeader">
- <%-- render the page tabs --%>
- <div id="tabs" class="rave-ui-tabs">
- <c:forEach var="userPage" items="${pages}">
- <%-- determine if the current page in the list matches the page the user is viewing --%>
- <c:set var="isCurrentPage">
- <c:choose>
- <c:when test="${page.entityId == userPage.entityId}">true</c:when>
- <c:otherwise>false</c:otherwise>
- </c:choose>
- </c:set>
- <div id="tab-${userPage.entityId}" class="rave-ui-tab<c:if test="${isCurrentPage}"> rave-ui-tab-selected</c:if>">
- <div id="pageTitle-${userPage.entityId}" class="page-title" onclick="rave.viewPage(${userPage.entityId});"><c:out value="${userPage.name}"/></div>
- <c:if test="${isCurrentPage}">
- <div id="pageMenuWrapper">
- <span id="pageMenuButton" class="ui-icon ui-icon-circle-triangle-s" title="<fmt:message key="page.menu.title"/>"></span>
- <div id="pageMenu" class="page-menu">
- <div id="pageMenuEdit" class="page-menu-item"><fmt:message key="page.general.editpage"/></div>
- <div id="pageMenuDelete" class="page-menu-item<c:if test='${hasOnlyOnePage}'> page-menu-item-disabled</c:if>">
- <fmt:message key="page.general.deletepage"/></div>
- <div id="pageMenuMove" class="page-menu-item<c:if test='${hasOnlyOnePage}'> page-menu-item-disabled</c:if>">
- <fmt:message key="page.general.movepage"/></div>
- </div>
- </div>
- </c:if>
+
+
+<div class="container-fluid navbar-spacer">
+ <nav>
+ <ul class="nav nav-tabs">
+ <c:forEach var="userPage" items="${pages}">
+ <%-- determine if the current page in the list matches the page the user is viewing --%>
+ <c:set var="isCurrentPage">
+ <c:choose>
+ <c:when test="${page.entityId == userPage.entityId}">true</c:when>
+ <c:otherwise>false</c:otherwise>
+ </c:choose>
+ </c:set>
+ <c:choose>
+ <c:when test="${isCurrentPage}">
+ <li id="tab-${userPage.entityId}" class="active dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown"><c:out value="${userPage.name}"/><b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li id="pageMenuEdit"><a href="#"><fmt:message key="page.general.editpage"/></a></li>
+ <li id="pageMenuDelete" class="<c:if test='${hasOnlyOnePage}'>menu-item-disabled</c:if>"><a href="#"><fmt:message key="page.general.deletepage"/></a></li>
+ <li id="pageMenuMove" class="<c:if test='${hasOnlyOnePage}'>menu-item-disabled</c:if>"><a href="#"><fmt:message key="page.general.movepage"/></a></li>
+ </ul>
+ </li>
+ </c:when>
+ <c:otherwise>
+ <li id="tab-${userPage.entityId}" onclick="rave.viewPage(${userPage.entityId});"><a href="#"><c:out value="${userPage.name}"/></a></li>
+ </c:otherwise>
+ </c:choose>
+ </c:forEach>
+ <a id="addPageButton" href="#" class="btn"><i class="icon-plus"></i></a>
+ </ul>
+ </nav>
+
+
+ <div class="row-fluid">
+ <div id="emptyPageMessageWrapper" class="emptyPageMessageWrapper hidden">
+ <div class="emptyPageMessage">
+ <a href="<spring:url value="/app/store?referringPageId=${page.entityId}" />"><fmt:message key="page.general.empty"/></a>
</div>
- </c:forEach>
- <%-- display the add page button at the end of the tabs --%>
- <fmt:message key="page.general.addnewpage" var="addNewPageTitle"/>
- <button id="add_page" title="${addNewPageTitle}" style="display: none;"></button>
+ </div>
+ <div class="regions">
+ <%-- insert the region layout template --%>
+ <tiles:insertTemplate template="${layout}"/>
+ </div>
+ <div class="clear-float"> </div>
</div>
-</div>
-<%--render the main page content (regions/widgets) --%>
-<div id="pageContent">
- <div id="emptyPageMessageWrapper" class="emptyPageMessageWrapper hidden">
- <div class="emptyPageMessage">
- <a href="<spring:url value="/app/store?referringPageId=${page.entityId}" />"><fmt:message key="page.general.empty" /></a>
+
+
+ <div id="pageMenuDialog" class="modal hide" data-backdrop="static">
+ <div class="modal-header">
+ <a href="#" class="close" data-dismiss="modal">×</a>
+ <h3 id="pageMenuDialogHeader"></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>
+ <div class="control-group">
+ <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>
+ </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 class="regions">
- <%-- insert the region layout template --%>
- <tiles:insertTemplate template="${layout}"/>
+
+ <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="${page.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.entityId != page.entityId}">
+ <option value="${userPage.entityId}">
+ <fmt:message key="page.general.movethispage.after">
+ <fmt:param><c:out value="${userPage.name}"/></fmt:param>
+ </fmt:message>
+ </option>
+ </c:if>
+ </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>
- <div class="clear-float"> </div>
-</div>
-<fmt:message key="page.general.addnewpage" var="addNewPageTitle"/>
-<div id="dialog" title="${addNewPageTitle}" class="dialog hidden">
- <form id="pageForm">
- <div id="pageFormErrors" class="error"></div>
- <fieldset class="ui-helper-reset">
- <input type="hidden" name="tab_id" id="tab_id" value="" />
- <label for="tab_title"><fmt:message key="page.general.addpage.title"/></label>
- <input type="text" name="tab_title" id="tab_title" value="" class="required ui-widget-content ui-corner-all" />
- <label for="pageLayout"><fmt:message key="page.general.addpage.selectlayout"/></label>
- <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>
+
+ <fmt:message key="widget.menu.movetopage" var="moveWidgetToPageTitle"/>
+ <div id="moveWidgetDialog" title="${moveWidgetToPageTitle}" class="dialog hidden">
+ <div><fmt:message key="widget.menu.movethiswidget"/></div>
+ <form id="moveWidgetForm">
+ <select id="moveToPageId">
+ <c:forEach var="userPage" items="${pages}">
+ <c:if test="${userPage.entityId != page.entityId}">
+ <option value="${userPage.entityId}">
+ <c:out value="${userPage.name}"/>
+ </option>
+ </c:if>
</c:forEach>
</select>
</fieldset>
</form>
</div>
-<fmt:message key="page.general.movepage" var="movePageTitle"/>
-<div id="movePageDialog" title="${movePageTitle}" class="dialog hidden">
- <div><fmt:message key="page.general.movethispage"/></div>
- <form id="movePageForm">
- <select id="moveAfterPageId">
- <c:if test="${page.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.entityId != page.entityId}">
- <option value="${userPage.entityId}">
- <fmt:message key="page.general.movethispage.after">
- <fmt:param><c:out value="${userPage.name}"/></fmt:param>
- </fmt:message>
- </option>
- </c:if>
- </c:forEach>
- </select>
- </form>
-</div>
-<fmt:message key="widget.menu.movetopage" var="moveWidgetToPageTitle"/>
-<div id="moveWidgetDialog" title="${moveWidgetToPageTitle}" class="dialog hidden">
- <div><fmt:message key="widget.menu.movethiswidget"/></div>
- <form id="moveWidgetForm">
- <select id="moveToPageId">
- <c:forEach var="userPage" items="${pages}">
- <c:if test="${userPage.entityId != page.entityId}">
- <option value="${userPage.entityId}">
- <c:out value="${userPage.name}"/>
- </option>
- </c:if>
- </c:forEach>
- </select>
- </form>
-</div>
-
<portal:register-init-script location="${'BEFORE_RAVE'}">
<script>
//Define the global widgets map. This map will be populated by RegionWidgetRender providers.
@@ -181,4 +225,4 @@
rave.layout.init();
});
</script>
-</portal:register-init-script>
+</portal:register-init-script>
\ No newline at end of file