rave-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jc...@apache.org
Subject svn commit: r1213701 [1/2] - in /incubator/rave/trunk: 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/ rave-portal-resources/src/main/webapp/WEB-IN...
Date Tue, 13 Dec 2011 14:12:16 GMT
Author: jcian
Date: Tue Dec 13 14:12:16 2011
New Revision: 1213701

URL: http://svn.apache.org/viewvc?rev=1213701&view=rev
Log:
Completing initial tiles integration -- all pages are now derived from the same base_layout.jsp template. Supports RAVE-343.

Removed:
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_generic_page.tag
Modified:
    incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/ViewNames.java
    incubator/rave/trunk/rave-portal-resources/src/main/resources/messages.properties
    incubator/rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/includes/taglibs.jsp
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/home.jsp
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgetdetail.jsp
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/error.jsp
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/home.jsp
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newaccount.jsp
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/userProfile.jsp
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tiles-defs.xml
    incubator/rave/trunk/rave-portal-resources/src/main/webapp/login.jsp

Modified: incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/ViewNames.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/ViewNames.java?rev=1213701&r1=1213700&r2=1213701&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/ViewNames.java (original)
+++ incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/ViewNames.java Tue Dec 13 14:12:16 2011
@@ -24,23 +24,25 @@ package org.apache.rave.portal.web.util;
  */
 public class ViewNames {
     private ViewNames() {}
+
     private static final String USER_PREFIX = "templates.user.";
+    private static final String ADMIN_PREFIX = "templates.admin.";
 
     public static final String HOME = USER_PREFIX + "home";
-    public static final String MOBILE_HOME = USER_PREFIX + "mobile_home";    
-    public static final String STORE = "store";
-    public static final String WIDGET = "widget";
-    public static final String ADD_WIDGET_FORM = "addwidget";
-    public static final String NEW_ACCOUNT = "newaccount";
-    public static final String USER_PROFILE = "userProfile";
+    public static final String MOBILE_HOME = USER_PREFIX + "mobile_home";
+    public static final String STORE = USER_PREFIX + "store";
+    public static final String WIDGET = USER_PREFIX + "widget";
+    public static final String ADD_WIDGET_FORM = USER_PREFIX + "addwidget";
+    public static final String NEW_ACCOUNT = USER_PREFIX + "newaccount";
+    public static final String USER_PROFILE = USER_PREFIX + "userProfile";
 
-    public static final String ADMIN_HOME = "admin/home";
-    public static final String ADMIN_PREFERENCES = "admin/preferences";
-    public static final String ADMIN_PREFERENCE_DETAIL = "admin/preferencedetail";
-    public static final String ADMIN_USERS = "admin/users";
-    public static final String ADMIN_USERDETAIL = "admin/userdetail";
-    public static final String ADMIN_WIDGETS = "admin/widgets";
-    public static final String ADMIN_WIDGETDETAIL = "admin/widgetdetail";
+    public static final String ADMIN_HOME = ADMIN_PREFIX + "home";
+    public static final String ADMIN_PREFERENCES = ADMIN_PREFIX + "preferences";
+    public static final String ADMIN_PREFERENCE_DETAIL = ADMIN_PREFIX + "preferencedetail";
+    public static final String ADMIN_USERS = ADMIN_PREFIX + "users";
+    public static final String ADMIN_USERDETAIL = ADMIN_PREFIX + "userdetail";
+    public static final String ADMIN_WIDGETS = ADMIN_PREFIX + "widgets";
+    public static final String ADMIN_WIDGETDETAIL = ADMIN_PREFIX + "widgetdetail";
 
     public static final String REDIRECT = "redirect:/";
-}
+}
\ No newline at end of file

Modified: incubator/rave/trunk/rave-portal-resources/src/main/resources/messages.properties
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/resources/messages.properties?rev=1213701&r1=1213700&r2=1213701&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/resources/messages.properties (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/resources/messages.properties Tue Dec 13 14:12:16 2011
@@ -57,7 +57,6 @@ page.general.movethispage.tofirst=To Fir
 page.general.password=Password:
 page.general.screenshot=screenshot
 page.general.title=Rave
-page.general.titlesuffix= - Rave
 page.general.thumbnail=thumbnail
 page.general.toadmininterface=Admin interface
 page.general.username=Username:
@@ -108,6 +107,7 @@ page.userprofile.title=Update user profi
 page.userprofile.button=Update profile
 page.userprofile.openid.url=OpenID URL:
 
+page.widget.title=Widget Detail
 page.widget.addToPage=Add to Page
 page.widget.backToStore=Back to Store
 page.widget.widgetPreview=Widget Preview
@@ -160,6 +160,7 @@ admin.widgetdetail.action.update.success
 admin.preferences.title=Rave admin interface - Preferences
 admin.preferences.shorttitle=Preferences
 admin.preferences.edit=Edit preferences
+admin.preferencedetail.title=Rave admin interface - Preferences
 admin.preferencedetail.titleSuffix=Page title suffix
 admin.preferencedetail.pageSize=Number of items per page (list)
 admin.preferencedetail.pageSize.malformed=Enter a whole number greater than 0

Modified: incubator/rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties?rev=1213701&r1=1213700&r2=1213701&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties Tue Dec 13 14:12:16 2011
@@ -57,7 +57,6 @@ page.general.movethispage.tofirst=Naar e
 page.general.password=Wachtwoord:
 page.general.screenshot=screenshot
 page.general.title=Rave
-page.general.titlesuffix= - Rave
 page.general.thumbnail=miniatuur
 page.general.toadmininterface=Beheeromgeving
 page.general.username=Gebruikersnaam:
@@ -108,6 +107,7 @@ page.userprofile.title=Update gebruikers
 page.userprofile.button=Update profiel
 page.userprofile.openid.url=OpenID URL:
 
+page.widget.title=Widget Detail
 page.widget.addToPage=Voeg toe aan pagina
 page.widget.backToStore=Terug naar de winkel
 page.widget.widgetPreview=Widget preview
@@ -160,6 +160,7 @@ admin.widgetdetail.action.update.success
 admin.preferences.title=Rave admin interface - Voorkeuren
 admin.preferences.shorttitle=Voorkeuren
 admin.preferences.edit=Pas voorkeuren aan
+admin.preferencedetail.title=Rave admin interface - Voorkeuren
 admin.preferencedetail.titleSuffix=Toevoeging pagina titel
 admin.preferencedetail.pageSize=Aantal items per pagina (lijst)
 admin.preferencedetail.pageSize.malformed=Voer een geheel getal in groter dan 0

Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/includes/taglibs.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/includes/taglibs.jsp?rev=1213701&r1=1213700&r2=1213701&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/includes/taglibs.jsp (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/includes/taglibs.jsp Tue Dec 13 14:12:16 2011
@@ -21,6 +21,7 @@ under the License.
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
 <%@ taglib prefix="portal" uri="http://www.apache.org/rave/tags" %>
 <%@ taglib prefix="rave" tagdir="/WEB-INF/tags"%>
\ No newline at end of file

Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp?rev=1213701&r1=1213700&r2=1213701&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp Tue Dec 13 14:12:16 2011
@@ -29,7 +29,7 @@ under the License.
     <meta name="viewport" content="width=device-width" />
     <title><fmt:message key="${pageTitleKey}"/>
     <c:if test="${not empty portalSettings and not empty portalSettings['titleSuffix']}">
-        &nbsp;<c:out value="${portalSettings['titleSuffix'].value}"/></c:if></title>
+        <c:out value="${portalSettings['titleSuffix'].value}"/></c:if></title>
     <link rel="stylesheet" href="//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.13/themes/base/jquery-ui.css"/>
     <link rel="stylesheet" href="<c:url value="/css/default.css" />"/>
     <rave:custom_css/>

Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp?rev=1213701&r1=1213700&r2=1213701&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp Tue Dec 13 14:12:16 2011
@@ -17,139 +17,130 @@
   under the License.
   --%>
 <%@ page language="java" trimDirectiveWhitespaces="true" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
-<%@ taglib tagdir="/WEB-INF/tags" prefix="rave" %>
-
+<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
 <fmt:setBundle basename="messages"/>
-<fmt:message key="page.addwidget.title" var="pagetitle"/>
-<rave:rave_generic_page pageTitle="${pagetitle}">
-    <header>
-        <nav class="topnav">
-            <ul class="horizontal-list">
-              <c:if test="${not empty referringPageId}">
-                    <li>
-                        <a href="<spring:url value="/app/store?referringPageId=${referringPageId}" />">
-                            <fmt:message key="page.widget.backToStore"/>
-                        </a>
-                    </li>
-                </c:if>
+<header>
+    <nav class="topnav">
+        <ul class="horizontal-list">
+          <c:if test="${not empty referringPageId}">
                 <li>
-                   <c:choose>
-                    <c:when test="${empty referringPageId}">
-                        <spring:url value="/index.html" var="gobackurl" />
-                    </c:when>
-                    <c:otherwise>
-                        <spring:url value="/app/page/view/${referringPageId}" var="gobackurl"/>
-                    </c:otherwise>
-                </c:choose>
-                <a href="<c:out value="${gobackurl}"/>"><fmt:message key="page.general.back"/></a>
+                    <a href="<spring:url value="/app/store?referringPageId=${referringPageId}" />">
+                        <fmt:message key="page.widget.backToStore"/>
+                    </a>
                 </li>
-                <sec:authorize url="/app/admin/">
-                    <li>
-                        <a href="<spring:url value="/app/admin/"/>">
-                            <fmt:message key="page.general.toadmininterface"/>
-                        </a>
-                    </li>
-                </sec:authorize>
+            </c:if>
+            <li>
+               <c:choose>
+                <c:when test="${empty referringPageId}">
+                    <spring:url value="/index.html" var="gobackurl" />
+                </c:when>
+                <c:otherwise>
+                    <spring:url value="/app/page/view/${referringPageId}" var="gobackurl"/>
+                </c:otherwise>
+            </c:choose>
+            <a href="<c:out value="${gobackurl}"/>"><fmt:message key="page.general.back"/></a>
+            </li>
+            <sec:authorize url="/app/admin/">
                 <li>
-                    <a href="<spring:url value="/j_spring_security_logout" htmlEscape="true" />">
-                      <fmt:message key="page.general.logout"/></a>
+                    <a href="<spring:url value="/app/admin/"/>">
+                        <fmt:message key="page.general.toadmininterface"/>
+                    </a>
                 </li>
-            </ul>
-        </nav>
-        <h1><fmt:message key="page.addwidget.title"/></h1>
-    </header>
-
-    <div id="content">
-        <h2><fmt:message key="page.addwidget.form.header"/></h2>
-        <form:errors path="widget" cssClass="error" element="p"/>
-        <form:form id="newWidgetForm" action="add?referringPageId=${referringPageId}" commandName="widget" method="POST">
-            <fieldset>
-                <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>
-                    <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>
-                    <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="page.addwidget.form.submit" var="submit"/>
-                <input type="submit" value="${submit}"/>
-            </fieldset>
-        </form:form>
-    </div>
-</rave:rave_generic_page>
\ No newline at end of file
+            </sec:authorize>
+            <li>
+                <a href="<spring:url value="/j_spring_security_logout" htmlEscape="true" />">
+                  <fmt:message key="page.general.logout"/></a>
+            </li>
+        </ul>
+    </nav>
+    <h1><fmt:message key="page.addwidget.title"/></h1>
+</header>
+
+<div id="content">
+    <h2><fmt:message key="page.addwidget.form.header"/></h2>
+    <form:errors path="widget" cssClass="error" element="p"/>
+    <form:form id="newWidgetForm" action="add?referringPageId=${referringPageId}" commandName="widget" method="POST">
+        <fieldset>
+            <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>
+                <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>
+                <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="page.addwidget.form.submit" var="submit"/>
+            <input type="submit" value="${submit}"/>
+        </fieldset>
+    </form:form>
+</div>
\ No newline at end of file

Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/home.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/home.jsp?rev=1213701&r1=1213700&r2=1213701&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/home.jsp (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/home.jsp Tue Dec 13 14:12:16 2011
@@ -17,24 +17,18 @@
   under the License.
   --%>
 <%@ page language="java" trimDirectiveWhitespaces="true" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-<%@ taglib tagdir="/WEB-INF/tags" prefix="rave" %>
+<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
 <fmt:setBundle basename="messages"/>
 
-<fmt:message key="admin.home.title" var="pagetitle"/>
-<rave:rave_generic_page pageTitle="${pagetitle}">
-    <rave:header pageTitle="${pagetitle}"/>
-    <rave:admin_tabsheader/>
-    <div class="pageContent">
-        <article class="admincontent">
-            <h2><fmt:message key="admin.home.subtitle"/></h2>
-            <fmt:message key="admin.home.intro"/>
-            <div class="clear-float">
+<fmt:message key="${pageTitleKey}" var="pagetitle"/>
+<rave:header pageTitle="${pagetitle}"/>
+<rave:admin_tabsheader/>
+<div class="pageContent">
+    <article class="admincontent">
+        <h2><fmt:message key="admin.home.subtitle"/></h2>
+        <fmt:message key="admin.home.intro"/>
+        <div class="clear-float">
 
-            </div>
-        </article>
-    </div>
-</rave:rave_generic_page>
\ No newline at end of file
+        </div>
+    </article>
+</div>
\ No newline at end of file

Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp?rev=1213701&r1=1213700&r2=1213701&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp Tue Dec 13 14:12:16 2011
@@ -17,59 +17,56 @@
   under the License.
   --%>
 <%@ page language="java" trimDirectiveWhitespaces="true" %>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
 <fmt:setBundle basename="messages"/>
 
-<fmt:message key="admin.preferences.title" var="pagetitle"/>
-<rave:rave_generic_page pageTitle="${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>
-                </li>
-            </ul>
-            <h2><fmt:message key="admin.preferences.shorttitle"/></h2>
+<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>
+            </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>
+        <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>
-                            <fmt:message key="admin.preferencedetail.updateButton" var="updateButtonText"/>
-                            <input type="submit" value="${updateButtonText}"/>
-                        </fieldset>
-                    </form:form>
-                </section>
-                <div class="clear-float">
-
-                </div>
+                        <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>
+                        <fmt:message key="admin.preferencedetail.updateButton" var="updateButtonText"/>
+                        <input type="submit" value="${updateButtonText}"/>
+                    </fieldset>
+                </form:form>
+            </section>
+            <div class="clear-float">
 
             </div>
-        </article>
-    </div>
-</rave:rave_generic_page>
\ No newline at end of file
+
+        </div>
+    </article>
+</div>
\ No newline at end of file

Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp?rev=1213701&r1=1213700&r2=1213701&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp Tue Dec 13 14:12:16 2011
@@ -17,58 +17,55 @@
   under the License.
   --%>
 <%@ page language="java" trimDirectiveWhitespaces="true" %>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
 <fmt:setBundle basename="messages"/>
 
-<fmt:message key="admin.preferences.title" var="pagetitle"/>
-<rave:rave_generic_page pageTitle="${pagetitle}">
-    <rave:header pageTitle="${pagetitle}"/>
-    <rave:admin_tabsheader/>
-    <div class="pageContent">
-        <article class="admincontent">
-            <%--@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>
-            </c:if>
+<fmt:message key="${pageTitleKey}" var="pagetitle"/>
+<rave:header pageTitle="${pagetitle}"/>
+<rave:admin_tabsheader/>
+<div class="pageContent">
+    <article class="admincontent">
+        <%--@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>
+        </c:if>
 
-            <h2><fmt:message key="admin.preferences.shorttitle"/></h2>
+        <h2><fmt:message key="admin.preferences.shorttitle"/></h2>
 
-            <spring:url value="/app/admin/preferencedetail/edit" var="detaillink"/>
+        <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>"--%>
-            <c:choose>
-                <c:when test="${fn:length(preferenceMap) eq 0}">
-                    <a href="<c:out value="${detaillink}"/>"><fmt:message key="admin.preferences.edit"/></a>
-                </c:when>
-                <c:otherwise>
-                    <table class="datatable preferencestable">
-                        <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">
-                                    <a href="<c:out value="${detaillink}"/>"><fmt:message
-                                            key="admin.preferencedetail.${portalPreference.key}"/></a>
-                                </th>
-                                <td class="largetextcell">
-                                    <ul>
-                                        <c:forEach items="${portalPreference.values}" var="value">
-                                            <li><a href="<c:out value="${detaillink}"/>"><c:out value="${value}"/></a></li>
-                                        </c:forEach>
-                                    </ul>
-                                </td>
-                            </tr>
-                        </c:forEach>
-                        </tbody>
-                    </table>
-                </c:otherwise>
-            </c:choose>
+            <%--@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>
+            </c:when>
+            <c:otherwise>
+                <table class="datatable preferencestable">
+                    <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">
+                                <a href="<c:out value="${detaillink}"/>"><fmt:message
+                                        key="admin.preferencedetail.${portalPreference.key}"/></a>
+                            </th>
+                            <td class="largetextcell">
+                                <ul>
+                                    <c:forEach items="${portalPreference.values}" var="value">
+                                        <li><a href="<c:out value="${detaillink}"/>"><c:out value="${value}"/></a></li>
+                                    </c:forEach>
+                                </ul>
+                            </td>
+                        </tr>
+                    </c:forEach>
+                    </tbody>
+                </table>
+            </c:otherwise>
+        </c:choose>
 
-        </article>
-    </div>
-</rave:rave_generic_page>
\ No newline at end of file
+    </article>
+</div>
\ No newline at end of file

Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp?rev=1213701&r1=1213700&r2=1213701&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp Tue Dec 13 14:12:16 2011
@@ -17,129 +17,120 @@
   under the License.
   --%>
 <%@ page language="java" trimDirectiveWhitespaces="true" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-<%@ taglib tagdir="/WEB-INF/tags" prefix="rave" %>
+<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
 <fmt:setBundle basename="messages"/>
 
-<fmt:message key="admin.userdetail.title" var="pagetitle"/>
-
+<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>
+        </ul>
+        <h2><c:out value="${user.username}"/></h2>
+
+        <div class="rightcolumn">
+            <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}"/>"/>
 
-<rave:rave_generic_page pageTitle="${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/users"/>"><fmt:message key="admin.userdetail.goback"/></a>
-                </li>
-            </ul>
-            <h2><c:out value="${user.username}"/></h2>
-
-            <div class="rightcolumn">
-                <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>
-                </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">
-                        <form:errors cssClass="error" element="p"/>
-                        <fieldset>
-                            <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">
-                                    <input type="email" name="email" id="email" value="<c:out value="${status.value}"/>"
-                                           class="long"/>
-                                </spring:bind>
-                                <form:errors path="email" cssClass="error"/>
-                            </p>
-
-                            <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>
-                                <form:errors path="openId" cssClass="error"/>
-                            </p>
-
-                            <div>
-                                <span class="label"><fmt:message key="admin.userdata.accountstatus"/></span>
-                                <ul class="checkboxlist">
-                                    <li>
-                                        <fmt:message key="admin.userdata.enabled" var="labelEnabled"/>
-                                        <form:checkbox path="enabled" label="${labelEnabled}"
-                                                       disabled="${canChangeUserStatus ne true}"/>
-                                    </li>
-                                    <li>
-                                        <fmt:message key="admin.userdata.expired" var="labelExpired"/>
-                                        <form:checkbox path="expired" label="${labelExpired}"
-                                                       disabled="${canChangeUserStatus ne true}"/>
-                                    </li>
-                                    <li>
-                                        <fmt:message key="admin.userdata.locked" var="labelLocked"/>
-                                        <form:checkbox path="locked" label="${labelLocked}"
-                                                       disabled="${canChangeUserStatus ne true}"/>
-                                    </li>
-                                </ul>
-                            </div>
-                        </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>"--%>
+                        <div>
                             <ul class="checkboxlist">
-                                <form:checkboxes path="authorities" items="${authorities.resultSet}"
-                                                 itemLabel="authority" itemValue="authority" element="li" />
+                                <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>
-                        </fieldset>
-                        <fieldset>
-                            <fmt:message key="page.userprofile.button" var="updateButtonText"/>
-                            <input type="submit" value="${updateButtonText}"/>
-                        </fieldset>
-                    </form:form>
-                </section>
+                        </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">
+                    <form:errors cssClass="error" element="p"/>
+                    <fieldset>
+                        <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">
+                                <input type="email" name="email" id="email" value="<c:out value="${status.value}"/>"
+                                       class="long"/>
+                            </spring:bind>
+                            <form:errors path="email" cssClass="error"/>
+                        </p>
+
+                        <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>
+                            <form:errors path="openId" cssClass="error"/>
+                        </p>
 
-            </div>
+                        <div>
+                            <span class="label"><fmt:message key="admin.userdata.accountstatus"/></span>
+                            <ul class="checkboxlist">
+                                <li>
+                                    <fmt:message key="admin.userdata.enabled" var="labelEnabled"/>
+                                    <form:checkbox path="enabled" label="${labelEnabled}"
+                                                   disabled="${canChangeUserStatus ne true}"/>
+                                </li>
+                                <li>
+                                    <fmt:message key="admin.userdata.expired" var="labelExpired"/>
+                                    <form:checkbox path="expired" label="${labelExpired}"
+                                                   disabled="${canChangeUserStatus ne true}"/>
+                                </li>
+                                <li>
+                                    <fmt:message key="admin.userdata.locked" var="labelLocked"/>
+                                    <form:checkbox path="locked" label="${labelLocked}"
+                                                   disabled="${canChangeUserStatus ne true}"/>
+                                </li>
+                            </ul>
+                        </div>
+                    </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>"--%>
+                        <ul class="checkboxlist">
+                            <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}"/>
+                    </fieldset>
+                </form:form>
+            </section>
+
+        </div>
 
-            <div class="clear-float">
+        <div class="clear-float">
 
-            </div>
+        </div>
 
 
-        </article>
-    </div>
-</rave:rave_generic_page>
\ No newline at end of file
+    </article>
+</div>
\ No newline at end of file

Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp?rev=1213701&r1=1213700&r2=1213701&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp Tue Dec 13 14:12:16 2011
@@ -17,80 +17,73 @@
   under the License.
   --%>
 <%@ page language="java" trimDirectiveWhitespaces="true" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-<%@ taglib tagdir="/WEB-INF/tags" prefix="rave" %>
+<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
 <fmt:setBundle basename="messages"/>
 <%--@elvariable id="searchResult" type="org.apache.rave.portal.model.util.SearchResult<org.apache.rave.portal.model.User>"--%>
 
-<fmt:message key="admin.users.title" var="pagetitle"/>
-<rave:rave_generic_page pageTitle="${pagetitle}">
-    <rave:header pageTitle="${pagetitle}"/>
-    <rave:admin_tabsheader/>
-
-    <div class="pageContent">
-        <article class="admincontent">
-            <c:if test="${actionresult eq 'delete' or actionresult eq 'update'}">
-                <div class="alert-message success">
-                    <p>
-                        <fmt:message key="admin.userdetail.action.${actionresult}.success"/>
-                    </p>
-                </div>
+<fmt:message key="${pageTitleKey}" var="pagetitle"/>
+<rave:header pageTitle="${pagetitle}"/>
+<rave:admin_tabsheader/>
+<div class="pageContent">
+    <article class="admincontent">
+        <c:if test="${actionresult eq 'delete' or actionresult eq 'update'}">
+            <div class="alert-message success">
+                <p>
+                    <fmt:message key="admin.userdetail.action.${actionresult}.success"/>
+                </p>
+            </div>
+        </c:if>
+
+        <ul class="horizontal-list searchbox">
+            <li><a href="<spring:url value="/app/newaccount.jsp"/>"><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>
 
-            <ul class="horizontal-list searchbox">
-                <li><a href="<spring:url value="/app/newaccount.jsp"/>"><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><a href="${detaillink}"><c:out value="${user.username}"/></a></td>
-                        <td><a href="${detaillink}"><c:out value="${user.email}"/></a></td>
-                        <td><a href="${detaillink}">${user.enabled}</a></td>
-                    </tr>
-                </c:forEach>
-                </tbody>
-            </table>
-            </c:if>
-
-            <rave:admin_paging/>
+        <rave:admin_listheader/>
+        <rave:admin_paging/>
 
-        </article>
-    </div>
-
-    <script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-1.6.4.min.js"></script>
-    <script src="<spring:url value="/script/rave_admin.js"/>"></script>
-    <script>$(function() {
-        rave.admin.initAdminUi();
-    });</script>
-</rave:rave_generic_page>
\ No newline at end of file
+        <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><a href="${detaillink}"><c:out value="${user.username}"/></a></td>
+                    <td><a href="${detaillink}"><c:out value="${user.email}"/></a></td>
+                    <td><a href="${detaillink}">${user.enabled}</a></td>
+                </tr>
+            </c:forEach>
+            </tbody>
+        </table>
+        </c:if>
+
+        <rave:admin_paging/>
+
+    </article>
+</div>
+
+<script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-1.6.4.min.js"></script>
+<script src="<spring:url value="/script/rave_admin.js"/>"></script>
+<script>$(function() {
+    rave.admin.initAdminUi();
+});</script>
\ No newline at end of file

Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgetdetail.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgetdetail.jsp?rev=1213701&r1=1213700&r2=1213701&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgetdetail.jsp (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgetdetail.jsp Tue Dec 13 14:12:16 2011
@@ -17,162 +17,154 @@
   under the License.
   --%>
 <%@ page language="java" trimDirectiveWhitespaces="true" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-<%@ taglib tagdir="/WEB-INF/tags" prefix="rave" %>
+<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
 <fmt:setBundle basename="messages"/>
 
-<fmt:message key="admin.widgetdetail.title" var="pagetitle"/>
+<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>
 
-<rave:rave_generic_page pageTitle="${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">
+        <div class="rightcolumn">
+            <c:if test="${not empty widget.screenshotUrl or not empty widget.thumbnailUrl}">
                 <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>
-                                <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="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>
-                                <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>
+                    <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>
+        <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>
+                            <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="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>
+                            <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>
+
+        </div>
 
-            <div class="clear-float">
+        <div class="clear-float">
 
-            </div>
+        </div>
 
 
-        </article>
-    </div>
-</rave:rave_generic_page>
\ No newline at end of file
+    </article>
+</div>
\ No newline at end of file

Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp?rev=1213701&r1=1213700&r2=1213701&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp Tue Dec 13 14:12:16 2011
@@ -17,90 +17,82 @@
   under the License.
   --%>
 <%@ page language="java" trimDirectiveWhitespaces="true" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-<%@ taglib tagdir="/WEB-INF/tags" prefix="rave" %>
+<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
 <fmt:setBundle basename="messages"/>
 <%--@elvariable id="searchResult" type="org.apache.rave.portal.model.util.SearchResult<org.apache.rave.portal.model.Widget>"--%>
-
-<fmt:message key="admin.widgets.title" var="pagetitle"/>
-<rave:rave_generic_page pageTitle="${pagetitle}">
-    <rave:header pageTitle="${pagetitle}"/>
-    <rave:admin_tabsheader/>
-    <div class="pageContent">
-        <article class="admincontent">
-            <c:if test="${actionresult eq 'delete' or actionresult eq 'update'}">
-                <div class="alert-message success">
-                    <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>
-                    <c:forEach var="widget" items="${searchResult.resultSet}">
-                        <spring:url value="/app/admin/widgetdetail/${widget.entityId}" var="detaillink"/>
-                        <tr data-detaillink="${detaillink}">
-                            <td><a href="${detaillink}"><c:out value="${widget.title}"/></a></td>
-                            <td><a href="${detaillink}"><fmt:message key="widget.type.${widget.type}" /></a></td>
-                            <td><a href="${detaillink}"><c:out value="${widget.widgetStatus}"/></a></td>
-                        </tr>
-                    </c:forEach>
-                </tbody>
-            </table>
+<fmt:message key="${pageTitleKey}" var="pagetitle"/>
+<rave:header pageTitle="${pagetitle}"/>
+<rave:admin_tabsheader/>
+<div class="pageContent">
+    <article class="admincontent">
+        <c:if test="${actionresult eq 'delete' or actionresult eq 'update'}">
+            <div class="alert-message success">
+                <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>
-
-            <rave:admin_paging/>
-
-        </article>
-    </div>
-
-    <script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-1.6.4.min.js"></script>
-    <script src="<spring:url value="/script/rave_admin.js"/>"></script>
-    <script>$(function() {
-        rave.admin.initAdminUi();
-    });</script>
-
-</rave:rave_generic_page>
\ No newline at end of file
+        </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>
+                <c:forEach var="widget" items="${searchResult.resultSet}">
+                    <spring:url value="/app/admin/widgetdetail/${widget.entityId}" var="detaillink"/>
+                    <tr data-detaillink="${detaillink}">
+                        <td><a href="${detaillink}"><c:out value="${widget.title}"/></a></td>
+                        <td><a href="${detaillink}"><fmt:message key="widget.type.${widget.type}" /></a></td>
+                        <td><a href="${detaillink}"><c:out value="${widget.widgetStatus}"/></a></td>
+                    </tr>
+                </c:forEach>
+            </tbody>
+        </table>
+        </c:if>
+
+        <rave:admin_paging/>
+
+    </article>
+</div>
+
+<script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-1.6.4.min.js"></script>
+<script src="<spring:url value="/script/rave_admin.js"/>"></script>
+<script>$(function() {
+    rave.admin.initAdminUi();
+});</script>
\ No newline at end of file



Mime
View raw message