You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by aj...@apache.org on 2008/12/03 05:36:53 UTC
svn commit: r722765 [2/2] - in
/incubator/jspwiki/trunk/src/webdocs/templates: default/ default/admin/
default/editors/ raw/
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.jsp Tue Dec 2 20:36:52 2008
@@ -13,11 +13,11 @@
<%@ 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 +25,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 +41,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 +68,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 +88,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 +100,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 +114,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 +171,10 @@
<tr>
<td> </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 +184,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>
Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/PreviewContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PreviewContent.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/PreviewContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/PreviewContent.jsp Tue Dec 2 20:36:52 2008
@@ -2,15 +2,13 @@
<%@ 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 +17,7 @@
</div>
<div class="information">
- <fmt:message key="preview.info"/>
+ <fmt:message key="preview.info" />
</div>
</wiki:Tab>
Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/PreviewContent.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/ProfileTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/ProfileTab.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/ProfileTab.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/ProfileTab.jsp Tue Dec 2 20:36:52 2008
@@ -5,33 +5,26 @@
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ 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() );
%>
-<form action="<wiki:CheckRequestContext
- context='login'><wiki:Link jsp='Login.jsp' format='url'><wiki:Param name='tab'
- value='profile'/></wiki:Link></wiki:CheckRequestContext><wiki:CheckRequestContext
- context='prefs'><wiki:Link jsp='UserPreferences.jsp' format='url'><wiki:Param name='tab'
- value='profile'/></wiki:Link></wiki:CheckRequestContext>"
- id="editProfile"
- class="wikiform"
- onsubmit="return Wiki.submitOnce( this );"
- method="post" accept-charset="UTF-8">
+<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>
@@ -39,20 +32,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">
- <input type="text" name="loginname" id="loginname"
- size="20" value="<wiki:UserProfile property='loginname' />" />
+ <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>
@@ -61,19 +53,19 @@
<!-- 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="password0">Old</label>
+ <label for="password">Old</label>
<input type="password" name="password0" id="password0" size="20" value="" />
--%>
- <input type="password" name="password" id="password" size="20" value="" />
+ <stripes:password name="password" id="password" size="20" value="" />
</td>
</tr>
<tr>
- <td><label for="password2"><fmt:message key="prefs.password2"/></label></td>
+ <td><stripes:label for="passwordAgain" name="prefs.password2" /></td>
<td>
- <input type="password" name="password2" id="password2" size="20" value="" />
+ <stripes:password name="passwordAgain" id="passwordAgain" size="20" value="" />
<%-- extra validation ? min size, allowed chars? --%>
</td>
</tr>
@@ -81,31 +73,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>
- <input type="text" name="fullname" id="fullname"
- size="20" value="<wiki:UserProfile property='fullname'/>" />
- <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>
- <input type="text" name="email" id="email"
- size="20" value="<wiki:UserProfile property='email' />" />
- <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>
@@ -114,14 +104,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}" />
@@ -133,18 +123,16 @@
<td> </td>
<td>
<wiki:UserProfile property="exists">
- <input type="submit" name="ok" value="<fmt:message key='prefs.save.submit' />" />
+ <stripes:submit name="saveProfile"><fmt:message key="prefs.save.submit" /></stripes:submit>
</wiki:UserProfile>
<wiki:UserProfile property="new">
- <input type="submit" name="ok" value="<fmt:message key='prefs.save.submit' />" />
+ <stripes:submit name="saveProfile"><fmt:message key="prefs.save.submit" /></stripes:submit>
</wiki:UserProfile>
- <input type="hidden" name="redirect" value="<wiki:Variable var='redirect' default='' />" />
- <input type="hidden" name="action" value="saveProfile" />
<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>
</table>
-</form>
+</stripes:form>
Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/ProfileTab.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/SearchBox.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/SearchBox.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/SearchBox.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/SearchBox.jsp Tue Dec 2 20:36:52 2008
@@ -1,7 +1,6 @@
<%@ 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 +35,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>
Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/SearchBox.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/UploadTemplate.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/UploadTemplate.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/UploadTemplate.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/UploadTemplate.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 + ")";
@@ -16,8 +15,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 +29,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 +38,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 +49,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>
Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/UploadTemplate.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.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="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 +16,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>
Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/ViewTemplate.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/ViewTemplate.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/ViewTemplate.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/ViewTemplate.jsp Tue Dec 2 20:36:52 2008
@@ -1,7 +1,6 @@
<%@ 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 +9,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 +33,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/ViewTemplate.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/WorkflowContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/WorkflowContent.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/WorkflowContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/WorkflowContent.jsp Tue Dec 2 20:36:52 2008
@@ -4,8 +4,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" %>
<script language="JavaScript">
function SubmitOutcomeIfSelected(selectId)
{
@@ -20,33 +19,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 +53,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 +91,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 +112,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 +134,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}" />
Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/WorkflowContent.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/admin/AdminTemplate.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/admin/AdminTemplate.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/admin/AdminTemplate.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/admin/AdminTemplate.jsp Tue Dec 2 20:36:52 2008
@@ -4,23 +4,24 @@
<%@ page import="com.ecyrd.jspwiki.ui.admin.*" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<%@ page import="com.ecyrd.jspwiki.action.WikiContextFactory" %>
<html>
<head>
<title>JSPWiki administration</title>
- <wiki:Include page="commonheader.jsp"/>
- <link rel="stylesheet" media="screen, projection, print" type="text/css"
- href="<wiki:Link format='url' templatefile='admin/admin.css'/>"/>
+ <wiki:Include page="commonheader.jsp" />
+ <link rel="stylesheet" media="screen, projection, print" type="text/css" href="<wiki:Link format='url' templatefile='admin/admin.css' />" />
</head>
<body class="view">
<div id="wikibody">
-<div id="page" >
+<div id="page">
<h1>JSPWiki Administration</h1>
<div class="information">Not all things can be configured here. Some things need to be configured
in your <tt>jspwiki.properties</tt> file.</div>
<%
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
- WikiContext ctx = WikiContext.findContext(pageContext);
+ WikiContext ctx = WikiContextFactory.findContext( pageContext );
AdminBeanManager mgr = wiki.getAdminBeanManager();
%>
@@ -35,7 +36,7 @@
<div class="formcontainer">
<form action="Admin.jsp" method="post" accept-charset="UTF-8">
- <input type="hidden" name="tab-admin" value="core"/>
+ <input type="hidden" name="tab-admin" value="core" />
<input type="hidden" name="tab-core" value="${ab.title}" />
<input type="hidden" name="bean" value="${ab.id}" />
<%
@@ -49,7 +50,7 @@
</wiki:Tab>
<wiki:Tab id="users" title="Users">
- <wiki:Include page="admin/UserManagement.jsp"/>
+ <wiki:Include page="admin/UserManagement.jsp" />
</wiki:Tab>
<wiki:Tab id="groups" title="Groups">
@@ -57,7 +58,7 @@
<p>This is a list of all groups in this wiki. If you click on the group name,
you will be taken to the administration page of that particular group.</p>
<p>
- <wiki:Plugin plugin="Groups"/>
+ <wiki:Plugin plugin="Groups" />
</p>
</div>
</wiki:Tab>
@@ -70,7 +71,7 @@
<div class="formcontainer">
<form action="Admin.jsp" method="post" accept-charset="UTF-8">
- <input type="hidden" name="tab-admin" value="editors"/>
+ <input type="hidden" name="tab-admin" value="editors" />
<input type="hidden" name="tab-editors" value="${ab.title}" />
<%
out.write( ab.doGet(ctx) );
Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/admin/AdminTemplate.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/admin/UserManagement.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/admin/UserManagement.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/admin/UserManagement.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/admin/UserManagement.jsp Tue Dec 2 20:36:52 2008
@@ -6,8 +6,7 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ 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" %>
<script>
function constructdate(date)
{
@@ -55,7 +54,7 @@
<div id="userlist">
<select name="userid" id="userid" size="16" onchange="javascript:refreshUserInfo()">
<c:forEach var="user" items="${engine.userManager.userDatabase.wikiNames}">
- <option><c:out value="${user.name}" escapeXml="true"/></option>
+ <option><c:out value="${user.name}" escapeXml="true" /></option>
</c:forEach>
</select>
</div>
@@ -72,8 +71,7 @@
<tr>
<td><label for="loginname">Login name</label></td>
<td>
- <input type="text" name="loginname" id="loginname"
- size="20" value="" />
+ <input type="text" name="loginname" id="loginname" size="20" value="" />
</td>
</tr>
<tr>
@@ -91,15 +89,13 @@
<tr>
<td><label for="fullname">Full name</label></td>
<td>
- <input type="text" name="fullname" id="fullname"
- size="20" value="" />
+ <input type="text" name="fullname" id="fullname" size="20" value="" />
</td>
</tr>
<tr>
<td><label for="email">Email</label></td>
<td>
- <input type="text" name="email" id="email"
- size="20" value="" />
+ <input type="text" name="email" id="email" size="20" value="" />
</td>
</tr>
@@ -115,12 +111,12 @@
</tr>
<tr>
- <td><input type="submit" name="action" value="Save"/></td>
+ <td><input type="submit" name="action" value="Save" /></td>
</tr>
</table>
<div id="useractions">
- <input type="submit" name="action" value="Remove" onclick="return( confirm('Are you sure you wish to remove this user?') && Wiki.submitOnce(this) );"/> <input type="button" value="Add" onclick="javascript:addNew()"/>
+ <input type="submit" name="action" value="Remove" onclick="return( confirm('Are you sure you wish to remove this user?') && Wiki.submitOnce(this) );" /> <input type="button" value="Add" onclick="javascript:addNew()" />
</div>
</form>
</div>
Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/admin/UserManagement.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp Tue Dec 2 20:36:52 2008
@@ -6,8 +6,7 @@
<%@ page import="java.util.*" %>
<%@ 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" %>
<%--
This file provides a common header which includes the important JSPWiki scripts and other files.
You need to include this in your template, within <head> and </head>. It is recommended that
@@ -19,12 +18,10 @@
can be included).
--%>
<%-- CSS stylesheet --%>
-<link rel="stylesheet" media="screen, projection, print" type="text/css"
- href="<wiki:Link format='url' templatefile='jspwiki.css'/>"/>
+<link rel="stylesheet" media="screen, projection, print" type="text/css" href="<wiki:Link format='url' templatefile='jspwiki.css' />" />
<%-- put this at the top, to avoid double load when not yet cached --%>
-<link rel="stylesheet" type="text/css" media="print"
- href="<wiki:Link format='url' templatefile='jspwiki_print.css'/>" />
-<wiki:IncludeResources type="stylesheet"/>
+<link rel="stylesheet" type="text/css" media="print" href="<wiki:Link format='url' templatefile='jspwiki_print.css' />" />
+<wiki:IncludeResources type="stylesheet" />
<wiki:IncludeResources type="inlinecss" />
<%-- display the more-menu inside the leftmenu, when javascript is not avail --%>
@@ -35,11 +32,11 @@
</noscript>
<%-- JAVASCRIPT --%>
-<script type="text/javascript" src="<wiki:Link format='url' jsp='scripts/mootools.js'/>"></script>
-<script type="text/javascript" src="<wiki:Link format='url' jsp='scripts/prettify.js'/>"></script>
-<script type="text/javascript" src="<wiki:Link format='url' jsp='scripts/jspwiki-common.js'/>"></script>
-<script type="text/javascript" src="<wiki:Link format='url' jsp='scripts/jspwiki-commonstyles.js'/>"></script>
-<wiki:IncludeResources type="script"/>
+<script type="text/javascript" src="<wiki:Link format='url' jsp='scripts/mootools.js' />"></script>
+<script type="text/javascript" src="<wiki:Link format='url' jsp='scripts/prettify.js' />"></script>
+<script type="text/javascript" src="<wiki:Link format='url' jsp='scripts/jspwiki-common.js' />"></script>
+<script type="text/javascript" src="<wiki:Link format='url' jsp='scripts/jspwiki-commonstyles.js' />"></script>
+<wiki:IncludeResources type="script" />
<%-- COOKIE read client preferences --%>
<%
@@ -47,12 +44,12 @@
%>
<meta name="wikiContext" content='<wiki:Variable var="requestcontext" />' />
-<meta name="wikiBaseUrl" content='<wiki:BaseURL />' />
-<meta name="wikiPageUrl" content='<wiki:Link format="url" page="#$%"/>' />
+<meta name="wikiBaseUrl" content='<wiki:BaseURL/>' />
+<meta name="wikiPageUrl" content='<wiki:Link format="url" page="#$%" />' />
<meta name="wikiEditUrl" content='<wiki:EditLink format="url" />' />
-<meta name="wikiJsonUrl" content='<%= WikiContext.findContext(pageContext).getURL( WikiContext.NONE, "JSON-RPC" ) %>' /><%--unusual pagename--%>
+<meta name="wikiJsonUrl" content='<%= WikiContextFactory.findContext(pageContext).getURL( WikiContext.NONE, "JSON-RPC" ) %>' /><%--unusual pagename--%>
<meta name="wikiPageName" content='<wiki:Variable var="pagename" />' /><%--pagename without blanks--%>
-<meta name="wikiUserName" content='<wiki:UserName />' />
+<meta name="wikiUserName" content='<wiki:UserName/>' />
<meta name="wikiTemplateUrl" content='<wiki:Link format="url" templatefile="" />' />
<meta name="wikiApplicationName" content='<wiki:Variable var="ApplicationName" />' />
@@ -62,48 +59,39 @@
<wiki:IncludeResources type="jsfunction"/>
//]]></script>
-<meta http-equiv="Content-Type" content="text/html; charset=<wiki:ContentEncoding />" />
-<link rel="search" href="<wiki:LinkTo format='url' page='FindPage'/>"
- title='Search <wiki:Variable var="ApplicationName" />' />
-<link rel="help" href="<wiki:LinkTo format='url' page='TextFormattingRules'/>"
- title="Help" />
+<meta http-equiv="Content-Type" content="text/html; charset=<wiki:ContentEncoding/>" />
+<link rel="search" href="<wiki:LinkTo format='url' page='FindPage' />" title='Search <wiki:Variable var="ApplicationName" />' />
+<link rel="help" href="<wiki:LinkTo format='url' page='TextFormattingRules' />" title="Help" />
<%
- WikiContext c = WikiContext.findContext( pageContext );
+ WikiContext c = WikiContextFactory.findContext( pageContext );
String frontpage = c.getEngine().getFrontPage();
%>
- <link rel="start" href="<wiki:LinkTo format='url' page='<%=frontpage%>' />"
- title="Front page" />
-<link rel="alternate stylesheet" type="text/css" href="<wiki:Link format='url' templatefile='jspwiki_print.css'/>"
- title="Print friendly" />
-<link rel="alternate stylesheet" type="text/css" href="<wiki:Link format='url' templatefile='jspwiki.css'/>"
- title="Standard" />
-<link rel="shortcut icon" type="image/x-icon" href="<wiki:Link format='url' jsp='images/favicon.ico'/>" />
+ <link rel="start" href="<wiki:LinkTo format='url' page='<%=frontpage%>' />" title="Front page" />
+<link rel="alternate stylesheet" type="text/css" href="<wiki:Link format='url' templatefile='jspwiki_print.css' />" title="Print friendly" />
+<link rel="alternate stylesheet" type="text/css" href="<wiki:Link format='url' templatefile='jspwiki.css' />" title="Standard" />
+<link rel="shortcut icon" type="image/x-icon" href="<wiki:Link format='url' jsp='images/favicon.ico' />" />
<%-- ie6 needs next line --%>
-<link rel="icon" type="image/x-icon" href="<wiki:Link format='url' jsp='images/favicon.ico'/>" />
+<link rel="icon" type="image/x-icon" href="<wiki:Link format='url' jsp='images/favicon.ico' />" />
<%-- Support for the universal edit button (www.universaleditbutton.org) --%>
<wiki:CheckRequestContext context='view|info|diff|upload'>
<wiki:Permission permission="edit">
<wiki:PageType type="page">
- <link rel="alternate" type="application/x-wiki"
- href="<wiki:EditLink format='url' />"
- title="<fmt:message key='actions.edit.title'/>" />
+ <link rel="alternate" type="application/x-wiki" href="<wiki:EditLink format='url' />" title="<fmt:message key='actions.edit.title' />" />
</wiki:PageType>
</wiki:Permission>
</wiki:CheckRequestContext>
-<wiki:FeedDiscovery />
+<wiki:FeedDiscovery/>
<%-- SKINS : extra stylesheets, extra javascript --%>
<c:if test='${(!empty prefs.SkinName) && (prefs.SkinName!="PlainVanilla") }'>
-<link rel="stylesheet" type="text/css" media="screen, projection, print"
- href="<wiki:Link format='url' templatefile='skins/' /><c:out value='${prefs.SkinName}/skin.css' />" />
+<link rel="stylesheet" type="text/css" media="screen, projection, print" href="<wiki:Link format='url' templatefile='skins/' /><c:out value='${prefs.SkinName}/skin.css' />" />
<%--
<link rel="stylesheet" type="text/css" media="print"
href="<wiki:Link format='url' templatefile='skins/' /><c:out value='${prefs.SkinName}/print_skin.css' />" />
--%>
-<script type="text/javascript"
- src="<wiki:Link format='url' templatefile='skins/' /><c:out value='${prefs.SkinName}/skin.js' />" ></script>
+<script type="text/javascript" src="<wiki:Link format='url' templatefile='skins/' /><c:out value='${prefs.SkinName}/skin.js' />"></script>
</c:if>
-<wiki:Include page="localheader.jsp"/>
\ No newline at end of file
+<wiki:Include page="localheader.jsp" />
\ No newline at end of file
Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/editors/FCK.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/editors/FCK.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/editors/FCK.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/editors/FCK.jsp Tue Dec 2 20:36:52 2008
@@ -1,6 +1,6 @@
-<%@ page language="java" pageEncoding="UTF-8"%>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki"%>
-<%@ page import="java.util.Properties"%>
+<%@ page language="java" pageEncoding="UTF-8" %>
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ page import="java.util.Properties" %>
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ page import="com.ecyrd.jspwiki.auth.*" %>
<%@ page import="com.ecyrd.jspwiki.auth.permissions.*" %>
@@ -11,12 +11,12 @@
<%@ page import="org.apache.commons.lang.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<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" %>
<%--
This provides the FCK editor for JSPWiki.
--%>
-<% WikiContext context = WikiContext.findContext( pageContext );
+<% WikiContext context = WikiContextFactory.findContext( pageContext );
WikiEngine engine = context.getEngine();
context.setVariable( RenderingManager.WYSIWYG_EDITOR_MODE, Boolean.TRUE );
context.setVariable( WikiEngine.PROP_RUNFILTERS, "false" );
@@ -91,7 +91,7 @@
enctype="application/x-www-form-urlencoded">
<p>
<%-- Edit.jsp relies on these being found. So be careful, if you make changes. --%>
- <input name="page" type="hidden" value="<wiki:Variable var="pagename"/>" />
+ <input name="page" type="hidden" value="<wiki:Variable var="pagename" />" />
<input name="action" type="hidden" value="save" />
<input name="<%=SpamFilter.getHashFieldName(request)%>" type="hidden" value="<c:out value='${lastchange}' />" />
</p>
@@ -120,30 +120,30 @@
</noscript>
<p>
- <label for="changenote"><fmt:message key='editor.plain.changenote'/></label>
- <input type="text" id="changenote" name="changenote" size="80" maxlength="80" value="<c:out value='${changenote}'/>"/>
+ <label for="changenote"><fmt:message key='editor.plain.changenote' /></label>
+ <input type="text" id="changenote" name="changenote" size="80" maxlength="80" value="<c:out value='${changenote}' />" />
</p>
<wiki:CheckRequestContext context="comment">
<fieldset>
- <legend><fmt:message key="editor.commentsignature"/></legend>
+ <legend><fmt:message key="editor.commentsignature" /></legend>
<p>
- <label for="authorname" accesskey="n"><fmt:message key="editor.plain.name"/></label>
+ <label for="authorname" accesskey="n"><fmt:message key="editor.plain.name" /></label>
<input type="text" name="author" id="authorname" value="<c:out value='${sessionScope.author}' />" />
<input type="checkbox" name="remember" id="rememberme" <%=TextUtil.isPositive((String)session.getAttribute("remember")) ? "checked='checked'" : ""%> />
- <label for="rememberme"><fmt:message key="editor.plain.remember"/></label>
+ <label for="rememberme"><fmt:message key="editor.plain.remember" /></label>
</p>
<%--FIXME: seems not to read the email of the user, but some odd previously cached value --%>
<p>
- <label for="link" accesskey="m"><fmt:message key="editor.plain.email"/></label>
+ <label for="link" accesskey="m"><fmt:message key="editor.plain.email" /></label>
<input type="text" name="link" id="link" size="24" value="<c:out value='${sessionScope.link}' />" />
</p>
</fieldset>
</wiki:CheckRequestContext>
<p>
- <input name='ok' type='submit' value='<fmt:message key="editor.plain.save.submit"/>' />
- <input name='preview' type='submit' value='<fmt:message key="editor.plain.preview.submit"/>' />
- <input name='cancel' type='submit' value='<fmt:message key="editor.plain.cancel.submit"/>' />
+ <input name='ok' type='submit' value='<fmt:message key="editor.plain.save.submit" />' />
+ <input name='preview' type='submit' value='<fmt:message key="editor.plain.preview.submit" />' />
+ <input name='cancel' type='submit' value='<fmt:message key="editor.plain.cancel.submit" />' />
</p>
</div>
</form>
Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/editors/FCK.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp Tue Dec 2 20:36:52 2008
@@ -1,5 +1,5 @@
-<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki"%>
+<%@ page language="java" import="java.util.*" pageEncoding="UTF-8" %>
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ page import="com.ecyrd.jspwiki.auth.*" %>
<%@ page import="com.ecyrd.jspwiki.auth.permissions.*" %>
@@ -10,13 +10,13 @@
<%@ page import="com.ecyrd.jspwiki.rpc.json.*" %>
<%@ 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" %>
<%--
This is a plain editor for JSPWiki.
--%>
<%
- WikiContext context = WikiContext.findContext( pageContext );
+ WikiContext context = WikiContextFactory.findContext( pageContext );
WikiEngine engine = context.getEngine();
String contextPath = request.getContextPath();
@@ -103,84 +103,84 @@
</wiki:Permission>
--%>
<tr>
- <td><label for="changenote"><fmt:message key='editor.plain.changenote'/></label></td>
- <td><input type="text" name="changenote" id="changenote" size="80" maxlength="80" value="<c:out value='${changenote}'/>"/></td>
+ <td><label for="changenote"><fmt:message key='editor.plain.changenote' /></label></td>
+ <td><input type="text" name="changenote" id="changenote" size="80" maxlength="80" value="<c:out value='${changenote}' />" /></td>
</tr>
</table>
<div id="tools">
- <h4><fmt:message key='editor.plain.toolbar'/></h4>
+ <h4><fmt:message key='editor.plain.toolbar' /></h4>
<div id="toolbuttons">
<span>
- <a href="#" class="tool" rel="" id="tbLink" title="<fmt:message key='editor.plain.tbLink.title'/>">link</a>
- <a href="#" class="tool" rel="break" id="tbH1" title="<fmt:message key='editor.plain.tbH1.title'/>">h1</a>
- <a href="#" class="tool" rel="break" id="tbH2" title="<fmt:message key='editor.plain.tbH2.title'/>">h2</a>
- <a href="#" class="tool" rel="break" id="tbH3" title="<fmt:message key='editor.plain.tbH3.title'/>">h3</a>
+ <a href="#" class="tool" rel="" id="tbLink" title="<fmt:message key='editor.plain.tbLink.title' />">link</a>
+ <a href="#" class="tool" rel="break" id="tbH1" title="<fmt:message key='editor.plain.tbH1.title' />">h1</a>
+ <a href="#" class="tool" rel="break" id="tbH2" title="<fmt:message key='editor.plain.tbH2.title' />">h2</a>
+ <a href="#" class="tool" rel="break" id="tbH3" title="<fmt:message key='editor.plain.tbH3.title' />">h3</a>
</span>
<span>
- <a href="#" class="tool" rel="" id="tbB" title="<fmt:message key='editor.plain.tbB.title'/>">bold</a>
- <a href="#" class="tool" rel="" id="tbI" title="<fmt:message key='editor.plain.tbI.title'/>">italic</a>
- <a href="#" class="tool" rel="" id="tbMONO" title="<fmt:message key='editor.plain.tbMONO.title'/>">mono</a>
- <a href="#" class="tool" rel="" id="tbSUP" title="<fmt:message key='editor.plain.tbSUP.title'/>">sup</a>
- <a href="#" class="tool" rel="" id="tbSUB" title="<fmt:message key='editor.plain.tbSUB.title'/>">sub</a>
- <a href="#" class="tool" rel="" id="tbSTRIKE" title="<fmt:message key='editor.plain.tbSTRIKE.title'/>">strike</a>
+ <a href="#" class="tool" rel="" id="tbB" title="<fmt:message key='editor.plain.tbB.title' />">bold</a>
+ <a href="#" class="tool" rel="" id="tbI" title="<fmt:message key='editor.plain.tbI.title' />">italic</a>
+ <a href="#" class="tool" rel="" id="tbMONO" title="<fmt:message key='editor.plain.tbMONO.title' />">mono</a>
+ <a href="#" class="tool" rel="" id="tbSUP" title="<fmt:message key='editor.plain.tbSUP.title' />">sup</a>
+ <a href="#" class="tool" rel="" id="tbSUB" title="<fmt:message key='editor.plain.tbSUB.title' />">sub</a>
+ <a href="#" class="tool" rel="" id="tbSTRIKE" title="<fmt:message key='editor.plain.tbSTRIKE.title' />">strike</a>
</span>
<span>
- <a href="#" class="tool" rel="" id="tbBR" title="<fmt:message key='editor.plain.tbBR.title'/>">br</a>
- <a href="#" class="tool" rel="break" id="tbHR" title="<fmt:message key='editor.plain.tbHR.title'/>">hr</a>
- <a href="#" class="tool" rel="break" id="tbPRE" title="<fmt:message key='editor.plain.tbPRE.title'/>">pre</a>
- <a href="#" class="tool" rel="break" id="tbCODE" title="<fmt:message key='editor.plain.tbCODE.title'/>">code</a>
- <a href="#" class="tool" rel="break" id="tbDL" title="<fmt:message key='editor.plain.tbDL.title'/>">dl</a>
+ <a href="#" class="tool" rel="" id="tbBR" title="<fmt:message key='editor.plain.tbBR.title' />">br</a>
+ <a href="#" class="tool" rel="break" id="tbHR" title="<fmt:message key='editor.plain.tbHR.title' />">hr</a>
+ <a href="#" class="tool" rel="break" id="tbPRE" title="<fmt:message key='editor.plain.tbPRE.title' />">pre</a>
+ <a href="#" class="tool" rel="break" id="tbCODE" title="<fmt:message key='editor.plain.tbCODE.title' />">code</a>
+ <a href="#" class="tool" rel="break" id="tbDL" title="<fmt:message key='editor.plain.tbDL.title' />">dl</a>
</span>
<span>
- <a href="#" class="tool" rel="break" id="tbTOC" title="<fmt:message key='editor.plain.tbTOC.title'/>">toc</a>
- <a href="#" class="tool" rel="break" id="tbTAB" title="<fmt:message key='editor.plain.tbTAB.title'/>">tab</a>
- <a href="#" class="tool" rel="break" id="tbTABLE" title="<fmt:message key='editor.plain.tbTABLE.title'/>">table</a>
- <a href="#" class="tool" rel="" id="tbIMG" title="<fmt:message key='editor.plain.tbIMG.title'/>">img</a>
- <a href="#" class="tool" rel="break" id="tbQUOTE" title="<fmt:message key='editor.plain.tbQUOTE.title'/>">quote</a>
- <a href="#" class="tool" rel="break" id="tbSIGN" title="<fmt:message key='editor.plain.tbSIGN.title'/>">sign</a>
+ <a href="#" class="tool" rel="break" id="tbTOC" title="<fmt:message key='editor.plain.tbTOC.title' />">toc</a>
+ <a href="#" class="tool" rel="break" id="tbTAB" title="<fmt:message key='editor.plain.tbTAB.title' />">tab</a>
+ <a href="#" class="tool" rel="break" id="tbTABLE" title="<fmt:message key='editor.plain.tbTABLE.title' />">table</a>
+ <a href="#" class="tool" rel="" id="tbIMG" title="<fmt:message key='editor.plain.tbIMG.title' />">img</a>
+ <a href="#" class="tool" rel="break" id="tbQUOTE" title="<fmt:message key='editor.plain.tbQUOTE.title' />">quote</a>
+ <a href="#" class="tool" rel="break" id="tbSIGN" title="<fmt:message key='editor.plain.tbSIGN.title' />">sign</a>
</span>
<span>
- <a href="#" class="tool" rel="break" id="tbUNDO" title="<fmt:message key='editor.plain.undo.title'/>"><fmt:message key='editor.plain.undo.submit'/></a>
+ <a href="#" class="tool" rel="break" id="tbUNDO" title="<fmt:message key='editor.plain.undo.title' />"><fmt:message key='editor.plain.undo.submit' /></a>
</span>
<span>
- <a href="#" class="tool" rel="break" id="tbREDO" title="<fmt:message key='editor.plain.redo.title'/>"><fmt:message key='editor.plain.redo.submit'/></a>
+ <a href="#" class="tool" rel="break" id="tbREDO" title="<fmt:message key='editor.plain.redo.title' />"><fmt:message key='editor.plain.redo.submit' /></a>
</span>
</div>
<div id="toolextra" class="clearbox" style="display:none;">
<span>
- <input type="checkbox" name="tabcompletion" id="tabcompletion" <%=TextUtil.isPositive((String)session.getAttribute("tabcompletion")) ? "checked='checked'" : ""%>/>
- <label for="tabcompletion" title="<fmt:message key='editor.plain.tabcompletion.title'/>"><fmt:message key="editor.plain.tabcompletion"/></label>
+ <input type="checkbox" name="tabcompletion" id="tabcompletion" <%=TextUtil.isPositive((String)session.getAttribute("tabcompletion")) ? "checked='checked'" : ""%> />
+ <label for="tabcompletion" title="<fmt:message key='editor.plain.tabcompletion.title' />"><fmt:message key="editor.plain.tabcompletion" /></label>
</span>
<span>
- <input type="checkbox" name="smartpairs" id="smartpairs" <%=TextUtil.isPositive((String)session.getAttribute("smartpairs")) ? "checked='checked'" : ""%>/>
- <label for="smartpairs" title="<fmt:message key='editor.plain.smartpairs.title'/>"><fmt:message key="editor.plain.smartpairs"/></label>
+ <input type="checkbox" name="smartpairs" id="smartpairs" <%=TextUtil.isPositive((String)session.getAttribute("smartpairs")) ? "checked='checked'" : ""%> />
+ <label for="smartpairs" title="<fmt:message key='editor.plain.smartpairs.title' />"><fmt:message key="editor.plain.smartpairs" /></label>
</span>
</div>
<div id="searchbar">
<span>
- <label for="tbFIND" ><fmt:message key="editor.plain.find"/></label>
- <input type="text" name="tbFIND" id="tbFIND" size="16" />
- <label for="tbREPLACE" ><fmt:message key="editor.plain.replace"/></label>
- <input type="text" name="tbREPLACE" id="tbREPLACE" size="16" />
+ <label for="tbFIND"><fmt:message key="editor.plain.find" /></label>
+ <input type="text" name="tbFIND" id="tbFIND" size="16" />
+ <label for="tbREPLACE"><fmt:message key="editor.plain.replace" /></label>
+ <input type="text" name="tbREPLACE" id="tbREPLACE" size="16" />
<input type="button" name="doreplace" id="doreplace" value="<fmt:message key='editor.plain.find.submit' />" />
</span>
<span>
<input type="checkbox" name="tbMatchCASE" id="tbMatchCASE" />
- <label for="tbMatchCASE"><fmt:message key="editor.plain.matchcase"/></label>
+ <label for="tbMatchCASE"><fmt:message key="editor.plain.matchcase" /></label>
</span>
<span>
<input type="checkbox" name="tbREGEXP" id="tbREGEXP" />
- <label for="tbREGEXP" ><fmt:message key="editor.plain.regexp"/></label>
+ <label for="tbREGEXP"><fmt:message key="editor.plain.regexp" /></label>
</span>
<span>
<input type="checkbox" name="tbGLOBAL" id="tbGLOBAL" checked="checked" />
- <label for="tbGLOBAL"><fmt:message key="editor.plain.global"/></label>
+ <label for="tbGLOBAL"><fmt:message key="editor.plain.global" /></label>
</span>
</div>
- <div class="clearbox" ></div>
+ <div class="clearbox"></div>
</div>
<div>
@@ -192,15 +192,15 @@
<wiki:CheckRequestContext context="comment">
<fieldset>
- <legend><fmt:message key="editor.commentsignature"/></legend>
+ <legend><fmt:message key="editor.commentsignature" /></legend>
<p>
- <label for="authorname" accesskey="n"><fmt:message key="editor.plain.name"/></label>
+ <label for="authorname" accesskey="n"><fmt:message key="editor.plain.name" /></label>
<input type="text" name="author" id="authorname" value="<c:out value='${sessionScope.author}' />" />
<input type="checkbox" name="remember" id="rememberme" <%=TextUtil.isPositive((String)session.getAttribute("remember")) ? "checked='checked'" : ""%> />
- <label for="rememberme"><fmt:message key="editor.plain.remember"/></label>
+ <label for="rememberme"><fmt:message key="editor.plain.remember" /></label>
</p>
<p>
- <label for="link" accesskey="m"><fmt:message key="editor.plain.email"/></label>
+ <label for="link" accesskey="m"><fmt:message key="editor.plain.email" /></label>
<input type="text" name="link" id="link" size="24" value="<c:out value='${sessionScope.link}' />" />
</p>
</fieldset>
@@ -210,9 +210,9 @@
<div id="sneakpreviewheader">
<input type="checkbox" name="autopreview" id="autopreview" <%=TextUtil.isPositive((String)session.getAttribute("autopreview")) ? "checked='checked'" : ""%> />
- <label for="autopreview" title="<fmt:message key='editor.plain.sneakpreview.title'/>"><fmt:message key="editor.plain.sneakpreview"/></label>
+ <label for="autopreview" title="<fmt:message key='editor.plain.sneakpreview.title' />"><fmt:message key="editor.plain.sneakpreview" /></label>
<span id="previewSpin" class="spin" style="position:absolute;display:none;"></span>
</div>
-<div id="sneakpreview" ></div>
+<div id="sneakpreview"></div>
</div>
\ No newline at end of file
Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/editors/preview.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/editors/preview.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/editors/preview.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/editors/preview.jsp Tue Dec 2 20:36:52 2008
@@ -1,23 +1,23 @@
-<%@ page language="java" pageEncoding="UTF-8"%>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki"%>
+<%@ page language="java" pageEncoding="UTF-8" %>
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ page import="com.ecyrd.jspwiki.ui.*" %>
<%@ page import="com.ecyrd.jspwiki.filters.*" %>
<%@ 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"/>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<%@ page import="com.ecyrd.jspwiki.action.WikiContextFactory" %>
<%--
This is a special editor component for JSPWiki preview storage.
--%>
<%
- WikiContext context = WikiContext.findContext( pageContext );
+ WikiContext context = WikiContextFactory.findContext( pageContext );
String usertext = (String)pageContext.getAttribute( EditorManager.ATTR_EDITEDTEXT, PageContext.REQUEST_SCOPE );
if( usertext == null ) usertext = "";
String action = "comment".equals(request.getParameter("action")) ?
- context.getURL(WikiContext.COMMENT,context.getName()) :
- context.getURL(WikiContext.EDIT,context.getName());
+ context.getURL(WikiContext.COMMENT,context.getPage().getName()) :
+ context.getURL(WikiContext.EDIT,context.getPage().getName());
%>
<form action="<%=action%>"
method="post" accept-charset="<wiki:ContentEncoding/>"
Propchange: incubator/jspwiki/trunk/src/webdocs/templates/default/editors/preview.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/templates/raw/ViewTemplate.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/raw/ViewTemplate.jsp?rev=722765&r1=722764&r2=722765&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/raw/ViewTemplate.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/raw/ViewTemplate.jsp Tue Dec 2 20:36:52 2008
@@ -1,5 +1,5 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<% response.setContentType("text/plain; charset=UTF-8"); %>
<pre>
-<wiki:InsertPage mode="plain"/>
+<wiki:InsertPage mode="plain" />
</pre>
\ No newline at end of file
Propchange: incubator/jspwiki/trunk/src/webdocs/templates/raw/ViewTemplate.jsp
('svn:eol-style' removed)