You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by aj...@apache.org on 2010/02/04 06:16:12 UTC
svn commit: r906367 - in /incubator/jspwiki/trunk/src/WebContent: ./ admin/
applets/ templates/default/ templates/default/layout/
Author: ajaquith
Date: Thu Feb 4 05:16:11 2010
New Revision: 906367
URL: http://svn.apache.org/viewvc?rev=906367&view=rev
Log:
[JSPWIKI-578] Eliminated the remaining top-level JSPs except for Error.jsp. Minor tweaks to the templates/default directory; the layout JSP and related JSPs are in their own layout/subdirectory.
Added:
incubator/jspwiki/trunk/src/WebContent/templates/default/EditGroup.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/Group.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/Message.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/Search.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/Workflow.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/DefaultLayout.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/Favorites.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/Footer.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/Header.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/LocalHeader.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/PageActionsBottom.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/PageActionsTop.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/SearchBox.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/UserBox.jsp
Removed:
incubator/jspwiki/trunk/src/WebContent/DeleteGroup.jsp
incubator/jspwiki/trunk/src/WebContent/EditGroup.jsp
incubator/jspwiki/trunk/src/WebContent/Group.jsp
incubator/jspwiki/trunk/src/WebContent/Logout.jsp
incubator/jspwiki/trunk/src/WebContent/Message.jsp
incubator/jspwiki/trunk/src/WebContent/NewBlogEntry.jsp
incubator/jspwiki/trunk/src/WebContent/NewGroup.jsp
incubator/jspwiki/trunk/src/WebContent/Rename.jsp
incubator/jspwiki/trunk/src/WebContent/Search.jsp
incubator/jspwiki/trunk/src/WebContent/SisterSites.jsp
incubator/jspwiki/trunk/src/WebContent/Workflow.jsp
incubator/jspwiki/trunk/src/WebContent/applets/
incubator/jspwiki/trunk/src/WebContent/rss.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/DefaultLayout.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/DisplayMessage.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/EditGroupContent.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/Favorites.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/FindContent.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/Footer.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/GroupContent.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/GroupTab.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/Header.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/PageActionsBottom.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/PageActionsTop.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/SearchBox.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/UserBox.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/WorkflowContent.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/commonheader.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/localheader.jsp
Modified:
incubator/jspwiki/trunk/src/WebContent/admin/Admin.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/Comment.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/CreateProfile.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/Edit.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/Login.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/PageInfo.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/Preferences.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/Wiki.jsp
Modified: incubator/jspwiki/trunk/src/WebContent/admin/Admin.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/admin/Admin.jsp?rev=906367&r1=906366&r2=906367&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/admin/Admin.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/admin/Admin.jsp Thu Feb 4 05:16:11 2010
@@ -23,7 +23,7 @@
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
<s:useActionBean beanclass="org.apache.wiki.action.AdminActionBean" event="view" id="admin" executeResolution="true" />
-<s:layout-render name="${templates['DefaultLayout.jsp']}">
+<s:layout-render name="${templates['layout/DefaultLayout.jsp']}">
<s:layout-component name="content">
<h1>JSPWiki Administration</h1>
<div class="information">Not all things can be configured here. Some things need to be configured
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/Comment.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/Comment.jsp?rev=906367&r1=906366&r2=906367&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Comment.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Comment.jsp Thu Feb 4 05:16:11 2010
@@ -21,7 +21,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
-<s:layout-render name="${templates['DefaultLayout.jsp']}">
+<s:layout-render name="${templates['layout/DefaultLayout.jsp']}">
<%-- Page title should say Comment: + pagename --%>
<s:layout-component name="headTitle">
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/CreateProfile.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/CreateProfile.jsp?rev=906367&r1=906366&r2=906367&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/CreateProfile.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/CreateProfile.jsp Thu Feb 4 05:16:11 2010
@@ -23,7 +23,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<s:layout-render name="${templates['DefaultLayout.jsp']}">
+<s:layout-render name="${templates['layout/DefaultLayout.jsp']}">
<s:layout-component name="content">
<wiki:TabbedSection defaultTab="${param.tab}">
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/Edit.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/Edit.jsp?rev=906367&r1=906366&r2=906367&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Edit.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Edit.jsp Thu Feb 4 05:16:11 2010
@@ -21,7 +21,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
-<s:layout-render name="${templates['DefaultLayout.jsp']}">
+<s:layout-render name="${templates['layout/DefaultLayout.jsp']}">
<%-- Page title should say Edit: + pagename --%>
<s:layout-component name="headTitle">
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/EditGroup.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/EditGroup.jsp?rev=906367&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/EditGroup.jsp (added)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/EditGroup.jsp Thu Feb 4 05:16:11 2010
@@ -0,0 +1,126 @@
+<%--
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+--%>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
+<s:layout-render name="${templates['layout/DefaultLayout.jsp']}">
+ <s:layout-component name="content">
+ <wiki:TabbedSection defaultTab="editgroup">
+ <c:choose>
+
+ <%-- This a new group --%>
+ <c:when test="${wikiActionBean.new}">
+ <wiki:Tab id="editgroup" titleKey="actions.editgroup">
+ <h3><fmt:message key="newgroup.heading.create" /></h3>
+ <!-- Any messages or errors? -->
+ <div class="instructions"><s:messages /></div>
+ <div class="errors"><s:errors globalErrorsOnly="true" /></div>
+
+ <div class="formcontainer">
+ <s:form beanclass="org.apache.wiki.action.GroupActionBean"
+ id="editGroup"
+ method="POST"
+ acceptcharset="UTF-8">
+ <%-- Group name --%>
+ <div>
+ <s:label for="group" />
+ <s:text name="group" size="30" />
+ <s:errors field="group" />
+ <div class="description"><fmt:message key="newgroup.name.description" /></div>
+ </div>
+ <%-- Member list --%>
+ <div>
+ <s:label for="members" />
+ <c:set var="memberList">
+ <c:forEach items="${wikiActionBean.members}" var="member" varStatus="loop">
+ <s:format value="${member}" />
+ </c:forEach>
+ </c:set>
+ <textarea name="members" cols="30" rows="10">${memberList}</textArea>
+ <s:errors field="members" />
+ <div class="description"><fmt:message key="members.description" /></div>
+ </div>
+ <%-- Cancel or save the group --%>
+ <s:submit name="view" />
+ <s:submit name="save" />
+ </s:form>
+ </div>
+ </wiki:Tab>
+ </c:when>
+
+ <%-- This is an existing group --%>
+ <c:otherwise>
+
+ <%-- View group tab --%>
+ <wiki:Tab id="viewgroup" titleKey="group.tab" accesskey="v"
+ beanclass="org.apache.wiki.action.GroupActionBean">
+ <wiki:Param name="group" value="${wikiActionBean.group.name}" />
+ </wiki:Tab>
+
+ <%-- Edit group tab --%>
+ <wiki:Tab id="editgroup" titleKey="actions.editgroup">
+ <h3><s:format value="${wikiActionBean.group}" /></h3>
+ <!-- Any messages or errors? -->
+ <div class="instructions"><s:messages /></div>
+ <div class="errors"><s:errors globalErrorsOnly="true" /></div>
+
+ <div class="formcontainer">
+ <s:form beanclass="org.apache.wiki.action.GroupActionBean"
+ id="editGroup"
+ method="POST"
+ acceptcharset="UTF-8">
+ <s:hidden name="group" value="${wikiActionBean.group.name}" />
+ <%-- Group name --%>
+ <div class="description">
+ <fmt:message key="group.groupintro">
+ <fmt:param><em><s:format value="${wikiActionBean.group}" /></em></fmt:param>
+ </fmt:message>
+ </div>
+ <%-- Member list --%>
+ <div>
+ <s:label for="members" />
+ <c:set var="memberList">
+ <c:forEach items="${wikiActionBean.members}" var="member" varStatus="loop"><s:format value="${member}" />
</c:forEach>
+ </c:set>
+ <textarea name="members" cols="30" rows="10">${memberList}</textArea>
+ <s:errors field="members" />
+ <div class="description"><fmt:message key="members.description" /></div>
+ </div>
+ <%-- Creator/modifier info --%>
+ <div class="description">
+ <fmt:message key="group.creator">
+ <fmt:param><c:out value="${wikiActionBean.group.creator}" /></fmt:param>
+ <fmt:param><c:out value="${wikiActionBean.group.created}" /></fmt:param>
+ </fmt:message>
+ </div>
+ <%-- Cancel or save the group --%>
+ <s:submit name="view" />
+ <s:submit name="save" />
+ </s:form>
+ </div>
+ </wiki:Tab>
+
+ </c:otherwise>
+ </c:choose>
+ </wiki:TabbedSection>
+ </s:layout-component>
+</s:layout-render>
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/Group.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/Group.jsp?rev=906367&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Group.jsp (added)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Group.jsp Thu Feb 4 05:16:11 2010
@@ -0,0 +1,109 @@
+<%--
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
+<s:layout-render name="${templates['layout/DefaultLayout.jsp']}">
+ <s:layout-component name="content">
+ <wiki:TabbedSection defaultTab="viewgroup">
+ <wiki:Tab id="viewgroup" titleKey="group.tab">
+
+ <%-- Print the group name and any messages or errors --%>
+ <h3><s:format value="${wikiActionBean.group}" /></h3>
+ <c:choose>
+
+ <%-- Is this a new group? --%>
+ <c:when test="${wikiActionBean.new}">
+ <wiki:Permission permission="createGroups">
+ <fmt:message key="group.createsuggestion">
+ <fmt:param>
+ <s:link beanclass="org.apache.wiki.action.GroupActionBean" event="create">
+ <s:param name="group" value="${wikiActionBean.group.name}" />
+ <fmt:message key="group.createit" />
+ </s:link>
+ </fmt:param>
+ </fmt:message>
+ </wiki:Permission>
+ </c:when>
+
+ <%-- This is an existing group --%>
+ <c:otherwise>
+
+ <div class="description">
+ <fmt:message key="group.groupintro">
+ <fmt:param><em><s:format value="${wikiActionBean.group}" /></em></fmt:param>
+ </fmt:message>
+ </div>
+
+ <%-- The group exists: display the member list --%>
+ <div class="formcontainer">
+ <%-- Member list --%>
+ <div>
+ <s:label for="members" />
+ <c:forEach items="${wikiActionBean.members}" var="member" varStatus="loop">
+ <s:format value="${member}" />
+ </c:forEach>
+ </div>
+ <%-- Creator/modifier info --%>
+ <div class="description">
+ <fmt:message key='group.modifier'>
+ <fmt:param><c:out value="${wikiActionBean.group.modifier}" /></fmt:param>
+ <fmt:param>
+ <fmt:formatDate value="${wikiActionBean.group.lastModified}" pattern="${prefs.TimeFormat}" timeZone="${prefs.TimeZone}" />
+ </fmt:param>
+ </fmt:message>
+ </div>
+ <div class="description">
+ <fmt:message key="group.creator">
+ <fmt:param><c:out value="${wikiActionBean.group.creator}" /></fmt:param>
+ <fmt:param><fmt:formatDate value="${wikiActionBean.group.created}" pattern="${prefs.TimeFormat}" timeZone="${prefs.TimeZone}" /></fmt:param>
+ </fmt:message>
+ </div>
+ </div>
+
+ <%-- Delete group --%>
+ <wiki:Permission permission="deleteGroup">
+ <c:set var="confirm" value="<fmt:message key='grp.deletegroup.confirm'/>" scope="page"/>
+ <s:form beanclass="org.apache.wiki.action.GroupActionBean" class="wikiform"
+ id="deleteGroup"
+ onsubmit="return( confirm('${confirm}') );"
+ method="POST" acceptcharset="UTF-8">
+ <s:submit name="delete"><fmt:message key="actions.deletegroup" /></s:submit>
+ </s:form>
+ </wiki:Permission>
+ </c:otherwise>
+
+ </c:choose>
+
+ </wiki:Tab>
+
+ <%-- If user has rights to edit the group, provide a link --%>
+ <wiki:Permission permission="editGroup">
+ <wiki:Tab id="editgroup" titleKey="actions.editgroup" accesskey="e"
+ beanclass="org.apache.wiki.action.GroupActionBean" event="edit">
+ <wiki:Param name="group" value="${wikiActionBean.group.name}" />
+ </wiki:Tab>
+ </wiki:Permission>
+
+ </wiki:TabbedSection>
+ </s:layout-component>
+</s:layout-render>
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/Login.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/Login.jsp?rev=906367&r1=906366&r2=906367&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Login.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Login.jsp Thu Feb 4 05:16:11 2010
@@ -39,7 +39,7 @@
postURL = "/Login.jsp";
}
%>
-<s:layout-render name="${templates['DefaultLayout.jsp']}">
+<s:layout-render name="${templates['layout/DefaultLayout.jsp']}">
<s:layout-component name="content">
<wiki:TabbedSection defaultTab="${param.tab}">
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/Message.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/Message.jsp?rev=906367&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Message.jsp (added)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Message.jsp Thu Feb 4 05:16:11 2010
@@ -0,0 +1,31 @@
+<%--
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+--%>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+
+<%-- Inserts a string message. --%>
+
+ <div class="error">
+ <c:out value="${message}" />
+ </div>
+
+ <br clear="all" />
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/PageInfo.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/PageInfo.jsp?rev=906367&r1=906366&r2=906367&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/PageInfo.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/PageInfo.jsp Thu Feb 4 05:16:11 2010
@@ -21,7 +21,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
-<s:layout-render name="${templates['DefaultLayout.jsp']}">
+<s:layout-render name="${templates['layout/DefaultLayout.jsp']}">
<s:layout-component name="content">
<wiki:TabbedSection defaultTab="${param.tab}">
<wiki:NoSuchPage>
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/Preferences.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/Preferences.jsp?rev=906367&r1=906366&r2=906367&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Preferences.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Preferences.jsp Thu Feb 4 05:16:11 2010
@@ -25,7 +25,7 @@
<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<%@ page errorPage="/Error.jsp" %>
-<s:layout-render name="${templates['DefaultLayout.jsp']}">
+<s:layout-render name="${templates['layout/DefaultLayout.jsp']}">
<s:layout-component name="script">
<script type="text/javascript" src="<wiki:Link format='url' jsp='scripts/jspwiki-prefs.js' />"></script>
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/Search.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/Search.jsp?rev=906367&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Search.jsp (added)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Search.jsp Thu Feb 4 05:16:11 2010
@@ -0,0 +1,141 @@
+<%--
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
+<%@ page import="java.net.URLEncoder" %>
+<%@ page import="java.util.*" %>
+<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.ui.*" %>
+<%@ page import="org.apache.commons.lang.*" %>
+<%@ page errorPage="/Error.jsp" %>
+<s:layout-render name="${templates['layout/DefaultLayout.jsp']}">
+ <s:layout-component name="content">
+ <wiki:TabbedSection>
+
+ <%-- Search tab --%>
+ <wiki:Tab id="findcontent" titleKey="find.tab" accesskey="s">
+ <s:form beanclass="org.apache.wiki.action.SearchActionBean" class="wikiform"
+ id="searchform2" acceptcharset="UTF-8">
+
+ <h4><fmt:message key="find.input" /></h4>
+ <p>
+ <%-- Search query --%>
+ <s:text name="query" id="query2" size="32" />
+ <s:checkbox name="details" id="details" />
+ <fmt:message key="find.details" />
+
+ <%-- Search scope --%>
+ <s:select id="scope" name="${param.scope}">
+ <s:options-enumeration enum="org.apache.wiki.action.SearchActionBean.SearchScope" label="name" />
+ </s:select>
+
+ <%-- Submit buttons --%>
+ <s:submit name="search" id="ok" />
+ <s:submit name="go" id="go" />
+ <s:hidden name="start" id="start" value="0" />
+ <s:hidden name="maxItems" id="maxitems" value="20" />
+
+ <span id="spin" class="spin" style="position:absolute;display:none;"></span>
+ </p>
+ </s:form>
+
+ <div id="searchResult2">
+ <wiki:SearchResults>
+
+ <h4><fmt:message key="find.heading.results">
+ <fmt:param><c:out value="${wikiActionBean.query}" /></fmt:param>
+ </fmt:message></h4>
+ <p>
+ <fmt:message key="find.externalsearch" />
+ <a class="external" href="http://www.google.com/search?q=<c:out value='${wikiActionBean.query}' />" title="Google Search '<c:out value='${wikiActionBean.query}' />'" target="_blank">Google</a><img class="outlink" src="images/out.png" alt="" />
+ |
+ <a class="external" href="http://en.wikipedia.org/wiki/Special:Search?search=<c:out value='${wikiActionBean.query}' />" title="Wikipedia Search '<c:out value='${wikiActionBean.query}' />'" target="_blank">Wikipedia</a><img class="outlink" src="images/out.png" alt="" />
+ </p>
+
+ <wiki:SetPagination start="${wikiActionBean.start}" total="${fn:length(wikiActionBean.results)}"
+ pagesize="20" maxlinks="9" fmtkey="info.pagination" onclick="$('start').value=%s; SearchBox.runfullsearch();" />
+
+ <div class="graphBars">
+ <div class="zebra-table">
+ <table class="wikitable">
+
+ <tr>
+ <th align="left"><fmt:message key="find.results.page" /></th>
+ <th align="left"><fmt:message key="find.results.score" /></th>
+ </tr>
+
+ <wiki:SearchResultIterator id="searchref" start="${wikiActionBean.start}" maxItems="${wikiActionBean.maxItems}">
+ <tr>
+ <td><wiki:LinkTo><wiki:PageName/></wiki:LinkTo></td>
+ <td><span class="gBar"><%= searchref.getScore() %></span></td>
+ </tr>
+
+ <c:if test="${wikiActionBean.details == 'true'}"><%
+
+ String[] contexts = searchref.getContexts();
+ if( (contexts != null) && (contexts.length > 0) )
+ { %>
+ <tr class="odd">
+ <td colspan="2">
+ <div class="pre"><%
+
+ for (int i = 0; i < contexts.length; i++)
+ { %>
+ <%= (i > 0 ) ? "<span class='ellipsis'> ... </span>" : "" %><%= contexts[i] %>
+ <% } %>
+ </div>
+ </td>
+ </tr> <%
+ } %>
+ </c:if><%-- details --%>
+ </wiki:SearchResultIterator>
+
+ <%-- If no results --%>
+ <c:if test="${fn:length(wikiActionBean.results) == 0}">
+ <tr>
+ <td class="nosearchresult" colspan="2"><fmt:message key="find.noresults" /></td>
+ </tr>
+ </c:if>
+
+ </table>
+ </div>
+ </div>
+ ${pagination}
+
+ </wiki:SearchResults>
+ </div>
+ </wiki:Tab>
+
+ <%-- Help tab --%>
+ <wiki:PageExists page="SearchPageHelp">
+ <wiki:Tab id="findhelp" titleKey="find.tab.help" accesskey="h">
+ <wiki:InsertPage page="SearchPageHelp" />
+ </wiki:Tab>
+ </wiki:PageExists>
+
+ </wiki:TabbedSection>
+ </s:layout-component>
+</s:layout-render>
+
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/Wiki.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/Wiki.jsp?rev=906367&r1=906366&r2=906367&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Wiki.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Wiki.jsp Thu Feb 4 05:16:11 2010
@@ -43,7 +43,7 @@
mainblogpage = pagename.substring(0, pagename.indexOf("_blogentry_"));
}
%>
-<s:layout-render name="${templates['DefaultLayout.jsp']}">
+<s:layout-render name="${templates['layout/DefaultLayout.jsp']}">
<%-- If wiki page is current, allow search engines to spider it --%>
<wiki:CheckVersion mode="latest">
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/Workflow.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/Workflow.jsp?rev=906367&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Workflow.jsp (added)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Workflow.jsp Thu Feb 4 05:16:11 2010
@@ -0,0 +1,164 @@
+<%--
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
+<%@ page errorPage="/Error.jsp" %>
+<s:layout-render name="${templates['layout/DefaultLayout.jsp']}">
+ <s:layout-component name="content">
+ <h3><fmt:message key="workflow.heading" /></h3>
+ <p><fmt:message key="workflow.instructions" /></p>
+ <s:errors/>
+
+ <!-- Pending Decisions -->
+ <h4><fmt:message key="workflow.decisions.heading" /></h4>
+
+ <c:if test="${empty wikiActionBean.decisions}">
+ <div class="information">
+ <fmt:message key="workflow.noinstructions" />
+ </div>
+ </c:if>
+
+ <c:if test="${!empty wikiActionBean.decisions}">
+ <div class="formhelp">
+ <fmt:message key="workflow.actor.instructions" />
+ </div>
+ <table class="wikitable">
+ <thead>
+ <tr>
+ <th width="5%" align="center"><fmt:message key="workflow.id" /></th>
+ <th width="45%" align="left"><fmt:message key="workflow.item" /></th>
+ <th width="15%" align="left"><fmt:message key="workflow.actions" /></th>
+ <th width="15%" align="left"><fmt:message key="workflow.requester" /></th>
+ <th width="20%" align="left"><fmt:message key="workflow.startTime" /></th>
+ </tr>
+ </thead>
+ <tbody>
+ <c:forEach var="decision" items="${wikiActionBean.decisions}" varStatus="loop">
+ <tr class="${((loop.index % 2) == 0) ? 'even' : 'odd'}">
+ <!-- Workflow ID -->
+ <td align="center"><c:out value="${decision.workflow.id}" /></td>
+ <!-- Name of item -->
+ <td align="left">
+ <fmt:message key="${decision.messageKey}">
+ <c:forEach var="messageArg" items="${decision.messageArguments}">
+ <fmt:param><c:out value="${messageArg}" /></fmt:param>
+ </c:forEach>
+ </fmt:message>
+ </td>
+ <!-- Possible actions (outcomes) -->
+ <td align="left">
+ <s:form id="decision.${decision.id}" beanclass="org.apache.wiki.action.WorkflowActionBean" method="POST" acceptcharset="UTF-8">
+ <input type="hidden" name="id" value="${decision.id}" />
+ <s:select name="outcome" value="${decision.defaultOutcome.messageKey}">
+ <s:options-collection collection="${decision.availableOutcomes}" value="messageKey" label="messageKey" />
+ </s:select>
+ <s:submit name="decide" />
+ </s:form>
+ </td>
+ <!-- Requester -->
+ <td align="left"><c:out value="${decision.owner.name}" /></td>
+ <!-- When did the actor start this step? -->
+ <td align="left">
+ <fmt:formatDate value="${decision.startTime}" pattern="${prefs.TimeFormat}" timeZone="${prefs.TimeZone}" />
+ </td>
+ </tr>
+ <!-- Hidden row with Decision details, if there are any -->
+ <c:if test="${!empty decision.facts}">
+ <tr class="${((loop.index % 2) == 0) ? 'even' : 'odd'}" class="hideDiv">
+ <td> </td>
+ <td colspan="4" class="split">
+ <a href="#"
+ title="<fmt:message key='workflow.details.title' />"
+ onclick="$('decision.<c:out value="${decision.workflow.id}"/>').toggle();" >
+ <fmt:message key="workflow.details" />
+ </a>
+ <div class="hideDiv" id="<c:out value='decision.${decision.workflow.id}' />">
+ <c:forEach var="fact" items="${decision.facts}">
+ <h5><fmt:message key="${fact.messageKey}" /></h5>
+ <p><c:out escapeXml="false" value="${fact.value}" /></p>
+ </c:forEach>
+ </div>
+ </td>
+ </tr>
+ </c:if>
+ </c:forEach>
+ </tbody>
+ </table>
+ </c:if>
+
+ <!-- Running workflows for which current user is the owner -->
+ <h4><fmt:message key="workflow.workflows.heading" /></h4>
+
+ <c:if test="${empty wikiActionBean.workflows}">
+ <div class="information">
+ <fmt:message key="workflow.noinstructions" />
+ </div>
+ </c:if>
+
+ <c:if test="${!empty wikiActionBean.workflows}">
+ <div class="formhelp">
+ <fmt:message key="workflow.owner.instructions" />
+ </div>
+ <table class="wikitable">
+ <thead>
+ <tr>
+ <th width="5%" align="center"><fmt:message key="workflow.id" /></th>
+ <th width="45%" align="left"><fmt:message key="workflow.item" /></th>
+ <th width="15%" align="left"><fmt:message key="workflow.actions" /></th>
+ <th width="15%" align="left"><fmt:message key="workflow.actor" /></th>
+ <th width="20%" align="left"><fmt:message key="workflow.startTime" /></th>
+ </tr>
+ </thead>
+ <tbody>
+ <c:forEach var="workflow" items="${wikiActionBean.workflows}" varStatus="loop">
+ <tr class="${((loop.index % 2) == 0) ? 'even' : 'odd'}">
+ <!-- Workflow ID -->
+ <td align="center"><c:out value="${workflow.id}" /></td>
+ <!-- Name of item -->
+ <td align="left">
+ <fmt:message key="${workflow.messageKey}">
+ <c:forEach var="messageArg" items="${workflow.messageArguments}">
+ <fmt:param><c:out value="${messageArg}" /></fmt:param>
+ </c:forEach>
+ </fmt:message>
+ </td>
+ <!-- Actions -->
+ <td align="left">
+ <s:form id="workflow.${workflow.id}" beanclass="org.apache.wiki.action.WorkflowActionBean" method="POST" acceptcharset="UTF-8">
+ <input type="hidden" name="id" value="${workflow.id}" />
+ <s:submit name="abort"/>
+ </s:form>
+ </td>
+ <!-- Current actor -->
+ <td align="left"><c:out value="${workflow.currentActor.name}" /></td>
+ <!-- When did the actor start this step? -->
+ <td align="left">
+ <fmt:formatDate value="${workflow.currentStep.startTime}" pattern="${prefs.TimeFormat}" timeZone="${prefs.TimeZone}" />
+ </td>
+ </tr>
+ </c:forEach>
+ </tbody>
+ </table>
+ </c:if>
+ </s:layout-component>
+</s:layout-render>
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/layout/DefaultLayout.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/layout/DefaultLayout.jsp?rev=906367&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/layout/DefaultLayout.jsp (added)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/layout/DefaultLayout.jsp Thu Feb 4 05:16:11 2010
@@ -0,0 +1,195 @@
+<%--
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
+<%@ page import="org.apache.wiki.WikiContext" %>
+<%@ page import="org.apache.wiki.action.WikiContextFactory" %>
+<%--
+ This file contains the default layout used by all JSPWiki 3 pages.
+ The default layout contains the HTML doctype declaration, header,
+ and page layout. It can be customized in the following ways:
+
+ 1) Top-level JSPs can define default components, as defined by
+ Stripes <s:layout-component name="foo"> elements. Named components
+ that can be overridden include:
+
+ headTitle : The HTML page title, which will be rendered
+ in the <title> element. Default=wiki: pagename
+ stylesheet : Link tags to external stylesheets. Default=blank
+ inlinecss : Inline stylesheets. Default=blank
+ script : JavaScript <script> elements. Default=blank
+ jslocalizedstrings : Localized scripts for JavaScript
+ functions. Default=blank
+ jsfunction : JavaScript functions. Default=blank
+ headMetaRobots : Search engine options. Default=noindex,nofollow
+ content : The page contents. Default=blank
+
+ 2) DefaultLayout injects additional JSPs that are meant to be
+ customized. These include:
+
+ LocalHeader.jsp : A "local header" that can contain company logos
+ or other markup. Default=blank
+
+--%>
+<s:layout-definition>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title>
+ <%--
+
+ Title: by default, use the "view page" title
+ --%>
+ <s:layout-component name="headTitle">
+ <fmt:message key="view.title.view">
+ <fmt:param><wiki:Variable var="ApplicationName" /></fmt:param>
+ <fmt:param><wiki:PageName/></fmt:param>
+ </fmt:message>
+ </s:layout-component>
+ </title>
+ <%--
+
+ CSS stylesheets
+ --%>
+ <link rel="stylesheet" media="screen, projection, print" type="text/css" href="<wiki:Link format='url' templatefile='jspwiki.css' />" />
+ <%-- put this at the top, to avoid double load when not yet cached --%>
+ <%-- FIXME : @media print is included in jspwiki.css
+ <link rel="stylesheet" type="text/css" media="print" href="<wiki:Link format='url' templatefile='jspwiki_print.css' />" />
+ --%>
+ <link rel="alternate stylesheet" type="text/css" href="<wiki:Link format='url' templatefile='jspwiki_print.css' />" title="Print friendly" />
+ <link rel="alternate stylesheet" type="text/css" href="<wiki:Link format='url' templatefile='jspwiki.css' />" title="Standard" />
+ <s:layout-component name="stylesheet" />
+ <s:layout-component name="inlinecss" />
+ <%--
+
+ Links to favicon and common pages
+ --%>
+ <link rel="search" href="<wiki:LinkTo format='url' page='FindPage' />" title='Search ${wikiEngine.applicationName}' />
+ <link rel="help" href="<wiki:LinkTo format='url' page='TextFormattingRules' />" title="Help" />
+ <link rel="start" href="<wiki:LinkTo format='url' page='${wikiEngine.frontPage}' />" title="Front page" />
+ <link rel="shortcut icon" type="image/x-icon" href="<wiki:Link format='url' jsp='images/favicon.ico' />" />
+ <%-- ie6 needs next line --%>
+ <link rel="icon" type="image/x-icon" href="<wiki:Link format='url' jsp='favicon.ico' />" />
+ <%--
+
+ Support for the universal edit button
+ (www.universaleditbutton.org)
+ --%>
+ <wiki:CheckRequestContext context='view|info|diff|upload'>
+ <wiki:Permission permission="edit">
+ <wiki:PageType type="page">
+ <link rel="alternate" type="application/x-wiki" href="<wiki:EditLink format='url' />" title="<fmt:message key='actions.edit.title' />" />
+ </wiki:PageType>
+ </wiki:Permission>
+ </wiki:CheckRequestContext>
+ <%--
+
+ Skins: extra stylesheets, extra javascript
+ --%>
+ <c:if test='${(!empty prefs.Skin) && (prefs.Skin!="PlainVanilla") }'>
+ <link rel="stylesheet" type="text/css" media="screen, projection, print" href="<wiki:Link format='url' templatefile='skins/${prefs.Skin}/skin.css' />" />
+ <script type="text/javascript" src="<wiki:Link format='url' templatefile='skins/${prefs.Skin}/skin.js' />"></script>
+ </c:if>
+ <%--
+
+ JavaScript
+
+ <script src="http://ajax.googleapis.com/ajax/libs/mootools/1.2.3/mootools.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/mootools/1.2.3/mootools-yui-compressed.js"></script>
+ --%>
+ <script type="text/javascript" src="<wiki:Link format='url' jsp='scripts/mootools-core.js' />"></script>
+ <script type="text/javascript" src="<wiki:Link format='url' jsp='scripts/mootools-more.js' />"></script>
+
+ <script type="text/javascript" src="<wiki:Link format='url' jsp='scripts/prettify.js' />"></script>
+ <script type="text/javascript" src="<wiki:Link format='url' jsp='scripts/jspwiki-common.js' />"></script>
+ <script type="text/javascript" src="<wiki:Link format='url' jsp='scripts/jspwiki-commonstyles.js' />"></script>
+ <s:layout-component name="script" />
+ <%--
+
+ JavaScript: localized strings and functions
+ --%>
+ <script type="text/javascript">//<![CDATA[
+ /* Localized javascript strings: LocalizedStrings[] */
+ <%-- DELETEME
+ <s:layout-component name="jslocalizedstrings" />
+ <s:layout-component name="jsfunction" />
+ --%>
+ <wiki:IncludeResources type="jslocalizedstrings"/>
+ <wiki:IncludeResources type="jsfunction"/>
+ //]]></script>
+ <%--
+
+ Meta tags
+ --%>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <meta name="wikiContext" content='${wikiContext.requestContext}' />
+ <meta name="wikiBaseUrl" content='<wiki:BaseURL/>' />
+ <meta name="wikiPageUrl" content='<wiki:Link format="url" page="#$%"/>' />
+ <meta name="wikiEditUrl" content='<wiki:EditLink format="url" />' />
+ <meta name="wikiJsonUrl" content='<%= WikiContextFactory.findContext(pageContext).getURL( WikiContext.NONE, "JSON-RPC" ) %>' /><%--unusual pagename--%>
+ <meta name="wikiPageName" content='<wiki:Variable var="pagename" />' /><%--pagename without blanks--%>
+ <meta name="wikiUserName" content='<wiki:UserName/>' />
+ <meta name="wikiTemplateUrl" content='<wiki:Link format="url" templatefile="" />' />
+ <meta name="wikiApplicationName" content='${wikiEngine.applicationName}' />
+ <%--
+
+ Search engines: by default, page is not indexed or followed
+ --%>
+ <s:layout-component name="headMetaRobots">
+ <meta name="robots" content="noindex,nofollow" />
+ </s:layout-component>
+ <%--
+
+ RSS Feed discovery
+ --%>
+ <wiki:FeedDiscovery/>
+
+ <wiki:Include page="${templates['layout/LocalHeader.jsp']}" />
+
+
+ </head>
+
+ <body class="${wikiContext.requestContext}">
+
+ <div id="wikibody" class="${prefs.Orientation}">
+
+ <wiki:Include page="${templates['layout/Header.jsp']}" />
+
+ <div id="content">
+ <div id="page">
+ <wiki:Include page="${templates['layout/PageActionsTop.jsp']}" />
+ <s:layout-component name="content" />
+ <wiki:Include page="${templates['layout/PageActionsBottom.jsp']}" />
+ </div>
+ <wiki:Include page="${templates['layout/Favorites.jsp']}" />
+ <div class="clearbox"></div>
+ </div>
+
+ <wiki:Include page="${templates['layout/Footer.jsp']}" />
+
+ </div>
+ </body>
+
+</html>
+
+</s:layout-definition>
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/layout/Favorites.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/layout/Favorites.jsp?rev=906367&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/layout/Favorites.jsp (added)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/layout/Favorites.jsp Thu Feb 4 05:16:11 2010
@@ -0,0 +1,136 @@
+<%--
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+--%>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ page import="org.apache.wiki.*" %>
+
+<div id="favorites">
+
+ <div id="hiddenmorepopup">
+ <ul id="morepopup">
+ <wiki:CheckRequestContext context='view|info|diff|upload'>
+ <wiki:PageExists>
+ <wiki:Permission permission="comment">
+ <wiki:PageType type="page">
+ <li><a class="action comment"
+ href="<wiki:CommentLink format='url' />"
+ title="<fmt:message key='actions.comment.title' />"><fmt:message key="actions.comment" />
+ </a></li>
+ </wiki:PageType>
+ <wiki:PageType type="attachment">
+ <li><a class="action comment"
+ href="<wiki:BaseURL/>Comment.jsp?page=<wiki:ParentPageName />"
+ title="<fmt:message key='actions.comment.title' />"><fmt:message key="actions.comment" />
+ </a></li>
+ </wiki:PageType>
+ </wiki:Permission>
+ </wiki:PageExists>
+ </wiki:CheckRequestContext>
+
+ <wiki:PageExists>
+ <wiki:CheckRequestContext context='view|info|diff|upload|edit|comment|preview'>
+ <li>
+ <wiki:CheckVersion mode="latest">
+ <a class="action rawpage wikipage"
+ href="<wiki:Link format='url'><wiki:Param name='skin' value='raw'/></wiki:Link>"
+ title="<fmt:message key='actions.rawpage.title' />"><fmt:message key='actions.rawpage' />
+ </a>
+ </wiki:CheckVersion>
+ <wiki:CheckVersion mode="notlatest">
+ <a class="action rawpage wikipage"
+ href="<wiki:Link format='url' version='${param.version}'><wiki:Param name='skin' value='raw'/></wiki:Link>"
+ title="<fmt:message key='actions.rawpage.title' />"><fmt:message key='actions.rawpage' />
+ </a>
+ </wiki:CheckVersion>
+ </li>
+ </wiki:CheckRequestContext>
+ </wiki:PageExists>
+
+ <wiki:CheckRequestContext context='!workflow'>
+ <wiki:UserCheck status="authenticated">
+ <li><a class="action workflow"
+ href="<wiki:Link jsp='Workflow.jsp' format='url' />"
+ title="<fmt:message key='actions.workflow.title' />"><fmt:message key='actions.workflow' />
+ </a></li>
+ </wiki:UserCheck>
+ </wiki:CheckRequestContext>
+
+ <wiki:Permission permission="createGroups">
+ <li><a class="action creategroup"
+ href="<wiki:Link jsp='NewGroup.jsp' format='url' />"
+ title="<fmt:message key='actions.creategroup.title' />"><fmt:message key='actions.creategroup' />
+ </a></li>
+ </wiki:Permission>
+ <li class='separator'>
+ <div id="moremenu"><wiki:InsertPage page="MoreMenu" /></div>
+ </li>
+ </ul>
+ </div>
+
+ <wiki:CheckRequestContext context='!login'>
+
+ <wiki:UserCheck status="known">
+ <wiki:Translate>[{If page='{$username}Favorites' exists='true'
+
+%%collapsebox-closed
+! [My Favorites|{$username}Favorites]
+[{InsertPage page='{$username}Favorites' }]
+/% }]
+ </wiki:Translate>
+ </wiki:UserCheck>
+
+ <wiki:Permission permission="view">
+
+ <%-- LeftMenu is automatically generated from a Wiki page called "LeftMenu" --%>
+ <div class="leftmenu">
+ <wiki:InsertPage page="LeftMenu" />
+ <wiki:NoSuchPage page="LeftMenu">
+ <div class="error">
+ <wiki:EditLink page="LeftMenu">
+ <fmt:message key="fav.nomenu"><fmt:param>LeftMenu</fmt:param></fmt:message>
+ </wiki:EditLink>
+ </div>
+ </wiki:NoSuchPage>
+ </div>
+
+ <div class="leftmenufooter">
+ <wiki:InsertPage page="LeftMenuFooter" />
+ <wiki:NoSuchPage page="LeftMenuFooter">
+ <div class="error">
+ <wiki:EditLink page="LeftMenuFooter">
+ <fmt:message key="fav.nomenu"><fmt:param>LeftMenuFooter</fmt:param></fmt:message>
+ </wiki:EditLink>
+ </div>
+ </wiki:NoSuchPage>
+ </div>
+
+ </wiki:Permission>
+
+ </wiki:CheckRequestContext>
+
+ <div class="wikiversion"><%=Release.APPNAME%> v<%=Release.getVersionString()%>
+ <span class="rssfeed">
+ <wiki:RSSImageLink title='<%=LocaleSupport.getLocalizedMessage(pageContext,"fav.aggregatewiki.title")%>' />
+ </span>
+ </div>
+
+</div>
\ No newline at end of file
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/layout/Footer.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/layout/Footer.jsp?rev=906367&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/layout/Footer.jsp (added)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/layout/Footer.jsp Thu Feb 4 05:16:11 2010
@@ -0,0 +1,45 @@
+<%--
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+--%>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
+<%@ page import="org.apache.wiki.*" %>
+<div id="footer">
+
+ <div class="applicationlogo" >
+ <c:set var="frontPageTitle"><fmt:message key='actions.home.title' ><fmt:param><c:out value='${wikiEngine.frontPage}' /></fmt:param></fmt:message></c:set>
+ <s:link beanclass="org.apache.wiki.action.ViewActionBean" title="${frontPageTitle}"><fmt:message key="actions.home" /></s:link>
+ </div>
+
+ <div class="companylogo"></div>
+
+ <div class="copyright"><wiki:InsertPage page="CopyrightNotice" /></div>
+
+ <div class="wikiversion">
+ <%=Release.APPNAME%> v<%=Release.getVersionString()%>
+ </div>
+
+ <div class="rssfeed">
+ <wiki:RSSImageLink title="Aggregate the RSS feed" />
+ </div>
+
+</div>
\ No newline at end of file
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/layout/Header.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/layout/Header.jsp?rev=906367&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/layout/Header.jsp (added)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/layout/Header.jsp Thu Feb 4 05:16:11 2010
@@ -0,0 +1,44 @@
+<%--
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+--%>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
+<div id="header">
+
+ <div class="titlebox"><wiki:InsertPage page="TitleBox" /></div>
+
+ <div class="applicationlogo" >
+ <c:set var="frontPageTitle"><fmt:message key='actions.home.title' ><fmt:param><c:out value='${wikiEngine.frontPage}' /></fmt:param></fmt:message></c:set>
+ <s:link beanclass="org.apache.wiki.action.ViewActionBean" title="${frontPageTitle}"><fmt:message key="actions.home" /></s:link>
+ </div>
+
+ <div class="companylogo"></div>
+
+ <wiki:Include page="${templates['layout/UserBox.jsp']}" />
+
+ <div class="pagename"><wiki:PageName/></div>
+
+ <div class="searchbox"><wiki:Include page="${templates['layout/SearchBox.jsp']}" /></div>
+
+ <div class="breadcrumbs"><fmt:message key="header.yourtrail" /><wiki:Breadcrumbs/></div>
+
+</div>
\ No newline at end of file
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/layout/LocalHeader.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/layout/LocalHeader.jsp?rev=906367&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/layout/LocalHeader.jsp (added)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/layout/LocalHeader.jsp Thu Feb 4 05:16:11 2010
@@ -0,0 +1,35 @@
+<%--
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+--%>
+<%-- This is a local JSP header file, which you can override in your own template
+ if you want to put something in the head-section of the page.
+
+ The JSPWiki default template and distribution will never have anything here
+ except this comment. Therefore it's safe to override without accidentally
+ removing any functionality.
+
+ Some things which you might want to put here would e.g. be your site tracker
+ Javascript (like Google Analytics, or Sitemeter, or whatever).
+
+ The safest trick would be to create your own template (say "sitetemplate") directory,
+ and just put a new LocalHeader.jsp in it. JSPWiki will always use the
+ files in the "default" template, if it cannot locate an equivalent file in
+ your defined template directory.
+ --%>
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/layout/PageActionsBottom.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/layout/PageActionsBottom.jsp?rev=906367&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/layout/PageActionsBottom.jsp (added)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/layout/PageActionsBottom.jsp Thu Feb 4 05:16:11 2010
@@ -0,0 +1,52 @@
+<%--
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+--%>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<wiki:CheckRequestContext context='view|diff|edit|upload|info'>
+ <div id='actionsBottom' class="pageactions">
+ <wiki:PageExists>
+ <ul>
+ <li>
+ <wiki:CheckVersion mode="latest">
+ <fmt:message key="info.lastmodified">
+ <fmt:param><wiki:PageVersion/></fmt:param>
+ <fmt:param><wiki:DiffLink version="latest" newVersion="previous"><wiki:PageDate format='${prefs["TimeFormat"]}' /></wiki:DiffLink></fmt:param>
+ <fmt:param><wiki:Author/></fmt:param>
+ </fmt:message>
+ </wiki:CheckVersion>
+
+ <wiki:CheckVersion mode="notlatest">
+ <fmt:message key="actions.publishedon">
+ <fmt:param><wiki:PageDate format='${prefs["TimeFormat"]}' /></fmt:param>
+ <fmt:param><wiki:Author/></fmt:param>
+ </fmt:message>
+ </wiki:CheckVersion>
+ </li>
+ <li><wiki:RSSImageLink mode="wiki" /></li>
+ <li><a href="#top"
+ class="action quick2top"
+ title="<fmt:message key='actions.gototop' />">«</a></li>
+ </ul>
+ </wiki:PageExists>
+
+ <wiki:NoSuchPage><fmt:message key="actions.notcreated" /></wiki:NoSuchPage>
+ </div>
+</wiki:CheckRequestContext>
\ No newline at end of file
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/layout/PageActionsTop.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/layout/PageActionsTop.jsp?rev=906367&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/layout/PageActionsTop.jsp (added)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/layout/PageActionsTop.jsp Thu Feb 4 05:16:11 2010
@@ -0,0 +1,56 @@
+<%--
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+--%>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
+<div id="actionsTop" class="pageactions">
+ <ul>
+
+ <wiki:CheckRequestContext context='view|info|diff|upload|rename'>
+ <wiki:Permission permission="edit">
+ <li>
+ <wiki:PageType type="attachment">
+ <c:set var="editParentTitle"><fmt:message key="actions.editparent.title" /></c:set>
+ <s:link
+ beanclass="org.apache.wiki.action.EditActionBean" event="edit"
+ accesskey="e" class="action edit"
+ title="${editParentTitle}">
+ <fmt:message key='actions.edit' />
+ <s:param name="page"><wiki:ParentPageName/></s:param>
+ </s:link>
+ </wiki:PageType>
+ </li>
+ </wiki:Permission>
+ </wiki:CheckRequestContext>
+
+ <%-- converted to popup menu by jspwiki-common.js--%>
+ <li id="morebutton">
+ <s:link
+ beanclass="org.apache.wiki.action.ViewActionBean"
+ class="action more">
+ <s:param name="page" value="MoreMenu" />
+ <fmt:message key="actions.more" />
+ </s:link>
+ </li>
+
+ </ul>
+</div>
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/layout/SearchBox.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/layout/SearchBox.jsp?rev=906367&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/layout/SearchBox.jsp (added)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/layout/SearchBox.jsp Thu Feb 4 05:16:11 2010
@@ -0,0 +1,65 @@
+<%--
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
+<%-- Provides a simple searchbox that can be easily included anywhere on the page --%>
+<%-- Powered by jswpwiki-common.js//SearchBox --%>
+
+<s:form beanclass="org.apache.wiki.action.SearchActionBean" class="wikiform" id="searchForm" acceptcharset="UTF-8">
+
+ <c:set var="goTitle" scope="page"><fmt:message key="find.submit.go"/></c:set>
+ <s:text onblur="if( this.value == '' ) { this.value = this.defaultValue }; return true; "
+ onfocus="if( this.value == this.defaultValue ) { this.value = ''}; return true; "
+ name="query" id="query"
+ size="20"
+ accesskey="f"><fmt:message key='sbox.search.submit'/></s:text>
+ <s:submit name="search" id="searchSubmit" title="${goTitle}" value="${goTitle}" />
+
+ <div id="searchboxMenu" style='visibility:hidden;'>
+ <div id="searchTools">
+ <a href="#" id='quickView' class='btn'
+ onclick="SearchBox.navigate( '<s:url beanclass="org.apache.wiki.action.ViewActionBean"/>','<fmt:message key="sbox.view.title"/>' );"
+ title="<fmt:message key="sbox.view.title"/>"><span><span><fmt:message key="sbox.view"/></span></span></a>
+ <a href="#" id='quickEdit' class='btn'
+ onclick="SearchBox.navigate( '<s:url beanclass="org.apache.wiki.action.EditActionBean"><s:param name="page" value="Main"/></s:url>','<fmt:message key="sbox.edit.title"/>' );"
+ title="<fmt:message key="sbox.edit.title"/>"><span><span><fmt:message key="sbox.edit"/></span></span></a>
+ <a href="#" id='quickClone' class='btn'
+ onclick="return SearchBox.navigate( '<s:url beanclass="org.apache.wiki.action.EditActionBean"><s:param name="page" value="Main"/></s:url>', '<fmt:message key="sbox.clone.title"/>', true );"
+ title="<fmt:message key="sbox.clone.title"/>"><span><span><fmt:message key="sbox.clone"/></span></span></a>
+ <a href="#" id="advancedSearch" class='btn'
+ onclick="SearchBox.navigate( '<s:url beanclass="org.apache.wiki.action.SearchActionBean"><s:param name="query" value="Main"/></s:url>','<wiki:PageName/>' )"
+ title="<fmt:message key="sbox.find.title"/> [ f ]"><span><span><fmt:message key="sbox.find"/></span></span></a>
+ </div>
+ <div id="searchResult">
+ <fmt:message key='sbox.search.result' />
+ <span id="searchTarget"><fmt:message key='sbox.search.target' /></span>
+ <span id="searchSpin" class="spin" style="position:absolute;display:none;"></span>
+ <div id="searchOutput"></div>
+ </div>
+ <div id="recentSearches" style="display:none;">
+ <fmt:message key="sbox.recentsearches" />
+ <span><a href="#" id="recentClear"><fmt:message key="sbox.clearrecent" /></a></span>
+ </div>
+ </div>
+
+</s:form>
\ No newline at end of file
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/layout/UserBox.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/layout/UserBox.jsp?rev=906367&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/layout/UserBox.jsp (added)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/layout/UserBox.jsp Thu Feb 4 05:16:11 2010
@@ -0,0 +1,88 @@
+<%--
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+--%>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
+<div class="userbox">
+
+ <wiki:UserCheck status="anonymous">
+ <span class="username anonymous">
+ <fmt:message key="fav.greet.anonymous" />
+ </span>
+ </wiki:UserCheck>
+ <wiki:UserCheck status="asserted">
+ <span class="username asserted">
+ <fmt:message key="fav.greet.asserted">
+ <fmt:param><wiki:Translate>[<wiki:UserName/>]</wiki:Translate></fmt:param>
+ </fmt:message>
+ </span>
+ </wiki:UserCheck>
+ <wiki:UserCheck status="authenticated">
+ <span class="username authenticated">
+ <fmt:message key="fav.greet.authenticated">
+ <fmt:param><wiki:Translate>[<wiki:UserName/>]</wiki:Translate></fmt:param>
+ </fmt:message>
+ </span>
+ </wiki:UserCheck>
+
+ <%-- action buttons --%>
+ <wiki:UserCheck status="notAuthenticated">
+ <wiki:CheckRequestContext context='!login'>
+ <wiki:Permission permission="login">
+ <c:set var="loginTitle"><fmt:message key='actions.login.title' /></c:set>
+ <s:link
+ beanclass="org.apache.wiki.action.LoginActionBean"
+ class="btn login"
+ title="${loginTitle}">
+ <s:param name="redirect" value="${wikiContext.page.name}" />
+ <span><span><fmt:message key="actions.login"/></span></span>
+ </s:link>
+ </wiki:Permission>
+ </wiki:CheckRequestContext>
+ </wiki:UserCheck>
+
+ <wiki:UserCheck status="authenticated">
+ <c:set var="logoutTitle"><fmt:message key='actions.logout.title' /></c:set>
+ <s:link
+ beanclass="org.apache.wiki.action.LoginActionBean" event="logout"
+ class="btn logout"
+ title="${logoutTitle}">
+ <span><span><fmt:message key="actions.logout"/></span></span>
+ </s:link>
+ </wiki:UserCheck>
+
+ <wiki:CheckRequestContext context='!prefs'>
+ <wiki:CheckRequestContext context='!preview'>
+ <c:set var="prefsTitle"><fmt:message key='actions.prefs.title' /></c:set>
+ <s:link
+ beanclass="org.apache.wiki.action.UserPreferencesActionBean"
+ class="btn prefs" accesskey="p"
+ title="${prefsTitle}">
+ <s:param name="redirect" value="${wikiContext.page.name}" />
+ <span><span><fmt:message key="actions.prefs"/></span></span>
+ </s:link>
+ </wiki:CheckRequestContext>
+ </wiki:CheckRequestContext>
+
+ <div class="clearbox"></div>
+
+</div>
\ No newline at end of file