jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ajaqu...@apache.org
Subject svn commit: r746887 [2/3] - in /incubator/jspwiki/trunk/src: WebContent/ WebContent/WEB-INF/classes/ WebContent/WEB-INF/classes/templates/ WebContent/templates/default/ java/org/apache/wiki/ java/org/apache/wiki/action/ java/org/apache/wiki/ui/stripes/
Date Mon, 23 Feb 2009 05:27:56 GMT
Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_ru.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_ru.properties?rev=746887&r1=746886&r2=746887&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_ru.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_ru.properties Mon Feb 23 05:27:55 2009
@@ -16,9 +16,6 @@
 attach.add.info=\u0414\u043b\u044f \u0442\u043e\u0433\u043e \u0447\u0442\u043e\u0431\u044b \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u043d\u043e\u0432\u043e\u0435 \u043f\u0440\u0438\u043a\u0440\u0435\u043f\u043b\u0435\u043d\u0438\u0435, \u0412\u0430\u043c \u043d\u0443\u0436\u043d\u043e \u0432\u043e\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0441\u044f \u0432\u0441\u043f\u043b\u044b\u0432\u0430\u044e\u0449\u0438\u043c \u043e\u043a\u043d\u043e\u043c \u0434\u043b\u044f \u043f\u043e\u0438\u0441\u043a\u0430 \u0444\u0430\u0439\u043b\u0430, \u0430 \u043f\u043e\u0442\u043e\u043c \u043a\u043b\u0438\u043a\u043d\u0443\u0442\u044c \u043a\u043b\u0430\u0432\u0438\u0448\u0443 “\u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c“.
 attach.add.permission=\u0422\u043e\u043b\u044c\u043a\u043e \u0430\u0432\u0442\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u044b\u0435 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438 \u043c\u043e\u0433\u0443\u0442 \u0434\u043e\u0431\u0430\u0432\u043b\u044f\u0442\u044c \u043d\u043e\u0432\u044b\u0435 \u043f\u0440\u0438\u043a\u0440\u0435\u043f\u043b\u0435\u043d\u0438\u044f
 attach.bytes=\u0431\u0430\u0439\u0442
-attach.add.selectfile=\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0444\u0430\u0439\u043b:
-attach.add.changenote=\u0421\u0434\u0435\u043b\u0430\u043d\u044b\u0435 \u0438\u0441\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f:
-attach.add.submit=\u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c
 attach.preview=\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440
 attach.deleteconfirm=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435 \u0441\u0432\u043e\u0435 \u0436\u0435\u043b\u0430\u043d\u0438\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e \u043f\u0440\u0438\u043a\u0440\u0435\u043f\u043b\u0435\u043d\u0438\u0435!
 attach.delete=\u0423\u0434\u0430\u043b\u0438\u0442\u044c
@@ -28,7 +25,7 @@
 comment.title.comment={0}: \u041a\u043e\u043c\u043c\u0435\u043d\u0442\u0430\u0440\u0438\u0439: {1}
 comment.tab.discussionpage=\u0421\u0442\u0440\u0430\u043d\u0438\u0446\u0430 \u043e\u0431\u0441\u0443\u0436\u0434\u0435\u043d\u0438\u0439
 comment.tab.addcomment=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043a\u043e\u043c\u043c\u0435\u043d\u0442\u0430\u0440\u0438\u0439
-comment.edithelpmissing=\u041f\u043e\u0445\u043e\u0436\u0435 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430 {0} \u0443\u0442\u0435\u0440\u044f\u043d\u0430.  \u0412\u0430\u043c \u043d\u0430\u0434\u043e \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c \u0438\u043d\u0441\u0442\u0430\u043b\u044f\u0446\u0438\u044e...<br /><br />\u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0441\u043a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0442\u0435\u043a\u0441\u0442 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b <a href="http://www.jspwiki.org/Wiki.jsp?page=EditPageHelp">EditPageHelp \u0441\u0430\u0439\u0442\u0430 jspwiki.org</a>.
+comment.edithelpmissing=\u041f\u043e\u0445\u043e\u0436\u0435 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430 {0} \u0443\u0442\u0435\u0440\u044f\u043d\u0430.  \u0412\u0430\u043c \u043d\u0430\u0434\u043e \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c \u0438\u043d\u0441\u0442\u0430\u043b\u044f\u0446\u0438\u044e... \u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0441\u043a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0442\u0435\u043a\u0441\u0442 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b <a href="http://www.jspwiki.org/Wiki.jsp?page=EditPageHelp">EditPageHelp \u0441\u0430\u0439\u0442\u0430 jspwiki.org</a>.
 # ConflictContent.jsp
 
 conflict.oops.title=\u041e\u043f\u0430!
@@ -115,7 +112,7 @@
 group.creator={0} \u0441\u043e\u0437\u0434\u0430\u043d\u043e \u0433\u0440\u0443\u043f\u043f\u0443 {1}.
 # GroupTab.jsp
 grp.createdon=\u0421\u043e\u0437\u0434\u0430\u043d\u043e {0} \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u043c {1}
-grp.lastmodified=<br />\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0435 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u0441\u0434\u0435\u043b\u0430\u043d\u044b {0} \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u043c {1}
+grp.lastmodified=\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0435 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u0441\u0434\u0435\u043b\u0430\u043d\u044b {0} \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u043c {1}
 grp.groupnames.title=\u041a\u043b\u0438\u043a\u043d\u0438 \u0434\u043b\u044f \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u0433\u0440\u0443\u043f\u043f\u044b
 grp.newgroupname=(\u043d\u043e\u0432\u043e\u0435 \u0438\u043c\u044f \u0433\u0440\u0443\u043f\u043f\u044b)
 grp.savegroup=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0433\u0440\u0443\u043f\u043f\u0443
@@ -124,7 +121,7 @@
 grp.deletegroup=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0433\u0440\u0443\u043f\u043f\u0443
 grp.deletegroup.confirm=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u044d\u0442\u043e\u0439 \u0433\u0440\u0443\u043f\u043f\u044b
 grp.formhelp=\u0414\u0440\u0443\u0437\u044c\u044f \u044d\u0442\u043e\u0439 \u0433\u0440\u0443\u043f\u043f\u044b.  
-\u0422\u043e\u043b\u044c\u043a\u043e=\u0435\u0451 \u0443\u0447\u0430\u0441\u043d\u0438\u043a\u0438 \u043c\u043e\u0433\u0443\u0442 \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e.. <br />\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0432\u0438\u043a\u0438-\u0438\u043c\u044f \u0438\u043b\u0438 \u043e\u0431\u044b\u0447\u043d\u043e\u0435 \u0438\u043c\u044f \u0443\u0447\u0430\u0441\u043d\u0438\u043a\u0430 \u043f\u0440\u043e\u044d\u043a\u0442\u0430.
+\u0422\u043e\u043b\u044c\u043a\u043e=\u0435\u0451 \u0443\u0447\u0430\u0441\u043d\u0438\u043a\u0438 \u043c\u043e\u0433\u0443\u0442 \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e.. \u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0432\u0438\u043a\u0438-\u0438\u043c\u044f \u0438\u043b\u0438 \u043e\u0431\u044b\u0447\u043d\u043e\u0435 \u0438\u043c\u044f \u0443\u0447\u0430\u0441\u043d\u0438\u043a\u0430 \u043f\u0440\u043e\u044d\u043a\u0442\u0430.
 grp.allgroups=\u0412\u0441\u0435 \u0433\u0440\u0443\u043f\u043f\u044b
 # Header.jsp
 header.yourtrail=\u0412\u044b \u043f\u043e\u0441\u0435\u0442\u0438\u043b\u0438:&nbsp;
@@ -138,7 +135,6 @@
 info.noversions=\u042d\u0442\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430 \u0438\u043c\u0435\u0435\u0442 \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u0432\u0435\u0440\u0441\u0438\u044e
 info.feed=\u041f\u043e\u0442\u043e\u043a \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b
 info.pagediff.title=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0435\u0433\u043e \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f
-info.rename.submit=\u041f\u0435\u0440\u0435\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u0442\u044c \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443
 info.updatereferrers=\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0440\u0435\u0444\u0435\u0440\u0430\u043b\u043e\u0432?
 info.rename.permission=\u0422\u043e\u043b\u044c\u043a\u043e \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0438\u0440\u043e\u0432\u0430\u043d\u044b\u0435 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438 \u043c\u043e\u0433\u0443\u0442 \u043f\u0435\u0440\u0435\u0438\u043c\u0435\u043d\u043e\u0432\u044b\u0432\u0430\u0442\u044c \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b.
 info.delete.submit=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0449\u0443\u044e \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443
@@ -182,7 +178,6 @@
 info.uploadnew.help=\u0414\u043b\u044f \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438 \u043d\u043e\u0432\u043e\u0433\u043e \u043f\u0440\u0438\u043a\u0440\u0435\u043f\u043b\u0435\u043d\u0438\u044f \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u044d\u0442\u043e \u043f\u043e\u043b\u0435 \u0434\u043b\u044f \u043f\u043e\u0438\u0441\u043a\u0430 \u0444\u0430\u0439\u043b\u0430, \u043f\u043e\u0442\u043e\u043c \u043a\u043b\u0438\u043d\u0438\u0442\u0435 \u043a\u043d\u043e\u043f\u043a\u0443 &#8220;\u0417\u0430\u0433\u0440\u0443\u0442\u0438\u0442\u044c&#8220;.
 info.uploadnew.nopermission=\u0422\u043e\u043b\u044c\u043a\u043e \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0438\u0440\u043e\u0432\u0430\u043d\u044b\u0435 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438 \u043c\u043e\u0433\u0443\u0442 \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u0442\u044c \u043d\u043e\u0432\u044b\u0435 \u0432\u0435\u0440\u0441\u0438\u0438 \u043f\u0440\u0438\u043a\u0440\u0435\u043f\u043b\u0435\u043d\u0438\u0439.
 info.deleteattachment=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u0440\u0438\u043a\u0440\u0435\u043f\u043b\u0435\u043d\u0438\u0435
-info.deleteattachment.submit=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u0440\u0438\u043a\u0440\u0435\u043f\u043b\u0435\u043d\u0438\u0435
 info.attachment.history=\u0418\u0441\u0442\u043e\u0440\u0438\u044f \u0432\u0435\u0440\u0441\u0438\u0439 \u043f\u0440\u0438\u043a\u0440\u0435\u043f\u043b\u0435\u043d\u0438\u044f
 info.attachment.type=\u0412\u0438\u0434
 info.attachment.name=\u0418\u043c\u044f \u043f\u0440\u0438\u043a\u0440\u0435\u043f\u043b\u0435\u043d\u0438\u044f
@@ -208,7 +203,7 @@
 login.lostpw.reset.login={0} \u043f\u0430\u0440\u043e\u043b\u044c \u0431\u044b\u043b \u0432\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d \u0438 \u043e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u043d \u043d\u0430 \u043f\u043e\u0447\u0442\u0443.
 login.register.tab=\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f \u043d\u043e\u0432\u043e\u0433\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
 login.tab.help=\u041f\u043e\u043c\u043e\u0449\u044c
-login.loginhelpmissing=\u041f\u043e\u0445\u043e\u0436\u0435 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430 {0} \u043f\u043e\u0442\u0435\u0440\u044f\u043d\u0430.  \u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c \u0438\u043d\u0441\u0442\u0430\u043b\u044f\u0446\u0438\u044e...<br /><br />\u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0441\u043a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0442\u0435\u043a\u0441\u0442 \u0441  <a href="http://www.jspwiki.org/Wiki.jsp?page=LoginHelp">\u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b \u043f\u043e\u043c\u043e\u0449\u0438 \u0441\u0430\u0439\u0442\u0430 jspwiki.org</a>.
+login.loginhelpmissing=\u041f\u043e\u0445\u043e\u0436\u0435 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430 {0} \u043f\u043e\u0442\u0435\u0440\u044f\u043d\u0430.  \u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c \u0438\u043d\u0441\u0442\u0430\u043b\u044f\u0446\u0438\u044e... \u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0441\u043a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0442\u0435\u043a\u0441\u0442 \u0441  <a href="http://www.jspwiki.org/Wiki.jsp?page=LoginHelp">\u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b \u043f\u043e\u043c\u043e\u0449\u0438 \u0441\u0430\u0439\u0442\u0430 jspwiki.org</a>.
 # NewGroupContent.jsp
 newgroup.heading.create=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u043d\u043e\u0432\u0443\u044e \u0433\u0440\u0443\u043f\u043f\u0443
 newgroup.errorprefix=\u041e\u0448\u0438\u0431\u043a\u0430:&nbsp;
@@ -450,7 +445,6 @@
 blog.commenttitle=\u043a\u043e\u043c\u043c\u0435\u043d\u0442\u0430\u0440\u0438\u0438
 blog.backtomain=\u0412\u0435\u0440\u043d\u0443\u0442\u0441\u044f \u043d\u0430 \u0433\u043b\u0430\u0432\u043d\u0443\u044e \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443
 blog.addcomments=\u0414\u043e\u0431\u0440\u0430\u0432\u0438\u0442\u044c \u043d\u043e\u0432\u044b\u0439 \u043a\u043e\u043c\u043c\u0435\u043d\u0442\u0430\u0440\u0438\u0439
-
 #  The Javascript stuff
 
 javascript.sbox.clone.suffix=-\u041d\u043e\u0432\u044b\u0439
@@ -473,7 +467,7 @@
 javascript.group.validName=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0432\u0432\u0435\u0434\u0438\u0442\u0435 \u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e\u0435 \u0438\u043c\u044f \u0433\u0440\u0443\u043f\u043f\u044b
 javascript.category.title=\u041a\u043b\u0438\u043a\u043d\u0438\u0442\u0435 \u0434\u043b\u044f \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u0438 [{0}] ...
 javascript.slimbox.info=\u041a\u0430\u0440\u0442\u0438\u043d\u043a\u0430 {0} \u043a {1}
-javascript.slimbox.error=<h2>Error</h2>\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043e\u0442\u043f\u0440\u0430\u0432\u0438\u0442\u044c \u0432\u0430\u0448 \u0437\u0430\u043f\u0440\u043e\u0441.<br />\u041f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0441\u043d\u043e\u0432\u0430
+javascript.slimbox.error=Error! \u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043e\u0442\u043f\u0440\u0430\u0432\u0438\u0442\u044c \u0432\u0430\u0448 \u0437\u0430\u043f\u0440\u043e\u0441. \u041f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0441\u043d\u043e\u0432\u0430
 javascript.slimbox.directLink=\u041f\u0440\u044f\u043c\u0430\u044f \u0441\u0441\u044b\u043b\u043a\u0430 \u043d\u0430 \u043e\u0431\u044a\u0435\u043a\u0442
 javascript.slimbox.remoteRequest=\u0423\u0434\u0430\u043b\u0435\u043d\u043d\u044b\u0439 \u0437\u0430\u043f\u0440\u043e\u0441 {0} \u043a {1}
 javascript.slimbox.previous=&laquo;\u041f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0438\u0439

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_zh_CN.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_zh_CN.properties?rev=746887&r1=746886&r2=746887&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_zh_CN.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/templates/default_zh_CN.properties Mon Feb 23 05:27:55 2009
@@ -17,9 +17,6 @@
 attach.add.info=\u8981\u5411\u8be5\u9875\u9762\u6dfb\u52a0\u65b0\u9644\u4ef6\uff0c\u8bf7\u7528\u4e0b\u9762\u7684\u6846\u627e\u5230\u6587\u4ef6\uff0c\u7136\u540e\u5355\u51fb\u201c\u4e0a\u4f20\u201d\u3002
 attach.add.permission=\u53ea\u6709\u6388\u6743\u7684\u7528\u6237\u624d\u80fd\u4e0a\u4f20\u65b0\u9644\u4ef6\u3002
 attach.bytes=\u5b57\u8282
-attach.add.selectfile=\u9009\u62e9\u6587\u4ef6\uff1a
-attach.add.changenote=\u53d8\u66f4\u6ce8\u91ca\uff1a
-attach.add.submit=\u4e0a\u4f20
 attach.preview=\u56fe\u50cf\u9884\u89c8
 attach.deleteconfirm=\u8bf7\u786e\u8ba4\u662f\u5426\u8981\u6c38\u4e45\u5220\u9664\u6b64\u9644\u4ef6\uff01
 attach.delete=\u5220\u9664
@@ -116,7 +113,7 @@
 group.creator={0} \u5728 {1} \u521b\u5efa\u4e86\u8be5\u7ec4\u3002
 # GroupTab.jsp
 grp.createdon={0} \u7531 {1} \u521b\u5efa
-grp.lastmodified=<br />{0} \u7531 {1} \u6700\u540e\u66f4\u6539
+grp.lastmodified={0} \u7531 {1} \u6700\u540e\u66f4\u6539
 grp.groupnames.title=\u5355\u51fb\u7f16\u8f91\u8be5\u7ec4
 grp.newgroupname=\uff08\u65b0\u7ec4\u540d\uff09
 grp.savegroup=\u4fdd\u5b58\u7ec4
@@ -124,7 +121,7 @@
 grp.cancel=\u53d6\u6d88
 grp.deletegroup=\u5220\u9664\u7ec4
 grp.deletegroup.confirm=\u8bf7\u786e\u8ba4\u662f\u5426\u8981\u6c38\u4e45\u5220\u9664\u6b64\u7ec4\uff01
-grp.formhelp=\u8be5\u7ec4\u7684\u6210\u5458\u8d44\u683c\u3002\u53ea\u6709\u8be5\u7ec4\u7684\u6210\u5458\u624d\u53ef\u4ee5\u7f16\u8f91\u3002<br />\u8f93\u5165\u6bcf\u4e2a\u7528\u6237\u7684 Wiki \u540d\u6216\u5168\u540d\uff0c\u7528\u56de\u8f66\u7b26\u5206\u9694\u3002
+grp.formhelp=\u8be5\u7ec4\u7684\u6210\u5458\u8d44\u683c\u3002\u53ea\u6709\u8be5\u7ec4\u7684\u6210\u5458\u624d\u53ef\u4ee5\u7f16\u8f91\u3002 \u8f93\u5165\u6bcf\u4e2a\u7528\u6237\u7684 Wiki \u540d\u6216\u5168\u540d\uff0c\u7528\u56de\u8f66\u7b26\u5206\u9694\u3002
 grp.allgroups=\u6240\u6709\u7ec4
 # Header.jsp
 header.yourtrail=\u6d4f\u89c8\u8bb0\u5f55\uff1a&nbsp;
@@ -138,7 +135,6 @@
 info.noversions=\u8be5\u9875\u9762\u53ea\u6709\u4e00\u4e2a\u7248\u672c
 info.feed=\u9875\u9762\u8ba2\u9605\u6e90
 info.pagediff.title=\u663e\u793a\u4e0a\u4e00\u6b21\u9875\u9762\u66f4\u65b0\u6240\u505a\u7684\u66f4\u6539
-info.rename.submit=\u91cd\u547d\u540d\u9875\u9762
 info.updatereferrers=\u662f\u5426\u66f4\u65b0\u5f15\u7528\uff1f
 info.rename.permission=\u53ea\u6709\u6388\u6743\u7684\u7528\u6237\u624d\u80fd\u91cd\u547d\u540d\u9875\u9762\u3002
 info.delete.submit=\u5220\u9664\u6574\u4e2a\u9875\u9762
@@ -182,7 +178,6 @@
 info.uploadnew.help=\u8981\u5411\u8be5\u9875\u9762\u6dfb\u52a0\u65b0\u9644\u4ef6\uff0c\u8bf7\u7528\u4e0b\u9762\u7684\u6846\u627e\u5230\u6587\u4ef6\uff0c\u7136\u540e\u5355\u51fb\u201c\u4e0a\u4f20\u201d\u3002
 info.uploadnew.nopermission=\u53ea\u6709\u6388\u6743\u7684\u7528\u6237\u624d\u80fd\u4e0a\u4f20\u65b0\u9644\u4ef6\u7248\u672c\u3002
 info.deleteattachment=\u5220\u9664\u9644\u4ef6
-info.deleteattachment.submit=\u5220\u9664\u9644\u4ef6
 info.attachment.history=\u9644\u4ef6\u4fee\u8ba2\u5386\u53f2\u8bb0\u5f55
 info.attachment.type=\u7c7b\u578b
 info.attachment.name=\u9644\u4ef6\u540d\u79f0
@@ -210,7 +205,7 @@
 login.lostpw.reset.login=\u4e00\u6536\u5230\u65b0\u5bc6\u7801\uff0c{0} \u5c31\u4f1a\u767b\u5f55\u3002
 login.register.tab=\u6ce8\u518c\u65b0\u7528\u6237
 login.tab.help=\u5e2e\u52a9
-login.loginhelpmissing=\u54e6\uff0c\u4f3c\u4e4e {0} \u9875\u9762\u4e0d\u89c1\u4e86\u3002\u4e00\u5b9a\u662f\u6709\u4eba\u5bf9\u5b89\u88c5\u8fdb\u884c\u4e86\u64cd\u4f5c...<br /><br />\u60a8\u53ef\u4ee5\u4ece <a href="http://www.jspwiki.org/Wiki.jsp?page=LoginHelp">jspwiki.org \u7684 LoginHelp \u9875\u9762</a>\u590d\u5236\u6587\u672c\u3002
+login.loginhelpmissing=\u54e6\uff0c\u4f3c\u4e4e {0} \u9875\u9762\u4e0d\u89c1\u4e86\u3002\u4e00\u5b9a\u662f\u6709\u4eba\u5bf9\u5b89\u88c5\u8fdb\u884c\u4e86\u64cd\u4f5c... \u60a8\u53ef\u4ee5\u4ece <a href="http://www.jspwiki.org/Wiki.jsp?page=LoginHelp">jspwiki.org \u7684 LoginHelp \u9875\u9762</a>\u590d\u5236\u6587\u672c\u3002
 # NewGroupContent.jsp
 newgroup.heading.create=\u521b\u5efa\u65b0\u7ec4
 newgroup.errorprefix=\u9519\u8bef\uff1a&nbsp;
@@ -285,10 +280,10 @@
 prefs.user.timezone.server=[\u670d\u52a1\u5668]
 prefs.user.language.default=[\u7f3a\u7701\u503c]
 prefs.instructions=\u5728\u6b64\u8bbe\u7f6e\u7528\u6237\u9996\u9009\u9879\u3002\u60a8\u7684\u9009\u62e9\u5c06\u4fdd\u5b58\u4e3a\u6d4f\u89c8\u5668\u4e2d\u7684 cookie\u3002
-prefs.assertedname.description=\u60a8\u7684\u59d3\u540d\u3002\u5982\u679c\u8fd8\u672a\u521b\u5efa\u7528\u6237\u6982\u8981\u4fe1\u606f\uff0c\u60a8\u53ef\u4ee5\u544a\u8bc9 {0} \u60a8\u7684\u540d\u5b57\u6765\u201c\u58f0\u660e\u201d\u81ea\u5df1\u7684\u8eab\u4efd\u3002\u8bf7\u4e0d\u8981\u6b3a\u9a97\u6211\u4eec\u3002<br />\u6ce8\u610f\uff1a\u4ee5\u8fd9\u79cd\u65b9\u6cd5\u8bbe\u7f6e\u7684\u540d\u79f0\u4e0d\u662f\u4e00\u79cd\u771f\u6b63\u7684\u9a8c\u8bc1\u65b9\u6cd5\uff0c\u56e0\u4e3a\u5b83\u53ea\u662f\u5728\u60a8\u7684\u6d4f\u89c8\u5668\u4e2d\u8bbe\u7f6e\u4e86\u4e00\u4e2a\u4e0d\u8981\u5bc6\u7801\u7684 cookie\u3002\u6839\u636e\u5b89\u5168\u7b56\u7565\uff0cWiki \u4f1a\u7ed9\u8d4b\u4e88\u60a8\u4e00\u4e9b\u4f5c\u4e3a\u201c\u58f0\u660e\u201d\u7528\u6237\u7684\u6743\u9650\u3002{0} \u5982\u679c\u8981\u4f7f\u7528\u4f20\u7edf\u7684\u7528\u6237\u540d\u548c\u5bc6\u7801\uff0c\u8fd9\u9700\u8981\u66f4\u591a\u5b89\u5168\u6027\u3002
+prefs.assertedname.description=\u60a8\u7684\u59d3\u540d\u3002\u5982\u679c\u8fd8\u672a\u521b\u5efa\u7528\u6237\u6982\u8981\u4fe1\u606f\uff0c\u60a8\u53ef\u4ee5\u544a\u8bc9 {0} \u60a8\u7684\u540d\u5b57\u6765\u201c\u58f0\u660e\u201d\u81ea\u5df1\u7684\u8eab\u4efd\u3002\u8bf7\u4e0d\u8981\u6b3a\u9a97\u6211\u4eec\u3002 \u6ce8\u610f\uff1a\u4ee5\u8fd9\u79cd\u65b9\u6cd5\u8bbe\u7f6e\u7684\u540d\u79f0\u4e0d\u662f\u4e00\u79cd\u771f\u6b63\u7684\u9a8c\u8bc1\u65b9\u6cd5\uff0c\u56e0\u4e3a\u5b83\u53ea\u662f\u5728\u60a8\u7684\u6d4f\u89c8\u5668\u4e2d\u8bbe\u7f6e\u4e86\u4e00\u4e2a\u4e0d\u8981\u5bc6\u7801\u7684 cookie\u3002\u6839\u636e\u5b89\u5168\u7b56\u7565\uff0cWiki \u4f1a\u7ed9\u8d4b\u4e88\u60a8\u4e00\u4e9b\u4f5c\u4e3a\u201c\u58f0\u660e\u201d\u7528\u6237\u7684\u6743\u9650\u3002{0} \u5982\u679c\u8981\u4f7f\u7528\u4f20\u7edf\u7684\u7528\u6237\u540d\u548c\u5bc6\u7801\uff0c\u8fd9\u9700\u8981\u66f4\u591a\u5b89\u5168\u6027\u3002
 prefs.assertedname.create=\u521b\u5efa\u65b0\u7528\u6237\u4fe1\u606f
 prefs.submit.setname=\u8bbe\u7f6e\u7528\u6237\u540d
-prefs.clear.description=\u5728\u67d0\u4e9b\u60c5\u51b5\u4e0b\uff0c\u60a8\u53ef\u80fd\u9700\u8981\u4ece\u8ba1\u7b97\u673a\u5220\u9664\u201casserted\u201d\u7528\u6237\u540d\u548c\u7528\u6237\u9996\u9009\u9879\u3002\u8981\u8fd9\u6837\u505a\uff0c\u8bf7\u5355\u51fb\u201c\u6e05\u9664\u7528\u6237\u9996\u9009\u9879\u201d\u6309\u94ae\u3002<br />\u6ce8\u610f\uff0c\u8fd9\u5c06\u6c38\u8fdc\u5220\u9664\u60a8\u6240\u8bbe\u7f6e\u7684\u6240\u6709\u7528\u6237\u9996\u9009\u9879\u3002\u60a8\u9700\u8981\u91cd\u65b0\u8f93\u5165\u8fd9\u4e9b\u4fe1\u606f\u3002
+prefs.clear.description=\u5728\u67d0\u4e9b\u60c5\u51b5\u4e0b\uff0c\u60a8\u53ef\u80fd\u9700\u8981\u4ece\u8ba1\u7b97\u673a\u5220\u9664\u201casserted\u201d\u7528\u6237\u540d\u548c\u7528\u6237\u9996\u9009\u9879\u3002\u8981\u8fd9\u6837\u505a\uff0c\u8bf7\u5355\u51fb\u201c\u6e05\u9664\u7528\u6237\u9996\u9009\u9879\u201d\u6309\u94ae\u3002 \u6ce8\u610f\uff0c\u8fd9\u5c06\u6c38\u8fdc\u5220\u9664\u60a8\u6240\u8bbe\u7f6e\u7684\u6240\u6709\u7528\u6237\u9996\u9009\u9879\u3002\u60a8\u9700\u8981\u91cd\u65b0\u8f93\u5165\u8fd9\u4e9b\u4fe1\u606f\u3002
 prefs.newprofile=\u521b\u5efa\u65b0\u7528\u6237\u4fe1\u606f
 prefs.oldprofile=\u66f4\u65b0 Wiki \u6982\u8981\u4fe1\u606f
 prefs.errorprefix.prefs=\u65e0\u6cd5\u4fdd\u5b58\u9996\u9009\u9879\uff1a
@@ -450,7 +445,6 @@
 blog.commenttitle=\u8bc4\u8bba
 blog.backtomain=\u8fd4\u56de\u5230\u535a\u5ba2\u4e3b\u9875\u9762
 blog.addcomments=\u6dfb\u52a0\u65b0\u8bc4\u8bba
-
 #  The Javascript stuff
 
 javascript.sbox.clone.suffix=-New
@@ -473,7 +467,7 @@
 javascript.group.validName=\u8bf7\u4e3a\u65b0\u7ec4\u6307\u5b9a\u6709\u6548\u7684\u540d\u79f0
 javascript.category.title=\u5355\u51fb\u663e\u793a\u7c7b\u522b [{0}] ...
 javascript.slimbox.info=\u56fe\u50cf {0}\uff08\u5171 {1} \u4e2a\uff09
-javascript.slimbox.error=<h2>\u9519\u8bef</h2> \u60a8\u7684\u8bf7\u6c42\u6709\u95ee\u9898\u3002<br />\u8bf7\u91cd\u8bd5
+javascript.slimbox.error=\u9519\u8bef... \u60a8\u7684\u8bf7\u6c42\u6709\u95ee\u9898\u3002 \u8bf7\u91cd\u8bd5
 javascript.slimbox.directLink=\u5230\u76ee\u6807\u7684\u76f4\u63a5\u94fe\u63a5
 javascript.slimbox.remoteRequest=\u8fdc\u7a0b\u8bf7\u6c42 {0}\uff08\u5171 {1} \u4e2a\uff09
 javascript.slimbox.previous=&laquo;\u4e0a\u4e00\u4e2a

Modified: incubator/jspwiki/trunk/src/WebContent/Wiki.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/Wiki.jsp?rev=746887&r1=746886&r2=746887&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/Wiki.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/Wiki.jsp Mon Feb 23 05:27:55 2009
@@ -1,7 +1,17 @@
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<stripes:useActionBean beanclass="org.apache.wiki.action.ViewActionBean" event="view" executeResolution="true" id="wikiActionBean" />
-<stripes:layout-render name="/templates/default/ViewLayout.jsp">
-  <stripes:layout-component name="content">
-    <jsp:include page="/templates/default/PageContent.jsp" />
-  </stripes:layout-component>
-</stripes:layout-render>
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
+<s:useActionBean beanclass="org.apache.wiki.action.ViewActionBean" event="view" executeResolution="true" id="wikiActionBean" />
+<s:layout-render name="/templates/default/ViewLayout.jsp">
+
+  <s:layout-component name="content">
+    <wiki:NoSuchPage>
+      <fmt:message key="common.nopage">
+        <fmt:param><wiki:EditLink><fmt:message key="common.createit" /></wiki:EditLink></fmt:param>
+      </fmt:message>
+    </wiki:NoSuchPage>
+    <wiki:PageExists>
+      <jsp:include page="/templates/default/PageContent.jsp" />
+    </wiki:PageExists>
+  </s:layout-component>
+  
+</s:layout-render>

Added: incubator/jspwiki/trunk/src/WebContent/templates/default/AttachmentInfoTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/AttachmentInfoTab.jsp?rev=746887&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/AttachmentInfoTab.jsp (added)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/AttachmentInfoTab.jsp Mon Feb 23 05:27:55 2009
@@ -0,0 +1,173 @@
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
+<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.attachment.*" %>
+<%@ page import="org.apache.wiki.i18n.InternationalizationManager" %>
+<%@ 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" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
+<%@ page import="org.apache.wiki.action.WikiContextFactory" %>
+<%@ page import="org.apache.wiki.util.TextUtil" %>
+<%@ page import="org.apache.wiki.api.WikiPage" %>
+<%
+  WikiContext c = WikiContextFactory.findContext( pageContext );
+  WikiPage wikiPage = c.getPage();
+  String creationAuthor ="";
+
+  //FIXME -- seems not to work correctly for attachments !!
+  WikiPage firstPage = c.getEngine().getPage( wikiPage.getName(), 1 );
+  if( firstPage != null )
+  {
+    creationAuthor = firstPage.getAuthor();
+
+    if( creationAuthor != null && creationAuthor.length() > 0 )
+    {
+      creationAuthor = TextUtil.replaceEntities(creationAuthor);
+    }
+    else
+    {
+      creationAuthor = c.getBundle( InternationalizationManager.CORE_BUNDLE ).getString( "common.unknownauthor" );
+    }
+  }
+
+  int itemcount = 0;  //number of page versions
+  try
+  {
+    itemcount = wikiPage.getVersion(); /* highest version */
+  }
+  catch( Exception  e )  { /* dont care */ }
+
+  int pagesize = 20;
+  int startitem = itemcount-1; /* itemcount==1-20 -> startitem=0-19 ... */
+
+  String parm_start = (String)request.getParameter( "start" );
+  if( parm_start != null ) startitem = Integer.parseInt( parm_start ) ;
+
+  /* round to start of block: 0-19 becomes 0; 20-39 becomes 20 ... */
+  if( startitem > -1 ) startitem = ((startitem)/pagesize) * pagesize;
+
+  /* startitem drives the pagination logic */
+  /* startitem=-1:show all; startitem=0:show block 1-20; startitem=20:block 21-40 ... */
+%>
+<%
+  int MAXATTACHNAMELENGTH = 30;
+  String progressId = c.getEngine().getProgressManager().getNewProgressIdentifier();
+
+  int attCount = c.getEngine().getAttachmentManager().listAttachments(c.getPage()).size();
+  String attTitle = LocaleSupport.getLocalizedMessage(pageContext, "attach.tab");
+  if( attCount != 0 ) attTitle += " (" + attCount + ")";
+%>
+<wiki:TabbedSection defaultTab="info">
+
+  <wiki:Tab id="pagecontent" titleKey="view.tab" accesskey="v" url="Wiki.jsp?page=${wikiActionBean.page.name}"/>
+      
+  <wiki:Tab id="attach" title="<%= attTitle %>" accesskey="a" url="Attachments.jsp?page=${wikiActionBean.page.name}" />
+  
+  <wiki:Tab id="info" titleKey="info.tab" accesskey="i">
+    <h3><fmt:message key="info.uploadnew" /></h3>
+    <wiki:Permission permission="upload">
+      <form action="<wiki:Link jsp='attach' format='url' absolute='true'><wiki:Param name='progressid' value='<%=progressId%>'/></wiki:Link>"
+              class="wikiform"
+                id="uploadform"
+          onsubmit="return Wiki.submitUpload(this, '<%=progressId%>');"
+            method="post" accept-charset="<wiki:ContentEncoding/>"
+            enctype="multipart/form-data" >
+    
+        <%-- Do NOT change the order of wikiname and content, otherwise the
+            servlet won't find its parts. --%>
+    
+        <table>
+          <tr>
+            <td colspan="2"><div class="formhelp"><fmt:message key="info.uploadnew.help" /></div></td>
+          </tr>
+          <tr>
+            <td><label for="content"><fmt:message key="info.uploadnew.filename" /></label></td>
+            <td><input type="file" name="content" size="60" /></td>
+          </tr>
+          <tr>
+            <td><label for="changenote"><fmt:message key="info.uploadnew.changenote" /></label></td>
+            <td>
+            <input type="text" name="changenote" maxlength="80" size="60" />
+            </td>
+          </tr>
+          <tr>
+            <td></td>
+            <td>
+            <input type="hidden" name="page" value="<wiki:Variable var='pagename' />" />
+            <input type="submit" name="upload" value="<fmt:message key='attach.add.submit' />" id="upload" /> <input type="hidden" name="action" value="upload" />
+            <input type="hidden" name="nextpage" value="<wiki:PageInfoLink format='url' />" />
+                <div id="progressbar"><div class="ajaxprogress"></div></div>
+            </td>
+          </tr>
+        </table>
+      </form>
+    </wiki:Permission>
+    
+    <wiki:Permission permission="!upload">
+      <div class="formhelp"><fmt:message key="attach.add.permission" /></div>
+    </wiki:Permission>
+    
+    <wiki:Permission permission="delete">
+      <h3><fmt:message key="info.deleteattachment"/></h3>
+      <s:form beanclass="org.apache.wiki.action.ViewActionBean" class="wikiform" id="deleteForm" method="post" acceptcharset="UTF-8">
+        <div>
+          <s:submit name="deleteAttachment" id="delete-all" />
+        </div>
+      </s:form>
+    </wiki:Permission>
+    
+    <%-- FIXME why not add pagination here - no need for large amounts of attach versions on one page --%>
+    <h3><fmt:message key='info.attachment.history' /></h3>
+    <div class="zebra-table">
+      <div class="slimbox-img sortable">
+        <table class="wikitable">
+          <tr>
+            <th><fmt:message key="info.attachment.type" /></th>
+            <%--<th><fmt:message key="info.attachment.name"/></th>--%>
+            <th><fmt:message key="info.version" /></th>
+            <th><fmt:message key="info.size" /></th>
+            <th><fmt:message key="info.date" /></th>
+            <th><fmt:message key="info.author" /></th>
+            <th class='changenote'><fmt:message key="info.changenote" /></th>
+          </tr>
+      
+          <wiki:HistoryIterator id="att"><%-- <wiki:AttachmentsIterator id="att"> --%>
+          <%
+            String name = att.getName(); //att.getFileName();
+            int dot = name.lastIndexOf(".");
+            String attachtype = ( dot != -1 ) ? name.substring(dot+1) : "&nbsp;";
+      
+            String sname = name;
+            if( sname.length() > MAXATTACHNAMELENGTH ) sname = sname.substring(0,MAXATTACHNAMELENGTH) + "...";
+          %>
+          <tr>
+            <td>
+              <div id="attach-<%= attachtype %>" class="attachtype"><%= attachtype %></div>
+            </td>
+            <td>
+              <a href="<wiki:Link version='<%=Integer.toString(att.getVersion())%>' format='url' />" title="<%= name %>" class="attachment"><wiki:PageVersion /></a>
+            </td>
+            <td style="white-space:nowrap;text-align:right;">
+              <fmt:formatNumber value="<%=Double.toString(att.getSize()/1000.0) %>" groupingUsed="false" maxFractionDigits="1" minFractionDigits="1" />&nbsp;<fmt:message key="info.kilobytes" />
+            </td>
+      	    <td style="white-space:nowrap;">
+      	      <fmt:formatDate value="<%= att.getLastModified() %>" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" />
+      	    </td>
+            <td><wiki:Author/></td>
+            <td class='changenote'>
+            <%
+                String changeNote = (String)att.getAttribute(WikiPage.CHANGENOTE);
+                if( changeNote != null ) {
+                    changeNote = TextUtil.replaceEntities(changeNote);
+                %><%=changeNote%><%
+                }
+            %>
+            </td>
+          </tr>
+          </wiki:HistoryIterator>
+        </table>
+      </div>
+    </div>
+  </wiki:Tab>
+
+</wiki:TabbedSection>

Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/AttachmentTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/AttachmentTab.jsp?rev=746887&r1=746886&r2=746887&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/AttachmentTab.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/AttachmentTab.jsp Mon Feb 23 05:27:55 2009
@@ -1,11 +1,12 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
 <%@ page import="org.apache.wiki.*" %>
 <%@ page import="org.apache.wiki.auth.*" %>
 <%@ page import="org.apache.wiki.ui.progress.*" %>
 <%@ page import="org.apache.wiki.auth.permissions.*" %>
 <%@ page import="java.security.Permission" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
 <%@ page import="org.apache.wiki.action.WikiContextFactory" %>
 <%@ page import="org.apache.wiki.util.TextUtil" %>
 <%@ page import="org.apache.wiki.api.WikiPage" %>
@@ -13,119 +14,119 @@
   int MAXATTACHNAMELENGTH = 30;
   WikiContext c = WikiContextFactory.findContext( pageContext );
   String progressId = c.getEngine().getProgressManager().getNewProgressIdentifier();
-%>
-
-<div id="addattachment">
-<h3><fmt:message key="attach.add" /></h3>
-<wiki:Permission permission="upload">
-  <form action="<wiki:Link jsp='attach' format='url' absolute='true'><wiki:Param name='progressid' value='<%=progressId%>'/></wiki:Link>"
-         class="wikiform"
-            id="uploadform"
-        method="post"
-       enctype="multipart/form-data" accept-charset="<wiki:ContentEncoding/>"
-      onsubmit="return Wiki.submitUpload(this, '<%=progressId%>');" >
-    <table>
-    <tr>
-      <td colspan="2"><div class="formhelp"><fmt:message key="attach.add.info" /></div></td>
-    </tr>
-    <tr>
-      <td><label for="attachfilename"><fmt:message key="attach.add.selectfile" /></label></td>
-      <td><input type="file" name="content" id="attachfilename" size="60" /></td>
-    </tr>
-    <tr>
-      <td><label for="attachnote"><fmt:message key="attach.add.changenote" /></label></td>
-      <td><input type="text" name="changenote" id="attachnote" maxlength="80" size="60" />
-    <input type="hidden" name="nextpage" value="<wiki:UploadLink format="url" />" /></td>
-    </tr>
-
-   <tr>
-      <td></td>
-      <td>
-        <input type="hidden" name="page" value="<wiki:Variable var="pagename" />" />
-        <input type="submit" name="upload" id="upload" value="<fmt:message key='attach.add.submit' />" />
-        <input type="hidden" name="action" value="upload" />
-        <div id="progressbar"><div class="ajaxprogress"></div></div>
-      </td>
-    </tr>
-
-    </table>
-  </form>
-  <wiki:Messages div="error" />
-</wiki:Permission>
-<wiki:Permission permission="!upload">
-<div class="formhelp"><fmt:message key="attach.add.permission" /></div>
-</wiki:Permission>
-</div>
-
-<wiki:HasAttachments>
-
-<h3><fmt:message key="attach.list" /></h3>
-
-  <%--<small><fmt:message key="attach.listsubtitle"/></small>--%>
-
-  <wiki:Permission permission="delete">
-    <%-- hidden delete form --%>
-    <form action="tbd"
-           class="wikiform"
-              id="deleteForm" style="display:none;"
-          method="post" accept-charset="<wiki:ContentEncoding />"
-        onsubmit="return(confirm('<fmt:message key="attach.deleteconfirm"/>') && Wiki.submitOnce(this) );" >
-
-      <input id="delete-all" name="delete-all" type="submit" value="Delete" />
-
-    </form>
-  </wiki:Permission>
 
-  <div class="zebra-table"><div class="slimbox-img sortable">
-  <table class="wikitable">
-    <tr>
-      <th><fmt:message key="info.attachment.type" /></th>
-      <th><fmt:message key="info.attachment.name" /></th>
-      <th><fmt:message key="info.size" /></th>
-      <th><fmt:message key="info.version" /></th>
-      <th><fmt:message key="info.date" /></th>
-      <th><fmt:message key="info.author" /></th>
-      <wiki:Permission permission="delete"><th><fmt:message key="info.actions" /></th></wiki:Permission>
-      <th class="changenote"><fmt:message key="info.changenote" /></th>
-    </tr>
+  int attCount = c.getEngine().getAttachmentManager().listAttachments(c.getPage()).size();
+  String attTitle = LocaleSupport.getLocalizedMessage(pageContext, "attach.tab");
+  if( attCount != 0 ) attTitle += " (" + attCount + ")";
+%>
+<wiki:TabbedSection defaultTab="attach">
 
-    <wiki:AttachmentsIterator id="att">
+  <wiki:Tab id="pagecontent" titleKey="view.tab" accesskey="v" url="Wiki.jsp?page=${wikiActionBean.page.name}"/>
+      
+  <wiki:Tab id="attach" title="<%= attTitle %>" accesskey="a">
+    <div id="addattachment">
+      <h3><fmt:message key="attach.add" /></h3>
+      <wiki:Permission permission="upload">
+        <s:form beanclass="org.apache.wiki.action.ViewActionBean" class="wikiform" id="uploadform" acceptcharset="UTF-8">
+          <s:param name="progressid" value="<%=progressId%>" />
+          <s:param name="page" value="${wikiActionBean.page.name}" />
+          <table>
+          <tr>
+            <td colspan="2"><div class="formhelp"><fmt:message key="attach.add.info" /></div></td>
+          </tr>
+          <tr>
+            <td><s:label for="attachfile0" name="attach.add.selectfile" /></td>
+            <td><s:file name="newAttachments[0]" id="attachfile0" /></td>
+          </tr>
+          <tr>
+            <td><s:label for="attachnote" name="attach.add.changenote" /></td>
+            <td><s:text name="changenote" id="attachnote" maxlength="80" size="60" /></td>
+          </tr>
+      
+          <tr>
+            <td></td>
+            <td>
+              <s:submit name="upload" id="upload" />
+              <div id="progressbar"><div class="ajaxprogress"></div></div>
+            </td>
+          </tr>
+      
+          </table>
+        </s:form>
+        <wiki:Messages div="error" />
+      </wiki:Permission>
+      <wiki:Permission permission="!upload">
+        <div class="formhelp"><fmt:message key="attach.add.permission" /></div>
+      </wiki:Permission>
+    </div>
+    
+    <wiki:HasAttachments>
+    
+      <h3><fmt:message key="attach.list" /></h3>
+    
+      <%--<small><fmt:message key="attach.listsubtitle"/></small>--%>
+    
+      <wiki:Permission permission="delete">
+        <%-- hidden delete form --%>
+      </wiki:Permission>
+    
+      <div class="zebra-table">
+        <div class="slimbox-img sortable">
+          <table class="wikitable">
+            <tr>
+              <th><fmt:message key="info.attachment.type" /></th>
+              <th><fmt:message key="info.attachment.name" /></th>
+              <th><fmt:message key="info.size" /></th>
+              <th><fmt:message key="info.version" /></th>
+              <th><fmt:message key="info.date" /></th>
+              <th><fmt:message key="info.author" /></th>
+              <wiki:Permission permission="delete"><th><fmt:message key="info.actions" /></th></wiki:Permission>
+              <th class="changenote"><fmt:message key="info.changenote" /></th>
+            </tr>
+        
+            <wiki:AttachmentsIterator id="att">
     <%
       String name = att.getFileName();
       int dot = name.lastIndexOf(".");
       String attachtype = ( dot != -1 ) ? name.substring(dot+1) : "&nbsp;";
-
+    
       String sname = name;
       if( sname.length() > MAXATTACHNAMELENGTH ) sname = sname.substring(0,MAXATTACHNAMELENGTH) + "...";
     %>
-    <tr>
-      <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)%>' maxFractionDigits='1' minFractionDigits='1' />&nbsp;<fmt:message key="info.kilobytes" />
-      </td>
-      <td style="text-align:center;">
-        <a href="<wiki:PageInfoLink format='url' />" title="<fmt:message key='attach.moreinfo.title' />"><wiki:PageVersion/></a>
-      </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>
-          <input type="button" value="<fmt:message key='attach.delete' />" src="<wiki:Link format='url' context='<%=WikiContext.DELETE%>' />" onclick="$('deleteForm').setProperty('action',this.src); $('delete-all').click();" />
-      </td>
-      </wiki:Permission>
-      <td class="changenote">
-      <%
-         String changeNote = TextUtil.replaceEntities((String)att.getAttribute(WikiPage.CHANGENOTE));
-         if( changeNote != null ) {
-         %><%=changeNote%><%
-         }
-      %>
-      </td>
-    </tr>
-    </wiki:AttachmentsIterator>
-
-  </table>
-  </div></div>
+              <tr>
+                <td><div 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)%>' maxFractionDigits='1' minFractionDigits='1' />&nbsp;<fmt:message key="info.kilobytes" />
+                </td>
+                <td style="text-align:center;">
+                  <a href="<wiki:PageInfoLink format='url' />" title="<fmt:message key='attach.moreinfo.title' />"><wiki:PageVersion/></a>
+                </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>
+                    <input type="button" value="<fmt:message key='attach.delete' />" src="<wiki:Link format='url' context='<%=WikiContext.DELETE%>' />" onclick="$('deleteForm').setProperty('action',this.src); $('delete-all').click();" />
+                  </td>
+                </wiki:Permission>
+                <td class="changenote">
+    <%
+        String changeNote = TextUtil.replaceEntities((String)att.getAttribute(WikiPage.CHANGENOTE));
+        if( changeNote != null ) {
+        %><%=changeNote%><%
+        }
+    %>
+                </td>
+              </tr>
+            </wiki:AttachmentsIterator>
+        
+          </table>
+        </div>
+      </div>
+    
+    </wiki:HasAttachments>
+  </wiki:Tab>
+  
+  <wiki:Tab id="info" titleKey="info.tab" url="PageInfo.jsp?page=${wikiActionBean.page.name}" accesskey="i" />
 
-</wiki:HasAttachments>
+</wiki:TabbedSection>

Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/EditLayout.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/EditLayout.jsp?rev=746887&r1=746886&r2=746887&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/EditLayout.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/EditLayout.jsp Mon Feb 23 05:27:55 2009
@@ -1,11 +1,9 @@
 <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
 <stripes:layout-definition>
-
-<html id="top" xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>
       <wiki:CheckRequestContext context="edit">
@@ -21,8 +19,8 @@
       </fmt:message>
       </wiki:CheckRequestContext>
     </title>
-    <meta name="robots" content="noindex,follow" />
     <wiki:Include page="commonheader.jsp" />
+    <meta name="robots" content="noindex,follow" />
   </head>
 
   <body class="${wikiContext.requestContext}">

Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/PageContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/PageContent.jsp?rev=746887&r1=746886&r2=746887&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/PageContent.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/PageContent.jsp Mon Feb 23 05:27:55 2009
@@ -1,20 +1,20 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
 <%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.action.WikiContextFactory" %>
 <%@ page import="org.apache.wiki.attachment.*" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<%@ page import="org.apache.wiki.action.WikiContextFactory" %>
 <%
   WikiContext c = WikiContextFactory.findContext( pageContext );
   int attCount = c.getEngine().getAttachmentManager().listAttachments(c.getPage()).size();
   String attTitle = LocaleSupport.getLocalizedMessage(pageContext, "attach.tab");
   if( attCount != 0 ) attTitle += " (" + attCount + ")";
 %>
-
-<wiki:TabbedSection defaultTab='${param.tab}'>
+<wiki:TabbedSection defaultTab="pagecontent">
 
   <wiki:Tab id="pagecontent" titleKey="view.tab" accesskey="v">
-    <wiki:Include page="PageTab.jsp" />
+    <jsp:include page="/templates/default/PageTab.jsp" />
     <wiki:PageType type="attachment">
       <div class="information">
 	    <fmt:message key="info.backtoparentpage">
@@ -22,24 +22,13 @@
         </fmt:message>
       </div>
       <div style="overflow:hidden;">
-        <wiki:Translate>[<%= c.getPage().getName()%>]</wiki:Translate>
+        <wiki:Translate>[${wikiActionBean.page.name}]</wiki:Translate>
       </div>
     </wiki:PageType>    
   </wiki:Tab>
 
-  <wiki:PageExists>
+  <wiki:Tab id="attach" title="<%= attTitle %>" accesskey="a" url="Attachments.jsp?page=${wikiActionBean.page.name}" />
 
-  <wiki:PageType type="page">
-  <wiki:Tab id="attach" title="<%= attTitle %>" accesskey="a">
-    <wiki:Include page="AttachmentTab.jsp" />
-  </wiki:Tab>
-  </wiki:PageType>
-    
-  <wiki:Tab id="info" titleKey="info.tab"
-           url="<%=c.getURL(WikiContext.INFO, c.getPage().getName())%>"
-           accesskey="i" >
-  </wiki:Tab>
-    
-  </wiki:PageExists>
+  <wiki:Tab id="info" titleKey="info.tab" url="PageInfo.jsp?page=${wikiActionBean.page.name}" accesskey="i" />
 
-</wiki:TabbedSection>
\ No newline at end of file
+</wiki:TabbedSection>

Added: incubator/jspwiki/trunk/src/WebContent/templates/default/PageInfoTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/PageInfoTab.jsp?rev=746887&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/PageInfoTab.jsp (added)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/PageInfoTab.jsp Mon Feb 23 05:27:55 2009
@@ -0,0 +1,205 @@
+<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
+<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.attachment.*" %>
+<%@ page import="org.apache.wiki.i18n.InternationalizationManager" %>
+<%@ 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" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
+<%@ page import="org.apache.wiki.action.WikiContextFactory" %>
+<%@ page import="org.apache.wiki.util.TextUtil" %>
+<%@ page import="org.apache.wiki.api.WikiPage" %>
+<%
+  WikiContext c = WikiContextFactory.findContext( pageContext );
+  WikiPage wikiPage = c.getPage();
+  int attCount = c.getEngine().getAttachmentManager().listAttachments( c.getPage() ).size();
+  String attTitle = LocaleSupport.getLocalizedMessage(pageContext, "attach.tab");
+  if( attCount != 0 ) attTitle += " (" + attCount + ")";
+
+  String creationAuthor ="";
+
+  //FIXME -- seems not to work correctly for attachments !!
+  WikiPage firstPage = c.getEngine().getPage( wikiPage.getName(), 1 );
+  if( firstPage != null )
+  {
+    creationAuthor = firstPage.getAuthor();
+
+    if( creationAuthor != null && creationAuthor.length() > 0 )
+    {
+      creationAuthor = TextUtil.replaceEntities(creationAuthor);
+    }
+    else
+    {
+      creationAuthor = c.getBundle( InternationalizationManager.CORE_BUNDLE ).getString( "common.unknownauthor" );
+    }
+  }
+
+  int itemcount = 0;  //number of page versions
+  try
+  {
+    itemcount = wikiPage.getVersion(); /* highest version */
+  }
+  catch( Exception  e )  { /* dont care */ }
+
+  int pagesize = 20;
+  int startitem = itemcount-1; /* itemcount==1-20 -> startitem=0-19 ... */
+
+  String parm_start = (String)request.getParameter( "start" );
+  if( parm_start != null ) startitem = Integer.parseInt( parm_start ) ;
+
+  /* round to start of block: 0-19 becomes 0; 20-39 becomes 20 ... */
+  if( startitem > -1 ) startitem = ((startitem)/pagesize) * pagesize;
+
+  /* startitem drives the pagination logic */
+  /* startitem=-1:show all; startitem=0:show block 1-20; startitem=20:block 21-40 ... */
+%>
+<wiki:TabbedSection defaultTab="info">
+
+  <wiki:Tab id="pagecontent" titleKey="view.tab" accesskey="v" url="Wiki.jsp?page=${wikiActionBean.page.name}"/>
+      
+  <wiki:Tab id="attach" title="<%= attTitle %>" accesskey="a" url="Attachments.jsp?page=${wikiActionBean.page.name}" />
+  
+  <wiki:Tab id="info" titleKey="info.tab" accesskey="i">
+    <p>
+    <fmt:message key='info.lastmodified'>
+      <fmt:param><wiki:PageVersion>1</wiki:PageVersion></fmt:param>
+      <fmt:param>
+        <a href="<wiki:DiffLink format='url' version='latest' newVersion='previous' />" title="<fmt:message key='info.pagediff.title' />">
+          <fmt:formatDate value="<%= wikiPage.getLastModified() %>" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" />
+        </a>
+      </fmt:param>
+      <fmt:param><wiki:Author/></fmt:param>
+    </fmt:message>
+    <wiki:RSSImageLink mode="wiki" />
+    </p>
+    
+    <wiki:CheckVersion mode="notfirst">
+    <p>
+    <fmt:message key='info.createdon'>
+      <fmt:param>
+        <wiki:Link version="1">
+          <fmt:formatDate value="<%= firstPage.getLastModified() %>" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" />
+        </wiki:Link>
+      </fmt:param>
+      <fmt:param><%= creationAuthor %></fmt:param>
+    </fmt:message>
+    </p>
+    </wiki:CheckVersion>
+    
+    <wiki:Permission permission="rename">
+    
+    <div class="formhelp">
+      <wiki:Messages div="error" topic="rename" prefix='<%=LocaleSupport.getLocalizedMessage(pageContext,"prefs.errorprefix.rename")%>' />
+    </div>
+    
+    <s:form beanclass="org.apache.wiki.action.RenameActionBean" class="wikiform" id="renameform" method="post" acceptcharset="UTF-8" >
+      <p>
+        <s:hidden name="page" value="${wikiActionBean.page.name}" />
+        <s:submit name="info.rename.submit" />
+        <s:text name="renameto" value="${wikiActionBean.renameTo}" size="40" />
+        &nbsp;
+        <s:checkbox name="references" checked="${actionBean.changeReferences}" />
+        <fmt:message key="info.updatereferrers" />
+      </p>
+    </s:form>
+    </wiki:Permission>
+    <wiki:Permission permission="!rename">
+      <p><fmt:message key="info.rename.permission" /></p>
+    </wiki:Permission>
+    
+    <wiki:Permission permission="delete">
+    <s:form beanclass="org.apache.wiki.action.DeleteActionBean" class="wikiform" id="deleteForm" method="post" acceptcharset="UTF-8">
+      <p><s:submit name="delete" id="delete-all" /></p>
+    </s:form>
+    </wiki:Permission>
+    <wiki:Permission permission="!delete">
+      <p><fmt:message key="info.delete.permission" /></p>
+    </wiki:Permission>
+    
+    <div class="collapsebox-closed" id="incomingLinks">
+    <h4><fmt:message key="info.tab.incoming" /></h4>
+      <wiki:LinkTo><wiki:PageName/></wiki:LinkTo>
+      <wiki:Plugin plugin="ReferringPagesPlugin" args="before='*' after='\n' " />
+    </div>
+    
+    <div class="collapsebox-closed" id="outgoingLinks">
+    <h4><fmt:message key="info.tab.outgoing" /></h4>
+    <wiki:Plugin plugin="ReferredPagesPlugin" args="depth='1' type='local'" />
+    </div>
+    
+    <div class="clearbox"></div>
+    
+    <%-- DIFF section --%>
+    <wiki:CheckRequestContext context='diff'>
+      <wiki:Include page="DiffTab.jsp" />
+    </wiki:CheckRequestContext>
+    <%-- DIFF section --%>
+    
+    
+    <wiki:CheckVersion mode="first"><fmt:message key="info.noversions" /></wiki:CheckVersion>
+    <wiki:CheckVersion mode="notfirst">
+    <%-- if( itemcount > 1 ) { --%>
+    
+    <wiki:SetPagination start="<%=startitem%>" total="<%=itemcount%>" pagesize="<%=pagesize%>" maxlinks="9" fmtkey="info.pagination" href='<%=c.getURL(WikiContext.INFO, c.getPage().getName(), "start=%s")%>' />
+    
+    <div class="zebra-table sortable table-filter">
+    <table class="wikitable">
+      <tr>
+        <th><fmt:message key="info.version" /></th>
+        <th><fmt:message key="info.date" /></th>
+        <th><fmt:message key="info.size" /></th>
+        <th><fmt:message key="info.author" /></th>
+        <th><fmt:message key="info.changes" /></th>
+        <th class='changenote'><fmt:message key="info.changenote" /></th>
+      </tr>
+    
+      <wiki:HistoryIterator id="currentPage">
+      <% if( ( startitem == -1 ) ||
+              (  ( currentPage.getVersion() > startitem )
+              && ( currentPage.getVersion() <= startitem + pagesize ) ) )
+          {
+        %>
+      <tr>
+        <td>
+          <wiki:LinkTo version="<%=Integer.toString(currentPage.getVersion())%>">
+            <wiki:PageVersion/>
+          </wiki:LinkTo>
+        </td>
+    
+        <td><fmt:formatDate value="<%= currentPage.getLastModified() %>" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" /></td>
+        <td style="white-space:nowrap;text-align:right;">
+          <c:set var="ff"><wiki:PageSize/></c:set>
+          <fmt:formatNumber value='${ff/1000}' maxFractionDigits='3' minFractionDigits='1' />&nbsp;<fmt:message key="info.kilobytes" />
+        </td>
+        <td><wiki:Author/></td>
+    
+        <td>
+          <wiki:CheckVersion mode="notfirst">
+            <wiki:DiffLink version="current" newVersion="previous"><fmt:message key="info.difftoprev" /></wiki:DiffLink>
+            <wiki:CheckVersion mode="notlatest"> | </wiki:CheckVersion>
+          </wiki:CheckVersion>
+          <wiki:CheckVersion mode="notlatest">
+            <wiki:DiffLink version="latest" newVersion="current"><fmt:message key="info.difftolast" /></wiki:DiffLink>
+          </wiki:CheckVersion>
+        </td>
+    
+          <td class="changenote">
+            <%
+              String changeNote = (String)currentPage.getAttribute( WikiPage.CHANGENOTE );
+              changeNote = (changeNote != null) ? TextUtil.replaceEntities( changeNote ) : "" ;
+            %>
+            <%= changeNote %>
+          </td>
+    
+      </tr>
+      <% } %>
+      </wiki:HistoryIterator>
+    
+    </table>
+    </div>
+    ${pagination}
+    <%-- } /* itemcount > 1 */ --%>
+    </wiki:CheckVersion>
+  </wiki:Tab>
+
+</wiki:TabbedSection>

Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/PageTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/PageTab.jsp?rev=746887&r1=746886&r2=746887&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/PageTab.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/PageTab.jsp Mon Feb 23 05:27:55 2009
@@ -2,7 +2,7 @@
 <%@ page import="org.apache.wiki.*" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
 <%@ page import="org.apache.wiki.action.WikiContextFactory" %>
 <%@ page import="org.apache.wiki.util.TextUtil" %>
 <%@ page import="org.apache.wiki.api.WikiPage" %>
@@ -68,23 +68,14 @@
 
   <% if( ! blogcommentpage.equals("") ) { %>
   <wiki:PageExists page="<%= blogcommentpage%>">
-	<div class="weblogcommentstitle"><fmt:message key="blog.commenttitle" /></div>
+  	<div class="weblogcommentstitle"><fmt:message key="blog.commenttitle" /></div>
     <div class="weblogcomments"><wiki:InsertPage page="<%= blogcommentpage%>" /></div>
   </wiki:PageExists>
   <% }; %>
   <div class="information">	
-	<wiki:Link page="<%= mainblogpage %>"><fmt:message key="blog.backtomain" /></wiki:Link>&nbsp; &nbsp;
-	<wiki:Link context="comment" page="<%= blogcommentpage%>"><fmt:message key="blog.addcomments" /></wiki:Link>
+	  <wiki:Link page="<%= mainblogpage %>"><fmt:message key="blog.backtomain" /></wiki:Link>&nbsp; &nbsp;
+	  <wiki:Link context="comment" page="<%= blogcommentpage%>"><fmt:message key="blog.addcomments" /></wiki:Link>
   </div>
 
 </wiki:PageExists>
 <% }; %>
-
-<wiki:NoSuchPage>
-  <%-- FIXME: Should also note when a wrong version has been fetched. --%>
-  <div class="information">
-  <fmt:message key="common.nopage">
-    <fmt:param><wiki:EditLink><fmt:message key="common.createit" /></wiki:EditLink></fmt:param>
-  </fmt:message>
-  </div>
-</wiki:NoSuchPage>
\ No newline at end of file

Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/PreferencesTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/PreferencesTab.jsp?rev=746887&r1=746886&r2=746887&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/PreferencesTab.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/PreferencesTab.jsp Mon Feb 23 05:27:55 2009
@@ -1,20 +1,10 @@
 <%@ page errorPage="/Error.jsp" %>
-<%@ page import="java.util.*" %>
-<%@ page import="java.lang.*" %>
-<%@ page import="org.apache.wiki.*" %>
-<%@ page import="java.io.*" %>
-<%@ page import="java.util.jar.*" %>
-
-<%@ page import="org.apache.wiki.ui.*" %>
-<%@ page import="org.apache.wiki.preferences.*" %>
 <%@ taglib uri="http://jakarta.apache.org/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" %> 
-
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
-<%@ page import="org.apache.wiki.action.WikiContextFactory" %>
 
 <h3><fmt:message key="prefs.heading"><fmt:param><wiki:Variable var="applicationname" /></fmt:param></fmt:message></h3>
 
@@ -24,13 +14,13 @@
   </div>
 </c:if>
 
-<stripes:form beanclass="org.apache.wiki.action.UserPreferencesActionBean" class="wikiform" id="setCookie" method="post" acceptcharset="UTF-8">
+<s:form beanclass="org.apache.wiki.action.UserPreferencesActionBean" class="wikiform" id="setCookie" method="post" acceptcharset="UTF-8">
 <table>
   <tr>
-  <td><stripes:label for="assertedName" /></td>
+  <td><s:label for="assertedName" /></td>
   <td> 
-    <stripes:text id="assertedName" name="assertedName" size="20"><wiki:UserProfile property='wikiname' /></stripes:text>
-    <stripes:errors field="assertedName" />
+    <s:text id="assertedName" name="assertedName" size="20"><wiki:UserProfile property='wikiname' /></s:text>
+    <s:errors field="assertedName" />
   </td>
   </tr>
   <wiki:UserCheck status="anonymous">
@@ -52,75 +42,75 @@
   </wiki:UserCheck>
 
   <tr>
-  <td><stripes:label for="editor" /></td>
+  <td><s:label for="editor" /></td>
   <td>
     <select id="editor" name="editor">
       <wiki:EditorIterator id="edt">
         <option <%=edt.isSelected()%>value="<%=edt.getName()%>"><%=edt.getName()%></option>
       </wiki:EditorIterator>
     </select>
-    <stripes:errors field="editor" />
+    <s:errors field="editor" />
   </td>
   </tr>
   
   <tr>
-  <td><stripes:label for="sectionEditing" /></td>
+  <td><s:label for="sectionEditing" /></td>
   <td>
-    <stripes:checkbox id="sectionEditing" name="sectionEditing" checked="true" />
-    <stripes:errors field="sectionEditing" />
+    <s:checkbox id="sectionEditing" name="sectionEditing" checked="true" />
+    <s:errors field="sectionEditing" />
     <fmt:message key="prefs.user.sectionediting.text" />
   </td>
   </tr>
   
   <tr>
-  <td><stripes:label for="skin" /></td>
+  <td><s:label for="skin" /></td>
   <td>
-    <stripes:select id="skin" name="skin">
-      <stripes:options-collection collection="${skins}" />
-    </stripes:select>
-    <stripes:errors field="skin" />
+    <s:select id="skin" name="skin">
+      <s:options-collection collection="${skins}" />
+    </s:select>
+    <s:errors field="skin" />
   </td>
   </tr>
 
   <c:if test='${not empty locales}'>
     <tr>
-      <td><stripes:label for="locale" /></td>
+      <td><s:label for="locale" /></td>
       <td>
-        <stripes:select name="locale">
-          <stripes:options-map map="${locales}" />
-        </stripes:select>
-        <stripes:errors field="locale" />
+        <s:select name="locale">
+          <s:options-map map="${locales}" />
+        </s:select>
+        <s:errors field="locale" />
       </td>
     </tr>
   </c:if>
 
   <tr>
-    <td><stripes:label for="orientation" /></td>
+    <td><s:label for="orientation" /></td>
     <td>
-      <stripes:select id="orientation" name="orientation">
-        <stripes:options-enumeration enum="org.apache.wiki.preferences.Preferences.Orientation" label="name" />
-      </stripes:select>
-      <stripes:errors field="orientation" />
+      <s:select id="orientation" name="orientation">
+        <s:options-enumeration enum="org.apache.wiki.preferences.Preferences.Orientation" label="name" />
+      </s:select>
+      <s:errors field="orientation" />
     </td>
   </tr>
 
   <tr>
-    <td><stripes:label for="timeFormat" /></td>
+    <td><s:label for="timeFormat" /></td>
     <td>
-      <stripes:select id="timeFormat" name="timeFormat">
-        <stripes:options-map map="${timeformats}" />
-      </stripes:select>
-      <stripes:errors field="timeFormat" />
+      <s:select id="timeFormat" name="timeFormat">
+        <s:options-map map="${timeformats}" />
+      </s:select>
+      <s:errors field="timeFormat" />
     </td>
   </tr>
 
   <tr>
-    <td><stripes:label for="timeZone" /></td>
+    <td><s:label for="timeZone" /></td>
     <td>
-      <stripes:select id="timeZone" name="timeZone">
-        <stripes:options-map map="${timezones}" />
-      </stripes:select>
-      <stripes:errors field="timeZone" />
+      <s:select id="timeZone" name="timeZone">
+        <s:options-map map="${timezones}" />
+      </s:select>
+      <s:errors field="timeZone" />
     </td>
   </tr>
 
@@ -128,7 +118,7 @@
   <tr>
   <td><label for="showQuickLinks">Show Quick Links</label></td>
   <td>
-    <stripes:checkbox id="showQuickLinks" name="showQuickLinks" checked="true" />
+    <s:checkbox id="showQuickLinks" name="showQuickLinks" checked="true" />
          <span class="quicklinks"><span 
                class='quick2Top'><a href='#wikibody' title='Go to Top' >&laquo;</a></span><span 
                class='quick2Prev'><a href='#' title='Go to Previous Section'>&lsaquo;</a></span><span 
@@ -141,30 +131,30 @@
   <tr>
   <td><label for="showCalendar">Show Calendar</label></td>
   <td>
-    <stripes:checkbox id="showCalendar" name="showCalendar" checked="true" />
+    <s:checkbox id="showCalendar" name="showCalendar" checked="true" />
   </td>
   </tr>
   --%>
   <tr>
     <td>&nbsp;</td>
     <td>
-      <stripes:submit name="save" accesskey="s" />
-      <stripes:hidden name="redirect"><wiki:Variable var='redirect' default='' /></stripes:hidden>
+      <s:submit name="save" accesskey="s" />
+      <s:hidden name="redirect"><wiki:Variable var='redirect' default='' /></s:hidden>
       <div class="formhelp"><fmt:message key='prefs.cookies' /></div>
     </td>
   </tr>
 
 </table>
-</stripes:form>
+</s:form>
   
 <!-- Clearing the 'asserted name' and other prefs in the cookie -->
 <%--wiki:UserCheck status="asserted"--%>
 
 <h3><fmt:message key='prefs.clear.heading' /></h3>
 
-<stripes:form beanclass="org.apache.wiki.action.UserPreferencesActionBean" id="clearCookie" method="post" acceptcharset="UTF-8">
+<s:form beanclass="org.apache.wiki.action.UserPreferencesActionBean" id="clearCookie" method="post" acceptcharset="UTF-8">
   <div>
-    <stripes:submit name="clearAssertedName" />
+    <s:submit name="clearAssertedName" />
   </div>
   <div class="formhelp"><fmt:message key="prefs.clear.description" /></div>
-</stripes:form>
+</s:form>

Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/ProfileTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/ProfileTab.jsp?rev=746887&r1=746886&r2=746887&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/ProfileTab.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/ProfileTab.jsp Mon Feb 23 05:27:55 2009
@@ -1,10 +1,10 @@
 <%@ taglib uri="http://jakarta.apache.org/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://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
-<stripes:form beanclass="org.apache.wiki.action.UserProfileActionBean" id="editProfile" class="wikiform" method="post" acceptcharset="UTF-8">
-      <stripes:param name="tab" value="profile" />
+<s:form beanclass="org.apache.wiki.action.UserProfileActionBean" id="editProfile" class="wikiform" method="post" acceptcharset="UTF-8">
+      <s:param name="tab" value="profile" />
 
       <h3>
       <wiki:UserProfile property="exists"><fmt:message key="prefs.oldprofile" /></wiki:UserProfile>
@@ -21,11 +21,11 @@
 
      <!-- Login name -->
      <tr>
-       <td><stripes:label for="profile.loginName" /></td>
+       <td><s:label for="profile.loginName" /></td>
        <td>
          <wiki:UserProfile property="canChangeLoginName">
-           <stripes:text name="profile.loginName" id="loginName" size="20"><wiki:UserProfile property="loginname" /></stripes:text>
-           <stripes:errors field="profile.loginName" />
+           <s:text name="profile.loginName" id="loginName" size="20"><wiki:UserProfile property="loginname" /></s:text>
+           <s:errors field="profile.loginName" />
          </wiki:UserProfile>
          <wiki:UserProfile property="!canChangeLoginName">
            <!-- If user can't change their login name, it's because the container manages the login -->
@@ -40,40 +40,40 @@
        </td>
      </tr>
 
-     <!-- Password; not displayed if container auth used -->
+     <!-- Password; not displayed if container authentication used -->
      <wiki:UserProfile property="canChangePassword">
        <tr>
-         <td><stripes:label for="profile.password" /></td>
+         <td><s:label for="profile.password" /></td>
          <td>
-           <stripes:password name="profile.password" id="password" size="20" value="" />
-           <stripes:errors field="profile.password" />
+           <s:password name="profile.password" id="password" size="20" value="" />
+           <s:errors field="profile.password" />
           </td>
         </tr>
         <tr>
-          <td><stripes:label for="passwordAgain" /></td>
+          <td><s:label for="passwordAgain" /></td>
           <td>
-           <stripes:password name="passwordAgain" id="passwordAgain" size="20" value="" />
-           <stripes:errors field="profile.passwordAgain" />
+           <s:password name="passwordAgain" id="passwordAgain" size="20" value="" />
+           <s:errors field="profile.passwordAgain" />
          </td>
        </tr>
      </wiki:UserProfile>
 
      <!-- Full name -->
      <tr>
-       <td><stripes:label for="profile.fullname" /></td>
+       <td><s:label for="profile.fullname" /></td>
        <td>
-         <stripes:text name="profile.fullname" id="fullname" size="20"><wiki:UserProfile property="fullname" /></stripes:text>
-          <stripes:errors field="profile.fullname" />
+         <s:text name="profile.fullname" id="fullname" size="20"><wiki:UserProfile property="fullname" /></s:text>
+          <s:errors field="profile.fullname" />
          <div class="formhelp"><fmt:message key="prefs.fullname.description" /></div>
        </td>
      </tr>
 
      <!-- E-mail -->
      <tr>
-       <td><stripes:label for="profile.email" name="email" /></td>
+       <td><s:label for="profile.email" name="email" /></td>
        <td>
-         <stripes:text name="profile.email" id="email" size="20"><wiki:UserProfile property="email" /></stripes:text>
-         <stripes:errors field="profile.email" />
+         <s:text name="profile.email" id="email" size="20"><wiki:UserProfile property="email" /></s:text>
+         <s:errors field="profile.email" />
          <div class="formhelp"><fmt:message key="prefs.email.description" /></div>
        </td>
      </tr>
@@ -111,11 +111,11 @@
      <tr>
        <td>&nbsp;</td>
        <td>
-       <stripes:submit name="save" />
+       <s:submit name="save" />
        <wiki:UserCheck status="assertionsAllowed">
           <div class="formhelp"><fmt:message key="prefs.cookie.info" /></div>
         </wiki:UserCheck>
        </td>
      </tr>
    </table>
-</stripes:form>
+</s:form>

Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/UserBox.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/UserBox.jsp?rev=746887&r1=746886&r2=746887&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/UserBox.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/UserBox.jsp Mon Feb 23 05:27:55 2009
@@ -46,7 +46,7 @@
       beanclass="org.apache.wiki.action.LoginActionBean" event="logout"
       class="action logout"
       title="${logoutTitle}">
-      <fmt:message key="actions.login"/>
+      <fmt:message key="actions.logout"/>
     </stripes:link>
   </wiki:UserCheck>
 

Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/ViewLayout.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/ViewLayout.jsp?rev=746887&r1=746886&r2=746887&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/ViewLayout.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/ViewLayout.jsp Mon Feb 23 05:27:55 2009
@@ -1,11 +1,9 @@
 <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="stripes" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
+<s:layout-definition>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<stripes:layout-definition>
-
-<html id="top" xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>
       <fmt:message key="view.title.view">
@@ -26,6 +24,7 @@
   </head>
 
   <body class="view">
+
     <div id="wikibody" class="${prefs.Orientation}">
      
       <wiki:Include page="Header.jsp" />
@@ -33,7 +32,7 @@
       <div id="content">
         <div id="page">
           <wiki:Include page="PageActionsTop.jsp" />
-          <stripes:layout-component name="content" />
+          <s:layout-component name="content" />
           <wiki:Include page="PageActionsBottom.jsp" />
         </div>
         <wiki:Include page="Favorites.jsp" />
@@ -47,4 +46,4 @@
 
 </html>
 
-</stripes:layout-definition>
+</s:layout-definition>

Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/commonheader.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/commonheader.jsp?rev=746887&r1=746886&r2=746887&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/commonheader.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/commonheader.jsp Mon Feb 23 05:27:55 2009
@@ -24,13 +24,6 @@
 <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>

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiContext.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiContext.java?rev=746887&r1=746886&r2=746887&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiContext.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/WikiContext.java Mon Feb 23 05:27:55 2009
@@ -100,7 +100,7 @@
     public static final String    UPLOAD   = HandlerInfo.getHandlerInfo( UploadActionBean.class, "upload" ).getRequestContext();
 
     /** User is commenting something. */
-    public static final String    COMMENT  = HandlerInfo.getHandlerInfo( CommentActionBean.class, "comment" ).getRequestContext();
+    public static final String    COMMENT  = HandlerInfo.getHandlerInfo( EditActionBean.class, "comment" ).getRequestContext();
 
     /** User is searching for content. */
     public static final String    FIND     = HandlerInfo.getHandlerInfo( SearchActionBean.class, "find" ).getRequestContext();

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java?rev=746887&r1=746886&r2=746887&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java Mon Feb 23 05:27:55 2009
@@ -38,6 +38,28 @@
 @UrlBinding( "/Edit.jsp" )
 public class EditActionBean extends AbstractPageActionBean
 {
+    @HandlesEvent("comment")
+    @HandlerPermission(permissionClass=PagePermission.class, target="${page.qualifiedName}", actions=PagePermission.COMMENT_ACTION)
+    @WikiRequestContext("comment")
+    public Resolution comment()
+    {
+        return null;
+    }
+
+    /**
+     * Event that diffs the current state of the edited page and forwards the
+     * user to the diff JSP.
+     * 
+     * @return a forward resolution back to the preview page.
+     */
+    @HandlesEvent( "diff" )
+    @HandlerPermission( permissionClass = PagePermission.class, target = "${page.qualifiedName}", actions = PagePermission.VIEW_ACTION )
+    @WikiRequestContext( "diff" )
+    public Resolution diff()
+    {
+        return new ForwardResolution( "/Diff.jsp" );
+    }
+
     @DefaultHandler
     @HandlesEvent( "edit" )
     @HandlerPermission( permissionClass = PagePermission.class, target = "${page.qualifiedName}", actions = PagePermission.EDIT_ACTION )
@@ -69,18 +91,4 @@
 
         return new ForwardResolution( "/Preview.jsp" );
     }
-
-    /**
-     * Event that diffs the current state of the edited page and forwards the
-     * user to the diff JSP.
-     * 
-     * @return a forward resolution back to the preview page.
-     */
-    @WikiRequestContext( "diff" )
-    @HandlesEvent( "diff" )
-    @HandlerPermission( permissionClass = PagePermission.class, target = "${page.qualifiedName}", actions = PagePermission.VIEW_ACTION )
-    public Resolution diff()
-    {
-        return new ForwardResolution( "/Diff.jsp" );
-    }
 }

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RenameActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RenameActionBean.java?rev=746887&r1=746886&r2=746887&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RenameActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RenameActionBean.java Mon Feb 23 05:27:55 2009
@@ -76,20 +76,9 @@
 
     private boolean m_changeReferences = false;
     
-    private WikiPage m_page = null;
-
     private String m_renameTo = null;
 
     /**
-     * Returns the WikiPage; defaults to <code>null</code>.
-     * @return the page
-     */
-    public WikiPage getPage()
-    {
-        return m_page;
-    }
-    
-    /**
      * Returns the proposed new name for the page; defaults to <code>null</code>
      * if not set.
      * 
@@ -120,7 +109,7 @@
      * @throws WikiException if the page cannot be renamed
      */
     @HandlesEvent( "rename" )
-    @HandlerPermission( permissionClass = PagePermission.class, target = "${page.name}", actions = PagePermission.RENAME_ACTION )
+    @HandlerPermission( permissionClass = PagePermission.class, target = "${page.qualifiedName}", actions = PagePermission.RENAME_ACTION )
     @WikiRequestContext( "rename" )
     public Resolution rename() throws WikiException
     {
@@ -155,8 +144,7 @@
     @Validate( required = true )
     public void setPage( WikiPage page )
     {
-        m_page = page;
-        getContext().setPage( page );
+        super.setPage( page );
     }
     
     /**

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java?rev=746887&r1=746886&r2=746887&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/UploadActionBean.java Mon Feb 23 05:27:55 2009
@@ -21,23 +21,49 @@
 
 package org.apache.wiki.action;
 
+import java.util.List;
+
 import org.apache.wiki.auth.permissions.PagePermission;
+import org.apache.wiki.log.Logger;
+import org.apache.wiki.log.LoggerFactory;
 import org.apache.wiki.ui.stripes.HandlerPermission;
 import org.apache.wiki.ui.stripes.WikiRequestContext;
 
+import net.sourceforge.stripes.action.FileBean;
 import net.sourceforge.stripes.action.HandlesEvent;
 import net.sourceforge.stripes.action.Resolution;
 import net.sourceforge.stripes.action.UrlBinding;
 
-
 @UrlBinding( "/Upload.jsp" )
 public class UploadActionBean extends AbstractActionBean
 {
+    private Logger log = LoggerFactory.getLogger( UploadActionBean.class );
+
+    private List<FileBean> m_newAttachments;
+
+    /**
+     * Sets the set of new attachments that should be saved when the
+     * {@link #upload()} event is executed.
+     * 
+     * @param newAttachments the new files to attach
+     */
+    public void setNewAttachments( List<FileBean> newAttachments )
+    {
+        m_newAttachments = newAttachments;
+    }
+
+    /**
+     * Handler method that uploads a new attachment to the ViewActionBean.
+     * 
+     * @return
+     */
     @HandlesEvent( "upload" )
-    @HandlerPermission( permissionClass = PagePermission.class, target = "${page.name}", actions = PagePermission.UPLOAD_ACTION )
+    @HandlerPermission( permissionClass = PagePermission.class, target = "${page.qualifiedName}", actions = PagePermission.VIEW_ACTION )
     @WikiRequestContext( "upload" )
     public Resolution upload()
     {
+        log.debug( "Executed upload; " + m_newAttachments.size() + " attachments found." );
         return null;
     }
+
 }



Mime
View raw message