Author: jalkanen
Date: Sun Aug 31 03:07:46 2008
New Revision: 690674
URL: http://svn.apache.org/viewvc?rev=690674&view=rev
Log:
* Commenting now uses the changenote field properly (and we got rid
of the "Comment by XXX" -functionality. Therefore, "comment.by" i18n field
is now unused.
* Renaming now uses symbols instead of English text to put in the changenote
field.
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/etc/i18n/CoreResources.properties
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/content/PageRenamer.java
incubator/jspwiki/trunk/src/webdocs/Comment.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=690674&r1=690673&r2=690674&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Aug 31 03:07:46 2008
@@ -1,3 +1,14 @@
+2008-08-31 Janne Jalkanen <[EMAIL PROTECTED]>
+
+ * 2.7.0-alpha-34
+
+ * Commenting now uses the changenote field properly (and we got rid
+ of the "Comment by XXX" -functionality. Therefore, "comment.by" i18n
field
+ is now unused.
+
+ * Renaming now uses symbols instead of English text to put in the
changenote
+ field.
+
2008-08-30 Harry Metske <[EMAIL PROTECTED]>
* 2.7.0-alpha-33
Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources.properties?rev=690674&r1=690673&r2=690674&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources.properties Sun Aug 31
03:07:46 2008
@@ -8,9 +8,6 @@
-# Comment.jsp
-comment.by=Comment by {0}
-
#
# Time/date formatting. Some plugins might be using some specific formats,
# but you are free to use these times and dates.
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=690674&r1=690673&r2=690674&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Sun Aug 31
03:07:46 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "33";
+ public static final String BUILD = "34";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/content/PageRenamer.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/content/PageRenamer.java?rev=690674&r1=690673&r2=690674&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/content/PageRenamer.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/content/PageRenamer.java Sun
Aug 31 03:07:46 2008
@@ -134,7 +134,7 @@
if( toPage == null ) throw new InternalWikiException("Rename seems to
have failed for some strange reason - please check logs!");
- toPage.setAttribute( WikiPage.CHANGENOTE, "Renamed from
"+fromPage.getName() );
+ toPage.setAttribute( WikiPage.CHANGENOTE, fromPage.getName() + " ==> "
+ toPage.getName() );
toPage.setAuthor( context.getCurrentUser().getName() );
engine.getPageManager().putPageText( toPage, engine.getPureText(
toPage ) );
@@ -211,7 +211,7 @@
if( !sourceText.equals( newText ) )
{
- p.setAttribute( WikiPage.CHANGENOTE, "Renaming change
"+fromPage.getName()+" to "+toPage.getName() );
+ p.setAttribute( WikiPage.CHANGENOTE, fromPage.getName()+" ==>
"+toPage.getName() );
p.setAuthor( context.getCurrentUser().getName() );
try
Modified: incubator/jspwiki/trunk/src/webdocs/Comment.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Comment.jsp?rev=690674&r1=690673&r2=690674&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Comment.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Comment.jsp Sun Aug 31 03:07:46 2008
@@ -132,9 +132,11 @@
modifiedPage.setAuthor( storedUser );
- Object[] args = { storedUser };
- modifiedPage.setAttribute( WikiPage.CHANGENOTE,
java.text.MessageFormat.format( rb.getString("comment.by"), args ) );
-
+ if( changenote != null )
+ modifiedPage.setAttribute( WikiPage.CHANGENOTE, changenote );
+ else
+ modifiedPage.removeAttribute( WikiPage.CHANGENOTE );
+
//
// Build comment part
//
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp?rev=690674&r1=690673&r2=690674&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/editors/plain.jsp Sun
Aug 31 03:07:46 2008
@@ -102,7 +102,7 @@
</tr>
</wiki:Permission>
--%>
-<wiki:CheckRequestContext context="edit">
+<wiki:CheckRequestContext context="edit|comment">
<tr>
<td><label for="changenote"><fmt:message
key='editor.plain.changenote'/></label></td>
<td><input type="text" name="changenote" id="changenote" size="80"
maxlength="80" value="<c:out value='${changenote}'/>"/></td>
