Author: ajaquith
Date: Mon Mar 1 05:14:07 2010
New Revision: 917383
URL: http://svn.apache.org/viewvc?rev=917383&view=rev
Log:
The Error.jsp references were made consistent in all JSPs. Rather than use JSTL
syntax (which won't evaluate when used with <% page errorPage %> tag), the
references now all use /Error.jsp, which itself jsp:includes the template JSP
Error.jsp using JSTL. This makes the error page customizable per-template, but
still very easy to use.
Added:
incubator/jspwiki/trunk/src/WebContent/Error.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/admin/Users.jsp
Removed:
incubator/jspwiki/trunk/src/WebContent/templates/default/admin/tabs/Users.jsp
Modified:
incubator/jspwiki/trunk/src/WebContent/index.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/AttachmentInfo.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/EditGroup.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/Error.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/Forbidden.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/Group.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/Login.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/Message.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/Preferences.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/admin/Admin.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/admin/Install.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/admin/InstallSuccess.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/admin/tabs/Security.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/editors/FCK.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp
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/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/StaticLayout.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/UserBox.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/tabs/AttachmentsTab.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/tabs/PageInfoTab.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/tabs/ProfileTab.jsp
Added: incubator/jspwiki/trunk/src/WebContent/Error.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Error.jsp?rev=917383&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Error.jsp (added)
+++ incubator/jspwiki/trunk/src/WebContent/Error.jsp Mon Mar 1 05:14:07 2010
@@ -0,0 +1,21 @@
+<%--
+ 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.
+--%>
+<jsp:include page="${templates['Error.jsp']}" />
\ No newline at end of file
Modified: incubator/jspwiki/trunk/src/WebContent/index.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/index.jsp?rev=917383&r1=917382&r2=917383&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/index.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/index.jsp Mon Mar 1 05:14:07 2010
@@ -1 +1,21 @@
+<%--
+ 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.
+--%>
<jsp:forward page="Wiki.jsp" />
\ No newline at end of file
Modified:
incubator/jspwiki/trunk/src/WebContent/templates/default/AttachmentInfo.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/AttachmentInfo.jsp?rev=917383&r1=917382&r2=917383&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/AttachmentInfo.jsp
(original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/AttachmentInfo.jsp
Mon Mar 1 05:14:07 2010
@@ -18,19 +18,20 @@
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="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ page import="java.text.SimpleDateFormat" %>
<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.action.WikiContextFactory" %>
+<%@ page import="org.apache.wiki.api.WikiPage" %>
<%@ page import="org.apache.wiki.attachment.*" %>
<%@ page import="org.apache.wiki.i18n.InternationalizationManager" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld"; prefix="s" %>
-<%@ page import="org.apache.wiki.action.WikiContextFactory" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
-<%@ page import="org.apache.wiki.api.WikiPage" %>
<%@ page import="org.apache.wiki.content.jcr.JCRWikiPage" %>
-<%@ page import="java.text.SimpleDateFormat" %>
+<%@ page errorPage="/Error.jsp" %>
<%
WikiContext c = WikiContextFactory.findContext( pageContext );
WikiPage wikiPage = c.getPage();
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=917383&r1=917382&r2=917383&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Comment.jsp
(original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Comment.jsp Mon
Mar 1 05:14:07 2010
@@ -21,6 +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" %>
+<%@ page errorPage="/Error.jsp" %>
<s:layout-render name="${templates['layout/DefaultLayout.jsp']}">
<%-- Page title should say Comment: + pagename --%>
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=917383&r1=917382&r2=917383&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/CreateProfile.jsp
(original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/CreateProfile.jsp
Mon Mar 1 05:14:07 2010
@@ -18,11 +18,12 @@
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://jakarta.apache.org/jspwiki.tld"; prefix="wiki" %>
<%@ 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['layout/DefaultLayout.jsp']}">
<s:layout-component name="content">
<wiki:TabbedSection defaultTab="${param.tab}">
Modified: 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=917383&r1=917382&r2=917383&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/EditGroup.jsp
(original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/EditGroup.jsp Mon
Mar 1 05:14:07 2010
@@ -18,10 +18,11 @@
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://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">
<wiki:TabbedSection defaultTab="editgroup">
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/Error.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/Error.jsp?rev=917383&r1=917382&r2=917383&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Error.jsp
(original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Error.jsp Mon Mar
1 05:14:07 2010
@@ -19,7 +19,7 @@
under the License.
--%>
<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld"; prefix="s" %>
-<%@ page isErrorPage="true" %>
+<%@ page errorPage="/Error.jsp" %>
<s:useActionBean beanclass="org.apache.wiki.action.MessageActionBean"
event="error" id="error" />
<s:layout-render name="${templates['layout/StaticLayout.jsp']}">
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/Forbidden.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/Forbidden.jsp?rev=917383&r1=917382&r2=917383&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Forbidden.jsp
(original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Forbidden.jsp Mon
Mar 1 05:14:07 2010
@@ -19,6 +19,7 @@
under the License.
-->
<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld"; prefix="s"%>
+<%@ page errorPage="/Error.jsp" %>
<s:layout-render name="${templates['layout/StaticLayout.jsp']}">
<s:layout-component name="headTitle">
Modified: 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=917383&r1=917382&r2=917383&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Group.jsp
(original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Group.jsp Mon Mar
1 05:14:07 2010
@@ -22,6 +22,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" %>
+<%@ page errorPage="/Error.jsp" %>
<s:layout-render name="${templates['layout/DefaultLayout.jsp']}">
<s:layout-component name="content">
<wiki:TabbedSection defaultTab="viewgroup">
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=917383&r1=917382&r2=917383&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Login.jsp
(original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Login.jsp Mon Mar
1 05:14:07 2010
@@ -26,6 +26,7 @@
<%@ page import="org.apache.wiki.action.*" %>
<%@ page import="org.apache.wiki.auth.*" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ page errorPage="/Error.jsp" %>
<%
String postURL = "";
WikiContext ctx = WikiContextFactory.findContext( pageContext );
Modified: 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=917383&r1=917382&r2=917383&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Message.jsp
(original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Message.jsp Mon
Mar 1 05:14:07 2010
@@ -21,11 +21,8 @@
<%@ 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" />
+<%@ page errorPage="/Error.jsp" %>
+<div class="error">
+ <c:out value="${message}" />
+</div>
+<br clear="all" />
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=917383&r1=917382&r2=917383&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Preferences.jsp
(original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Preferences.jsp
Mon Mar 1 05:14:07 2010
@@ -24,6 +24,7 @@
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld"; prefix="wiki" %>
<%@ 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['layout/DefaultLayout.jsp']}">
<s:layout-component name="script">
Modified: 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=917383&r1=917382&r2=917383&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Search.jsp
(original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Search.jsp Mon Mar
1 05:14:07 2010
@@ -26,10 +26,10 @@
<%@ page import="java.net.URLEncoder" %>
<%@ page import="java.util.*" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ page import="org.apache.commons.lang.*" %>
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.ui.*" %>
-<%@ page import="org.apache.commons.lang.*" %>
-<%@ page errorPage="${templates['Error.jsp']}" %>
+<%@ page errorPage="/Error.jsp" %>
<s:layout-render name="${templates['layout/DefaultLayout.jsp']}">
<s:layout-component name="content">
<wiki:TabbedSection>
Modified: 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=917383&r1=917382&r2=917383&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Workflow.jsp
(original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Workflow.jsp Mon
Mar 1 05:14:07 2010
@@ -22,7 +22,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" %>
-<%@ page errorPage="${templates['Error.jsp']}" %>
+<%@ page errorPage="/Error.jsp" %>
<s:layout-render name="${templates['layout/DefaultLayout.jsp']}">
<s:layout-component name="content">
<h3><fmt:message key="workflow.heading" /></h3>
Modified:
incubator/jspwiki/trunk/src/WebContent/templates/default/admin/Admin.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/admin/Admin.jsp?rev=917383&r1=917382&r2=917383&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/admin/Admin.jsp
(original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/admin/Admin.jsp
Mon Mar 1 05:14:07 2010
@@ -21,7 +21,7 @@
<%@ 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 errorPage="${templates['Error.jsp']}" %>
+<%@ page errorPage="/Error.jsp" %>
<s:layout-render name="${templates['layout/DefaultLayout.jsp']}">
<s:layout-component name="headTitle">
@@ -34,59 +34,57 @@
<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
- in your <tt>jspwiki.properties</tt> file.</div>
+
+ <wiki:TabbedSection defaultTab="${param['tab']}">
- <wiki:TabbedSection defaultTab="${param['tab']}">
-
- <wiki:Tab id="security" title="Security">
- <jsp:include page="${templates['admin/tabs/Security.jsp']}" />
- </wiki:Tab>
+ <wiki:Tab id="security" title="Security">
+ <jsp:include page="${templates['admin/tabs/Security.jsp']}" />
+ </wiki:Tab>
- <wiki:Tab id="users" title="Users"
- beanclass="org.apache.wiki.action.AdministerProfilesActionBean" />
-
- <wiki:Tab id="groups" title="Groups">
- <div>
- <p>This is a list of all groups in this wiki. If you click on the
group name,
- you will be taken to the administration page of that particular
group.</p>
- <p><wiki:Plugin plugin="Groups" /></p>
+ <wiki:Tab id="users" title="Users"
+ beanclass="org.apache.wiki.action.AdministerProfilesActionBean" />
+
+ <wiki:Tab id="groups" title="Groups">
+ <div>
+ <p>This is a list of all groups in this wiki. If you click on the
group name,
+ you will be taken to the administration page of that particular
group.</p>
+ <p><wiki:Plugin plugin="Groups" /></p>
+ </div>
+ </wiki:Tab>
+
+ <wiki:AdminBeanIterator type="core" id="ab">
+ <wiki:Tab id="${ab.id}" title="${ab.title}">
+ <div class="formcontainer">
+ <s:form beanclass="org.apache.wiki.action.AdminActionBean"
method="post" acceptcharset="UTF-8">
+ <s:hidden name="tab-admin" value="core" />
+ <s:hidden name="tab-core" value="${ab.title}" />
+ <s:hidden name="bean" value="${ab.id}" />
+ <%= ab.doGet( (WikiContext)request.getAttribute(
"wikiActionBeanContext" ) ) %>
+ <s:submit name="admin" value="Submit" />
+ </s:form>
</div>
</wiki:Tab>
-
- <wiki:AdminBeanIterator type="core" id="ab">
- <wiki:Tab id="${ab.id}" title="${ab.title}">
- <div class="formcontainer">
- <s:form beanclass="org.apache.wiki.action.AdminActionBean"
method="post" acceptcharset="UTF-8">
- <s:hidden name="tab-admin" value="core" />
- <s:hidden name="tab-core" value="${ab.title}" />
- <s:hidden name="bean" value="${ab.id}" />
- <%= ab.doGet( (WikiContext)request.getAttribute(
"wikiActionBeanContext" ) ) %>
- <s:submit name="admin" value="Submit" />
- </s:form>
- </div>
- </wiki:Tab>
- </wiki:AdminBeanIterator>
-
- <wiki:AdminBeanIterator type="editors" id="ab">
- <wiki:Tab id="${ab.id}" title="${ab.title}">
- <div class="formcontainer">
- <s:form beanclass="org.apache.wiki.action.AdminActionBean"
method="post" acceptcharset="UTF-8">
- <s:hidden name="tab-admin" value="editors" />
- <s:hidden name="tab-editors" value="${ab.title}" />
- <s:hidden name="bean" value="${ab.id}" />
- <%= ab.doGet( (WikiContext)request.getAttribute(
"wikiActionBeanContext" ) ) %>
- <s:submit name="admin" value="Submit" />
- </s:form>
- </div>
- </wiki:Tab>
- </wiki:AdminBeanIterator>
-
- <wiki:Tab id="filters" title="Filters">
- <p>There will be more filter stuff here</p>
- </wiki:Tab>
+ </wiki:AdminBeanIterator>
- </wiki:TabbedSection>
- </div>
+ <wiki:AdminBeanIterator type="editors" id="ab">
+ <wiki:Tab id="${ab.id}" title="${ab.title}">
+ <div class="formcontainer">
+ <s:form beanclass="org.apache.wiki.action.AdminActionBean"
method="post" acceptcharset="UTF-8">
+ <s:hidden name="tab-admin" value="editors" />
+ <s:hidden name="tab-editors" value="${ab.title}" />
+ <s:hidden name="bean" value="${ab.id}" />
+ <%= ab.doGet( (WikiContext)request.getAttribute(
"wikiActionBeanContext" ) ) %>
+ <s:submit name="admin" value="Submit" />
+ </s:form>
+ </div>
+ </wiki:Tab>
+ </wiki:AdminBeanIterator>
+
+ <wiki:Tab id="filters" title="Filters">
+ <p>There will be more filter stuff here</p>
+ </wiki:Tab>
+
+ </wiki:TabbedSection>
+
</s:layout-component>
</s:layout-render>
Modified:
incubator/jspwiki/trunk/src/WebContent/templates/default/admin/Install.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/admin/Install.jsp?rev=917383&r1=917382&r2=917383&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/admin/Install.jsp
(original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/admin/Install.jsp
Mon Mar 1 05:14:07 2010
@@ -20,7 +20,7 @@
--%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt"%>
<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld"; prefix="s"%>
-<%@ page errorPage="${templates['Error.jsp']}" %>
+<%@ page errorPage="/Error.jsp" %>
<s:layout-render name="${templates['layout/StaticLayout.jsp']}">
<s:layout-component name="headTitle">
Modified:
incubator/jspwiki/trunk/src/WebContent/templates/default/admin/InstallSuccess.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/admin/InstallSuccess.jsp?rev=917383&r1=917382&r2=917383&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/templates/default/admin/InstallSuccess.jsp
(original)
+++
incubator/jspwiki/trunk/src/WebContent/templates/default/admin/InstallSuccess.jsp
Mon Mar 1 05:14:07 2010
@@ -20,7 +20,7 @@
--%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt"%>
<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld"; prefix="s"%>
-<%@ page errorPage="${templates['Error.jsp']}" %>
+<%@ page errorPage="/Error.jsp" %>
<s:layout-render name="${templates['layout/StaticLayout.jsp']}">
<s:layout-component name="headTitle">
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/admin/Users.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/admin/Users.jsp?rev=917383&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/admin/Users.jsp
(added)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/admin/Users.jsp
Mon Mar 1 05:14:07 2010
@@ -0,0 +1,92 @@
+<%--
+ 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="headTitle">
+ JSPWiki Administration
+ </s:layout-component>
+
+ <s:layout-component name="pageTitle">
+ JSPWiki Administration
+ </s:layout-component>
+
+ <s:layout-component name="content">
+ <h1>JSPWiki Administration</h1>
+
+ <wiki:TabbedSection defaultTab="${param['tab']}">
+
+ <wiki:Tab id="security" title="Security"
+ beanclass="org.apache.wiki.action.AdminActionBean">
+ <wiki:Param name="tab" value="security" />
+ </wiki:Tab>
+
+ <wiki:Tab id="users" title="Users">
+ <p>
+ This is a list of user accounts that exist in this system.
+ </p>
+ <div id="useredit">
+ <s:form
beanclass="org.apache.wiki.action.AdministerProfilesActionBean"
+ class="wikiform" id="adminuserform" acceptcharset="UTF-8">
+ <p><s:messages/></p>
+ <table>
+ <thead>
+ <tr>
+ <th><s:label for="profile.loginName" /></th>
+ <th><s:label for="profile.fullname" /></th>
+ <th><s:label for="profile.email" name="email" /></th>
+ <td><label><fmt:message key="prefs.creationdate"
/></label></td>
+ <td><label><fmt:message key="prefs.profile.lastmodified"
/></label></td>
+ <th><s:label for="profile.password" /></th>
+ </tr>
+ </thead>
+ <c:forEach var="user" items="${wikiActionBean.users}"
varStatus="loop">
+ <tr>
+ <td><s:text name="users[${loop.index}].loginName" size="20"
/></td>
+ <td><s:text name="users[${loop.index}].fullname"
id="fullname" size="20" /></td>
+ <td><s:text name="users[${loop.index}].email" id="email"
size="20" /></td>
+ <td>${user.created}</td>
+ <td>${user.lastModified}</td>
+ <td><s:password name="users[${loop.index}].password"
size="20" value="" /></td>
+ </tr>
+ </c:forEach>
+ </table>
+ </s:form>
+ </div>
+ </wiki:Tab>
+
+ <wiki:Tab id="groups" title="Groups"
+ beanclass="org.apache.wiki.action.AdminActionBean">
+ <wiki:Param name="tab" value="groups" />
+ </wiki:Tab>
+
+ <wiki:Tab id="filters" title="Filters"
+ beanclass="org.apache.wiki.action.AdminActionBean">
+ <wiki:Param name="tab" value="filters" />
+ </wiki:Tab>
+
+ </wiki:TabbedSection>
+
+ </s:layout-component>
+</s:layout-render>
Modified:
incubator/jspwiki/trunk/src/WebContent/templates/default/admin/tabs/Security.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/admin/tabs/Security.jsp?rev=917383&r1=917382&r2=917383&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/templates/default/admin/tabs/Security.jsp
(original)
+++
incubator/jspwiki/trunk/src/WebContent/templates/default/admin/tabs/Security.jsp
Mon Mar 1 05:14:07 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" %>
<%@ page import="org.apache.wiki.auth.SecurityVerifier" %>
-<%@ page errorPage="${templates['Error.jsp']}" %>
+<%@ page errorPage="/Error.jsp" %>
<h1>JSPWiki Security Configuration Verifier</h1>
<p>This page examines JSPWiki's security configuration and tries to determine
if it is working the way it should. Although JSPWiki comes configured with some
reasonable default configuration settings out of the box, it's not always
obvious what settings to change if you need to customize the security... and
sooner or later, just about everyone does.</p>
Modified:
incubator/jspwiki/trunk/src/WebContent/templates/default/editors/FCK.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/editors/FCK.jsp?rev=917383&r1=917382&r2=917383&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/editors/FCK.jsp
(original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/editors/FCK.jsp
Mon Mar 1 05:14:07 2010
@@ -18,23 +18,23 @@
specific language governing permissions and limitations
under the License.
--%>
-<%@ page language="java" pageEncoding="UTF-8" %>
+<%@ 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="java.util.Properties" %>
+<%@ page import="org.apache.commons.lang.*" %>
<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.action.WikiContextFactory" %>
+<%@ page import="org.apache.wiki.api.WikiPage" %>
<%@ page import="org.apache.wiki.auth.*" %>
<%@ page import="org.apache.wiki.auth.permissions.*" %>
+<%@ page import="org.apache.wiki.filters.*" %>
<%@ page import="org.apache.wiki.render.*" %>
<%@ page import="org.apache.wiki.parser.JSPWikiMarkupParser" %>
<%@ page import="org.apache.wiki.ui.*" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
-<%@ page import="org.apache.wiki.filters.*" %>
-<%@ page import="org.apache.wiki.api.WikiPage" %>
-<%@ page import="org.apache.commons.lang.*" %>
-<%@ 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.action.WikiContextFactory" %>
+<%@ page errorPage="/Error.jsp" %>
<%--
This provides the FCK editor for JSPWiki.
--%>
@@ -115,7 +115,6 @@
<s:form beanclass="org.apache.wiki.action.EditActionBean"
class="wikiform"
id="editform"
- method="post"
acceptcharset="UTF-8"
enctype="application/x-www-form-urlencoded">
Modified:
incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp?rev=917383&r1=917382&r2=917383&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp
(original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp
Mon Mar 1 05:14:07 2010
@@ -22,6 +22,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" %>
+<%@ page errorPage="/Error.jsp" %>
<%--
This is a plain editor for JSPWiki.
--%>
@@ -30,7 +31,6 @@
<s:form beanclass="org.apache.wiki.action.EditActionBean"
class="wikiform"
id="editform"
- method="post"
acceptcharset="UTF-8"
enctype="application/x-www-form-urlencoded">
@@ -175,7 +175,6 @@
<s:submit name="save" />
<s:submit name="cancel" />
</p>
-
</s:form>
</div>
\ No newline at end of file
Modified:
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=917383&r1=917382&r2=917383&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/DefaultLayout.jsp
(original)
+++
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/DefaultLayout.jsp
Mon Mar 1 05:14:07 2010
@@ -27,6 +27,7 @@
<%@ page import="org.apache.wiki.Release" %>
<%@ page import="org.apache.wiki.WikiContext" %>
<%@ page import="org.apache.wiki.action.WikiContextFactory" %>
+<%@ page errorPage="/Error.jsp" %>
<%--
This file contains the default layout used by all JSPWiki 3 pages.
The default layout contains the HTML doctype declaration, header,
@@ -114,7 +115,6 @@
--%>
<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-slimbox.js' />"></script>
@@ -125,13 +125,8 @@
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>
<%--
Modified:
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=917383&r1=917382&r2=917383&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/Favorites.jsp
(original)
+++
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/Favorites.jsp
Mon Mar 1 05:14:07 2010
@@ -18,11 +18,11 @@
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" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld"; prefix="wiki" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<%@ page import="org.apache.wiki.*" %>
-
+<%@ page errorPage="/Error.jsp" %>
<div id="favorites">
<div id="hiddenmorepopup">
Modified:
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=917383&r1=917382&r2=917383&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/LocalHeader.jsp
(original)
+++
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/LocalHeader.jsp
Mon Mar 1 05:14:07 2010
@@ -33,3 +33,4 @@
files in the "default" template, if it cannot locate an equivalent file in
your defined template directory.
--%>
+<%@ page errorPage="/Error.jsp" %>
Modified:
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=917383&r1=917382&r2=917383&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/PageActionsBottom.jsp
(original)
+++
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/PageActionsBottom.jsp
Mon Mar 1 05:14:07 2010
@@ -18,8 +18,9 @@
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" %>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld"; prefix="wiki" %>
+<%@ page errorPage="/Error.jsp" %>
<wiki:CheckRequestContext context='view|diff|edit|upload|info'>
<div id='actionsBottom' class="pageactions">
<wiki:PageExists>
Modified:
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=917383&r1=917382&r2=917383&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/PageActionsTop.jsp
(original)
+++
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/PageActionsTop.jsp
Mon Mar 1 05:14:07 2010
@@ -18,10 +18,11 @@
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://jakarta.apache.org/jspwiki.tld"; prefix="wiki" %>
<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld"; prefix="s" %>
+<%@ page errorPage="/Error.jsp" %>
<div id="actionsTop" class="pageactions">
<ul>
Modified:
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=917383&r1=917382&r2=917383&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/SearchBox.jsp
(original)
+++
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/SearchBox.jsp
Mon Mar 1 05:14:07 2010
@@ -22,6 +22,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" %>
+<%@ page errorPage="/Error.jsp" %>
<%-- Provides a simple searchbox that can be easily included anywhere on the
page --%>
<%-- Powered by jswpwiki-common.js//SearchBox --%>
Modified:
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/StaticLayout.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/layout/StaticLayout.jsp?rev=917383&r1=917382&r2=917383&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/StaticLayout.jsp
(original)
+++
incubator/jspwiki/trunk/src/WebContent/templates/default/layout/StaticLayout.jsp
Mon Mar 1 05:14:07 2010
@@ -22,6 +22,7 @@
--%>
<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld"; prefix="s" %>
<%@ page import="org.apache.wiki.Release" %>
+<%@ page errorPage="/Error.jsp" %>
<%--
Minimal layout used for JSPs that don't need any dynamic content.
Its structure is identical to DefaultLayout.jsp.
Modified:
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=917383&r1=917382&r2=917383&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/layout/UserBox.jsp
(original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/layout/UserBox.jsp
Mon Mar 1 05:14:07 2010
@@ -18,10 +18,11 @@
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://jakarta.apache.org/jspwiki.tld"; prefix="wiki" %>
<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld"; prefix="s" %>
+<%@ page errorPage="/Error.jsp" %>
<div class="userbox">
<wiki:UserCheck status="anonymous">
Modified:
incubator/jspwiki/trunk/src/WebContent/templates/default/tabs/AttachmentsTab.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/tabs/AttachmentsTab.jsp?rev=917383&r1=917382&r2=917383&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/templates/default/tabs/AttachmentsTab.jsp
(original)
+++
incubator/jspwiki/trunk/src/WebContent/templates/default/tabs/AttachmentsTab.jsp
Mon Mar 1 05:14:07 2010
@@ -23,7 +23,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions"; prefix="fn" %>
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld"; prefix="wiki" %>
<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld"; prefix="s" %>
-<%@ page errorPage="${templates['Error.jsp']}" %>
+<%@ page errorPage="/Error.jsp" %>
<%-- Show existing attachments --%>
<wiki:HasAttachments>
<h3><fmt:message key="attach.list" /></h3>
Modified:
incubator/jspwiki/trunk/src/WebContent/templates/default/tabs/PageInfoTab.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/tabs/PageInfoTab.jsp?rev=917383&r1=917382&r2=917383&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/templates/default/tabs/PageInfoTab.jsp
(original)
+++
incubator/jspwiki/trunk/src/WebContent/templates/default/tabs/PageInfoTab.jsp
Mon Mar 1 05:14:07 2010
@@ -23,6 +23,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions"; prefix="fn" %>
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld"; prefix="wiki" %>
<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld"; prefix="s" %>
+<%@ page errorPage="/Error.jsp" %>
<%-- Referring pages --%>
<div class='line'>
Modified:
incubator/jspwiki/trunk/src/WebContent/templates/default/tabs/ProfileTab.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/tabs/ProfileTab.jsp?rev=917383&r1=917382&r2=917383&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/templates/default/tabs/ProfileTab.jsp
(original)
+++
incubator/jspwiki/trunk/src/WebContent/templates/default/tabs/ProfileTab.jsp
Mon Mar 1 05:14:07 2010
@@ -18,11 +18,12 @@
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://jakarta.apache.org/jspwiki.tld"; prefix="wiki" %>
<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld"; prefix="s" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ page errorPage="/Error.jsp" %>
<h3>
<wiki:UserProfile property="exists"><fmt:message key="prefs.oldprofile"
/></wiki:UserProfile>
<wiki:UserProfile property="new"><fmt:message key="prefs.newprofile"
/></wiki:UserProfile>
