jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ajaqu...@apache.org
Subject svn commit: r722765 [1/2] - in /incubator/jspwiki/trunk/src/webdocs/templates: default/ default/admin/ default/editors/ raw/
Date Wed, 03 Dec 2008 04:36:53 GMT
Author: ajaquith
Date: Tue Dec  2 20:36:52 2008
New Revision: 722765

URL: http://svn.apache.org/viewvc?rev=722765&view=rev
Log:
Checked in the Stripes code (about 220 classes, tests, JSPs and other files. All code compiles clean, but the JSPs do NOT work at the moment. Unit tests run clean except for some stray failing Stripes-related unit tests. See the file doc/README - Stripes Migration for some (repeat, SOME) details of what it all means. I'll sort out the JSP issues later this week.

Modified:
    incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXCategories.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXSearch.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/AttachmentTab.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/CommentContent.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/ConflictContent.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/DiffContent.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/DiffTab.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/DisplayMessage.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/EditContent.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/EditTemplate.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/Favorites.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/FindContent.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/GroupTab.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/NewGroupContent.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/PageContent.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/PageTab.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesContent.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/PreviewContent.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/ProfileTab.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/SearchBox.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/UploadTemplate.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/ViewTemplate.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/WorkflowContent.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/admin/AdminTemplate.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/admin/UserManagement.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/editors/FCK.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/default/editors/preview.jsp   (contents, props changed)
    incubator/jspwiki/trunk/src/webdocs/templates/raw/ViewTemplate.jsp   (contents, props changed)

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXCategories.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXCategories.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXCategories.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXCategories.jsp Tue Dec  2 20:36:52 2008
@@ -1,5 +1,7 @@
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.ViewActionBean" event="view" />
 <%! 
   public void jspInit()
   {
@@ -10,10 +12,9 @@
 <%
   // Copied from a top-level jsp -- which would be a better place to put this 
   WikiContext wikiContext = wiki.createContext( request, WikiContext.VIEW );
-  if( !wikiContext.hasAccess( response ) ) return;
   String pagereq = wikiContext.getPage().getName();
 
   response.setContentType("text/html; charset="+wiki.getContentEncoding() );
 %>
-<div class='categoryTitle'><wiki:LinkTo><wiki:PageName /></wiki:LinkTo></div>
+<div class='categoryTitle'><wiki:LinkTo><wiki:PageName/></wiki:LinkTo></div>
 <div class='categoryText'><wiki:Plugin plugin="ReferringPagesPlugin" args="max='20' before='*' after='\n' " /></div>
\ No newline at end of file

Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXCategories.jsp
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXSearch.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXSearch.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXSearch.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXSearch.jsp Tue Dec  2 20:36:52 2008
@@ -1,5 +1,5 @@
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
-<%@ page language="java" pageEncoding="UTF-8"%>
+<%@ page language="java" pageEncoding="UTF-8" %>
 <%@ page import="com.ecyrd.jspwiki.log.Logger" %>
 <%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
@@ -13,8 +13,8 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<fmt:setLocale value="${prefs.Language}" />
-<fmt:setBundle basename="templates.default"/>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.SearchActionBean" event="find" />
 <%! 
   public void jspInit()
   {
@@ -28,7 +28,6 @@
   /* FIXME: too much hackin on this level -- should better happen in toplevel jsp's */
   /* Create wiki context and check for authorization */
   WikiContext wikiContext = wiki.createContext( request, WikiContext.FIND );
-  if(!wikiContext.hasAccess( response )) return;
  
   String query = request.getParameter( "query");
 
@@ -82,32 +81,24 @@
 
 <wiki:SearchResults>
 
-  <h4><fmt:message key="find.heading.results"><fmt:param><c:out value="${param.query}"/></fmt:param></fmt:message></h4>
+  <h4><fmt:message key="find.heading.results"><fmt:param><c:out value="${param.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='${param.query}'/>"
-        title="Google Search '<c:out value='${param.query}'/>'"
-       target="_blank">Google</a><img class="outlink" src="images/out.png" alt="" />
+  <fmt:message key="find.externalsearch" />
+    <a class="external" href="http://www.google.com/search?q=<c:out value='${param.query}' />" title="Google Search '<c:out value='${param.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='${param.query}'/>" 
-        title="Wikipedia Search '<c:out value='${param.query}'/>'"
-       target="_blank">Wikipedia</a><img class="outlink" src="images/out.png" alt="" />
+    <a class="external" href="http://en.wikipedia.org/wiki/Special:Search?search=<c:out value='${param.query}' />" title="Wikipedia Search '<c:out value='${param.query}' />'" target="_blank">Wikipedia</a><img class="outlink" src="images/out.png" alt="" />
   </p>
 
-  <wiki:SetPagination start="${param.start}" total="<%=list.size()%>" pagesize="20" maxlinks="9" 
-                     fmtkey="info.pagination"
-                    onclick="$('start').value=%s; SearchBox.runfullsearch();" />
+  <wiki:SetPagination start="${param.start}" total="<%=list.size()%>" pagesize="20" maxlinks="9" fmtkey="info.pagination" onclick="$('start').value=%s; SearchBox.runfullsearch();" />
   
     <div class="graphBars">
     <div class="zebra-table">
-    <table class="wikitable" >
+    <table class="wikitable">
 
       <tr>
-         <th align="left"><fmt:message key="find.results.page"/></th>
-         <th align="left"><fmt:message key="find.results.score"/></th>
+         <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="${param.start}" maxItems="<%=maxitems%>">
@@ -122,8 +113,8 @@
         if( (contexts != null) && (contexts.length > 0) ) 
         {
 %>  
-      <tr class="odd" >
-        <td colspan="2" >
+      <tr class="odd">
+        <td colspan="2">
           <div class="fragment">
 <%
           for (int i = 0; i < contexts.length; i++) 
@@ -145,7 +136,7 @@
 
       <wiki:IfNoSearchResults>
         <tr>
-          <td class="nosearchresult" colspan="2"><fmt:message key="find.noresults"/></td>
+          <td class="nosearchresult" colspan="2"><fmt:message key="find.noresults" /></td>
         </tr>
       </wiki:IfNoSearchResults>
 

Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXSearch.jsp
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/AttachmentTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/AttachmentTab.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/AttachmentTab.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/AttachmentTab.jsp Tue Dec  2 20:36:52 2008
@@ -5,16 +5,16 @@
 <%@ page import="com.ecyrd.jspwiki.auth.permissions.*" %>
 <%@ page import="java.security.Permission" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<fmt:setLocale value="${prefs.Language}" />
-<fmt:setBundle basename="templates.default"/>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<%@ page import="com.ecyrd.jspwiki.action.WikiContextFactory" %>
 <%
   int MAXATTACHNAMELENGTH = 30;
-  WikiContext c = WikiContext.findContext(pageContext);
+  WikiContext c = WikiContextFactory.findContext( pageContext );
   String progressId = c.getEngine().getProgressManager().getNewProgressIdentifier();
 %>
 
 <div id="addattachment">
-<h3><fmt:message key="attach.add"/></h3>
+<h3><fmt:message key="attach.add" /></h3>
 <wiki:Permission permission="upload">
   <form action="<wiki:Link jsp='attach' format='url' absolute='true'><wiki:Param name='progressid' value='<%=progressId%>'/></wiki:Link>"
          class="wikiform"
@@ -27,20 +27,20 @@
       <td colspan="2"><div class="formhelp"><fmt:message key="attach.add.info" /></div></td>
     </tr>
     <tr>
-      <td><label for="attachfilename"><fmt:message key="attach.add.selectfile"/></label></td>
-      <td><input type="file" name="content" id="attachfilename" size="60"/></td>
+      <td><label for="attachfilename"><fmt:message key="attach.add.selectfile" /></label></td>
+      <td><input type="file" name="content" id="attachfilename" size="60" /></td>
     </tr>
     <tr>
-      <td><label for="attachnote"><fmt:message key="attach.add.changenote"/></label></td>
+      <td><label for="attachnote"><fmt:message key="attach.add.changenote" /></label></td>
       <td><input type="text" name="changenote" id="attachnote" maxlength="80" size="60" />
-    <input type="hidden" name="nextpage" value="<wiki:UploadLink format="url"/>" /></td>
+    <input type="hidden" name="nextpage" value="<wiki:UploadLink format="url" />" /></td>
     </tr>
 
    <tr>
       <td></td>
       <td>
-        <input type="hidden" name="page" value="<wiki:Variable var="pagename"/>" />
-        <input type="submit" name="upload" id="upload" value="<fmt:message key='attach.add.submit'/>" />
+        <input type="hidden" name="page" value="<wiki:Variable var="pagename" />" />
+        <input type="submit" name="upload" id="upload" value="<fmt:message key='attach.add.submit' />" />
         <input type="hidden" name="action" value="upload" />
         <div id="progressbar"><div class="ajaxprogress"></div></div>
       </td>
@@ -51,13 +51,13 @@
   <wiki:Messages div="error" />
 </wiki:Permission>
 <wiki:Permission permission="!upload">
-<div class="formhelp"><fmt:message key="attach.add.permission"/></div>
+<div class="formhelp"><fmt:message key="attach.add.permission" /></div>
 </wiki:Permission>
 </div>
 
 <wiki:HasAttachments>
 
-<h3><fmt:message key="attach.list"/></h3>
+<h3><fmt:message key="attach.list" /></h3>
 
   <%--<small><fmt:message key="attach.listsubtitle"/></small>--%>
 
@@ -77,14 +77,14 @@
   <div class="zebra-table"><div class="slimbox-img sortable">
   <table class="wikitable">
     <tr>
-      <th><fmt:message key="info.attachment.type"/></th>
-      <th><fmt:message key="info.attachment.name"/></th>
-      <th><fmt:message key="info.size"/></th>
-      <th><fmt:message key="info.version"/></th>
-      <th><fmt:message key="info.date"/></th>
-      <th><fmt:message key="info.author"/></th>
-      <wiki:Permission permission="delete"><th><fmt:message key="info.actions"/></th></wiki:Permission>
-      <th class="changenote"><fmt:message key="info.changenote"/></th>
+      <th><fmt:message key="info.attachment.type" /></th>
+      <th><fmt:message key="info.attachment.name" /></th>
+      <th><fmt:message key="info.size" /></th>
+      <th><fmt:message key="info.version" /></th>
+      <th><fmt:message key="info.date" /></th>
+      <th><fmt:message key="info.author" /></th>
+      <wiki:Permission permission="delete"><th><fmt:message key="info.actions" /></th></wiki:Permission>
+      <th class="changenote"><fmt:message key="info.changenote" /></th>
     </tr>
 
     <wiki:AttachmentsIterator id="att">
@@ -98,21 +98,18 @@
     %>
     <tr>
       <td><div id="attach-<%= attachtype %>" class="attachtype"><%= attachtype %></div></td>
-      <td><wiki:LinkTo title="<%= name %>" ><%= sname %></wiki:LinkTo></td>
+      <td><wiki:LinkTo title="<%= name %>"><%= sname %></wiki:LinkTo></td>
       <td style="white-space:nowrap;text-align:right;">
-        <fmt:formatNumber value='<%=Double.toString(att.getSize()/1000.0)%>' maxFractionDigits='1' minFractionDigits='1'/>&nbsp;<fmt:message key="info.kilobytes"/>
+        <fmt:formatNumber value='<%=Double.toString(att.getSize()/1000.0)%>' maxFractionDigits='1' minFractionDigits='1' />&nbsp;<fmt:message key="info.kilobytes" />
       </td>
       <td style="text-align:center;">
-        <a href="<wiki:PageInfoLink format='url' />" title="<fmt:message key='attach.moreinfo.title'/>"><wiki:PageVersion /></a>
+        <a href="<wiki:PageInfoLink format='url' />" title="<fmt:message key='attach.moreinfo.title' />"><wiki:PageVersion/></a>
       </td>
 	  <td style="white-space:nowrap;"><fmt:formatDate value="<%= att.getLastModified() %>" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" /></td>
-      <td><wiki:Author /></td>
+      <td><wiki:Author/></td>
       <wiki:Permission permission="delete">
       <td>
-          <input type="button"
-                value="<fmt:message key='attach.delete'/>"
-                  src="<wiki:Link format='url' context='<%=WikiContext.DELETE%>' />"
-              onclick="$('deleteForm').setProperty('action',this.src); $('delete-all').click();" />
+          <input type="button" value="<fmt:message key='attach.delete' />" src="<wiki:Link format='url' context='<%=WikiContext.DELETE%>' />" onclick="$('deleteForm').setProperty('action',this.src); $('delete-all').click();" />
       </td>
       </wiki:Permission>
       <td class="changenote">

Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/AttachmentTab.jsp
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/CommentContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/CommentContent.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/CommentContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/CommentContent.jsp Tue Dec  2 20:36:52 2008
@@ -2,10 +2,9 @@
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<fmt:setLocale value="${prefs.Language}" />
-<fmt:setBundle basename="templates.default"/>
+<%@ page import="com.ecyrd.jspwiki.action.WikiContextFactory" %>
 <%
-  WikiContext c = WikiContext.findContext( pageContext );
+  WikiContext c = WikiContextFactory.findContext( pageContext );
   int attCount = c.getEngine().getAttachmentManager().listAttachments(c.getPage()).size();
   String attTitle = LocaleSupport.getLocalizedMessage(pageContext, "attach.tab");
   if( attCount != 0 ) attTitle += " (" + attCount + ")";  
@@ -18,11 +17,11 @@
 
   <wiki:Tab id="commentcontent" title='<%=LocaleSupport.getLocalizedMessage(pageContext,"comment.tab.addcomment")%>'>
 
-  <wiki:Editor />
+  <wiki:Editor/>
   </wiki:Tab>
 
   <wiki:Tab id="attach" title="<%= attTitle %>" accesskey="a">
-    <wiki:Include page="AttachmentTab.jsp"/>
+    <wiki:Include page="AttachmentTab.jsp" />
   </wiki:Tab>
   
   <wiki:Tab id="info" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "info.tab")%>'

Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/CommentContent.jsp
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/ConflictContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/ConflictContent.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/ConflictContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/ConflictContent.jsp Tue Dec  2 20:36:52 2008
@@ -1,22 +1,20 @@
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<fmt:setLocale value="${prefs.Language}" />
-<fmt:setBundle basename="templates.default"/>
-<wiki:TabbedSection >
+<wiki:TabbedSection>
 
 <wiki:Tab id="conflict" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "conflict.oops.title")%>'>
   <div class="error"><fmt:message key="conflict.oops" /></div>
-  <fmt:message key="conflict.goedit" >
-    <fmt:param><wiki:EditLink><wiki:PageName /></wiki:EditLink></fmt:param>
+  <fmt:message key="conflict.goedit">
+    <fmt:param><wiki:EditLink><wiki:PageName/></wiki:EditLink></fmt:param>
   </fmt:message>
 </wiki:Tab>
  
-<wiki:Tab id="conflictOther" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "conflict.modified")%>' >
+<wiki:Tab id="conflictOther" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "conflict.modified")%>'>
   <tt><%=pageContext.getAttribute("conflicttext",PageContext.REQUEST_SCOPE)%></tt>      
 </wiki:Tab>
  
-<wiki:Tab id="conflictOwn" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "conflict.yourtext")%>' >
+<wiki:Tab id="conflictOwn" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "conflict.yourtext")%>'>
   <tt><%=pageContext.getAttribute("usertext",PageContext.REQUEST_SCOPE)%></tt>
 </wiki:Tab>
 

Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/ConflictContent.jsp
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/DiffContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/DiffContent.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/DiffContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/DiffContent.jsp Tue Dec  2 20:36:52 2008
@@ -1,2 +1,2 @@
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
-<wiki:Include page="InfoContent.jsp"/>
+<wiki:Include page="InfoContent.jsp" />

Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/DiffContent.jsp
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/DiffTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/DiffTab.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/DiffTab.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/DiffTab.jsp Tue Dec  2 20:36:52 2008
@@ -5,11 +5,11 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<fmt:setLocale value="${prefs.Language}" />
-<fmt:setBundle basename="templates.default"/>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<%@ page import="com.ecyrd.jspwiki.action.WikiContextFactory" %>
 
 <% 
-  WikiContext c = WikiContext.findContext( pageContext );  
+  WikiContext c = WikiContextFactory.findContext( pageContext );  
   List history = c.getEngine().getVersionHistory(c.getPage().getName());
   pageContext.setAttribute( "history", history );
   pageContext.setAttribute( "diffprovider", c.getEngine().getVariable(c,"jspwiki.diffProvider"));
@@ -22,32 +22,32 @@
        <input type="hidden" name="page" value="<wiki:Variable var='pagename' />" />
        <fmt:message key="diff.difference">
          <fmt:param>
-           <select id="r1" name="r1" onchange="this.form.submit();" >
+           <select id="r1" name="r1" onchange="this.form.submit();">
            <c:forEach items="${history}" var="i">
-             <option value="<c:out value='${i.version}'/>" <c:if test="${i.version == olddiff}">selected="selected"</c:if> ><c:out value="${i.version}"/></option>
+             <option value="<c:out value='${i.version}' />" <c:if test="${i.version == olddiff}">selected="selected"</c:if> ><c:out value="${i.version}" /></option>
            </c:forEach>
            </select>
          </fmt:param>
          <fmt:param>
-           <select id="r2" name="r2" onchange="this.form.submit();" >
+           <select id="r2" name="r2" onchange="this.form.submit();">
            <c:forEach items="${history}" var="i">
-             <option value="<c:out value='${i.version}'/>" <c:if test="${i.version == newdiff}">selected="selected"</c:if> ><c:out value="${i.version}"/></option>
+             <option value="<c:out value='${i.version}' />" <c:if test="${i.version == newdiff}">selected="selected"</c:if> ><c:out value="${i.version}" /></option>
            </c:forEach>
            </select>
          </fmt:param>
        </fmt:message>
   </h4>
 
-  <c:if test='${diffprovider eq "ContextualDiffProvider"}' >
+  <c:if test='${diffprovider eq "ContextualDiffProvider"}'>
     <div class="diffnote">
-      <a href="#change-1" title="<fmt:message key='diff.gotofirst.title'/>" class="diff-nextprev" >
-         <fmt:message key="diff.gotofirst"/>
+      <a href="#change-1" title="<fmt:message key='diff.gotofirst.title' />" class="diff-nextprev">
+         <fmt:message key="diff.gotofirst" />
       </a>&raquo;&raquo;
     </div>
   </c:if>
 
   <div class="diffbody">
-    <wiki:InsertDiff><i><fmt:message key="diff.nodiff"/></i></wiki:InsertDiff> 
+    <wiki:InsertDiff><i><fmt:message key="diff.nodiff" /></i></wiki:InsertDiff> 
   </div>
 </div>
 </form>

Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/DiffTab.jsp
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/DisplayMessage.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/DisplayMessage.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/DisplayMessage.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/DisplayMessage.jsp Tue Dec  2 20:36:52 2008
@@ -5,7 +5,7 @@
 <%-- Inserts a string message. --%>
 
    <div class="error">
-     <c:out value="${message}"/>
+     <c:out value="${message}" />
    </div>
 
    <br clear="all" />

Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/DisplayMessage.jsp
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/EditContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/EditContent.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/EditContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/EditContent.jsp Tue Dec  2 20:36:52 2008
@@ -3,10 +3,9 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<fmt:setLocale value="${prefs.Language}" />
-<fmt:setBundle basename="templates.default"/>
+<%@ page import="com.ecyrd.jspwiki.action.WikiContextFactory" %>
 <%
-  WikiContext c = WikiContext.findContext( pageContext );
+  WikiContext c = WikiContextFactory.findContext( pageContext );
   int attCount = c.getEngine().getAttachmentManager().listAttachments(c.getPage()).size();
   String attTitle = LocaleSupport.getLocalizedMessage(pageContext, "attach.tab");
   if( attCount != 0 ) attTitle += " (" + attCount + ")";
@@ -17,8 +16,8 @@
   <wiki:CheckLock mode="locked" id="lock">
     <div class="error">
       <fmt:message key="edit.locked">
-        <fmt:param><c:out value="${lock.locker}"/></fmt:param>
-        <fmt:param><c:out value="${lock.timeLeft}"/></fmt:param>
+        <fmt:param><c:out value="${lock.locker}" /></fmt:param>
+        <fmt:param><c:out value="${lock.timeLeft}" /></fmt:param>
       </fmt:message>
     </div>
   </wiki:CheckLock>
@@ -31,14 +30,14 @@
     </div>
   </wiki:CheckVersion>
     
-  <wiki:Editor />
+  <wiki:Editor/>
     
 </wiki:Tab>
   
   <wiki:PageExists>  
 
   <wiki:Tab id="attach" title="<%= attTitle %>" accesskey="a">
-    <wiki:Include page="AttachmentTab.jsp"/>
+    <wiki:Include page="AttachmentTab.jsp" />
   </wiki:Tab>
 
   <wiki:Tab id="info" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "info.tab")%>'
@@ -48,7 +47,7 @@
 
   </wiki:PageExists>  
     
-  <wiki:Tab id="edithelp" title='<%=LocaleSupport.getLocalizedMessage(pageContext,"edit.tab.help")%>' accesskey="h" >
+  <wiki:Tab id="edithelp" title='<%=LocaleSupport.getLocalizedMessage(pageContext,"edit.tab.help")%>' accesskey="h">
   <wiki:InsertPage page="EditPageHelp" />
   <wiki:NoSuchPage page="EditPageHelp">
     <div class="error">

Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/EditContent.jsp
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp Tue Dec  2 20:36:52 2008
@@ -9,14 +9,14 @@
 <%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
 <%@ page errorPage="/Error.jsp" %>
-<fmt:setLocale value="${prefs.Language}" />
-<fmt:setBundle basename="templates.default"/>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<%@ page import="com.ecyrd.jspwiki.action.WikiContextFactory" %>
 <%!
     Logger log = LoggerFactory.getLogger("JSPWiki");
 %>
 
 <%
-  WikiContext c = WikiContext.findContext( pageContext );
+  WikiContext c = WikiContextFactory.findContext( pageContext );
 
   // Extract the group name and members
   String name = request.getParameter( "group" );
@@ -70,21 +70,21 @@
 
     <table class="wikitable">
     <tr>
-      <th><fmt:message key="group.name"/></th>
+      <th><fmt:message key="group.name" /></th>
       <td><%=name%></td>
     </tr>
     <tr>
-      <th><label><fmt:message key="group.members"/></label></th>
+      <th><label><fmt:message key="group.members" /></label></th>
       <td>
       <textarea id="members" name="members" rows="10" cols="30"><%=TextUtil.replaceEntities(s.toString())%></textarea>
-      <div class="formhelp"><fmt:message key="editgroup.memberlist"/></div>
+      <div class="formhelp"><fmt:message key="editgroup.memberlist" /></div>
       </td>
     </tr>
     </table>
     <div class="formhelp">
       <fmt:message key="editgroup.savehelp"><fmt:param><%=name%></fmt:param></fmt:message>
     </div>
-      <input type="submit" name="ok" value="<fmt:message key="editgroup.submit.save"/>" />
+      <input type="submit" name="ok" value="<fmt:message key="editgroup.submit.save" />" />
       <input type="hidden" name="group" value="<%=name%>" />
       <input type="hidden" name="action" value="save" />
   </form>

Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/EditTemplate.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/EditTemplate.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/EditTemplate.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/EditTemplate.jsp Tue Dec  2 20:36:52 2008
@@ -1,7 +1,5 @@
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<fmt:setLocale value="${prefs.Language}" />
-<fmt:setBundle basename="templates.default"/>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <html id="top" xmlns="http://www.w3.org/1999/xhtml">
@@ -11,21 +9,21 @@
     <wiki:CheckRequestContext context="edit">
     <fmt:message key="edit.title.edit">
       <fmt:param><wiki:Variable var="ApplicationName" /></fmt:param>
-      <fmt:param><wiki:PageName /></fmt:param>
+      <fmt:param><wiki:PageName/></fmt:param>
     </fmt:message>
     </wiki:CheckRequestContext>
     <wiki:CheckRequestContext context="comment">
     <fmt:message key="comment.title.comment">
       <fmt:param><wiki:Variable var="ApplicationName" /></fmt:param>
-      <fmt:param><wiki:PageName /></fmt:param>
+      <fmt:param><wiki:PageName/></fmt:param>
     </fmt:message>
     </wiki:CheckRequestContext>
   </title>
   <meta name="robots" content="noindex,follow" />
-  <wiki:Include page="commonheader.jsp"/>
+  <wiki:Include page="commonheader.jsp" />
 </head>
 
-<body <wiki:CheckRequestContext context='edit'>class="edit"</wiki:CheckRequestContext><wiki:CheckRequestContext context='comment'>class="comment"</wiki:CheckRequestContext> >
+<body <wiki:CheckRequestContext context='edit'>class="edit"</wiki:CheckRequestContext> <wiki:CheckRequestContext context='comment'>class="comment"</wiki:CheckRequestContext> >
 
 <div id="wikibody" class="${prefs.Orientation}">
 
@@ -34,12 +32,12 @@
   <div id="content">
 
     <div id="page">
-      <wiki:Include page="PageActionsTop.jsp"/>
+      <wiki:Include page="PageActionsTop.jsp" />
       <wiki:Content/>
-      <wiki:Include page="PageActionsBottom.jsp"/>
+      <wiki:Include page="PageActionsBottom.jsp" />
 	</div>
 
-    <wiki:Include page="Favorites.jsp"/> 
+    <wiki:Include page="Favorites.jsp" /> 
 
 	<div class="clearbox"></div>
   </div>	

Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/EditTemplate.jsp
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/Favorites.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/Favorites.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/Favorites.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/Favorites.jsp Tue Dec  2 20:36:52 2008
@@ -1,8 +1,6 @@
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<fmt:setLocale value="${prefs.Language}" />
-<fmt:setBundle basename="templates.default"/>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 
 <div id="favorites">
@@ -31,7 +29,7 @@
      </wiki:CheckRequestContext>
     
      <wiki:PageExists>  
-     <wiki:CheckRequestContext context='view|info|diff|upload|edit|comment|preview' >
+     <wiki:CheckRequestContext context='view|info|diff|upload|edit|comment|preview'>
        <li>
        <wiki:CheckVersion mode="latest">
        <a class="action rawpage wikipage" 
@@ -65,7 +63,7 @@
         </a></li>
       </wiki:Permission>
 	  <li class='separator'>
-        <div id="moremenu" ><wiki:InsertPage page="MoreMenu" /></div>
+        <div id="moremenu"><wiki:InsertPage page="MoreMenu" /></div>
       </li>
   </ul>
   </div>

Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/Favorites.jsp
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/FindContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/FindContent.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/FindContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/FindContent.jsp Tue Dec  2 20:36:52 2008
@@ -7,8 +7,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<fmt:setLocale value="${prefs.Language}" />
-<fmt:setBundle basename="templates.default"/>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
 
 <wiki:TabbedSection>
 <wiki:Tab id="findcontent" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "find.tab")%>' accesskey="s">
@@ -28,7 +27,7 @@
     <input type="checkbox" name="details" id="details" <c:if test='${param.details == "on"}'>checked='checked'</c:if> />
     <fmt:message key="find.details" />
 
-    <select name="scope" id="scope" > 
+    <select name="scope" id="scope"> 
       <option value="" <c:if test="${empty param.scope}">selected="selected"</c:if> ><fmt:message key='find.scope.all' /></option>
       <option value="author:" <c:if test='${param.scope eq "author:"}'>selected="selected"</c:if> ><fmt:message key='find.scope.authors' /></option>
       <option value="name:" <c:if test='${param.scope eq "name:"}'>selected="selected"</c:if> ><fmt:message key='find.scope.pagename' /></option>
@@ -36,8 +35,8 @@
       <option value="attachment:" <c:if test='${param.scope eq "attachment:"}'>selected="selected"</c:if> ><fmt:message key='find.scope.attach' /></option>       
     </select>
 
-	<input type="submit" name="ok" id="ok" value="<fmt:message key="find.submit.find"/>" />
-	<input type="submit" name="go" id="go" value="<fmt:message key="find.submit.go"/>" />
+	<input type="submit" name="ok" id="ok" value="<fmt:message key="find.submit.find" />" />
+	<input type="submit" name="go" id="go" value="<fmt:message key="find.submit.go" />" />
     <input type="hidden" name="start" id="start" value="0" />
     <input type="hidden" name="maxitems" id="maxitems" value="20" />
 
@@ -45,13 +44,13 @@
   </p>
 </form>
 
-<div id="searchResult2" ><wiki:Include page="AJAXSearch.jsp"/></div>
+<div id="searchResult2"><wiki:Include page="AJAXSearch.jsp" /></div>
 
 </wiki:Tab>
 
 <wiki:PageExists page="SearchPageHelp">
 <wiki:Tab id="findhelp" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "find.tab.help")%>' accesskey="h">
-  <wiki:InsertPage page="SearchPageHelp"/>
+  <wiki:InsertPage page="SearchPageHelp" />
 </wiki:Tab>
 </wiki:PageExists>
 

Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/FindContent.jsp
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp Tue Dec  2 20:36:52 2008
@@ -2,10 +2,9 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<fmt:setLocale value="${prefs.Language}" />
-<fmt:setBundle basename="templates.default"/>
+<%@ page import="com.ecyrd.jspwiki.action.WikiContextFactory" %>
 <%
-  WikiContext c = WikiContext.findContext(pageContext);
+  WikiContext c = WikiContextFactory.findContext( pageContext );
   String frontpage = c.getEngine().getFrontPage(); 
 %> 
 <div id="footer">
@@ -17,7 +16,7 @@
 
   <div class="companylogo"></div>
 
-  <div class="copyright"><wiki:InsertPage page="CopyrightNotice"/></div>
+  <div class="copyright"><wiki:InsertPage page="CopyrightNotice" /></div>
 
   <div class="wikiversion">
     <%=Release.APPNAME%> v<%=Release.getVersionString()%>

Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp Tue Dec  2 20:36:52 2008
@@ -11,14 +11,14 @@
 <%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page errorPage="/Error.jsp" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<fmt:setLocale value="${prefs.Language}" />
-<fmt:setBundle basename="templates.default"/>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<%@ page import="com.ecyrd.jspwiki.action.WikiContextFactory" %>
 <%!
   Logger log = LoggerFactory.getLogger("JSPWiki");
 %>
 
 <%
-  WikiContext c = WikiContext.findContext( pageContext );
+  WikiContext c = WikiContextFactory.findContext( pageContext );
 
   // Extract the group name and members
   String name = request.getParameter( "group" );
@@ -37,12 +37,12 @@
     creator = group.getCreator();
     if ( group.getCreated() != null )
     {
-      created = Preferences.renderDate(WikiContext.findContext( pageContext ), group.getCreated(),Preferences.TimeFormat.DATETIME);
+      created = Preferences.renderDate(WikiContextFactory.findContext( pageContext ), group.getCreated(),Preferences.TimeFormat.DATETIME);
     }
     modifier = group.getModifier();
     if ( group.getLastModified() != null )
     {
-      modified = Preferences.renderDate(WikiContext.findContext( pageContext ), group.getLastModified(),Preferences.TimeFormat.DATETIME) ; 
+      modified = Preferences.renderDate(WikiContextFactory.findContext( pageContext ), group.getLastModified(),Preferences.TimeFormat.DATETIME) ; 
     }
   }
   name = TextUtil.replaceEntities(name);
@@ -58,13 +58,13 @@
     if ( c.getWikiSession().getMessages( GroupManager.MESSAGES_KEY ).length == 0 )
     {
 %>
-    <fmt:message key="group.doesnotexist"/>
+    <fmt:message key="group.doesnotexist" />
     <wiki:Permission permission="createGroups">
       <fmt:message key="group.createsuggestion">
         <fmt:param><wiki:Link jsp="NewGroup.jsp">
                       <wiki:Param name="group" value="<%=name%>" />
                       <wiki:Param name="group" value="<%=name%>" />
-                      <fmt:message key="group.createit"/>
+                      <fmt:message key="group.createit" />
                    </wiki:Link>
         </fmt:param>
       </fmt:message>
@@ -74,7 +74,7 @@
     else
     {
 %>
-       <wiki:Messages div="error" topic="<%=GroupManager.MESSAGES_KEY%>" prefix='<%=LocaleSupport.getLocalizedMessage(pageContext,"group.errorprefix")%>'/>
+       <wiki:Messages div="error" topic="<%=GroupManager.MESSAGES_KEY%>" prefix='<%=LocaleSupport.getLocalizedMessage(pageContext,"group.errorprefix")%>' />
 <%
     }
   }
@@ -83,7 +83,7 @@
 %>
  <table class="wikitable">
     <tr>
-      <th><fmt:message key="group.name"/></th>
+      <th><fmt:message key="group.name" /></th>
       <td>
         <fmt:message key="group.groupintro">
           <fmt:param><em><%=name%></em></fmt:param>
@@ -92,7 +92,7 @@
     </tr>
     <!-- Members -->
     <tr>
-      <th><fmt:message key="group.members"/>
+      <th><fmt:message key="group.members" />
       </th>
       <td><%
             for ( int i = 0; i < members.length; i++ )

Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/GroupTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/GroupTab.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/GroupTab.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/GroupTab.jsp Tue Dec  2 20:36:52 2008
@@ -13,8 +13,8 @@
 <%@ page errorPage="/Error.jsp" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<fmt:setLocale value="${prefs.Language}" />
-<fmt:setBundle basename="templates.default"/>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<%@ page import="com.ecyrd.jspwiki.action.WikiContextFactory" %>
 <%!
   String printWikiGroupPutGroup( Group group, String name, boolean cursor, PageContext pageContext)
   {
@@ -36,11 +36,11 @@
       
       ss.append( delim );
       mf = new MessageFormat(LocaleSupport.getLocalizedMessage(pageContext, "grp.createdon") );
-      args = new Object[]{(group.getCreated()==null) ? "" : Preferences.renderDate(WikiContext.findContext( pageContext ), group.getCreated(),Preferences.TimeFormat.DATETIME), group.getCreator()};
+      args = new Object[]{(group.getCreated()==null) ? "" : Preferences.renderDate(WikiContextFactory.findContext( pageContext ), group.getCreated(),Preferences.TimeFormat.DATETIME), group.getCreator()};
       ss.append( mf.format( args ) );
       
       mf = new MessageFormat(LocaleSupport.getLocalizedMessage(pageContext, "grp.lastmodified") );
-      args = new Object[]{(group.getLastModified()==null) ? "" : Preferences.renderDate(WikiContext.findContext( pageContext ), group.getLastModified(),Preferences.TimeFormat.DATETIME), group.getModifier()};
+      args = new Object[]{(group.getLastModified()==null) ? "" : Preferences.renderDate(WikiContextFactory.findContext( pageContext ), group.getLastModified(),Preferences.TimeFormat.DATETIME), group.getModifier()};
       ss.append( mf.format( args ) );
       
       ss.append( "\", " );
@@ -53,9 +53,9 @@
   }
 %>
 
-<wiki:Messages div="error" topic="<%=GroupManager.MESSAGES_KEY%>" prefix='<%=LocaleSupport.getLocalizedMessage(pageContext,"group.errorprefix")%>'/>
+<wiki:Messages div="error" topic="<%=GroupManager.MESSAGES_KEY%>" prefix='<%=LocaleSupport.getLocalizedMessage(pageContext,"group.errorprefix")%>' />
 
-<table id='wikigroups' class='wikitable' >
+<table id='wikigroups' class='wikitable'>
 <tr>
   <th><fmt:message key="group.name" /></th>
   <th><fmt:message key="group.members" /></th>
@@ -81,14 +81,11 @@
   </td>
   <td id="groupmembers">
     <div style="float:left;">
-    <textarea rows="8" cols="30" disabled="disabled"
-              name="membersfield" id="membersfield" ></textarea>
+    <textarea rows="8" cols="30" disabled="disabled" name="membersfield" id="membersfield"></textarea>
     </div>
-    <form action="<wiki:Link format='url' jsp='Group.jsp'/>" 
-              id="groupForm" 
-          method="post" accept-charset="<wiki:ContentEncoding />" >
+    <form action="<wiki:Link format='url' jsp='Group.jsp' />" id="groupForm" method="post" accept-charset="UTF-8">
       <div>
-      <input type="hidden" name="group"   value="" />
+      <input type="hidden" name="group" value="" />
       <input type="hidden" name="members" value="" />
       <input type="hidden" name="action"  value="save" />
       <input type="button" disabled="disabled"
@@ -124,13 +121,13 @@
   </tr>
   <tr valign="top">
   <td>
-    <div class="formhelp"><fmt:message key="grp.formhelp"/></div>
+    <div class="formhelp"><fmt:message key="grp.formhelp" /></div>
     <p id="groupinfo" class="formhelp"></p>
   </td>
   </tr>
 </table>
 
-<h3><fmt:message key="grp.allgroups"/></h3>
+<h3><fmt:message key="grp.allgroups" /></h3>
 <p><wiki:Translate>[{Groups}]</wiki:Translate></p>
 
 
@@ -140,7 +137,7 @@
  
 <script type="text/javascript">//<![CDATA[
 <%
-  WikiContext c = WikiContext.findContext( pageContext );
+  WikiContext c = WikiContextFactory.findContext( pageContext );
   Principal[] roles = c.getWikiSession().getRoles();
 
   for( int i = 0; i < roles.length; i++ )

Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/GroupTab.jsp
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp Tue Dec  2 20:36:52 2008
@@ -1,16 +1,15 @@
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
-<fmt:setLocale value="${prefs.Language}" />
-<fmt:setBundle basename="templates.default"/>
+<%@ page import="com.ecyrd.jspwiki.action.WikiContextFactory" %>
 <%
-  WikiContext c = WikiContext.findContext(pageContext);
+  WikiContext c = WikiContextFactory.findContext( pageContext );
   String frontpage = c.getEngine().getFrontPage(); 
 %>
 
 <div id="header">
 
-  <div class="titlebox"><wiki:InsertPage page="TitleBox"/></div>
+  <div class="titlebox"><wiki:InsertPage page="TitleBox" /></div>
 
   <div class="applicationlogo" > 
     <a href="<wiki:LinkTo page='<%=frontpage%>' format='url' />"
@@ -21,10 +20,10 @@
 
   <wiki:Include page="UserBox.jsp" />
 
-  <div class="pagename"><wiki:PageName /></div>
+  <div class="pagename"><wiki:PageName/></div>
 
   <div class="searchbox"><wiki:Include page="SearchBox.jsp" /></div>
 
-  <div class="breadcrumbs"><fmt:message key="header.yourtrail"/><wiki:Breadcrumbs /></div>
+  <div class="breadcrumbs"><fmt:message key="header.yourtrail" /><wiki:Breadcrumbs/></div>
 
 </div>
\ No newline at end of file

Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp Tue Dec  2 20:36:52 2008
@@ -8,10 +8,10 @@
 <%@ 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" %>
-<fmt:setLocale value="${prefs.Language}" />
-<fmt:setBundle basename="templates.default"/>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<%@ page import="com.ecyrd.jspwiki.action.WikiContextFactory" %>
 <%
-  WikiContext c = WikiContext.findContext(pageContext);
+  WikiContext c = WikiContextFactory.findContext( pageContext );
   WikiPage wikiPage = c.getPage();
   int attCount = c.getEngine().getAttachmentManager().listAttachments( c.getPage() ).size();
   String attTitle = LocaleSupport.getLocalizedMessage(pageContext, "attach.tab");
@@ -72,24 +72,23 @@
   </wiki:Tab>
 
   <wiki:Tab id="attach" title="<%= attTitle %>" accesskey="a">
-    <wiki:Include page="AttachmentTab.jsp"/>
+    <wiki:Include page="AttachmentTab.jsp" />
   </wiki:Tab>
 
   <%-- actual infopage content --%>
-  <wiki:Tab id="info" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "info.tab")%>' accesskey="i" >
+  <wiki:Tab id="info" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "info.tab")%>' accesskey="i">
   <p>
   <fmt:message key='info.lastmodified'>
-    <fmt:param><wiki:PageVersion >1</wiki:PageVersion></fmt:param>
+    <fmt:param><wiki:PageVersion>1</wiki:PageVersion></fmt:param>
     <fmt:param>
-      <a href="<wiki:DiffLink format='url' version='latest' newVersion='previous' />"
-        title="<fmt:message key='info.pagediff.title' />" >
+      <a href="<wiki:DiffLink format='url' version='latest' newVersion='previous' />" title="<fmt:message key='info.pagediff.title' />">
         <fmt:formatDate value="<%= wikiPage.getLastModified() %>" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" />
       </a>
     </fmt:param>
-    <fmt:param><wiki:Author /></fmt:param>
+    <fmt:param><wiki:Author/></fmt:param>
   </fmt:message>
 
-  <wiki:RSSImageLink mode="wiki"/>
+  <wiki:RSSImageLink mode="wiki" />
   </p>
 
   <wiki:CheckVersion mode="notfirst">
@@ -108,7 +107,7 @@
   <wiki:Permission permission="rename">
 
     <div class="formhelp">
-      <wiki:Messages div="error" topic="rename" prefix='<%=LocaleSupport.getLocalizedMessage(pageContext,"prefs.errorprefix.rename")%>'/>
+      <wiki:Messages div="error" topic="rename" prefix='<%=LocaleSupport.getLocalizedMessage(pageContext,"prefs.errorprefix.rename")%>' />
     </div>
 
     <form action="<wiki:Link format='url' jsp='Rename.jsp'/>"
@@ -122,12 +121,12 @@
       <input type="text" name="renameto" value="<%= parm_renameto %>" size="40" />
       &nbsp;&nbsp;
       <input type="checkbox" name="references" checked="checked" />
-      <fmt:message key="info.updatereferrers"/>
+      <fmt:message key="info.updatereferrers" />
       </p>
     </form>
   </wiki:Permission>
   <wiki:Permission permission="!rename">
-      <p><fmt:message key="info.rename.permission"/></p>
+      <p><fmt:message key="info.rename.permission" /></p>
   </wiki:Permission>
 
   <wiki:Permission permission="delete">
@@ -137,18 +136,17 @@
           method="post" accept-charset="<wiki:ContentEncoding />"
         onsubmit="return( confirm('<fmt:message key="info.confirmdelete"/>') && Wiki.submitOnce(this) );">
       <p>
-      <input type="submit" name="delete-all" id="delete-all"
-            value="<fmt:message key='info.delete.submit'/>" />
+      <input type="submit" name="delete-all" id="delete-all" value="<fmt:message key='info.delete.submit' />" />
       </p>
     </form>
   </wiki:Permission>
   <wiki:Permission permission="!delete">
-      <p><fmt:message key="info.delete.permission"/></p>
+      <p><fmt:message key="info.delete.permission" /></p>
   </wiki:Permission>
 
   <div class="collapsebox-closed" id="incomingLinks">
   <h4><fmt:message key="info.tab.incoming" /></h4>
-    <wiki:LinkTo><wiki:PageName /></wiki:LinkTo>
+    <wiki:LinkTo><wiki:PageName/></wiki:LinkTo>
     <wiki:Plugin plugin="ReferringPagesPlugin" args="before='*' after='\n' " />
   </div>
 
@@ -161,28 +159,26 @@
 
   <%-- DIFF section --%>
   <wiki:CheckRequestContext context='diff'>
-     <wiki:Include page="DiffTab.jsp"/>
+     <wiki:Include page="DiffTab.jsp" />
   </wiki:CheckRequestContext>
   <%-- DIFF section --%>
 
 
-    <wiki:CheckVersion mode="first"><fmt:message key="info.noversions"/></wiki:CheckVersion>
+    <wiki:CheckVersion mode="first"><fmt:message key="info.noversions" /></wiki:CheckVersion>
     <wiki:CheckVersion mode="notfirst">
     <%-- if( itemcount > 1 ) { --%>
 
-    <wiki:SetPagination start="<%=startitem%>" total="<%=itemcount%>" pagesize="<%=pagesize%>" maxlinks="9"
-                       fmtkey="info.pagination"
-                         href='<%=c.getURL(WikiContext.INFO, c.getPage().getName(), "start=%s")%>' />
+    <wiki:SetPagination start="<%=startitem%>" total="<%=itemcount%>" pagesize="<%=pagesize%>" maxlinks="9" fmtkey="info.pagination" href='<%=c.getURL(WikiContext.INFO, c.getPage().getName(), "start=%s")%>' />
 
     <div class="zebra-table sortable table-filter">
-    <table class="wikitable" >
+    <table class="wikitable">
       <tr>
-        <th><fmt:message key="info.version"/></th>
-        <th><fmt:message key="info.date"/></th>
-        <th><fmt:message key="info.size"/></th>
-        <th><fmt:message key="info.author"/></th>
-        <th><fmt:message key="info.changes"/></th>
-        <th class='changenote'><fmt:message key="info.changenote"/></th>
+        <th><fmt:message key="info.version" /></th>
+        <th><fmt:message key="info.date" /></th>
+        <th><fmt:message key="info.size" /></th>
+        <th><fmt:message key="info.author" /></th>
+        <th><fmt:message key="info.changes" /></th>
+        <th class='changenote'><fmt:message key="info.changenote" /></th>
       </tr>
 
       <wiki:HistoryIterator id="currentPage">
@@ -200,19 +196,19 @@
 
         <td><fmt:formatDate value="<%= currentPage.getLastModified() %>" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" /></td>
         <td style="white-space:nowrap;text-align:right;">
-          <c:set var="ff"><wiki:PageSize /></c:set>
-          <fmt:formatNumber value='${ff/1000}' maxFractionDigits='3' minFractionDigits='1'/>&nbsp;<fmt:message key="info.kilobytes"/>
+          <c:set var="ff"><wiki:PageSize/></c:set>
+          <fmt:formatNumber value='${ff/1000}' maxFractionDigits='3' minFractionDigits='1' />&nbsp;<fmt:message key="info.kilobytes" />
         </td>
-        <td><wiki:Author /></td>
+        <td><wiki:Author/></td>
 
         <td>
           <wiki:CheckVersion mode="notfirst">
-            <wiki:DiffLink version="current" newVersion="previous"><fmt:message key="info.difftoprev"/></wiki:DiffLink>
+            <wiki:DiffLink version="current" newVersion="previous"><fmt:message key="info.difftoprev" /></wiki:DiffLink>
             <wiki:CheckVersion mode="notlatest"> | </wiki:CheckVersion>
           </wiki:CheckVersion>
 
           <wiki:CheckVersion mode="notlatest">
-            <wiki:DiffLink version="latest" newVersion="current"><fmt:message key="info.difftolast"/></wiki:DiffLink>
+            <wiki:DiffLink version="latest" newVersion="current"><fmt:message key="info.difftolast" /></wiki:DiffLink>
           </wiki:CheckVersion>
         </td>
 
@@ -254,9 +250,9 @@
 	       url="<%=c.getURL(WikiContext.VIEW, ((Attachment)wikiPage).getParentName()) %>">
   </wiki:Tab>
 
-  <wiki:Tab id="info" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "info.attachment.tab")%>' accesskey="i" >
+  <wiki:Tab id="info" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "info.attachment.tab")%>' accesskey="i">
 
-  <h3><fmt:message key="info.uploadnew"/></h3>
+  <h3><fmt:message key="info.uploadnew" /></h3>
 
   <wiki:Permission permission="upload">
   <form action="<wiki:Link jsp='attach' format='url' absolute='true'><wiki:Param name='progressid' value='<%=progressId%>'/></wiki:Link>"
@@ -275,7 +271,7 @@
   </tr>
   <tr>
     <td><label for="content"><fmt:message key="info.uploadnew.filename" /></label></td>
-    <td><input type="file" name="content" size="60"/></td>
+    <td><input type="file" name="content" size="60" /></td>
   </tr>
   <tr>
     <td><label for="changenote"><fmt:message key="info.uploadnew.changenote" /></label></td>
@@ -287,8 +283,8 @@
     <td></td>
     <td>
     <input type="hidden" name="page" value="<wiki:Variable var='pagename' />" />
-    <input type="submit" name="upload" value="<fmt:message key='attach.add.submit'/>" id="upload" /> <input type="hidden" name="action"  value="upload" />
-    <input type="hidden" name="nextpage" value="<wiki:PageInfoLink format='url'/>" />
+    <input type="submit" name="upload" value="<fmt:message key='attach.add.submit' />" id="upload" /> <input type="hidden" name="action" value="upload" />
+    <input type="hidden" name="nextpage" value="<wiki:PageInfoLink format='url' />" />
         <div id="progressbar"><div class="ajaxprogress"></div></div>
     </td>
   </tr>
@@ -297,7 +293,7 @@
   </form>
   </wiki:Permission>
   <wiki:Permission permission="!upload">
-    <div class="formhelp"><fmt:message key="attach.add.permission"/></div>
+    <div class="formhelp"><fmt:message key="attach.add.permission" /></div>
   </wiki:Permission>
 
   <wiki:Permission permission="delete">
@@ -308,8 +304,7 @@
           method="post" accept-charset="<wiki:ContentEncoding />"
         onsubmit="return( confirm('<fmt:message key="info.confirmdelete"/>') && Wiki.submitOnce(this) );" >
      <div>
-     <input type="submit" name="delete-all" id="delete-all"
-           value="<fmt:message key='info.deleteattachment.submit' />" />
+     <input type="submit" name="delete-all" id="delete-all" value="<fmt:message key='info.deleteattachment.submit' />" />
      </div>
     </form>
   </wiki:Permission>
@@ -320,18 +315,18 @@
   <div class="zebra-table"><div class="slimbox-img sortable">
   <table class="wikitable">
     <tr>
-      <th><fmt:message key="info.attachment.type"/></th>
+      <th><fmt:message key="info.attachment.type" /></th>
       <%--<th><fmt:message key="info.attachment.name"/></th>--%>
-      <th><fmt:message key="info.version"/></th>
-      <th><fmt:message key="info.size"/></th>
-      <th><fmt:message key="info.date"/></th>
-      <th><fmt:message key="info.author"/></th>
+      <th><fmt:message key="info.version" /></th>
+      <th><fmt:message key="info.size" /></th>
+      <th><fmt:message key="info.date" /></th>
+      <th><fmt:message key="info.author" /></th>
       <%--
       <wiki:Permission permission="upload">
          <th><fmt:message key="info.actions"/></th>
       </wiki:Permission>
       --%>
-      <th  class='changenote'><fmt:message key="info.changenote"/></th>
+      <th class='changenote'><fmt:message key="info.changenote" /></th>
     </tr>
 
     <wiki:HistoryIterator id="att"><%-- <wiki:AttachmentsIterator id="att"> --%>
@@ -356,10 +351,10 @@
                        title="<%= name %>"
                        class="attachment" ><wiki:PageVersion /></a></td>
       <td style="white-space:nowrap;text-align:right;">
-        <fmt:formatNumber value='<%=Double.toString(att.getSize()/1000.0) %>' groupingUsed='false' maxFractionDigits='1' minFractionDigits='1'/>&nbsp;<fmt:message key="info.kilobytes"/>
+        <fmt:formatNumber value='<%=Double.toString(att.getSize()/1000.0) %>' groupingUsed='false' maxFractionDigits='1' minFractionDigits='1' />&nbsp;<fmt:message key="info.kilobytes" />
       </td>
 	  <td style="white-space:nowrap;"><fmt:formatDate value="<%= att.getLastModified() %>" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" /></td>
-      <td><wiki:Author /></td>
+      <td><wiki:Author/></td>
       <%--
       // FIXME: This needs to be added, once we figure out what is going on.
       <wiki:Permission permission="upload">
@@ -394,6 +389,6 @@
 
 <wiki:NoSuchPage>
   <fmt:message key="common.nopage">
-    <fmt:param><wiki:EditLink><fmt:message key="common.createit"/></wiki:EditLink></fmt:param>
+    <fmt:param><wiki:EditLink><fmt:message key="common.createit" /></wiki:EditLink></fmt:param>
   </fmt:message>
 </wiki:NoSuchPage>

Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp Tue Dec  2 20:36:52 2008
@@ -1,16 +1,15 @@
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
-<%@ page import="com.ecyrd.jspwiki.*" %>
+<%@ page import="com.ecyrd.jspwiki.action.*" %>
 <%@ page import="com.ecyrd.jspwiki.auth.*" %>
 <%@ page errorPage="/Error.jsp" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<fmt:setLocale value="${prefs.Language}" />
-<fmt:setBundle basename="templates.default"/>
 <%
     String postURL = "";
-    WikiContext ctx = WikiContext.findContext( pageContext );
+    WikiActionBean ctx = WikiContextFactory.findContext( pageContext );
     AuthenticationManager mgr = ctx.getEngine().getAuthenticationManager();
 
     if( mgr.isContainerAuthenticated() )
@@ -19,9 +18,7 @@
     }
     else
     {
-        String redir = (String)ctx.getVariable("redirect");
-        if( redir == null ) redir = ctx.getEngine().getFrontPage();
-        postURL = ctx.getURL( WikiContext.LOGIN, redir );
+        postURL = "/Login.action";
     }
 
     boolean supportsCookieAuthentication = mgr.allowsCookieAuthentication();
@@ -33,11 +30,7 @@
 <wiki:Tab id="logincontent" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "login.tab")%>'>
 <%--<wiki:Include page='LoginTab.jsp'/>--%>
 
-<form action="<%=postURL%>"
-          id="login"
-       class="wikiform"
-    onsubmit="return Wiki.submitOnce(this);"
-      method="post" accept-charset="<wiki:ContentEncoding />" >
+<stripes:form action="<%=postURL%>" id="login" class="wikiform" method="post" acceptcharset="UTF-8">
 
 <div class="center">
 
@@ -48,47 +41,42 @@
   <table>
     <tr>
       <td colspan="2" class="formhelp">
-        <wiki:Messages div="error" topic="login"
-                    prefix='<%=LocaleSupport.getLocalizedMessage(pageContext,"login.errorprefix")%>' />
+        <wiki:Messages div="error" topic="login" prefix='<%=LocaleSupport.getLocalizedMessage(pageContext,"login.errorprefix")%>' />
       </td>
     </tr>
     <tr>
-      <td><label for="j_username"><fmt:message key="login.login"/></label></td>
-      <td><input type="text" size="24" value="<wiki:Variable var='uid' default='' />"
-                 name="j_username" id="j_username" /></td>
+      <td><stripes:label for="j_username" name="login.login" /></td>
+      <td>
+        <stripes:text size="24" name="j_username" id="j_username"><wiki:Variable var="uid" default="" /></stripes:text>
+      </td>
     </tr>
     <tr>
-      <td><label for="j_password"><fmt:message key="login.password"/></label></td>
-      <td><input type="password" size="24"
-                 name="j_password" id="j_password" /></td>
+      <td><stripes:label for="j_password" name="login.password" /></td>
+      <td><stripes:password size="24" name="j_password" id="j_password" /></td>
     </tr>
     <% if( supportsCookieAuthentication ) { %>
     <tr>
-      <td><label for="j_remember"><fmt:message key="login.remember"/></label></td>
-      <td><input type="checkbox"
-                 name="j_remember" id="j_remember" /></td>
+      <td><stripes:label for="j_remember" name="login.remember" /></td>
+      <td><stripes:checkbox name="j_remember" id="j_remember" /></td>
     </tr>
     <% } %>
     <tr>
       <td>&nbsp;</td>
       <td>
-        <input type="hidden" name="redirect" value="<wiki:Variable var='redirect' default='' />" />
-        <input type="submit" name="submitlogin" value="<fmt:message key='login.submit.login'/>" />
+        <stripes:submit name="login"><fmt:message key="login.submit.login" /></stripes:submit>
       </td>
     </tr>
     </table>
 
     <div class="formhelp">
-      <fmt:message key="login.lostpw"/>
-      <a href="#" onclick="$('menu-lostpassword').fireEvent('click');"
-                    title="<fmt:message key='login.lostpw.title'/>" >
-        <fmt:message key="login.lostpw.getnew"/>
+      <fmt:message key="login.lostpw" />
+      <a href="#" onclick="$('menu-lostpassword').fireEvent('click');" title="<fmt:message key='login.lostpw.title' />">
+        <fmt:message key="login.lostpw.getnew" />
       </a>
     </div>
     <div class="formhelp">
-      <fmt:message key="login.nopassword"/>
-      <a href="#" onclick="$('menu-profile').fireEvent('click');"
-                    title="<fmt:message key='login.registernow.title'/>" >
+      <fmt:message key="login.nopassword" />
+      <a href="#" onclick="$('menu-profile').fireEvent('click');" title="<fmt:message key='login.registernow.title' />">
         <fmt:message key="login.registernow">
           <fmt:param><wiki:Variable var="applicationname" /></fmt:param>
         </fmt:message>
@@ -96,7 +84,7 @@
     </div>
 
 </div>
-</form>
+</stripes:form>
 
 </wiki:Tab>
 
@@ -104,11 +92,7 @@
 <wiki:Tab id="lostpassword" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "login.lostpw.tab")%>'>
 
 <div class="center">
-<form action="<wiki:Link jsp='LostPassword.jsp' format='url'><wiki:Param name='tab' value='lostpassword'/></wiki:Link>"
-          id="lostpw"
-       class="wikiform"
-    onsubmit="return Wiki.submitOnce(this);"
-      method="post" accept-charset="<wiki:ContentEncoding />" >
+<stripes:form action="/LostPassword.jsp" id="lostpw" class="wikiform" method="post" acceptcharset="UTF-8">
 
   <h3><fmt:message key="login.lostpw.heading" /></h3>
 
@@ -117,7 +101,7 @@
       <wiki:Messages div="information" topic="resetpw" prefix="" />
       <p>
         <fmt:message key="login.lostpw.reset.login">
-          <fmt:param><a href="<wiki:Link jsp='Login.jsp' />"><fmt:message key="login.lostpw.reset.clickhere"/></a></fmt:param>
+          <fmt:param><a href="<wiki:Link jsp='Login.action' />"><fmt:message key="login.lostpw.reset.clickhere" /></a></fmt:param>
         </fmt:message>
       </p>
   </c:when>
@@ -126,40 +110,36 @@
   <div class="formhelp"><fmt:message key="login.lostpw.help"></fmt:message></div>
 
   <table>
-    <c:if test="${param.tab eq 'lostpassword'}" >
+    <c:if test="${param.tab eq 'lostpassword'}">
     <tr>
       <td colspan="2" class="formhelp">
-        <wiki:Messages div="error" topic="resetpw"
-                    prefix='<%=LocaleSupport.getLocalizedMessage(pageContext,"login.errorprefix")%>' />
+        <wiki:Messages div="error" topic="resetpw" prefix='<%=LocaleSupport.getLocalizedMessage(pageContext,"login.errorprefix")%>' />
         <wiki:Messages div="information" topic="resetpwok" />
       </td>
     </tr>
     </c:if>
     <tr>
-      <td><label for="name"><fmt:message key="login.lostpw.name"/></label></td>
-      <td><input type="text" size="24" name="name" id="name" /></td>
+      <td><stripes:label for="name" name="login.lostpw.name" /></td>
+      <td><stripes:text size="24" name="name" id="name" /></td>
     </tr>
     <tr>
       <td>&nbsp;</td>
       <td>
-        <input type="hidden" name="action" value="resetPassword"/>
-        <input type="submit" name="Submit" value="<fmt:message key='login.lostpw.submit'/>" />
+        <stripes:submit name="resetPassword"><fmt:message key="login.lostpw.submit" /></stripes:submit>
       </td>
     </tr>
   </table>
 
   <div class="formhelp">
-    <fmt:message key="login.invite"/>
-    <a href="#" onclick="$('menu-logincontent').fireEvent('click');"
-                  title="<fmt:message key='login.title'/>" >
+    <fmt:message key="login.invite" />
+    <a href="#" onclick="$('menu-logincontent').fireEvent('click');" title="<fmt:message key='login.title' />">
       <fmt:message key="login.heading.login"><fmt:param><wiki:Variable var="applicationname" /></fmt:param></fmt:message>
     </a>
   </div>
   <div class="formhelp">
-    <fmt:message key="login.nopassword"/>
+    <fmt:message key="login.nopassword" />
     <%--<a href="UserPreferences.jsp?tab=profile">--%>
-    <a href="#" onclick="$('menu-profile').fireEvent('click');"
-                  title="<fmt:message key='login.registernow.title'/>" >
+    <a href="#" onclick="$('menu-profile').fireEvent('click');" title="<fmt:message key='login.registernow.title' />">
       <fmt:message key="login.registernow">
         <fmt:param><wiki:Variable var="applicationname" /></fmt:param>
       </fmt:message>
@@ -169,7 +149,7 @@
   </c:otherwise>
   </c:choose>
 
-</form>
+</stripes:form>
 </div>
 
 </wiki:Tab>
@@ -177,12 +157,12 @@
 
 <%-- Register new user profile --%>
 <wiki:Permission permission='editProfile'>
-<wiki:Tab id="profile" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "login.register.tab")%>' >
-  <wiki:Include page='ProfileTab.jsp'/>
+<wiki:Tab id="profile" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "login.register.tab")%>'>
+  <wiki:Include page='ProfileTab.jsp' />
 </wiki:Tab>
 </wiki:Permission>
 
-<wiki:Tab id="loginhelp" title='<%=LocaleSupport.getLocalizedMessage(pageContext,"login.tab.help")%>' >
+<wiki:Tab id="loginhelp" title='<%=LocaleSupport.getLocalizedMessage(pageContext,"login.tab.help")%>'>
   <wiki:InsertPage page="LoginHelp" />
 
   <wiki:NoSuchPage page="LoginHelp">

Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/NewGroupContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/NewGroupContent.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/NewGroupContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/NewGroupContent.jsp Tue Dec  2 20:36:52 2008
@@ -9,8 +9,7 @@
 <%@ page errorPage="/Error.jsp" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<fmt:setLocale value="${prefs.Language}" />
-<fmt:setBundle basename="templates.default"/>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
 <%
   // Extract the group name and members
   String name = request.getParameter( "group" );
@@ -37,24 +36,23 @@
 <wiki:TabbedSection defaultTab="${param.tab}">
   <wiki:Tab id="logincontent" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "newgroup.heading.create")%>'>
 
-<h3><fmt:message key="newgroup.heading.create"/></h3>
+<h3><fmt:message key="newgroup.heading.create" /></h3>
 
 <wiki:Messages div='error' topic='<%=GroupManager.MESSAGES_KEY%>' prefix='<%=LocaleSupport.getLocalizedMessage(pageContext,"newgroup.errorprefix")%>' />
 
-  <form id="createGroup" action="<wiki:Link format="url" jsp="NewGroup.jsp"/>"
-    method="POST" accept-charset="UTF-8">
+  <form id="createGroup" action="<wiki:Link format="url" jsp="NewGroup.jsp" />" method="POST" accept-charset="UTF-8">
 
   <div class="formhelp">
-     <fmt:message key="newgroup.instructions.start"/>
+     <fmt:message key="newgroup.instructions.start" />
   </div>
 
   <table class="wikitable">
     <!-- Name -->
     <tr>
-      <th><label><fmt:message key="newgroup.name"/></label></th>
+      <th><label><fmt:message key="newgroup.name" /></label></th>
       <td><input type="text" name="group" size="30" value="<%=name%>" />
       <div class="formhelp">
-        <fmt:message key="newgroup.name.description"/>
+        <fmt:message key="newgroup.name.description" />
       </div>
       </td>
     </tr>
@@ -69,18 +67,18 @@
       }
     %>
     <tr>
-      <th><label><fmt:message key="group.members"/></label></th>
+      <th><label><fmt:message key="group.members" /></label></th>
       <td><textarea id="members" name="members" rows="20" cols="40"><%=TextUtil.replaceEntities(s.toString())%></textarea>
       <div class="formhelp">
-        <fmt:message key="newgroup.members.description"/>
+        <fmt:message key="newgroup.members.description" />
       </div>
       </td>
     </tr>
     </table>
-    <input type="submit" name="ok" value="<fmt:message key="newgroup.creategroup"/>" />
+    <input type="submit" name="ok" value="<fmt:message key="newgroup.creategroup" />" />
     <input type="hidden" name="action" value="save" />
     <div class="formhelp">
-         <fmt:message key="newgroup.instructions.end"/>
+         <fmt:message key="newgroup.instructions.end" />
     </div>
   </form>
 

Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/NewGroupContent.jsp
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.jsp Tue Dec  2 20:36:52 2008
@@ -2,32 +2,29 @@
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<fmt:setLocale value="${prefs.Language}" />
-<fmt:setBundle basename="templates.default"/>
+<%@ page import="com.ecyrd.jspwiki.action.WikiContextFactory" %>
 <%
-  WikiContext c = WikiContext.findContext(pageContext);
+  WikiContext c = WikiContextFactory.findContext( pageContext );
   WikiPage wikipage = c.getPage();
 %>
 <wiki:CheckRequestContext context='view|diff|edit|upload|info'>
 <div id='actionsBottom' class="pageactions"> 
   <wiki:PageExists>  
 
-    <a href="#top" 
-      class="action quick2top" 
-      title="<fmt:message key='actions.gototop'/>" >&laquo;</a>
+    <a href="#top" class="action quick2top" title="<fmt:message key='actions.gototop' />">&laquo;</a>
 
     <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["DateFormat"]}'/></wiki:DiffLink></fmt:param>
-          <fmt:param><wiki:Author /></fmt:param>
+          <fmt:param><wiki:PageVersion/></fmt:param>
+          <fmt:param><wiki:DiffLink version="latest" newVersion="previous"><wiki:PageDate format='${prefs["DateFormat"]}' /></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["DateFormat"]}'/></fmt:param>
-         <fmt:param><wiki:Author /></fmt:param>
+         <fmt:param><wiki:PageDate format='${prefs["DateFormat"]}' /></fmt:param>
+         <fmt:param><wiki:Author/></fmt:param>
       </fmt:message>
     </wiki:CheckVersion>
 
@@ -35,6 +32,6 @@
 
   </wiki:PageExists>
 
-  <wiki:NoSuchPage><fmt:message key="actions.notcreated"/></wiki:NoSuchPage> 
+  <wiki:NoSuchPage><fmt:message key="actions.notcreated" /></wiki:NoSuchPage> 
 </div>
 </wiki:CheckRequestContext>
\ No newline at end of file

Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.jsp
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.jsp Tue Dec  2 20:36:52 2008
@@ -2,8 +2,6 @@
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<fmt:setLocale value="${prefs.Language}" />
-<fmt:setBundle basename="templates.default"/>
 <div id="actionsTop" class="pageactions"> 
   <ul>
 
@@ -11,12 +9,10 @@
     <wiki:Permission permission="edit">
 	<li>
         <wiki:PageType type="page">
-          <a href="<wiki:EditLink format='url' />" accesskey="e"  class="action edit"
-            title="<fmt:message key='actions.edit.title'/>" ><fmt:message key='actions.edit'/></a>
+          <a href="<wiki:EditLink format='url' />" accesskey="e" class="action edit" title="<fmt:message key='actions.edit.title' />"><fmt:message key='actions.edit' /></a>
         </wiki:PageType>
         <wiki:PageType type="attachment">
-          <a href="<wiki:BaseURL/>Edit.jsp?page=<wiki:ParentPageName />" accesskey="e" class="action edit"
-            title="<fmt:message key='actions.editparent.title'/>" ><fmt:message key='actions.editparent'/></a>
+          <a href="<wiki:BaseURL/>Edit.jsp?page=<wiki:ParentPageName/>" accesskey="e" class="action edit" title="<fmt:message key='actions.editparent.title' />"><fmt:message key='actions.editparent' /></a>
         </wiki:PageType>
     </li>
     </wiki:Permission>
@@ -24,7 +20,7 @@
 
     <%-- converted to popup menu by jspwiki-common.js--%>
     <li id="morebutton">
-      <a href="<wiki:Link format='url' page='MoreMenu' />" class="action more"><fmt:message key="actions.more"/></a>
+      <a href="<wiki:Link format='url' page='MoreMenu' />" class="action more"><fmt:message key="actions.more" /></a>
     </li>
 
   </ul>

Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.jsp
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/PageContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PageContent.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PageContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PageContent.jsp Tue Dec  2 20:36:52 2008
@@ -3,22 +3,21 @@
 <%@ page import="com.ecyrd.jspwiki.attachment.*" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<fmt:setLocale value="${prefs.Language}" />
-<fmt:setBundle basename="templates.default"/>
+<%@ page import="com.ecyrd.jspwiki.action.WikiContextFactory" %>
 <%
-  WikiContext c = WikiContext.findContext( pageContext );
+  WikiContext c = WikiContextFactory.findContext( pageContext );
   int attCount = c.getEngine().getAttachmentManager().listAttachments(c.getPage()).size();
   String attTitle = LocaleSupport.getLocalizedMessage(pageContext, "attach.tab");
   if( attCount != 0 ) attTitle += " (" + attCount + ")";
 %>
 
-<wiki:TabbedSection defaultTab='${param.tab}' >
+<wiki:TabbedSection defaultTab='${param.tab}'>
 
   <wiki:Tab id="pagecontent" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "view.tab")%>' accesskey="v">
-    <wiki:Include page="PageTab.jsp"/>
+    <wiki:Include page="PageTab.jsp" />
     <wiki:PageType type="attachment">
       <div class="information">
-	    <fmt:message key="info.backtoparentpage" >
+	    <fmt:message key="info.backtoparentpage">
 	      <fmt:param><wiki:LinkToParent><wiki:ParentPageName/></wiki:LinkToParent></fmt:param>
         </fmt:message>
       </div>
@@ -32,7 +31,7 @@
 
   <wiki:PageType type="page">
   <wiki:Tab id="attach" title="<%= attTitle %>" accesskey="a">
-    <wiki:Include page="AttachmentTab.jsp"/>
+    <wiki:Include page="AttachmentTab.jsp" />
   </wiki:Tab>
   </wiki:PageType>
     

Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/PageContent.jsp
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/PageTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PageTab.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PageTab.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PageTab.jsp Tue Dec  2 20:36:52 2008
@@ -1,11 +1,11 @@
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*" %><%--CHECK why is this needed --%>
-<fmt:setLocale value="${prefs.Language}" />
-<fmt:setBundle basename="templates.default"/>
+<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<%@ page import="com.ecyrd.jspwiki.action.WikiContextFactory" %><%--CHECK why is this needed --%>
 <%
-	WikiContext c = WikiContext.findContext( pageContext );
+	WikiContext c = WikiContextFactory.findContext( pageContext );
    	WikiPage p = c.getPage();
 	String pagename = p.getName();
 
@@ -22,15 +22,14 @@
 <%-- If the page is an older version, then offer a note and a possibility
      to restore this version as the latest one. --%>
 <wiki:CheckVersion mode="notlatest">
-  <form action="<wiki:Link format='url' jsp='Wiki.jsp'/>" 
-        method="get"  accept-charset='UTF-8'>
+  <form action="<wiki:Link format='url' jsp='Wiki.jsp' />" method="get" accept-charset='UTF-8'>
 
     <input type="hidden" name="page" value="<wiki:Variable var='pagename' />" />     
     <div class="warning">
       <fmt:message key="view.oldversion">
         <fmt:param>
           <%--<wiki:PageVersion/>--%>
-          <select id="version" name="version" onchange="this.form.submit();" >
+          <select id="version" name="version" onchange="this.form.submit();">
 <% 
    int latestVersion = c.getEngine().getPage( pagename, WikiProvider.LATEST_VERSION ).getVersion();
    int thisVersion = p.getVersion();
@@ -46,16 +45,16 @@
           </select>
         </fmt:param>
       </fmt:message>  
-      <br />
-      <wiki:LinkTo><fmt:message key="view.backtocurrent"/></wiki:LinkTo>&nbsp;&nbsp;
-      <wiki:EditLink version="this"><fmt:message key="view.restore"/></wiki:EditLink>
+      <br/>
+      <wiki:LinkTo><fmt:message key="view.backtocurrent" /></wiki:LinkTo>&nbsp;&nbsp;
+      <wiki:EditLink version="this"><fmt:message key="view.restore" /></wiki:EditLink>
     </div>
 
   </form>
 </wiki:CheckVersion>
 
 <%-- Inserts no text if there is no page. --%>
-<wiki:InsertPage />
+<wiki:InsertPage/>
 
 <%-- Inserts blogcomment if appropriate 
 <% if( !blogpage.equals("") ) { %>
@@ -66,13 +65,13 @@
 
   <% if( ! blogcommentpage.equals("") ) { %>
   <wiki:PageExists page="<%= blogcommentpage%>">
-	<div class="weblogcommentstitle"><fmt:message key="blog.commenttitle"/></div>
+	<div class="weblogcommentstitle"><fmt:message key="blog.commenttitle" /></div>
     <div class="weblogcomments"><wiki:InsertPage page="<%= blogcommentpage%>" /></div>
   </wiki:PageExists>
   <% }; %>
   <div class="information">	
-	<wiki:Link page="<%= mainblogpage %>"><fmt:message key="blog.backtomain"/></wiki:Link>&nbsp; &nbsp;
-	<wiki:Link context="comment" page="<%= blogcommentpage%>" ><fmt:message key="blog.addcomments"/></wiki:Link>
+	<wiki:Link page="<%= mainblogpage %>"><fmt:message key="blog.backtomain" /></wiki:Link>&nbsp; &nbsp;
+	<wiki:Link context="comment" page="<%= blogcommentpage%>"><fmt:message key="blog.addcomments" /></wiki:Link>
   </div>
 
 </wiki:PageExists>
@@ -80,9 +79,9 @@
 
 <wiki:NoSuchPage>
   <%-- FIXME: Should also note when a wrong version has been fetched. --%>
-  <div class="information" >
+  <div class="information">
   <fmt:message key="common.nopage">
-    <fmt:param><wiki:EditLink><fmt:message key="common.createit"/></wiki:EditLink></fmt:param>
+    <fmt:param><wiki:EditLink><fmt:message key="common.createit" /></wiki:EditLink></fmt:param>
   </fmt:message>
   </div>
 </wiki:NoSuchPage>
\ No newline at end of file

Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/PageTab.jsp
            ('svn:eol-style' removed)

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesContent.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesContent.jsp Tue Dec  2 20:36:52 2008
@@ -3,29 +3,28 @@
 <%@ page import="com.ecyrd.jspwiki.ui.*" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<fmt:setLocale value="${prefs.Language}" />
-<fmt:setBundle basename="templates.default"/>
+<%@ page import="com.ecyrd.jspwiki.action.WikiContextFactory" %>
 <% 
-  WikiContext context = WikiContext.findContext( pageContext ); 
+  WikiContext context = WikiContextFactory.findContext( pageContext ); 
   TemplateManager.addResourceRequest( context, "script", "scripts/jspwiki-prefs.js" );
 %>
 
 <wiki:TabbedSection defaultTab="${param.tab}">
 
-  <wiki:Tab id="prefs" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "prefs.tab.prefs")%>' accesskey="p" >
+  <wiki:Tab id="prefs" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "prefs.tab.prefs")%>' accesskey="p">
      <wiki:Include page="PreferencesTab.jsp" />
   </wiki:Tab>
 
   <wiki:UserCheck status="authenticated">
   <wiki:Permission permission="editProfile">
-  <wiki:Tab id="profile" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "prefs.tab.profile")%>' accesskey="o" >
+  <wiki:Tab id="profile" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "prefs.tab.profile")%>' accesskey="o">
      <wiki:Include page="ProfileTab.jsp" />
   </wiki:Tab>
   </wiki:Permission>
   </wiki:UserCheck>
   
   <wiki:Permission permission="createGroups"> <!-- FIXME check right permissions -->
-  <wiki:Tab id="group" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "group.tab")%>' accesskey="g" >
+  <wiki:Tab id="group" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "group.tab")%>' accesskey="g">
     <wiki:Include page="GroupTab.jsp" />
   </wiki:Tab>
   </wiki:Permission>

Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesContent.jsp
            ('svn:eol-style' removed)



Mime
View raw message