jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ajaqu...@apache.org
Subject svn commit: r722372 [2/3] - in /incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH: src/webdocs/ src/webdocs/admin/ src/webdocs/templates/default/ src/webdocs/templates/default/admin/ src/webdocs/templates/default/editors/ src/webdocs/templates/raw/...
Date Tue, 02 Dec 2008 04:21:05 GMT
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/FindContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/FindContent.jsp?rev=722372&r1=722371&r2=722372&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/FindContent.jsp (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/FindContent.jsp Mon Dec  1 20:21:03 2008
@@ -7,8 +7,9 @@
 <%@ 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 +29,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 +37,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 +46,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>
 

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/Footer.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/Footer.jsp?rev=722372&r1=722371&r2=722372&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/Footer.jsp (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/Footer.jsp Mon Dec  1 20:21:03 2008
@@ -2,10 +2,11 @@
 <%@ 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 +18,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()%>

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/GroupContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/GroupContent.jsp?rev=722372&r1=722371&r2=722372&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/GroupContent.jsp (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/GroupContent.jsp Mon Dec  1 20:21:03 2008
@@ -11,14 +11,16 @@
 <%@ 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 +39,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 +60,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 +76,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 +85,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 +94,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++ )

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/GroupTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/GroupTab.jsp?rev=722372&r1=722371&r2=722372&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/GroupTab.jsp (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/GroupTab.jsp Mon Dec  1 20:21:03 2008
@@ -13,8 +13,10 @@
 <%@ 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 +38,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 +55,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 +83,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 +123,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 +139,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++ )

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/Header.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/Header.jsp?rev=722372&r1=722371&r2=722372&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/Header.jsp (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/Header.jsp Mon Dec  1 20:21:03 2008
@@ -1,16 +1,17 @@
 <%@ 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 +22,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

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/InfoContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/InfoContent.jsp?rev=722372&r1=722371&r2=722372&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/InfoContent.jsp (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/InfoContent.jsp Mon Dec  1 20:21:03 2008
@@ -8,10 +8,12 @@
 <%@ 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 +74,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 +109,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 +123,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 +138,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 +161,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 +198,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 +252,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 +273,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 +285,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 +295,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 +306,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 +317,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 +353,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 +391,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>

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/LoginContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/LoginContent.jsp?rev=722372&r1=722371&r2=722372&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/LoginContent.jsp (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/LoginContent.jsp Mon Dec  1 20:21:03 2008
@@ -9,7 +9,7 @@
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
 <%
     String postURL = "";
-    WikiActionBean ctx = WikiContext.findContext( pageContext );
+    WikiActionBean ctx = WikiContextFactory.findContext( pageContext );
     AuthenticationManager mgr = ctx.getEngine().getAuthenticationManager();
 
     if( mgr.isContainerAuthenticated() )
@@ -30,10 +30,7 @@
 <wiki:Tab id="logincontent" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "login.tab")%>'>
 <%--<wiki:Include page='LoginTab.jsp'/>--%>
 
-<stripes:form action="<%=postURL%>"
-          id="login"
-       class="wikiform"
-      method="post" acceptcharset="${wikiEngine.contentEncoding}" >
+<stripes:form action="<%=postURL%>" id="login" class="wikiform" method="post" acceptcharset="UTF-8">
 
 <div class="center">
 
@@ -44,45 +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><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>
+        <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><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><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>
-        <stripes:submit name="login"><fmt:message key="login.submit.login"/></stripes:submit>
+        <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>
@@ -98,10 +92,7 @@
 <wiki:Tab id="lostpassword" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "login.lostpw.tab")%>'>
 
 <div class="center">
-<stripes:form action="/LostPassword.jsp"
-          id="lostpw"
-       class="wikiform"
-      method="post" acceptcharset="${wikiEngine.contentEncoding}" >
+<stripes:form action="/LostPassword.jsp" id="lostpw" class="wikiform" method="post" acceptcharset="UTF-8">
 
   <h3><fmt:message key="login.lostpw.heading" /></h3>
 
@@ -110,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.action' />"><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>
@@ -119,39 +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><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>
-        <stripes:submit name="resetPassword"><fmt:message key="login.lostpw.submit"/></stripes: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,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">

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/NewGroupContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/NewGroupContent.jsp?rev=722372&r1=722371&r2=722372&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/NewGroupContent.jsp (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/NewGroupContent.jsp Mon Dec  1 20:21:03 2008
@@ -9,8 +9,9 @@
 <%@ 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 +38,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 +69,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>
 

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PageActionsBottom.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PageActionsBottom.jsp?rev=722372&r1=722371&r2=722372&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PageActionsBottom.jsp (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PageActionsBottom.jsp Mon Dec  1 20:21:03 2008
@@ -2,32 +2,31 @@
 <%@ 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 +34,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

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PageActionsTop.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PageActionsTop.jsp?rev=722372&r1=722371&r2=722372&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PageActionsTop.jsp (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PageActionsTop.jsp Mon Dec  1 20:21:03 2008
@@ -2,8 +2,8 @@
 <%@ 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 +11,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 +22,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>

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PageContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PageContent.jsp?rev=722372&r1=722371&r2=722372&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PageContent.jsp (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PageContent.jsp Mon Dec  1 20:21:03 2008
@@ -3,22 +3,23 @@
 <%@ 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 +33,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>
     

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PageTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PageTab.jsp?rev=722372&r1=722371&r2=722372&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PageTab.jsp (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PageTab.jsp Mon Dec  1 20:21:03 2008
@@ -1,11 +1,13 @@
 <%@ 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 +24,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 +47,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 +67,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 +81,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

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PreferencesContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PreferencesContent.jsp?rev=722372&r1=722371&r2=722372&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PreferencesContent.jsp (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PreferencesContent.jsp Mon Dec  1 20:21:03 2008
@@ -3,29 +3,30 @@
 <%@ 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>

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PreferencesTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PreferencesTab.jsp?rev=722372&r1=722371&r2=722372&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PreferencesTab.jsp (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PreferencesTab.jsp Mon Dec  1 20:21:03 2008
@@ -13,11 +13,13 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> 
 
 <%@ 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" %>
+
+
 <%
   //FIXME: this should better move to UserPreferences.jsp but that doesn't seem to work. Ugh ?
-  WikiContext c = WikiContext.findContext( pageContext );
+  WikiContext c = WikiContextFactory.findContext( pageContext );
   TemplateManager t = c.getEngine().getTemplateManager();
   pageContext.setAttribute( "skins", t.listSkins(pageContext, c.getTemplate() ) );
   pageContext.setAttribute( "languages", t.listLanguages(pageContext) );
@@ -25,11 +27,11 @@
   pageContext.setAttribute( "timezones", t.listTimeZones(pageContext) );
 %>
 
-<h3><fmt:message key="prefs.heading"><fmt:param><wiki:Variable var="applicationname"/></fmt:param></fmt:message></h3>
+<h3><fmt:message key="prefs.heading"><fmt:param><wiki:Variable var="applicationname" /></fmt:param></fmt:message></h3>
 
-<c:if test="${param.tab eq 'prefs'}" >
+<c:if test="${param.tab eq 'prefs'}">
   <div class="formhelp">
-    <wiki:Messages div="error" topic="prefs" prefix='<%=LocaleSupport.getLocalizedMessage(pageContext,"prefs.errorprefix.prefs")%>'/>
+    <wiki:Messages div="error" topic="prefs" prefix='<%=LocaleSupport.getLocalizedMessage(pageContext,"prefs.errorprefix.prefs")%>' />
   </div>
 </c:if>
 
@@ -41,7 +43,7 @@
 <table>
 
   <tr>
-  <td><label for="assertedName"><fmt:message key="prefs.assertedname"/></label></td>
+  <td><label for="assertedName"><fmt:message key="prefs.assertedname" /></label></td>
   <td> 
   <input type="text" id="assertedName" name="assertedName" size="20" value="<wiki:UserProfile property='wikiname' />" />
   <%-- CHECK THIS
@@ -68,18 +70,18 @@
   </wiki:UserCheck>
 
   <tr>
-  <td><label for="editor"><fmt:message key="edit.chooseeditor"/></label></td>
+  <td><label for="editor"><fmt:message key="edit.chooseeditor" /></label></td>
   <td>
     <select id="editor" name="editor">
       <wiki:EditorIterator id="edt">
-        <option <%=edt.isSelected()%> value="<%=edt.getName()%>"><%=edt.getName()%></option>
+        <option <%=edt.isSelected()%>value="<%=edt.getName()%>"><%=edt.getName()%></option>
       </wiki:EditorIterator>
   </select>
   </td>
   </tr>
   
   <tr>
-  <td><label for="prefSectionEditing"><fmt:message key="prefs.user.sectionediting"/></label></td>
+  <td><label for="prefSectionEditing"><fmt:message key="prefs.user.sectionediting" /></label></td>
   <td>
   <input id="prefSectionEditing" name="prefSectionEditing" 
        type="checkbox" <c:if test='${"on" == prefs.SectionEditing}'>checked="checked"</c:if> ></input>
@@ -88,11 +90,11 @@
   </tr>
   
   <tr>
-  <td><label for="prefSkin"><fmt:message key="prefs.user.skin"/></label></td>
+  <td><label for="prefSkin"><fmt:message key="prefs.user.skin" /></label></td>
   <td>
   <select id="prefSkin" name="prefSkin">
     <c:forEach items="${skins}" var="i">
-      <option value='<c:out value='${i}'/>' <c:if test='${i == prefs.SkinName}'>selected="selected"</c:if> ><c:out value="${i}"/></option>
+      <option value='<c:out value='${i}' />' <c:if test='${i == prefs.SkinName}'>selected="selected"</c:if> ><c:out value="${i}" /></option>
     </c:forEach>
   </select>
   </td>
@@ -100,13 +102,13 @@
 
 
   <c:if test='${not empty languages}'>
-  <c:set var="prefLanguage" ><c:out value="${prefs.Language}" default="<%=request.getLocale().toString()%>" /></c:set>
+  <c:set var="prefLanguage"><c:out value="${prefs.Language}" default="<%=request.getLocale().toString()%>" /></c:set>
   <tr>
-  <td><label for="prefLanguage"><fmt:message key="prefs.user.language"/></label></td>
+  <td><label for="prefLanguage"><fmt:message key="prefs.user.language" /></label></td>
   <td>
   <select id="prefLanguage" name="prefLanguage">
     <c:forEach items='${languages}' var='lg'>
-      <option value="<c:out value='${lg.key}'/>" <c:if test='${fn:startsWith(prefLanguage,lg.key)}'>selected="selected"</c:if> ><c:out value="${lg.value}"/></option>
+      <option value="<c:out value='${lg.key}' />" <c:if test='${fn:startsWith(prefLanguage,lg.key)}'>selected="selected"</c:if> ><c:out value="${lg.value}" /></option>
     </c:forEach>
   </select>
   </td>
@@ -114,32 +116,32 @@
   </c:if>
 
   <tr>
-  <td><label for="prefOrientation"><fmt:message key="prefs.user.orientation"/></label></td>
+  <td><label for="prefOrientation"><fmt:message key="prefs.user.orientation" /></label></td>
   <td>
   <select id="prefOrientation" name="prefOrientation" onclick="Wiki.changeOrientation();">
-      <option value='fav-left' <c:if test='${"fav-left" == prefs.Orientation}'>selected="selected"</c:if> ><fmt:message key="prefs.user.orientation.left"/></option>
-      <option value='fav-right' <c:if test='${"fav-right" == prefs.Orientation}'>selected="selected"</c:if> ><fmt:message key="prefs.user.orientation.right"/></option>
+      <option value='fav-left' <c:if test='${"fav-left" == prefs.Orientation}'>selected="selected"</c:if> ><fmt:message key="prefs.user.orientation.left" /></option>
+      <option value='fav-right' <c:if test='${"fav-right" == prefs.Orientation}'>selected="selected"</c:if> ><fmt:message key="prefs.user.orientation.right" /></option>
   </select>
   </td>
   </tr>
 
   <tr>
-  <td><label for="prefTimeFormat"><fmt:message key="prefs.user.timeformat"/></label></td>
+  <td><label for="prefTimeFormat"><fmt:message key="prefs.user.timeformat" /></label></td>
   <td>
-  <select id="prefTimeFormat" name="prefTimeFormat" >
-    <c:forEach items='${timeformats}' var='tf' >
-      <option value='<c:out value="${tf.key}"/>' <c:if test='${tf.key == prefs.DateFormat}'>selected="selected"</c:if> ><c:out value="${tf.value}"/></option>
+  <select id="prefTimeFormat" name="prefTimeFormat">
+    <c:forEach items='${timeformats}' var='tf'>
+      <option value='<c:out value="${tf.key}" />' <c:if test='${tf.key == prefs.DateFormat}'>selected="selected"</c:if> ><c:out value="${tf.value}" /></option>
     </c:forEach>
   </select>
   </td>
   </tr>
 
   <tr>
-  <td><label for="prefTimeZone"><fmt:message key="prefs.user.timezone"/></label></td>
+  <td><label for="prefTimeZone"><fmt:message key="prefs.user.timezone" /></label></td>
   <td>
   <select id='prefTimeZone' name='prefTimeZone'>
     <c:forEach items='${timezones}' var='tz'>
-      <option value='<c:out value="${tz.key}"/>' <c:if test='${tz.key == prefs.TimeZone}'>selected="selected"</c:if> ><c:out value="${tz.value}"/></option>
+      <option value='<c:out value="${tz.key}" />' <c:if test='${tz.key == prefs.TimeZone}'>selected="selected"</c:if> ><c:out value="${tz.value}" /></option>
     </c:forEach>
   </select>
   </td>
@@ -171,11 +173,10 @@
  <tr>
   <td>&nbsp;</td>
   <td>
-    <input type="submit" name="ok" value="<fmt:message key='prefs.save.prefs.submit'/>" 
-      accesskey="s" />
+    <input type="submit" name="ok" value="<fmt:message key='prefs.save.prefs.submit' />" accesskey="s" />
     <input type="hidden" name="redirect" value="<wiki:Variable var='redirect' default='' />" />
     <input type="hidden" name="action" value="setAssertedName" />
-    <div class="formhelp"><fmt:message key='prefs.cookies'/></div>
+    <div class="formhelp"><fmt:message key='prefs.cookies' /></div>
   </td>
   </tr>
 
@@ -185,14 +186,14 @@
 <!-- Clearing the 'asserted name' and other prefs in the cookie -->
 <%--wiki:UserCheck status="asserted"--%>
 
-<h3><fmt:message key='prefs.clear.heading'/></h3>
+<h3><fmt:message key='prefs.clear.heading' /></h3>
 
 <form action="<wiki:Link jsp='UserPreferences.jsp' format='url'><wiki:Param name='tab' value='prefs'/></wiki:Link>"
           id="clearCookie"
     onsubmit="Wiki.prefs.empty(); return Wiki.submitOnce( this );" 
       method="post" accept-charset="<wiki:ContentEncoding />" >
   <div>
-  <input type="submit" name="ok" value="<fmt:message key='prefs.clear.submit'/>" />
+  <input type="submit" name="ok" value="<fmt:message key='prefs.clear.submit' />" />
   <input type="hidden" name="action" value="clearAssertedName" />
   </div>
   <div class="formhelp"><fmt:message key="prefs.clear.description" /></div>

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PreviewContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PreviewContent.jsp?rev=722372&r1=722371&r2=722372&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PreviewContent.jsp (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PreviewContent.jsp Mon Dec  1 20:21:03 2008
@@ -2,15 +2,15 @@
 <%@ page import="com.ecyrd.jspwiki.ui.EditorManager" %>
 <%@ 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"/>
+
+
 
 <%-- Inserts page content for preview. --%>
 <wiki:TabbedSection>
 <wiki:Tab id="previewcontent" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "preview.tab")%>'>
 
   <div class="information">
-    <fmt:message key="preview.info"/>
+    <fmt:message key="preview.info" />
     <wiki:Editor/>
   </div>
 
@@ -19,7 +19,7 @@
   </div>
 
   <div class="information">
-    <fmt:message key="preview.info"/>
+    <fmt:message key="preview.info" />
   </div>
 
 </wiki:Tab>

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/ProfileTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/ProfileTab.jsp?rev=722372&r1=722371&r2=722372&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/ProfileTab.jsp (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/ProfileTab.jsp Mon Dec  1 20:21:03 2008
@@ -7,28 +7,26 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ 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"/>
+<%@ page import="com.ecyrd.jspwiki.action.WikiContextFactory" %>
+
+
 <%
   /* dateformatting not yet supported by wiki:UserProfile tag - diy */
-  WikiContext wikiContext = WikiContext.findContext(pageContext);
+  WikiContext wikiContext = WikiContextFactory.findContext( pageContext );
   UserManager manager = wikiContext.getEngine().getUserManager();
   UserProfile profile = manager.getUserProfile( wikiContext.getWikiSession() );
 %>
-<stripes:form beanclass="com.ecyrd.jspwiki.action.UserPreferencesActionBean"
-          id="editProfile"
-       class="wikiform"
-      method="post" acceptcharset="${wikiEngine.contentEncoding}">
-      <stripes:param name="tab" value="profile"/>
+<stripes:form beanclass="com.ecyrd.jspwiki.action.UserPreferencesActionBean" id="editProfile" class="wikiform" method="post" acceptcharset="UTF-8">
+      <stripes:param name="tab" value="profile" />
 
       <h3>
-      <wiki:UserProfile property="exists"><fmt:message key="prefs.oldprofile"/></wiki:UserProfile>
-      <wiki:UserProfile property="new"><fmt:message key="prefs.newprofile"/></wiki:UserProfile>
+      <wiki:UserProfile property="exists"><fmt:message key="prefs.oldprofile" /></wiki:UserProfile>
+      <wiki:UserProfile property="new"><fmt:message key="prefs.newprofile" /></wiki:UserProfile>
       </h3>
 
-      <c:if test="${param.tab eq 'profile'}" >
+      <c:if test="${param.tab eq 'profile'}">
         <div class="formhelp">
-        <wiki:Messages div="error" topic="profile" prefix='<%=LocaleSupport.getLocalizedMessage(pageContext,"prefs.errorprefix.profile")%>'/>
+        <wiki:Messages div="error" topic="profile" prefix='<%=LocaleSupport.getLocalizedMessage(pageContext,"prefs.errorprefix.profile")%>' />
         </div>
       </c:if>
 
@@ -36,20 +34,19 @@
 
      <!-- Login name -->
      <tr>
-       <td><label for="loginname"><fmt:message key="prefs.loginname"/></label></td>
+       <td><stripes:label for="loginname" name="prefs.loginname" /></td>
        <td>
          <wiki:UserProfile property="canChangeLoginName">
-           <stripes:text name="loginname" id="loginname"
-                  size="20"><wiki:UserProfile property="loginname"/></stripes:text>
+           <stripes:text name="loginname" id="loginname" size="20"><wiki:UserProfile property="loginname" /></stripes:text>
          </wiki:UserProfile>
          <wiki:UserProfile property="!canChangeLoginName">
            <!-- If user can't change their login name, it's because the container manages the login -->
            <wiki:UserProfile property="new">
-             <div class="warning"><fmt:message key="prefs.loginname.cannotset.new"/></div>
+             <div class="warning"><fmt:message key="prefs.loginname.cannotset.new" /></div>
            </wiki:UserProfile>
            <wiki:UserProfile property="exists">
-             <span class="formvalue"><wiki:UserProfile property="loginname"/></span>
-             <div class="warning"><fmt:message key="prefs.loginname.cannotset.exists"/></div>
+             <span class="formvalue"><wiki:UserProfile property="loginname" /></span>
+             <div class="warning"><fmt:message key="prefs.loginname.cannotset.exists" /></div>
            </wiki:UserProfile>
          </wiki:UserProfile>
        </td>
@@ -58,7 +55,7 @@
      <!-- Password; not displayed if container auth used -->
      <wiki:UserProfile property="canChangePassword">
        <tr>
-         <td><label for="password"><fmt:message key="prefs.password"/></label></td>
+         <td><stripes:label for="password" name="prefs.password" /></td>
          <td>
             <%--FIXME Enter Old PW to validate change flow, not yet treated by JSPWiki
             <label for="password">Old</label>&nbsp;
@@ -68,7 +65,7 @@
           </td>
         </tr>
         <tr>
-          <td><label for="passwordAgain"><fmt:message key="prefs.password2"/></label></td>
+          <td><stripes:label for="passwordAgain" name="prefs.password2" /></td>
           <td>
             <stripes:password name="passwordAgain" id="passwordAgain" size="20" value="" />
             <%-- extra validation ? min size, allowed chars? --%>
@@ -78,31 +75,29 @@
 
      <!-- Full name -->
      <tr>
-       <td><label for="fullname"><fmt:message key="prefs.fullname"/></label></td>
+       <td><stripes:label for="fullname" name="prefs.fullname" /></td>
        <td>
-         <stripes:text name="fullname" id="fullname"
-                size="20"><wiki:UserProfile property="fullname"/></stripes:text>
-         <div class="formhelp"><fmt:message key="prefs.fullname.description"/></div>
+         <stripes:text name="fullname" id="fullname" size="20"><wiki:UserProfile property="fullname" /></stripes:text>
+         <div class="formhelp"><fmt:message key="prefs.fullname.description" /></div>
        </td>
      </tr>
 
      <!-- E-mail -->
      <tr>
-       <td><label for="email"><fmt:message key="prefs.email"/></label></td>
+       <td><stripes:label for="email" name="prefs.email" /></td>
        <td>
-         <stripes:text name="email" id="email"
-                size="20"><wiki:UserProfile property="email" /></stripes:text>
-         <div class="formhelp"><fmt:message key="prefs.email.description"/></div>
+         <stripes:text name="email" id="email" size="20"><wiki:UserProfile property="email" /></stripes:text>
+         <div class="formhelp"><fmt:message key="prefs.email.description" /></div>
        </td>
      </tr>
 
      <wiki:UserProfile property="exists">
      <tr class="additinfo">
-       <td><label><fmt:message key="prefs.roles"/></label></td>
+       <td><stripes:label name="prefs.roles" /></td>
        <td><div class="formvalue"><wiki:UserProfile property="roles" /></div></td>
      </tr>
      <tr class="additinfo">
-       <td><label><fmt:message key="prefs.groups"/></label></td>
+       <td><stripes:label name="prefs.groups" /></td>
        <td>
          <%-- TODO this should become clickable group links so you can immediately go and look at them if you want --%>
          <div class="formvalue"><wiki:UserProfile property="groups" /></div>
@@ -111,14 +106,14 @@
      </tr>
 
      <tr class="additinfo">
-       <td><label><fmt:message key="prefs.creationdate"/></label></td>
+       <td><stripes:label name="prefs.creationdate" /></td>
        <td class="formvalue">
          <%--<wiki:UserProfile property="created"/>--%>
  	     <fmt:formatDate value="<%= profile.getCreated() %>" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" />
        </td>
      </tr>
      <tr class="additinfo">
-       <td><label><fmt:message key="prefs.profile.lastmodified"/></label></td>
+       <td><stripes:label name="prefs.profile.lastmodified" /></td>
        <td class="formvalue">
          <%--<wiki:UserProfile property="modified"/>--%>
  	     <fmt:formatDate value="<%= profile.getLastModified() %>" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" />
@@ -130,14 +125,14 @@
        <td>&nbsp;</td>
        <td>
        <wiki:UserProfile property="exists">
-        <stripes:submit name="saveProfile"><fmt:message key="prefs.save.submit"/></stripes:submit>
+        <stripes:submit name="saveProfile"><fmt:message key="prefs.save.submit" /></stripes:submit>
        </wiki:UserProfile>
        <wiki:UserProfile property="new">
-        <stripes:submit name="saveProfile"><fmt:message key="prefs.save.submit"/></stripes:submit>
+        <stripes:submit name="saveProfile"><fmt:message key="prefs.save.submit" /></stripes:submit>
        </wiki:UserProfile>
 
        <wiki:UserCheck status="assertionsAllowed">
-          <div class="formhelp"><fmt:message key="prefs.cookie.info"/></div>
+          <div class="formhelp"><fmt:message key="prefs.cookie.info" /></div>
         </wiki:UserCheck>
        </td>
      </tr>

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/SearchBox.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/SearchBox.jsp?rev=722372&r1=722371&r2=722372&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/SearchBox.jsp (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/SearchBox.jsp Mon Dec  1 20:21:03 2008
@@ -1,7 +1,8 @@
 <%@ 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"/>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+
+
 <%-- Provides a simple searchbox that can be easily included anywhere on the page --%>
 <%-- Powered by jswpwiki-common.js//SearchBox --%>
 
@@ -36,15 +37,15 @@
       onclick="SearchBox.navigate( '<wiki:BaseURL />Search.jsp?query=__PAGEHERE__','<wiki:Variable var="pagename"/>' )"
         title="<fmt:message key="sbox.find.title"/> [ f ]"><fmt:message key="sbox.find"/></a>
     </div>
-    <div id="searchResult" >
-	  <fmt:message key='sbox.search.result'/>
-      <span id="searchTarget" ><fmt:message key='sbox.search.target'/></span>
+    <div id="searchResult">
+	  <fmt:message key='sbox.search.result' />
+      <span id="searchTarget"><fmt:message key='sbox.search.target' /></span>
       <span id="searchSpin" class="spin" style="position:absolute;display:none;"></span>
-	  <div id="searchOutput" ></div>
+	  <div id="searchOutput"></div>
     </div>
     <div id="recentSearches" style="display:none;">
-      <fmt:message key="sbox.recentsearches"/>
-      <span><a href="#" id="recentClear"><fmt:message key="sbox.clearrecent"/></a></span>
+      <fmt:message key="sbox.recentsearches" />
+      <span><a href="#" id="recentClear"><fmt:message key="sbox.clearrecent" /></a></span>
     </div>
   </div>
 

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/UploadTemplate.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/UploadTemplate.jsp?rev=722372&r1=722371&r2=722372&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/UploadTemplate.jsp (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/UploadTemplate.jsp Mon Dec  1 20:21:03 2008
@@ -2,10 +2,11 @@
 <%@ 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 + ")";
@@ -16,8 +17,8 @@
 <html id="top" xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
-  <title><fmt:message key="upload.title"><fmt:param><wiki:Variable var="applicationname"/></fmt:param></fmt:message></title>
-  <wiki:Include page="commonheader.jsp"/>
+  <title><fmt:message key="upload.title"><fmt:param><wiki:Variable var="applicationname" /></fmt:param></fmt:message></title>
+  <wiki:Include page="commonheader.jsp" />
   <meta name="robots" content="noindex,nofollow" />
 </head>
 
@@ -30,7 +31,7 @@
   <div id="content">
 
     <div id="page">
-      <wiki:Include page="PageActionsTop.jsp"/>
+      <wiki:Include page="PageActionsTop.jsp" />
 
       <wiki:TabbedSection defaultTab="attachments" >
         <wiki:Tab id="pagecontent" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "view.tab")%>'
@@ -39,8 +40,8 @@
         </wiki:Tab>
         
         <wiki:PageExists>
-        <wiki:Tab id="attachments" title="<%= attTitle %>" >
-          <wiki:Include page="AttachmentTab.jsp"/>
+        <wiki:Tab id="attachments" title="<%= attTitle %>">
+          <wiki:Include page="AttachmentTab.jsp" />
         </wiki:Tab>
         <wiki:Tab id="info" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "info.tab")%>'
                  url="<%=c.getURL(WikiContext.INFO, c.getPage().getName())%>"
@@ -50,11 +51,11 @@
         </wiki:PageExists>
       </wiki:TabbedSection>
 
-      <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>

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/UserBox.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/UserBox.jsp?rev=722372&r1=722371&r2=722372&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/UserBox.jsp (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/UserBox.jsp Mon Dec  1 20:21:03 2008
@@ -2,10 +2,11 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.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 );
 %>
 <div class="userbox">
 
@@ -17,14 +18,14 @@
   <wiki:UserCheck status="asserted">
     <span class="username asserted">
       <fmt:message key="fav.greet.asserted">
-      <fmt:param><wiki:Translate>[<wiki:UserName />]</wiki:Translate></fmt:param>
+      <fmt:param><wiki:Translate>[<wiki:UserName/>]</wiki:Translate></fmt:param>
     </fmt:message>
     </span>
   </wiki:UserCheck>
   <wiki:UserCheck status="authenticated">
     <span class="username authenticated">
       <fmt:message key="fav.greet.authenticated">
-        <fmt:param><wiki:Translate>[<wiki:UserName />]</wiki:Translate></fmt:param>
+        <fmt:param><wiki:Translate>[<wiki:UserName/>]</wiki:Translate></fmt:param>
       </fmt:message>
     </span>
   </wiki:UserCheck>

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/ViewTemplate.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/ViewTemplate.jsp?rev=722372&r1=722371&r2=722372&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/ViewTemplate.jsp (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/ViewTemplate.jsp Mon Dec  1 20:21:03 2008
@@ -1,7 +1,7 @@
 <%@ 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: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">
@@ -10,10 +10,10 @@
   <title>
     <fmt:message key="view.title.view">
       <fmt:param><wiki:Variable var="ApplicationName" /></fmt:param>
-      <fmt:param><wiki:PageName /></fmt:param>
+      <fmt:param><wiki:PageName/></fmt:param>
     </fmt:message>
   </title>
-  <wiki:Include page="commonheader.jsp"/>
+  <wiki:Include page="commonheader.jsp" />
   <wiki:CheckVersion mode="notlatest">
     <meta name="robots" content="noindex,nofollow" />
   </wiki:CheckVersion>
@@ -34,12 +34,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>

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/WorkflowContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/WorkflowContent.jsp?rev=722372&r1=722371&r2=722372&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/WorkflowContent.jsp (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/WorkflowContent.jsp Mon Dec  1 20:21:03 2008
@@ -4,8 +4,9 @@
 <%@ 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" %>
+
+
 <script language="JavaScript">
   function SubmitOutcomeIfSelected(selectId) 
   {
@@ -20,33 +21,33 @@
   int i = 0;
   String evenOdd;
 %>
-<wiki:TabbedSection defaultTab='${param.tab} %>' >
+<wiki:TabbedSection defaultTab='${param.tab} %>'>
 
-<wiki:Tab id="pagecontent" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "workflow.tab")%>' >
+<wiki:Tab id="pagecontent" title='<%=LocaleSupport.getLocalizedMessage(pageContext, "workflow.tab")%>'>
 
 <h3><fmt:message key="workflow.heading" /></h3>
-<p><fmt:message key="workflow.instructions"/></p>
+<p><fmt:message key="workflow.instructions" /></p>
 
 <!-- Pending Decisions -->
 <h4><fmt:message key="workflow.decisions.heading" /></h4>
 
 <c:if test="${empty decisions}">
   <div class="information">
-    <fmt:message key="workflow.noinstructions"/>
+    <fmt:message key="workflow.noinstructions" />
   </div>
 </c:if>
 
 <c:if test="${!empty decisions}">
   <div class="formhelp">
-    <fmt:message key="workflow.actor.instructions"/>
+    <fmt:message key="workflow.actor.instructions" />
   </div>
   <table class="wikitable">
     <thead>
-      <th width="5%"  align="center"><fmt:message key="workflow.id"/></th>
-      <th width="45%" align="left"><fmt:message key="workflow.item"/></th>
-      <th width="15%" align="left"><fmt:message key="workflow.actions"/></th>
-      <th width="15%" align="left"><fmt:message key="workflow.requester"/></th>
-      <th width="20%" align="left"><fmt:message key="workflow.startTime"/></th>
+      <th width="5%" align="center"><fmt:message key="workflow.id" /></th>
+      <th width="45%" align="left"><fmt:message key="workflow.item" /></th>
+      <th width="15%" align="left"><fmt:message key="workflow.actions" /></th>
+      <th width="15%" align="left"><fmt:message key="workflow.requester" /></th>
+      <th width="20%" align="left"><fmt:message key="workflow.startTime" /></th>
     </thead>
     <tbody>
       <% i = 1; %>
@@ -54,30 +55,29 @@
         <% evenOdd = (i % 2 == 0) ? "even" : "odd"; %>
         <tr class="<%=evenOdd%>">
           <!-- Workflow ID -->
-          <td align="center"><c:out value="${decision.workflow.id}"/></td>
+          <td align="center"><c:out value="${decision.workflow.id}" /></td>
           <!-- Name of item -->
           <td align="left">
             <fmt:message key="${decision.messageKey}">
               <c:forEach var="messageArg" items="${decision.messageArguments}">
-                <fmt:param><c:out value="${messageArg}"/></fmt:param>
+                <fmt:param><c:out value="${messageArg}" /></fmt:param>
               </c:forEach>
             </fmt:message>
           </td>
           <!-- Possible actions (outcomes) -->
           <td align="left">
-            <form id="<c:out value='decision.${decision.id}'/>" 
-              action="<wiki:Link jsp='Workflow.jsp' format='url'/>" method="POST" accept-charset="UTF-8">
+            <form id="<c:out value='decision.${decision.id}' />" action="<wiki:Link jsp='Workflow.jsp' format='url' />" method="POST" accept-charset="UTF-8">
               <input type="hidden" name="action" value="decide" />
               <input type="hidden" name="id" value="<c:out value='${decision.id}' />" />
               <select name="outcome" onchange="SubmitOutcomeIfSelected(this)">
-                <option value="-"><fmt:message key="select.one"/></option>
-                <c:forEach var="outcome" items="${decision.availableOutcomes}"><option value="${outcome.messageKey}"><fmt:message key="${outcome.messageKey}"/></option>
+                <option value="-"><fmt:message key="select.one" /></option>
+                <c:forEach var="outcome" items="${decision.availableOutcomes}"><option value="${outcome.messageKey}"><fmt:message key="${outcome.messageKey}" /></option>
                 </c:forEach>
               </select>
             </form>
           </td>
           <!-- Requester -->
-          <td align="left"><c:out value="${decision.owner.name}"/></td>
+          <td align="left"><c:out value="${decision.owner.name}" /></td>
           <!-- When did the actor start this step? -->
           <td align="left">
             <fmt:formatDate value="${decision.startTime}" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" />
@@ -93,10 +93,10 @@
               onclick="$('decision.<c:out value="${decision.workflow.id}"/>').toggle();" >
                 <fmt:message key="workflow.details" />
               </a>
-              <div class="hideDiv" id="<c:out value='decision.${decision.workflow.id}'/>">
+              <div class="hideDiv" id="<c:out value='decision.${decision.workflow.id}' />">
                 <c:forEach var="fact" items="${decision.facts}">
                   <h5><fmt:message key="${fact.messageKey}" /></h5>
-                  <p><c:out escapeXml="false" value="${fact.value}"/></p>
+                  <p><c:out escapeXml="false" value="${fact.value}" /></p>
                 </c:forEach>
               </div>
             </td>
@@ -114,21 +114,21 @@
 
 <c:if test="${empty workflows}">
   <div class="information">
-    <fmt:message key="workflow.noinstructions"/>
+    <fmt:message key="workflow.noinstructions" />
   </div>
 </c:if>
 
 <c:if test="${!empty workflows}">
   <div class="formhelp">
-    <fmt:message key="workflow.owner.instructions"/>
+    <fmt:message key="workflow.owner.instructions" />
   </div>
   <table class="wikitable">
     <thead>
-      <th width="5%"  align="center"><fmt:message key="workflow.id"/></th>
-      <th width="45%" align="left"><fmt:message key="workflow.item"/></th>
-      <th width="15%" align="left"><fmt:message key="workflow.actions"/></th>
-      <th width="15%" align="left"><fmt:message key="workflow.actor"/></th>
-      <th width="20%" align="left"><fmt:message key="workflow.startTime"/></th>
+      <th width="5%" align="center"><fmt:message key="workflow.id" /></th>
+      <th width="45%" align="left"><fmt:message key="workflow.item" /></th>
+      <th width="15%" align="left"><fmt:message key="workflow.actions" /></th>
+      <th width="15%" align="left"><fmt:message key="workflow.actor" /></th>
+      <th width="20%" align="left"><fmt:message key="workflow.startTime" /></th>
     </thead>
     <% i = 1; %>
     <tbody>
@@ -136,25 +136,25 @@
         <% evenOdd = (i % 2 == 0) ? "even" : "odd"; %>
         <tr class="<%=evenOdd%>">
           <!-- Workflow ID -->
-          <td  align="center"><c:out value="${workflow.id}"/></td>
+          <td align="center"><c:out value="${workflow.id}" /></td>
           <!-- Name of item -->
           <td align="left">
             <fmt:message key="${workflow.messageKey}">
               <c:forEach var="messageArg" items="${workflow.messageArguments}">
-                <fmt:param><c:out value="${messageArg}"/></fmt:param>
+                <fmt:param><c:out value="${messageArg}" /></fmt:param>
               </c:forEach>
             </fmt:message>
-          </td >
+          </td>
           <!-- Actions -->
           <td align="left">
-            <form id="<c:out value='workflow.${workflow.id}'/>" action="<wiki:Link jsp='Workflow.jsp' format='url'/>" method="POST" accept-charset="UTF-8">
+            <form id="<c:out value='workflow.${workflow.id}' />" action="<wiki:Link jsp='Workflow.jsp' format='url' />" method="POST" accept-charset="UTF-8">
               <input type="submit" name="submit" value="<fmt:message key="outcome.step.abort" />" />
               <input type="hidden" name="action" value="abort" />
               <input type="hidden" name="id" value="<c:out value="${workflow.id}" />" />
             </form>
           </td>
           <!-- Current actor -->
-          <td align="left"><c:out value="${workflow.currentActor.name}"/></td>
+          <td align="left"><c:out value="${workflow.currentActor.name}" /></td>
           <!-- When did the actor start this step? -->
           <td align="left">
             <fmt:formatDate value="${workflow.currentStep.startTime}" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" />



Mime
View raw message