Author: ajaquith
Date: Mon Oct 6 14:46:38 2008
New Revision: 702283
URL: http://svn.apache.org/viewvc?rev=702283&view=rev
Log:
Merged STRIPES_BRANCH with trunk revision 702245.
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/editors/plain.jsp
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog?rev=702283&r1=702282&r2=702283&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog Mon Oct 6
14:46:38 2008
@@ -1,3 +1,10 @@
+2008-10-06 Dirk Frederickx <[EMAIL PROTECTED]>
+
+ * 2.8.0-beta-18
+
+ * [JSPWIKI-395] One more xhtml issue in plain.jsp. Not what you'd
expected ;-)
+
+
2008-10-05 Dirk Frederickx <[EMAIL PROTECTED]>
* 2.8.0-beta-17
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=702283&r1=702282&r2=702283&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java
Mon Oct 6 14:46:38 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "17";
+ public static final String BUILD = "18";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/editors/plain.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/editors/plain.jsp?rev=702283&r1=702282&r2=702283&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/editors/plain.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/editors/plain.jsp
Mon Oct 6 14:46:38 2008
@@ -88,7 +88,7 @@
</p>
<%-- This following field is only for the SpamFilter to catch bots which
are just randomly filling all fields and submitting.
Normal user should never see this field, nor type anything in it. --%>
- <div style="display:none;">Authentication code: <input type="text"
name="<%=SpamFilter.getBotFieldName()%>" id="<%=SpamFilter.getBotFieldName()%>"
value=""/></div>
+ <div style="display:none;">Authentication code: <input type="text"
name="<%=SpamFilter.getBotFieldName()%>" id="<%=SpamFilter.getBotFieldName()%>"
value="" /></div>
<table>
<%--FIXME
<wiki:Permission permission="rename">
@@ -141,7 +141,8 @@
<a href="#" class="tool" rel="break" id="tbSIGN" title="<fmt:message
key='editor.plain.tbSIGN.title'/>">sign</a>
</span>
<span>
- <a href="#" class="tool" rel="break" id="tbUNDO" title="<fmt:message
key='editor.plain.undo.title'/>"><fmt:message
key='editor.plain.undo.submit'/></a></span>
+ <a href="#" class="tool" rel="break" id="tbUNDO" title="<fmt:message
key='editor.plain.undo.title'/>"><fmt:message
key='editor.plain.undo.submit'/></a>
+ </span>
<span>
<a href="#" class="tool" rel="break" id="tbREDO" title="<fmt:message
key='editor.plain.redo.title'/>"><fmt:message
key='editor.plain.redo.submit'/></a>
</span>
@@ -186,7 +187,7 @@
<textarea id="editorarea" name="<%=EditorManager.REQ_EDITEDTEXT%>"
class="editor"
rows="20"
cols="80"><%=TextUtil.replaceEntities(usertext)%></textarea>
- <div class="clearbox"></div>
+ <div class="clearbox" ></div>
</div>
<wiki:CheckRequestContext context="comment">
@@ -208,9 +209,9 @@
</form>
<div id="sneakpreviewheader">
- <input type="checkbox" name="autopreview" id="autopreview"
<%=TextUtil.isPositive((String)session.getAttribute("autopreview")) ?
"checked='checked'" : ""%>/>
+ <input type="checkbox" name="autopreview" id="autopreview"
<%=TextUtil.isPositive((String)session.getAttribute("autopreview")) ?
"checked='checked'" : ""%> />
<label for="autopreview" title="<fmt:message
key='editor.plain.sneakpreview.title'/>"><fmt:message
key="editor.plain.sneakpreview"/></label>
</div>
-<div id="sneakpreview"/></div>
+<div id="sneakpreview" ></div>
</div>
\ No newline at end of file
