Author: ajaquith
Date: Tue Apr 1 21:07:39 2008
New Revision: 643724
URL: http://svn.apache.org/viewvc?rev=643724&view=rev
Log:
Merged with trunk 2.7.0-svn-2.
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Captcha.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Install.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Rename.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/AJAXSearch.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/AttachmentTab.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/CommentContent.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/ConflictContent.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/DiffContent.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/DiffTab.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/EditContent.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/EditGroupContent.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/EditTemplate.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/Favorites.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/FindContent.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/Footer.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/GroupContent.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/GroupTab.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/Header.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/InfoContent.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/LoginContent.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/NewGroupContent.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PageActionsBottom.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PageActionsTop.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PageContent.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PageTab.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PreferencesContent.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PreferencesTab.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PreviewContent.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/ProfileTab.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/SearchBox.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/UploadTemplate.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/UserBox.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/ViewTemplate.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/WorkflowContent.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/commonheader.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/jspwiki.css
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Captcha.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Captcha.jsp?rev=643724&r1=643723&r2=643724&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Captcha.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Captcha.jsp
Tue Apr 1 21:07:39 2008
@@ -6,7 +6,10 @@
<%@ page import="com.ecyrd.jspwiki.ui.EditorManager" %>
<%@ page import="org.apache.commons.lang.time.StopWatch" %>
<%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<fmt:setBundle basename="CoreResources"/>
+
<%!
Logger log = Logger.getLogger("JSPWiki");
%>
@@ -61,18 +64,28 @@
}
else
{
- alert("Please correctly identify the cats.");
+ alert('<fmt:message key="captcha.js.humancheckcomplete.alert" />');
return false;
}
+ }
+
+ function i18nAsirra() {
+ document.getElementById("asirra_InstructionsTextId").innerHTML =
"<fmt:message key="captcha.asirra.please.select" />";
+ for ( var i = 0; i < 12; i++)
+ {
+ document.getElementById("asirra_AdoptMeDiv" +
i).getElementsByTagName("a")[0].innerHTML= '<font size="-1">' + '<fmt:message
key="captcha.asirra.adopt.me" />' + '</font>' ;
+ }
+
document.getElementById("asirra_KnobsTable").getElementsByTagName("a")[0].title="<fmt:message
key="captcha.asirra.a.get.challenge" />";
+
document.getElementById("asirra_KnobsTable").getElementsByTagName("a")[1].title="<fmt:message
key="captcha.asirra.a.whatsthis" />";
+ document.getElementById("mainForm").style.display="block"; // show form
when i18n is done
}
</script>
</head>
-<body>
+<body onload="i18nAsirra()">
<div style="margin:8px">
- <p>We believe you may be a robot or a spammer. Could you please pick out
the kittens from the below
- set of images, so we know you are a normal human being?</p>
+ <p><fmt:message key="captcha.description" /></p>
- <form action="<wiki:Link jsp='Captcha.jsp' format='url'/>" method="post"
id="mainForm">
+ <form action="<wiki:Link jsp='Captcha.jsp' format='url'/>" method="post"
id="mainForm" style="display: none;">
<input type="hidden" value="foo" name="text" />
<input type="hidden" value='<%=request.getParameter("page")%>'
name='page'/>
<script type="text/javascript"
src="http://challenge.asirra.com/js/AsirraClientSide.js";></script>
@@ -81,8 +94,7 @@
// asirraState.SetCellsPerRow(6);
</script>
<br />
- <input type="button" value="Submit"
onclick="javascript:Asirra_CheckIfHuman(HumanCheckComplete)" />
+ <input type="button" value="<fmt:message key="captcha.submit" />"
onclick="javascript:Asirra_CheckIfHuman(HumanCheckComplete)" />
</form>
-
</div>
</body>
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Install.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Install.jsp?rev=643724&r1=643723&r2=643724&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Install.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Install.jsp
Tue Apr 1 21:07:39 2008
@@ -3,7 +3,11 @@
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ page import="com.ecyrd.jspwiki.auth.AuthenticationManager" %>
<%@ page import="com.ecyrd.jspwiki.ui.Installer" %>
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="org.apache.log4j.*" %>
+<%@ page import="java.util.ResourceBundle" %>
+<%@ page import="java.text.MessageFormat" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<fmt:setBundle basename="CoreResources"/>
<%!
Logger log = Logger.getLogger("JSPWiki");
@@ -21,7 +25,8 @@
// Parse the existing properties
installer.parseProperties();
boolean validated = false;
-String password = null;
+String password = null;
+ResourceBundle rb = wikiContext.getBundle("CoreResources");
// If user hit "submit" button, validate and install them
if( request.getParameter("submit") != null )
@@ -33,24 +38,16 @@
password = installer.createAdministrator();
if ( password != null )
{
- wikiSession.addMessage( Installer.INSTALL_INFO, "Because no
administrator account "
- + "exists yet, JSPWiki created one for you, with a random
password. You can change "
- + "this password later, of course. The account's id is <strong>"
+ Installer.ADMIN_ID
- + "</strong> and the password is <strong>" + password +
"</strong>. "
- + "<em>Please write this information down and keep it in a safe
place</em>. "
- + "JSPWiki also created a wiki group called <strong>" +
Installer.ADMIN_GROUP
- + "</strong> that contains this user." );
+ Object[] args = { Installer.ADMIN_ID, password,
Installer.ADMIN_GROUP };
+ wikiSession.addMessage( Installer.INSTALL_INFO,
+ MessageFormat.format( rb.getString(
"install.jsp.install.msg.rnd.pwd" ), args ) );
}
}
}
if ( !installer.adminExists() )
{
- wikiSession.addMessage( Installer.INSTALL_WARNING, "Is this the first time
you've run the "
- + " Installer? If it is, you should know that after JSPWiki validates
and saves your "
- + "configuration for the first time, you will need administrative
privileges to access "
- + "this page again. We do this to prevent random people on the
Internet from doing bad "
- + "things to your wiki." );
+ wikiSession.addMessage( Installer.INSTALL_WARNING, rb.getString(
"install.jsp.install.msg.admin.notexists" ) );
}
// Make this HTTP response non-cached, and never-expiring
@@ -63,7 +60,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html xmlns="http://www.w3.org/1999/xhtml";>
<head>
- <title>JSPWiki Installer</title>
+ <title><fmt:message key="install.jsp.title" /></title>
<link rel="stylesheet" media="screen, projection" type="text/css"
href="<wiki:Link format="url" templatefile="jspwiki.css"/>"/>
<wiki:IncludeResources type="stylesheet"/>
</head>
@@ -72,26 +69,19 @@
<div id="page">
<div id="pagecontent">
-<h1>JSPWiki Installer</h1>
+<h1><fmt:message key="install.jsp.intro.title" /></h1>
-<p>Welcome! This little JSP page is here to help you do the first difficult
stage of JSPWiki
-installation. If you're seeing this page, you have already installed JSPWiki
correctly
-inside your container.</p>
-
-<p>There are now some things that you should configure. When you press
submit, the
-<code>jspwiki.properties</code> file from the distribution will be modified,
or if it
-can't be found, a new one will be created.</p>
-
-<p>This setup system is really meant for people who just want to be up and
running really quickly.
-If you want to integrate JSPWiki with an existing system, I would recommend
that you go and edit
-the <code>jspwiki.properties</code> file directly. You can find a sample
config file from
-<code>yourwiki/WEB-INF/</code>.</p>
+<p><fmt:message key="install.jsp.intro.p1" /></p>
+
+<p><fmt:message key="install.jsp.intro.p2" /></p>
+
+<p><fmt:message key="install.jsp.intro.p3" /></p>
<!-- Any messages or errors? -->
<div class="instructions">
- <wiki:Messages div="information" topic="<%=Installer.INSTALL_INFO%>"
prefix="Good news:"/>
- <wiki:Messages div="warning" topic="<%=Installer.INSTALL_WARNING%>"
prefix="Warning: "/>
- <wiki:Messages div="error" topic="<%=Installer.INSTALL_ERROR%>"
prefix="Could not save configuration: "/>
+ <wiki:Messages div="information" topic="<%=Installer.INSTALL_INFO%>"
prefix="<%= rb.getString( "install.jsp.install.info" )%>"/>
+ <wiki:Messages div="warning" topic="<%=Installer.INSTALL_WARNING%>"
prefix="<%= rb.getString( "install.jsp.install.warning" )%>"/>
+ <wiki:Messages div="error" topic="<%=Installer.INSTALL_ERROR%>" prefix="<%=
rb.getString( "install.jsp.install.error" )%>"/>
</div>
<div class="formcontainer">
@@ -99,45 +89,39 @@
<form action="Install.jsp" method="post">
<!-- Page and log directories -->
- <h3>Basics</h3>
+ <h3><fmt:message key="install.jsp.basics.title" /></h3>
<div class="block">
- <label>Application Name</label>
+ <label><fmt:message key="install.jsp.basics.appname.label" /></label>
<input type="text" name="<%=Installer.APP_NAME%>" size="20"
value="<%=installer.getProperty( Installer.APP_NAME )%>"/><br />
<div class="description">
- What should your wiki be called? Try and make this a relatively short
name.
+ <fmt:message key="install.jsp.basics.appname.desc" />
</div>
- <label>Base URL</label>
+ <label><fmt:message key="install.jsp.basics.baseurl.label" /></label>
<input type="text" name="<%=Installer.BASE_URL%>" size="40"
value="<%=installer.getProperty( Installer.BASE_URL )%>"/><br />
<div class="description">
- Please tell JSPWiki where your wiki is located.
+ <fmt:message key="install.jsp.basics.baseurl.desc" />
</div>
- <label>Page storage</label>
+ <label><fmt:message key="install.jsp.basics.page.storage.label" /></label>
<input type="text" name="<%=Installer.PAGE_DIR%>" size="40"
value="<%=installer.getProperty( Installer.PAGE_DIR )%>"/><br />
<div class="description">
- By default, JSPWiki will use the VersioningFileProvider that stores
files in a particular
- directory on your hard drive. If you specify a directory that does not
exist, JSPWiki will
- create one for you. All attachments will also be put in the same
directory.
+ <fmt:message key="install.jsp.basics.page.storage.desc" />
</div>
</div>
- <h3>Security</h3>
+ <h3><fmt:message key="install.jsp.security.title" /></h3>
<div class="block">
- <label>Security configuration</label><br/>
+ <label><fmt:message key="install.jsp.security.sec.conf.label"
/></label><br/>
<input type="radio" name="<%=AuthenticationManager.PROP_SECURITY%>"
value="<%=AuthenticationManager.SECURITY_JAAS%>" checked="checked"/>
- JAAS plus container security (default)<br/>
+ <fmt:message key="install.jsp.security.sec.conf.opt1" /><br/>
<input type="radio" name="<%=AuthenticationManager.PROP_SECURITY%>"
value="<%=AuthenticationManager.SECURITY_OFF%>"/>
- Container security only
+ <fmt:message key="install.jsp.security.sec.conf.opt2" />
<div class="description">
- By default, JSPWiki manages access to resources using a JAAS-based
security system.
- It will also respect any container security constraints you might have,
- if you've enabled them in your <code>web.xml</code> file. If you disable
JAAS security,
- JSPWiki might not work as you expect. But sometimes you might want to do
this if you're
- trying to troubleshoot.
+ <fmt:message key="install.jsp.security.sec.conf.desc" />
</div>
<%
@@ -146,12 +130,10 @@
if ( password != null )
{
%>
- <label>Administrator account</label>
- <p>Enabled</p>
+ <label><fmt:message key="install.jsp.security.admaccount.label"
/></label>
+ <p><fmt:message key="install.jsp.security.admaccount.enabled" /></p>
<div class="description">
- This wiki has an administrator account named <strong>admin</strong>
that is part of
- the wiki group <strong>Admin</strong>. By default, JSPWiki's security
policy grants
- all members of the Admin group the all-powerful
<code>AllPermission</code>.
+ <fmt:message key="install.jsp.security.admaccount.enabled.desc" />
</div>
<%
}
@@ -159,39 +141,38 @@
else
{
%>
- <label>Administrator account</label>
- <p>Not enabled</p>
+ <label><fmt:message key="install.jsp.security.admaccount.label"
/></label>
+ <p><fmt:message key="install.jsp.security.admaccount.notenabled" /></p>
<div class="description">
- This wiki doesn't seem to have an administrator account. When you
click <em>Configure!</em>,
- JSPWiki will create one for you.
+ <fmt:message key="install.jsp.security.admaccount.notenabled.desc" />
</div>
<%
}
%>
</div>
- <h3>Advanced Settings</h3>
+ <h3><fmt:message key="install.jsp.adv.settings.title" /></h3>
<div class="block">
- <label>Log files</label>
+ <label><fmt:message key="install.jsp.adv.settings.logfile.label" /></label>
<input type="text" name="<%=Installer.LOG_DIR%>"
value="<%=installer.getProperty( Installer.LOG_DIR )%>" size="40"/><br />
<div class="description">
- JSPWiki uses Jakarta Log4j for logging. Please tell JSPWiki where the
log files should go.
+ <fmt:message key="install.jsp.adv.settings.logfile.desc" />
</div>
- <label>Work directory</label>
+ <label><fmt:message key="install.jsp.adv.settings.workdir.label" /></label>
<input type="text" name="<%=Installer.WORK_DIR%>" size="40"
value="<%=installer.getProperty( Installer.WORK_DIR )%>"/><br />
<div class="description">
- This is the place where all caches and other runtime stuff is stored.
+ <fmt:message key="install.jsp.adv.settings.workdir.desc" />
</div>
</div>
<div class="block">
<div class="instructions">
- After you click <em>Configure!</em>, the installer will write your
settings to
- <code><%=installer.getPropertiesPath()%></code>. It will also create an
- Administrator account with a random password and a corresponding Admin
group.
+ <fmt:message key="install.jsp.instr.desc" >
+ <fmt:param><%=installer.getPropertiesPath()%></fmt:param>
+ </fmt:message>
</div>
- <input type="submit" name="submit" value="Configure!" />
+ <input type="submit" name="submit" value="<fmt:message
key="install.jsp.instr.submit" />" />
</div>
</form>
@@ -203,7 +184,7 @@
if( validated )
{
%>
- <h3>Here is your new jspwiki.properties</h3>
+ <h3><fmt:message key="install.jsp.validated.new.props" /></h3>
<pre><%=installer.getProperties()%></pre>
<%
}
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Rename.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Rename.jsp?rev=643724&r1=643723&r2=643724&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Rename.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Rename.jsp
Tue Apr 1 21:07:39 2008
@@ -5,6 +5,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="java.util.*" %>
<%@ page import="java.text.*" %>
+<fmt:setBundle basename="CoreResources"/>
<%!
Logger log = Logger.getLogger("JSPWiki");
%>
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/AJAXSearch.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/AJAXSearch.jsp?rev=643724&r1=643723&r2=643724&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/AJAXSearch.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/AJAXSearch.jsp
Tue Apr 1 21:07:39 2008
@@ -12,6 +12,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:setBundle basename="templates.default"/>
<%!
public void jspInit()
{
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/AttachmentTab.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/AttachmentTab.jsp?rev=643724&r1=643723&r2=643724&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/AttachmentTab.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/AttachmentTab.jsp
Tue Apr 1 21:07:39 2008
@@ -5,6 +5,7 @@
<%@ page import="com.ecyrd.jspwiki.auth.permissions.*" %>
<%@ page import="java.security.Permission" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<fmt:setBundle basename="templates.default"/>
<%
int MAXATTACHNAMELENGTH = 30;
WikiContext c = WikiContext.findContext(pageContext);
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/CommentContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/CommentContent.jsp?rev=643724&r1=643723&r2=643724&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/CommentContent.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/CommentContent.jsp
Tue Apr 1 21:07:39 2008
@@ -2,6 +2,7 @@
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext( pageContext );
int attCount =
c.getEngine().getAttachmentManager().listAttachments(c.getPage()).size();
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/ConflictContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/ConflictContent.jsp?rev=643724&r1=643723&r2=643724&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/ConflictContent.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/ConflictContent.jsp
Tue Apr 1 21:07:39 2008
@@ -1,6 +1,7 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setBundle basename="templates.default"/>
<wiki:TabbedSection >
<wiki:Tab id="conflict"
title='<%=LocaleSupport.getLocalizedMessage(pageContext,
"conflict.oops.title")%>'>
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/DiffContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/DiffContent.jsp?rev=643724&r1=643723&r2=643724&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/DiffContent.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/DiffContent.jsp
Tue Apr 1 21:07:39 2008
@@ -1,3 +1,4 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
-<wiki:Include page="InfoContent.jsp"/>
\ No newline at end of file
+<fmt:setBundle basename="templates.default"/>
+<wiki:Include page="InfoContent.jsp"/>
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/DiffTab.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/DiffTab.jsp?rev=643724&r1=643723&r2=643724&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/DiffTab.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/DiffTab.jsp
Tue Apr 1 21:07:39 2008
@@ -5,6 +5,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
+<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext( pageContext );
List history = c.getEngine().getVersionHistory(c.getPage().getName());
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/EditContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/EditContent.jsp?rev=643724&r1=643723&r2=643724&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/EditContent.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/EditContent.jsp
Tue Apr 1 21:07:39 2008
@@ -3,6 +3,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext( pageContext );
int attCount =
c.getEngine().getAttachmentManager().listAttachments(c.getPage()).size();
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/EditGroupContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/EditGroupContent.jsp?rev=643724&r1=643723&r2=643724&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/EditGroupContent.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/EditGroupContent.jsp
Tue Apr 1 21:07:39 2008
@@ -1,5 +1,6 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<fmt:setBundle basename="templates.default"/>
<%@ page import="java.security.Principal" %>
<%@ page import="java.util.Arrays" %>
<%@ page import="com.ecyrd.jspwiki.auth.PrincipalComparator" %>
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/EditTemplate.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/EditTemplate.jsp?rev=643724&r1=643723&r2=643724&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/EditTemplate.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/EditTemplate.jsp
Tue Apr 1 21:07:39 2008
@@ -1,5 +1,6 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<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";>
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/Favorites.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/Favorites.jsp?rev=643724&r1=643723&r2=643724&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/Favorites.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/Favorites.jsp
Tue Apr 1 21:07:39 2008
@@ -1,6 +1,7 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setBundle basename="templates.default"/>
<%@ page import="com.ecyrd.jspwiki.*" %>
<div id="favorites">
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=643724&r1=643723&r2=643724&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
Tue Apr 1 21:07:39 2008
@@ -7,6 +7,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setBundle basename="templates.default"/>
<wiki:TabbedSection>
<wiki:Tab id="findcontent"
title='<%=LocaleSupport.getLocalizedMessage(pageContext, "find.tab")%>'
accesskey="s">
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=643724&r1=643723&r2=643724&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
Tue Apr 1 21:07:39 2008
@@ -2,6 +2,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext(pageContext);
String frontpage = c.getEngine().getFrontPage();
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=643724&r1=643723&r2=643724&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
Tue Apr 1 21:07:39 2008
@@ -9,6 +9,7 @@
<%@ page import="org.apache.log4j.*" %>
<%@ page errorPage="/Error.jsp" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setBundle basename="templates.default"/>
<%!
Logger log = Logger.getLogger("JSPWiki");
%>
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=643724&r1=643723&r2=643724&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
Tue Apr 1 21:07:39 2008
@@ -11,6 +11,7 @@
<%@ page errorPage="/Error.jsp" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<fmt:setBundle basename="templates.default"/>
<%!
String printWikiGroupPutGroup( Group group, String name, boolean cursor,
PageContext pageContext)
{
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=643724&r1=643723&r2=643724&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
Tue Apr 1 21:07:39 2008
@@ -1,6 +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"/>
<%
WikiContext c = WikiContext.findContext(pageContext);
String frontpage = c.getEngine().getFrontPage();
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=643724&r1=643723&r2=643724&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
Tue Apr 1 21:07:39 2008
@@ -7,6 +7,7 @@
<%@ 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:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext(pageContext);
WikiPage wikiPage = c.getPage();
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=643724&r1=643723&r2=643724&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
Tue Apr 1 21:07:39 2008
@@ -6,6 +6,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setBundle basename="templates.default"/>
<%
String postURL = "";
WikiContext ctx = WikiContext.findContext( pageContext );
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=643724&r1=643723&r2=643724&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
Tue Apr 1 21:07:39 2008
@@ -9,6 +9,7 @@
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setBundle basename="templates.default"/>
<%
// Extract the group name and members
String name = request.getParameter( "group" );
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=643724&r1=643723&r2=643724&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
Tue Apr 1 21:07:39 2008
@@ -2,6 +2,7 @@
<%@ 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:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext(pageContext);
WikiPage wikipage = c.getPage();
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=643724&r1=643723&r2=643724&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
Tue Apr 1 21:07:39 2008
@@ -2,6 +2,7 @@
<%@ 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:setBundle basename="templates.default"/>
<%
//WikiContext c = WikiContext.findContext(pageContext);
//String frontpage = c.getEngine().getFrontPage();
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=643724&r1=643723&r2=643724&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
Tue Apr 1 21:07:39 2008
@@ -3,6 +3,7 @@
<%@ 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:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext( pageContext );
int attCount =
c.getEngine().getAttachmentManager().listAttachments(c.getPage()).size();
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=643724&r1=643723&r2=643724&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
Tue Apr 1 21:07:39 2008
@@ -2,6 +2,7 @@
<%@ 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:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext( pageContext );
WikiPage p = c.getPage();
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=643724&r1=643723&r2=643724&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
Tue Apr 1 21:07:39 2008
@@ -3,6 +3,7 @@
<%@ 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:setBundle basename="templates.default"/>
<%
WikiContext context = WikiContext.findContext( pageContext );
TemplateManager.addResourceRequest( context, "script",
"scripts/jspwiki-prefs.js" );
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=643724&r1=643723&r2=643724&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
Tue Apr 1 21:07:39 2008
@@ -7,6 +7,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setBundle basename="templates.default"/>
<%
/* see commonheader.jsp */
String prefDateFormat = Preferences.getPreference(pageContext,"DateFormat");
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=643724&r1=643723&r2=643724&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
Tue Apr 1 21:07:39 2008
@@ -2,6 +2,7 @@
<%@ 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:setBundle basename="templates.default"/>
<%-- Inserts page content for preview. --%>
<wiki:TabbedSection>
<wiki:Tab id="previewcontent"
title='<%=LocaleSupport.getLocalizedMessage(pageContext, "preview.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=643724&r1=643723&r2=643724&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
Tue Apr 1 21:07:39 2008
@@ -6,6 +6,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:setBundle basename="templates.default"/>
<%
/* dateformatting not yet supported by wiki:UserProfile tag - diy */
WikiContext wikiContext = WikiContext.findContext(pageContext);
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=643724&r1=643723&r2=643724&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
Tue Apr 1 21:07:39 2008
@@ -1,5 +1,6 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<fmt:setBundle basename="templates.default"/>
<%-- Provides a simple searchbox that can be easily included anywhere on the
page --%>
<%-- Powered by jswpwiki-common.js//SearchBox --%>
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=643724&r1=643723&r2=643724&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
Tue Apr 1 21:07:39 2008
@@ -2,6 +2,7 @@
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext( pageContext );
int attCount =
c.getEngine().getAttachmentManager().listAttachments(c.getPage()).size();
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=643724&r1=643723&r2=643724&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
Tue Apr 1 21:07:39 2008
@@ -1,6 +1,7 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setBundle basename="templates.default"/>
<%@ page import="com.ecyrd.jspwiki.*" %>
<%
WikiContext c = WikiContext.findContext(pageContext);
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=643724&r1=643723&r2=643724&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
Tue Apr 1 21:07:39 2008
@@ -1,5 +1,6 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<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";>
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=643724&r1=643723&r2=643724&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
Tue Apr 1 21:07:39 2008
@@ -4,6 +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:setBundle basename="templates.default"/>
<script language="JavaScript">
function SubmitOutcomeIfSelected(selectId)
{
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/commonheader.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/commonheader.jsp?rev=643724&r1=643723&r2=643724&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/commonheader.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/commonheader.jsp
Tue Apr 1 21:07:39 2008
@@ -6,6 +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:setBundle basename="templates.default"/>
<%--
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
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/jspwiki.css
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/jspwiki.css?rev=643724&r1=643723&r2=643724&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/jspwiki.css
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/jspwiki.css
Tue Apr 1 21:07:39 2008
@@ -169,6 +169,7 @@
h2, h3, h4 {
clear:both;
margin:1em 0;
+ line-height:1.2;
}
b, i {
color:inherit;
@@ -181,7 +182,7 @@
margin:0;
}
ul,ol {
- padding-left:1.8em;
+ padding-left:3em;
}
dl dt {
font-weight:bold;
