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/08/12 17:45:41 UTC
svn commit: r685199 [1/2] - in
/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default:
./ admin/ editors/ images/ skins/OrderedList/ skins/PlainVanilla 1024x768/
skins/PlainVanilla/ skins/Smart/
Author: ajaquith
Date: Tue Aug 12 08:45:38 2008
New Revision: 685199
URL: http://svn.apache.org/viewvc?rev=685199&view=rev
Log:
Merged STRIPES_BRANCH with trunk revision 685086.
Added:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/AJAXPreview.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/images/attach-strip.png (with props)
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/images/book_open.png (with props)
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/images/editor-strip.gif (with props)
Removed:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/editors/WikiWizard.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/images/arrdown-small.png
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/images/arrleft.png
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/images/arrright.png
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/images/arrup.png
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/images/attach-icons.png
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/images/error.png
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/images/exclamation.png
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/images/film.png
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/images/information.png
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/images/ipod.png
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/images/page_white.png
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/images/page_white_acrobat.png
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/images/page_white_excel.png
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/images/page_white_flash.png
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/images/page_white_magnify.png
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/images/page_white_powerpoint.png
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/images/page_white_text.png
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/images/page_white_word.png
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/images/page_white_zip.png
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/images/search.png
Modified:
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/admin/AdminTemplate.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/admin/UserManagement.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/editors/FCK.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/editors/plain.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/editors/preview.jsp
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/images/tip.png
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/jspwiki.css
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/jspwiki_print.css
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/skin.css
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/PlainVanilla 1024x768/skin.css
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/PlainVanilla 1024x768/skin.js
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/PlainVanilla/skin.css
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/Smart/skin.css
Added: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/AJAXPreview.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/AJAXPreview.jsp?rev=685199&view=auto
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/AJAXPreview.jsp (added)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/AJAXPreview.jsp Tue Aug 12 08:45:38 2008
@@ -0,0 +1,26 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ page language="java" pageEncoding="UTF-8"%>
+<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.*" %>
+<%@ page import="com.ecyrd.jspwiki.auth.*" %>
+<%@ page import="com.ecyrd.jspwiki.auth.permissions.*" %>
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%!
+ public void jspInit()
+ {
+ wiki = WikiEngine.getInstance( getServletConfig() );
+ }
+ Logger log = Logger.getLogger("JSPWikiSearch");
+ WikiEngine wiki;
+%>
+<%
+ // Copied from a top-level jsp -- which would be a better place to put this
+ WikiContext wikiContext = wiki.createContext( request, WikiContext.VIEW );
+ if( !wikiContext.hasAccess( response ) ) return;
+
+ response.setContentType("text/html; charset="+wiki.getContentEncoding() );
+
+ String wikimarkup = request.getParameter( "wikimarkup" );
+%>
+<wiki:Translate><%= wikimarkup %></wiki:Translate>
\ No newline at end of file
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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 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:setLocale value="${prefs.Language}" />
<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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 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:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
int MAXATTACHNAMELENGTH = 30;
@@ -92,7 +93,7 @@
<%
String name = att.getFileName();
int dot = name.lastIndexOf(".");
- String attachtype = ( dot != -1 ) ? name.substring(dot+1) : "";
+ String attachtype = ( dot != -1 ) ? name.substring(dot+1) : " ";
String sname = name;
if( sname.length() > MAXATTACHNAMELENGTH ) sname = sname.substring(0,MAXATTACHNAMELENGTH) + "...";
@@ -101,12 +102,12 @@
<td><div id="attach-<%= attachtype %>" class="attachtype"><%= attachtype %></div></td>
<td><wiki:LinkTo title="<%= name %>" ><%= sname %></wiki:LinkTo></td>
<td style="white-space:nowrap;text-align:right;">
- <fmt:formatNumber value='<%=Double.toString(att.getSize()/1000.0)%>' groupingUsed='false' maxFractionDigits='1' minFractionDigits='1'/> <fmt:message key="info.kilobytes"/>
+ <fmt:formatNumber value='<%=Double.toString(att.getSize()/1000.0)%>' maxFractionDigits='1' minFractionDigits='1'/> <fmt:message key="info.kilobytes"/>
</td>
<td style="text-align:center;">
<a href="<wiki:PageInfoLink format='url' />" title="<fmt:message key='attach.moreinfo.title'/>"><wiki:PageVersion /></a>
</td>
- <td style="white-space:nowrap;"><fmt:formatDate value="<%= att.getLastModified() %>" pattern="${prefs['DateFormat']}" /></td>
+ <td style="white-space:nowrap;"><fmt:formatDate value="<%= att.getLastModified() %>" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" /></td>
<td><wiki:Author /></td>
<wiki:Permission permission="delete">
<td>
@@ -118,7 +119,7 @@
</wiki:Permission>
<td class="changenote">
<%
- String changeNote = (String)att.getAttribute(WikiPage.CHANGENOTE);
+ String changeNote = TextUtil.replaceEntities((String)att.getAttribute(WikiPage.CHANGENOTE));
if( changeNote != null ) {
%><%=changeNote%><%
}
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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 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:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext( pageContext );
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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 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:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<wiki:TabbedSection >
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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 2008
@@ -1,4 +1,2 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 2008
@@ -5,7 +5,9 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
+
<%
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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 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:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext( pageContext );
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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 2008
@@ -1,6 +1,5 @@
<%@ 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" %>
@@ -9,6 +8,8 @@
<%@ page import="org.apache.log4j.*" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<%@ page errorPage="/Error.jsp" %>
+<fmt:setLocale value="${prefs.Language}" />
+<fmt:setBundle basename="templates.default"/>
<%!
Logger log = Logger.getLogger("JSPWiki");
%>
@@ -91,7 +92,8 @@
<form action="<wiki:Link format='url' jsp='DeleteGroup.jsp'/>"
class="wikiform"
id="deleteGroup"
- onsubmit="return( confirm('<fmt:message key="group.areyousure"><fmt:param>${param.group}</fmt:param></fmt:message>') && Wiki.submitOnce(this) );"
+ onsubmit="return( confirm('<fmt:message key="grp.deletegroup.confirm"/>')
+ && Wiki.submitOnce(this) );"
method="POST" accept-charset="UTF-8">
<input type="submit" name="ok" value="<fmt:message key="actions.deletegroup"/>" />
<input type="hidden" name="group" value="${param.group}" />
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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 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:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -27,7 +28,7 @@
<wiki:CheckRequestContext context="edit"><body class="edit" ></wiki:CheckRequestContext>
<wiki:CheckRequestContext context="comment"><body class="comment" ></wiki:CheckRequestContext>
-<div id="wikibody" class="${prefs['orientation']}">
+<div id="wikibody" class="${prefs.Orientation}">
<wiki:Include page="Header.jsp" />
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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 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:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%@ page import="com.ecyrd.jspwiki.*" %>
@@ -8,6 +9,67 @@
<wiki:Include page="UserBox.jsp" />
+ <div id="hiddenmorepopup">
+ <ul id="morepopup">
+ <wiki:CheckRequestContext context='view|info|diff|upload'>
+ <wiki:PageExists>
+ <wiki:Permission permission="comment">
+ <wiki:PageType type="page">
+ <li><a class="action comment"
+ href="<wiki:CommentLink format='url' />"
+ title="<fmt:message key='actions.comment.title' />"><fmt:message key="actions.comment" />
+ </a></li>
+ </wiki:PageType>
+ <wiki:PageType type="attachment">
+ <li><a class="action comment"
+ href="<wiki:BaseURL/>Comment.jsp?page=<wiki:ParentPageName />"
+ title="<fmt:message key='actions.comment.title' />"><fmt:message key="actions.comment" />
+ </a></li>
+ </wiki:PageType>
+ </wiki:Permission>
+ </wiki:PageExists>
+ </wiki:CheckRequestContext>
+
+ <wiki:PageExists>
+ <wiki:CheckRequestContext context='view|info|diff|upload|edit|comment|preview' >
+ <li>
+ <wiki:CheckVersion mode="latest">
+ <a class="action rawpage wikipage"
+ href="<wiki:Link format='url'><wiki:Param name='skin' value='raw'/></wiki:Link>"
+ title="<fmt:message key='actions.rawpage.title' />"><fmt:message key='actions.rawpage' />
+ </a>
+ </wiki:CheckVersion>
+ <wiki:CheckVersion mode="notlatest">
+ <a class="action rawpage wikipage"
+ href="<wiki:Link format='url' version='${param.version}'><wiki:Param name='skin' value='raw'/></wiki:Link>"
+ title="<fmt:message key='actions.rawpage.title' />"><fmt:message key='actions.rawpage' />
+ </a>
+ </wiki:CheckVersion>
+ </li>
+ </wiki:CheckRequestContext>
+ </wiki:PageExists>
+
+ <wiki:CheckRequestContext context='!workflow'>
+ <wiki:UserCheck status="authenticated">
+ <li><a class="action workflow"
+ href="<wiki:Link jsp='Workflow.jsp' format='url' />"
+ title="<fmt:message key='actions.workflow.title' />"><fmt:message key='actions.workflow' />
+ </a></li>
+ </wiki:UserCheck>
+ </wiki:CheckRequestContext>
+
+ <wiki:Permission permission="createGroups">
+ <li><a class="action creategroup"
+ href="<wiki:Link jsp='NewGroup.jsp' format='url' />"
+ title="<fmt:message key='actions.creategroup.title' />"><fmt:message key='actions.creategroup' />
+ </a></li>
+ </wiki:Permission>
+ <li class='separator'>
+ <div id="moremenu" ><wiki:InsertPage page="MoreMenu" /></div>
+ </li>
+ </ul>
+ </div>
+
<wiki:CheckRequestContext context='!login'>
<wiki:UserCheck status="known">
@@ -19,7 +81,9 @@
%% }]
</wiki:Translate>
</wiki:UserCheck>
-
+
+ <wiki:Permission permission="view">
+
<%-- LeftMenu is automatically generated from a Wiki page called "LeftMenu" --%>
<div class="leftmenu">
<wiki:InsertPage page="LeftMenu" />
@@ -43,6 +107,8 @@
</wiki:NoSuchPage>
</div>
+ </wiki:Permission>
+
</wiki:CheckRequestContext>
<div class="wikiversion"><%=Release.APPNAME%> v<%=Release.getVersionString()%>
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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 2008
@@ -7,7 +7,9 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
+
<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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 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:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext(pageContext);
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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 2008
@@ -9,6 +9,7 @@
<%@ page import="org.apache.log4j.*" %>
<%@ page errorPage="/Error.jsp" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%!
Logger log = Logger.getLogger("JSPWiki");
@@ -128,7 +129,8 @@
<form action="<wiki:Link format='url' jsp='DeleteGroup.jsp'/>"
class="wikiform"
id="deleteGroup"
- onsubmit="return( confirm('<fmt:message key="group.areyousure"><fmt:param>${param.group}</fmt:param></fmt:message>') && Wiki.submitOnce(this) );"
+ onsubmit="return( confirm('<fmt:message key="grp.deletegroup.confirm"/>')
+ && Wiki.submitOnce(this) );"
method="POST" accept-charset="UTF-8">
<input type="submit" name="ok" value="<fmt:message key="actions.deletegroup"/>" />
<input type="hidden" name="group" value="${param.group}" />
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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 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:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%!
String printWikiGroupPutGroup( Group group, String name, boolean cursor, PageContext pageContext)
@@ -135,8 +136,7 @@
String groupname = request.getParameter( "group" );
%>
-<script type="text/javascript">
-//<![CDATA[
+<script type="text/javascript">//<![CDATA[
<%
WikiContext c = WikiContext.findContext( pageContext );
Principal[] roles = c.getWikiSession().getRoles();
@@ -152,8 +152,7 @@
}
}
%>
-//]]>
-</script>
+//]]></script>
<%--
WikiGroup.putGroup( "Group1qsdf qsdf qsdf qsdf qsdffsdfq en nog een beetje langer he", "Member1\nMember2\nMember3\nMember4\nMember5\nMember6", "createdon", "createdby", "changedon", "changedby" );
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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 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:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext(pageContext);
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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 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:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext(pageContext);
@@ -33,6 +34,8 @@
int pagesize = 20;
int startitem = itemcount;
+ if( startitem == pagesize ) startitem = 0;
+
String parm_start = (String)request.getParameter( "start" );
if( parm_start != null ) startitem = Integer.parseInt( parm_start ) ;
/*round to start of a pagination block */
@@ -65,21 +68,13 @@
<fmt:param>
<a href="<wiki:DiffLink format='url' version='latest' newVersion='previous' />"
title="<fmt:message key='info.pagediff.title' />" >
- <fmt:formatDate value="<%= wikiPage.getLastModified() %>" pattern="${prefs['DateFormat']}" />
+ <fmt:formatDate value="<%= wikiPage.getLastModified() %>" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" />
</a>
</fmt:param>
<fmt:param><wiki:Author /></fmt:param>
</fmt:message>
- <a href="<wiki:Link format='url' jsp='rss.jsp'>
- <wiki:Param name='page' value='<%=wikiPage.getName()%>'/>
- <wiki:Param name='mode' value='wiki'/>
- </wiki:Link>"
- title="<fmt:message key='info.rsspagefeed.title'>
- <fmt:param><wiki:PageName /></fmt:param>
- </fmt:message>" >
- <img src="<wiki:Link jsp='images/xml.png' format='url'/>" alt="[RSS]"/>
- </a>
+ <wiki:RSSImageLink mode="wiki"/>
</p>
<wiki:CheckVersion mode="notfirst">
@@ -87,7 +82,7 @@
<fmt:message key='info.createdon'>
<fmt:param>
<wiki:Link version="1">
- <fmt:formatDate value="<%= firstPage.getLastModified() %>" pattern="${prefs['DateFormat']}" />
+ <fmt:formatDate value="<%= firstPage.getLastModified() %>" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" />
</wiki:Link>
</fmt:param>
<fmt:param><%= creationAuthor %></fmt:param>
@@ -172,8 +167,8 @@
<wiki:HistoryIterator id="currentPage">
<% if( ( startitem == -1 ) ||
- ( ( currentPage.getVersion() >= startitem )
- && ( currentPage.getVersion() < startitem + pagesize ) ) )
+ ( ( currentPage.getVersion() > startitem )
+ && ( currentPage.getVersion() <= startitem + pagesize ) ) )
{
%>
<tr>
@@ -183,10 +178,10 @@
</wiki:LinkTo>
</td>
- <td><fmt:formatDate value="<%= currentPage.getLastModified() %>" pattern="${prefs['DateFormat']}" /></td>
- <td>
- <%--<fmt:formatNumber value='<%=Double.toString(currentPage.getSize()/1000.0)%>' groupingUsed='false' maxFractionDigits='1' minFractionDigits='1'/> Kb--%>
- <wiki:PageSize />
+ <td><fmt:formatDate value="<%= currentPage.getLastModified() %>" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" /></td>
+ <td style="white-space:nowrap;text-align:right;">
+ <c:set var="ff"><wiki:PageSize /></c:set>
+ <fmt:formatNumber value='${ff/1000}' maxFractionDigits='3' minFractionDigits='1'/> <fmt:message key="info.kilobytes"/>
</td>
<td><wiki:Author /></td>
@@ -215,7 +210,7 @@
</table>
</div>
- ${pagination}
+ ${pagination}
<%-- } /* itemcount > 1 */ --%>
</wiki:CheckVersion>
</wiki:Tab>
@@ -323,7 +318,7 @@
<%
String name = att.getName(); //att.getFileName();
int dot = name.lastIndexOf(".");
- String attachtype = ( dot != -1 ) ? name.substring(dot+1) : "";
+ String attachtype = ( dot != -1 ) ? name.substring(dot+1) : " ";
String sname = name;
if( sname.length() > MAXATTACHNAMELENGTH ) sname = sname.substring(0,MAXATTACHNAMELENGTH) + "...";
@@ -343,7 +338,7 @@
<td style="white-space:nowrap;text-align:right;">
<fmt:formatNumber value='<%=Double.toString(att.getSize()/1000.0) %>' groupingUsed='false' maxFractionDigits='1' minFractionDigits='1'/> <fmt:message key="info.kilobytes"/>
</td>
- <td style="white-space:nowrap;"><fmt:formatDate value="<%= att.getLastModified() %>" pattern="${prefs['DateFormat']}" /></td>
+ <td style="white-space:nowrap;"><fmt:formatDate value="<%= att.getLastModified() %>" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" /></td>
<td><wiki:Author /></td>
<%--
// FIXME: This needs to be added, once we figure out what is going on.
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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 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:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
String postURL = "";
@@ -130,6 +131,7 @@
<td colspan="2" class="formhelp">
<wiki:Messages div="error" topic="resetpw"
prefix='<%=LocaleSupport.getLocalizedMessage(pageContext,"login.errorprefix")%>' />
+ <wiki:Messages div="information" topic="resetpwok" />
</td>
</tr>
</c:if>
@@ -186,7 +188,7 @@
<wiki:NoSuchPage page="LoginHelp">
<div class="error">
<fmt:message key="login.loginhelpmissing">
- <fmt:param><wiki:EditLink page="LoginPageHelp">LoginHelp</wiki:EditLink></fmt:param>
+ <fmt:param><wiki:EditLink page="LoginHelp">LoginHelp</wiki:EditLink></fmt:param>
</fmt:message>
</div>
</wiki:NoSuchPage>
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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 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:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
// Extract the group name and members
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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 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:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext(pageContext);
@@ -30,16 +31,8 @@
</fmt:message>
</wiki:CheckVersion>
- <a href="<wiki:Link format='url' jsp='rss.jsp'>
- <wiki:Param name='page' value='<%=wikipage.getName()%>'/>
- <wiki:Param name='mode' value='wiki'/>
- </wiki:Link>"
- title="<fmt:message key='info.rsspagefeed.title'>
- <fmt:param><wiki:PageName /></fmt:param>
- </fmt:message>" >
- <img src="<wiki:Link jsp='images/xml.png' format='url'/>" alt="[RSS]"/>
- </a>
-
+ <wiki:RSSImageLink mode="wiki" />
+
</wiki:PageExists>
<wiki:NoSuchPage><fmt:message key="actions.notcreated"/></wiki:NoSuchPage>
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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 2008
@@ -2,17 +2,12 @@
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
-<%
- //WikiContext c = WikiContext.findContext(pageContext);
- //String frontpage = c.getEngine().getFrontPage();
-%>
-
<div id="actionsTop" class="pageactions">
- <form class="wikiform" method="get" action="" >
<ul>
- <wiki:CheckRequestContext context='view|info|diff|upload'>
+ <wiki:CheckRequestContext context='view|info|diff|upload'>
<wiki:Permission permission="edit">
<li>
<wiki:PageType type="page">
@@ -25,66 +20,12 @@
</wiki:PageType>
</li>
</wiki:Permission>
- </wiki:CheckRequestContext>
-
- <%-- more actions dropdown -- converted to popup by javascript
- so all basic actions are accessible even if js is not avail --%>
- <li>
- <select name="actionsMore" id="actionsMore"
- onchange="if ((this.selectedIndex != 0) && (!this.options[this.selectedIndex].disabled)) location.href=this.form.action=this.options[this.selectedIndex].value; this.selectedIndex = 0;">
- <option class="actionsMore" value="" selected='selected'><fmt:message key="actions.more"/></option>
-
- <wiki:CheckRequestContext context='view|info|diff|upload'>
- <wiki:PageExists>
- <wiki:Permission permission="comment">
- <wiki:PageType type="page">
- <option class="action comment" value="<wiki:CommentLink format='url' />"
- title="<fmt:message key='actions.comment.title' />"><fmt:message key="actions.comment" />
- </option>
- </wiki:PageType>
- <wiki:PageType type="attachment">
- <option class="action comment" value="<wiki:BaseURL/>Comment.jsp?page=<wiki:ParentPageName />"
- title="<fmt:message key='actions.comment.title' />"><fmt:message key="actions.comment" />
- </option>
- </wiki:PageType>
- </wiki:Permission>
- </wiki:PageExists>
- </wiki:CheckRequestContext>
-
- <wiki:CheckRequestContext context='view|info|diff|upload|edit|comment|preview' >
- <option class="action rawpage" value="<wiki:Link format='url' ><wiki:Param name='skin' value='raw'/></wiki:Link>"
- title="<fmt:message key='actions.rawpage.title' />"><fmt:message key='actions.rawpage' />
- </option>
- </wiki:CheckRequestContext>
-
- <wiki:CheckRequestContext context='!workflow'>
- <wiki:UserCheck status="authenticated">
- <option class="action workflow" value="<wiki:Link jsp='Workflow.jsp' format='url' />"
- title="<fmt:message key='actions.workflow.title' />"><fmt:message key='actions.workflow' />
- </option>
- </wiki:UserCheck>
</wiki:CheckRequestContext>
- <wiki:Permission permission="createGroups">
- <option class="action creategroup" value="<wiki:Link jsp='NewGroup.jsp' format='url' />"
- title="<fmt:message key='actions.creategroup.title' />"><fmt:message key='actions.creategroup' />
- </option>
- </wiki:Permission>
+ <%-- converted to popup menu by jspwiki-common.js--%>
+ <li id="morebutton">
+ <a href="<wiki:Link format='url' page='MoreMenu' />" class="action more"><fmt:message key="actions.more"/></a>
+ </li>
- </select>
- </li>
- <li id="morebutton" style="display:none">
- <a href="#" class="action more"><fmt:message key="actions.more"/></a>
- <div id="moremenu" >
- <wiki:InsertPage page="MoreMenu" />
- </div>
- </li>
-<%--
- <li>
- <a class="action quick2bottom" href="#footer" title="<fmt:message key='actions.gotobottom' />" >»</a>
- </li>
---%>
</ul>
-
- </form>
</div>
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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 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:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext( pageContext );
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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 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:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext( pageContext );
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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 2008
@@ -3,9 +3,10 @@
<%@ page import="com.ecyrd.jspwiki.ui.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<fmt:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
- WikiContext context = WikiContext.findContext( pageContext );
+ 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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 2008
@@ -1,20 +1,28 @@
<%@ page errorPage="/Error.jsp" %>
<%@ page import="java.util.*" %>
+<%@ page import="java.lang.*" %>
<%@ page import="com.ecyrd.jspwiki.*" %>
+<%@ page import="java.io.*" %>
+<%@ page import="java.util.jar.*" %>
+
<%@ page import="com.ecyrd.jspwiki.ui.*" %>
<%@ page import="com.ecyrd.jspwiki.preferences.*" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://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"/>
<%
- /* see commonheader.jsp */
- String prefDateFormat = Preferences.getPreference(pageContext,"DateFormat");
- String prefTimeZone = Preferences.getPreference(pageContext,"TimeZone");
-
+ //FIXME: this should better move to UserPreferences.jsp but that doesn't seem to work. Ugh ?
WikiContext c = WikiContext.findContext( pageContext );
- pageContext.setAttribute( "skins", c.getEngine().getTemplateManager().listSkins(pageContext, c.getTemplate() ) );
+ TemplateManager t = c.getEngine().getTemplateManager();
+ pageContext.setAttribute( "skins", t.listSkins(pageContext, c.getTemplate() ) );
+ pageContext.setAttribute( "languages", t.listLanguages(pageContext) );
+ pageContext.setAttribute( "timeformats", t.listTimeFormats(pageContext) );
+ pageContext.setAttribute( "timezones", t.listTimeZones(pageContext) );
%>
<h3><fmt:message key="prefs.heading"><fmt:param><wiki:Variable var="applicationname"/></fmt:param></fmt:message></h3>
@@ -71,6 +79,15 @@
</tr>
<tr>
+ <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>
+ <fmt:message key="prefs.user.sectionediting.text"/>
+ </td>
+ </tr>
+
+ <tr>
<td><label for="prefSkin"><fmt:message key="prefs.user.skin"/></label></td>
<td>
<select id="prefSkin" name="prefSkin">
@@ -81,149 +98,59 @@
</td>
</tr>
+
+ <c:if test='${not empty languages}'>
+ <c:set var="prefLanguage" ><c:out value="${prefs.Language}" default="<%=request.getLocale().toString()%>" /></c:set>
<tr>
- <td><label for="prefOrientation"><fmt:message key="prefs.user.orientation"/></label></td>
+ <td><label for="prefLanguage"><fmt:message key="prefs.user.language"/></label></td>
<td>
- <select id="prefOrientation" name="prefOrientation" onchange="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-hidden' <c:if test='${"fav-hidden" == prefs["orientation"]}'>selected="selected"</c:if> ><fmt:message key="prefs.user.fav-hide"/></option>
- --%>
+ <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>
+ </c:forEach>
</select>
</td>
</tr>
+ </c:if>
<tr>
- <td><label for="prefTimeFormat"><fmt:message key="prefs.user.timeformat"/></label></td>
+ <td><label for="prefOrientation"><fmt:message key="prefs.user.orientation"/></label></td>
<td>
- <select id="prefTimeFormat" name="prefTimeFormat" >
- <%
- Properties props = c.getEngine().getWikiProperties();
- ArrayList tfArr = new ArrayList(40);
-
- /* filter timeformat props */
- for( Enumeration e = props.propertyNames(); e.hasMoreElements(); )
- {
- String name = (String) e.nextElement();
- if( name.startsWith( "jspwiki.defaultprefs.timeformat." ) )
- {
- tfArr.add(name);
- }
- }
-
- /* fetch actual formats */
- if( tfArr.size() == 0 )
- {
- tfArr.add( "dd-MMM-yy" );
- tfArr.add( "d-MMM-yyyy" );
- tfArr.add( "EEE, dd-MMM-yyyy, zzzz" );
- } else {
- Collections.sort( tfArr );
- for( int i=0; i < tfArr.size(); i++ )
- {
- tfArr.set(i, props.getProperty( (String)tfArr.get(i) ) );
- }
- }
-
- Date d = new Date() ; // Now.
-
- for( int i=0; i < tfArr.size(); i++ )
- {
- String f = (String)tfArr.get(i);
- String selected = ( prefDateFormat.equals( f ) ? " selected='selected'" : "" ) ;
- try
- {
- java.text.SimpleDateFormat fmt = new java.text.SimpleDateFormat( f );
- java.util.TimeZone tz = java.util.TimeZone.getDefault();
- try
- {
- tz.setRawOffset( Integer.parseInt( prefTimeZone ) );
- }
- catch( Exception e) { /* dont care */ } ;
- fmt.setTimeZone( tz );
- %>
- <option value="<%= f %>" <%= selected%> ><%= fmt.format(d) %></option>
- <%
- }
- catch( IllegalArgumentException e ) { } // skip parameter
- }
- %>
+ <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>
</select>
</td>
</tr>
<tr>
- <td><label for="prefTimeZone"><fmt:message key="prefs.user.timezone"/></label></td>
+ <td><label for="prefTimeFormat"><fmt:message key="prefs.user.timeformat"/></label></td>
<td>
- <select id='prefTimeZone' name='prefTimeZone' class='select'>
- <%
- String[][] tzs =
- { { "-43200000" , "(UTC-12) Enitwetok, Kwajalien" }
- , { "-39600000" , "(UTC-11) Nome, Midway Island, Samoa" }
- , { "-36000000" , "(UTC-10) Hawaii" }
- , { "-32400000" , "(UTC-9) Alaska" }
- , { "-28800000" , "(UTC-8) Pacific Time" }
- , { "-25200000" , "(UTC-7) Mountain Time" }
- , { "-21600000" , "(UTC-6) Central Time, Mexico City" }
- , { "-18000000" , "(UTC-5) Eastern Time, Bogota, Lima, Quito" }
- , { "-14400000" , "(UTC-4) Atlantic Time, Caracas, La Paz" }
- , { "-12600000" , "(UTC-3:30) Newfoundland" }
- , { "-10800000" , "(UTC-3) Brazil, Buenos Aires, Georgetown, Falkland Is." }
- , { "-7200000" , "(UTC-2) Mid-Atlantic, Ascention Is., St Helena" }
- , { "-3600000" , "(UTC-1) Azores, Cape Verde Islands" }
- , { "0" , "(UTC) Casablanca, Dublin, Edinburgh, London, Lisbon, Monrovia" }
- , { "3600000" , "(UTC+1) Berlin, Brussels, Copenhagen, Madrid, Paris, Rome" }
- , { "7200000" , "(UTC+2) Helsinki, Athens, Kaliningrad, South Africa, Warsaw" }
- , { "10800000" , "(UTC+3) Baghdad, Riyadh, Moscow, Nairobi" }
- , { "12600000" , "(UTC+3.30) Tehran" }
- , { "14400000" , "(UTC+4) Adu Dhabi, Baku, Muscat, Tbilisi" }
- , { "16200000" , "(UTC+4:30) Kabul" }
- , { "18000000" , "(UTC+5) Islamabad, Karachi, Tashkent" }
- , { "19800000" , "(UTC+5:30) Bombay, Calcutta, Madras, New Delhi" }
- , { "21600000" , "(UTC+6) Almaty, Colomba, Dhakra" }
- , { "25200000" , "(UTC+7) Bangkok, Hanoi, Jakarta" }
- , { "28800000" , "(UTC+8) Beijing, Hong Kong, Perth, Singapore, Taipei" }
- , { "32400000" , "(UTC+9) Osaka, Sapporo, Seoul, Tokyo, Yakutsk" }
- , { "34200000" , "(UTC+9:30) Adelaide, Darwin" }
- , { "36000000" , "(UTC+10) Melbourne, Papua New Guinea, Sydney, Vladivostok" }
- , { "39600000" , "(UTC+11) Magadan, New Caledonia, Solomon Islands" }
- , { "43200000" , "(UTC+12) Auckland, Wellington, Fiji, Marshall Island" }
- };
- String servertz = Integer.toString( java.util.TimeZone.getDefault().getRawOffset() ) ;
- String selectedtz = servertz;
- for( int i=0; i < tzs.length; i++ )
- {
- if( prefTimeZone.equals( tzs[i][0] ) ) selectedtz = prefTimeZone;
- }
- for( int i=0; i < tzs.length; i++ )
- {
- String selected = ( selectedtz.equals( tzs[i][0] ) ? " selected='selected'" : "" ) ;
- String server = ( servertz.equals( tzs[i][0] ) ? " [SERVER]" : "" ) ;
- %>
- <option value="<%= tzs[i][0] %>" <%= selected%> ><%= tzs[i][1]+server %></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>
- <%-- user browser language only ; why not allow to choose from all installed server languages on jspwiki ??
<tr>
- <td><label for="prefLanguage">Select Language</label></td>
+ <td><label for="prefTimeZone"><fmt:message key="prefs.user.timezone"/></label></td>
<td>
- <select id="prefLanguage" name="prefLanguage" >
- <option value="">English</option>
+ <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>
+ </c:forEach>
</select>
</td>
</tr>
-
+
+ <%--
<tr>
<td><label for="prefShowQuickLinks">Show Quick Links</label></td>
<td>
<input class='checkbox' type='checkbox' id='prefShowQuickLinks' name='prefShowQuickLinks'
- <%= (prefShowQuickLinks.equals("yes") ? "checked='checked'" : "") %> />
+ <c:if test='${"on" == prefs["SectionEdit"]}'>selected="selected"</c:if> />
<span class="quicklinks"><span
class='quick2Top'><a href='#wikibody' title='Go to Top' >«</a></span><span
class='quick2Prev'><a href='#' title='Go to Previous Section'>‹</a></span><span
@@ -260,7 +187,7 @@
<h3><fmt:message key='prefs.clear.heading'/></h3>
-<form action="<wiki:Link format='url' jsp='UserPreferences.jsp'><wiki:Param name='tab' value='prefs'/></wiki:Link>"
+<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 />" >
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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 2008
@@ -2,7 +2,9 @@
<%@ 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")%>'>
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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 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:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
/* dateformatting not yet supported by wiki:UserProfile tag - diy */
@@ -116,14 +117,14 @@
<td><label><fmt:message key="prefs.creationdate"/></label></td>
<td class="formvalue">
<%--<wiki:UserProfile property="created"/>--%>
- <fmt:formatDate value="<%= profile.getCreated() %>" pattern="${prefs['DateFormat']}" />
+ <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 class="formvalue">
<%--<wiki:UserProfile property="modified"/>--%>
- <fmt:formatDate value="<%= profile.getLastModified() %>" pattern="${prefs['DateFormat']}" />
+ <fmt:formatDate value="<%= profile.getLastModified() %>" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" />
</td>
</tr>
</wiki:UserProfile>
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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 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:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%-- Provides a simple searchbox that can be easily included anywhere on the page --%>
<%-- Powered by jswpwiki-common.js//SearchBox --%>
@@ -14,7 +15,7 @@
type="text" value="<fmt:message key='sbox.search.submit'/>"
name="query" id="query"
size="20"
- accesskey="f"></input>
+ accesskey="f" />
<button type="submit"
name="searchSubmit" id="searchSubmit"
value="<fmt:message key='find.submit.go'/>"
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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 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:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext( pageContext );
@@ -22,7 +23,7 @@
<body>
-<div id="wikibody" class="${prefs['orientation']}">
+<div id="wikibody" class="${prefs.Orientation}">
<wiki:Include page="Header.jsp" />
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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 2008
@@ -1,8 +1,9 @@
<%@ 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.*" %>
+<fmt:setLocale value="${prefs.Language}" />
+<fmt:setBundle basename="templates.default"/>
<%
WikiContext c = WikiContext.findContext(pageContext);
%>
@@ -33,7 +34,7 @@
<wiki:CheckRequestContext context='!login'>
<wiki:Permission permission="login">
<a href="<wiki:Link jsp='Login.jsp' format='url'><wiki:Param
- name='redirect' value='<%=c.getPage().getName()%>'/></wiki:Link>"
+ name='redirect' value='<%=c.getEngine().encodeName(c.getName())%>'/></wiki:Link>"
class="action login"
title="<fmt:message key='actions.login.title'/>"><fmt:message key="actions.login"/></a>
</wiki:Permission>
@@ -50,7 +51,7 @@
<wiki:CheckRequestContext context='!prefs'>
<wiki:CheckRequestContext context='!preview'>
<a href="<wiki:Link jsp='UserPreferences.jsp' format='url' ><wiki:Param name='redirect'
- value='<%=c.getPage().getName()%>'/></wiki:Link>"
+ value='<%=c.getEngine().encodeName(c.getName())%>'/></wiki:Link>"
class="action prefs" accesskey="p"
title="<fmt:message key='actions.prefs.title'/>"><fmt:message key="actions.prefs" />
</a>
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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 2008
@@ -1,5 +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">
@@ -26,8 +27,8 @@
<body class="view">
-<div id="wikibody" class="${prefs['orientation']}">
-
+<div id="wikibody" class="${prefs.Orientation}">
+
<wiki:Include page="Header.jsp" />
<div id="content">
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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 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:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<script language="JavaScript">
function SubmitOutcomeIfSelected(selectId)
@@ -79,7 +80,7 @@
<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']}" />
+ <fmt:formatDate value="${decision.startTime}" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" />
</td>
</tr>
<!-- Hidden row with Decision details, if there are any -->
@@ -156,7 +157,7 @@
<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']}" />
+ <fmt:formatDate value="${workflow.currentStep.startTime}" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" />
</td>
</tr>
<% i++; %>
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/admin/AdminTemplate.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/admin/AdminTemplate.jsp?rev=685199&r1=685198&r2=685199&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/admin/AdminTemplate.jsp (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/admin/AdminTemplate.jsp Tue Aug 12 08:45:38 2008
@@ -13,6 +13,7 @@
</head>
<body class="view">
<div id="wikibody">
+<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>
@@ -84,6 +85,7 @@
<p>There will be more filter stuff here</p>
</wiki:Tab>
</wiki:TabbedSection>
+</div>
</div>
</body>
\ No newline at end of file
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/admin/UserManagement.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/admin/UserManagement.jsp?rev=685199&r1=685198&r2=685199&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/admin/UserManagement.jsp (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/admin/UserManagement.jsp Tue Aug 12 08:45:38 2008
@@ -6,6 +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"/>
<script>
function constructdate(date)
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=685199&r1=685198&r2=685199&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 Aug 12 08:45:38 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:setLocale value="${prefs.Language}" />
<fmt:setBundle basename="templates.default"/>
<%--
This file provides a common header which includes the important JSPWiki scripts and other files.
@@ -21,14 +22,23 @@
<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'/>" />
+<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 --%>
+<noscript>
+<style type="text/css">
+#hiddenmorepopup { display:block; }
+</style>
+</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"/>
<%-- COOKIE read client preferences --%>
@@ -36,26 +46,21 @@
Preferences.setupPreferences(pageContext);
%>
-<script type="text/javascript">
-//<![CDATA[
+<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="wikiEditUrl" content='<wiki:EditLink format="url" />' />
+<meta name="wikiJsonUrl" content='<%= WikiContext.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="wikiTemplateUrl" content='<wiki:Link format="url" templatefile="" />' />
+<meta name="wikiApplicationName" content='<wiki:Variable var="ApplicationName" />' />
+<script type="text/javascript">//<![CDATA[
/* Localized javascript strings: LocalizedStrings[] */
<wiki:IncludeResources type="jslocalizedstrings"/>
-
-/* Initialise glboal Wiki js object with server and page dependent variables */
-/* FIXME : better is to add this to the window.onload handler */
-Wiki.init({
- 'BaseUrl': '<wiki:BaseURL />',
- 'PageUrl': '<wiki:Link format="url" absolute="true" page="#$%"/>', /* unusual pagename */
- 'TemplateDir': '<wiki:Link format="url" templatefile=""/>',
- 'PageName': '<wiki:Variable var="pagename" />',/* pagename without blanks */
- 'UserName': '<wiki:UserName />',
- 'JsonUrl' : '<%= WikiContext.findContext(pageContext).getURL( WikiContext.NONE, "JSON-RPC" ) %>'
- });
<wiki:IncludeResources type="jsfunction"/>
-
-//]]>
-</script>
+//]]></script>
<meta http-equiv="Content-Type" content="text/html; charset=<wiki:ContentEncoding />" />
<link rel="search" href="<wiki:LinkTo format='url' page='FindPage'/>"
@@ -72,7 +77,20 @@
title="Print friendly" />
<link rel="alternate stylesheet" type="text/css" href="<wiki:Link format='url' templatefile='jspwiki.css'/>"
title="Standard" />
-<link rel="icon" type="image/png" href="<wiki:Link format='url' jsp='images/favicon.png'/>" />
+<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'/>" />
+
+<%-- 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'/>" />
+ </wiki:PageType>
+ </wiki:Permission>
+</wiki:CheckRequestContext>
<wiki:FeedDiscovery />
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/editors/FCK.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/editors/FCK.jsp?rev=685199&r1=685198&r2=685199&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/editors/FCK.jsp (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/editors/FCK.jsp Tue Aug 12 08:45:38 2008
@@ -2,6 +2,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.*" %>
<%@ page import="com.ecyrd.jspwiki.render.*" %>
<%@ page import="com.ecyrd.jspwiki.parser.JSPWikiMarkupParser" %>
<%@ page import="com.ecyrd.jspwiki.ui.*" %>
@@ -9,11 +11,13 @@
<%@ 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"/>
<%--
This provides the FCK editor for JSPWiki.
--%>
<% WikiContext context = WikiContext.findContext( pageContext );
+ WikiEngine engine = context.getEngine();
context.setVariable( RenderingManager.WYSIWYG_EDITOR_MODE, Boolean.TRUE );
context.setVariable( WikiEngine.PROP_RUNFILTERS, "false" );
@@ -24,15 +28,38 @@
String usertext = EditorManager.getEditedText(pageContext);
TemplateManager.addResourceRequest( context, "script", "scripts/fckeditor/fckeditor.js" );
%>
-<wiki:CheckRequestContext context="edit"><%
+<wiki:CheckRequestContext context="edit">
+<wiki:NoSuchPage> <%-- this is a new page, check if we're cloning --%>
+<%
+ String clone = request.getParameter( "clone" );
+ if( clone != null )
+ {
+ WikiPage p = engine.getPage( clone );
+ if( p != null )
+ {
+ AuthorizationManager mgr = engine.getAuthorizationManager();
+ PagePermission pp = new PagePermission( p, PagePermission.VIEW_ACTION );
+
+ try
+ {
+ if( mgr.checkPermission( context.getWikiSession(), pp ) )
+ {
+ usertext = engine.getPureText( p );
+ }
+ }
+ catch( Exception e ) { /*log.error( "Accessing clone page "+clone, e );*/ }
+ }
+ }
+%>
+</wiki:NoSuchPage>
+<%
if( usertext == null )
{
- usertext = context.getEngine().getPureText( context.getPage() );
+ usertext = engine.getPureText( context.getPage() );
}%>
</wiki:CheckRequestContext>
<% if( usertext == null ) usertext = "";
- WikiEngine engine = context.getEngine();
RenderingManager renderingManager = new RenderingManager();
// since the WikiProperties are shared, we'll want to make our own copy of it for modifying.