You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by aj...@apache.org on 2009/09/13 19:53:27 UTC
svn commit: r814362 - in
/incubator/jspwiki/trunk/src/WebContent/templates/default: PageInfoTab.jsp
PreviewContent.jsp editors/plain.jsp
Author: ajaquith
Date: Sun Sep 13 17:53:27 2009
New Revision: 814362
URL: http://svn.apache.org/viewvc?rev=814362&view=rev
Log:
SearchBox and a few other JSPs received the Stripes forms-tag treatment.
Modified:
incubator/jspwiki/trunk/src/WebContent/templates/default/PageInfoTab.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/PreviewContent.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp
Modified: 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=814362&r1=814361&r2=814362&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/PageInfoTab.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/PageInfoTab.jsp Sun Sep 13 17:53:27 2009
@@ -107,44 +107,43 @@
</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" />
-
- <s:checkbox name="references" checked="${actionBean.changeReferences}" />
- <fmt:message key="info.updatereferrers" />
- </p>
- </s:form>
+ <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" />
+ <s:submit name="rename" />
+ <s:text name="renameTo" size="40" />
+
+ <s:checkbox name="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>
+ <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>
+ <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'" />
+ <h4><fmt:message key="info.tab.outgoing" /></h4>
+ <wiki:Plugin plugin="ReferredPagesPlugin" args="depth='1' type='local'" />
</div>
<div class="clearbox"></div>
@@ -158,67 +157,67 @@
<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' /> <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 %>
+ <%-- 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>
-
- </tr>
- <% } %>
- </wiki:HistoryIterator>
-
- </table>
- </div>
- ${pagination}
- <%-- } /* itemcount > 1 */ --%>
+
+ <td><fmt:formatDate value="<%= currentPage.getLastModified() %>" pattern="${prefs.DateFormat}" timeZone="${prefs.TimeZone}" /></td>
+ <td style="white-space:nowrap;text-align:right;">
+ <c:set var="ff"><wiki:PageSize/></c:set>
+ <fmt:formatNumber value='${ff/1000}' maxFractionDigits='3' minFractionDigits='1' /> <fmt:message key="info.kilobytes" />
+ </td>
+ <td><wiki:Author/></td>
+
+ <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>
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/PreviewContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/PreviewContent.jsp?rev=814362&r1=814361&r2=814362&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/PreviewContent.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/PreviewContent.jsp Sun Sep 13 17:53:27 2009
@@ -43,7 +43,7 @@
<s:hidden name="author" />
<s:hidden name="changenote" />
<s:hidden name="link" />
- <s:hidden name="page" value="${wikiActionBean.page.name}" />
+ <s:hidden name="page" />
<s:hidden name="remember" />
<s:hidden name="startTime" />
<s:hidden name="text" />
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp?rev=814362&r1=814361&r2=814362&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp Sun Sep 13 17:53:27 2009
@@ -45,14 +45,14 @@
<%-- EditActionBean relies on these being found. So be careful, if you make changes. --%>
<p id="submitbuttons">
- <s:hidden name="page"><wiki:Variable var='pagename' /></s:hidden>
+ <s:hidden name="page" />
<s:hidden name="startTime" />
<c:set var="saveTitle" scope="page"><fmt:message key="editor.plain.save.title" /></c:set>
<wiki:CheckRequestContext context='edit'>
<s:submit name="save" accesskey="s" title="${saveTitle}" />
</wiki:CheckRequestContext>
<wiki:CheckRequestContext context='comment'>
- <s:submit name="comment" accesskey="s" title="${saveTitle}"><fmt:message key="editor.plain.save.submit"/></s:submit>
+ <s:submit name="comment" accesskey="s" title="${saveTitle}" />
</wiki:CheckRequestContext>
<c:set var="previewTitle" scope="page"><fmt:message key="editor.plain.preview.title" /></c:set>
@@ -74,7 +74,6 @@
</tr>
<wiki:CheckRequestContext context="comment">
- <%--<fieldset><legend><fmt:message key="editor.commentsignature" /></legend>--%>
<tr>
<td><s:label for="author" accesskey="n" name="author" /></td>
<td><s:text id="author" name="author" />
@@ -86,7 +85,6 @@
<td><s:label for="link" accesskey="m" name="editor.plain.email" /></td>
<td><s:text id="link" name="link" size="24" /></td>
</tr>
- <%--</fieldset>--%>
</wiki:CheckRequestContext>
</table>
@@ -123,34 +121,34 @@
</fieldset>
<fieldset class="unit">
- <legend><fmt:message key='editor.plain.style'/></legend>
- <a href="#" class="tool tB" title="<fmt:message key='editor.plain.tbB.title'/>">bold</a>
- <a href="#" class="tool tI" title="<fmt:message key='editor.plain.tbI.title'/>">italic</a>
- <a href="#" class="tool tMONO" title="<fmt:message key='editor.plain.tbMONO.title'/>">mono</a>
- <a href="#" class="tool tCSS" title="<fmt:message key='editor.plain.tbCSS.title'/>">%%</a>
- <a href="#" class="tool tFONT" title="<fmt:message key='editor.plain.tbFONT.title'/>">font</a>
- <a href="#" class="tool tCOLOR" title="<fmt:message key='editor.plain.tbCOLOR.title'/>">color</a>
- <!--
- <a href="#" class="tool tSUP" title="<fmt:message key='editor.plain.tbSUP.title'/>">sup</a>
- <a href="#" class="tool tSUB" title="<fmt:message key='editor.plain.tbSUB.title'/>">sub</a>
- <a href="#" class="tool tSTRIKE" title="<fmt:message key='editor.plain.tbSTRIKE.title'/>">strike</a>
- -->
+ <legend><fmt:message key='editor.plain.style'/></legend>
+ <a href="#" class="tool tB" title="<fmt:message key='editor.plain.tbB.title'/>">bold</a>
+ <a href="#" class="tool tI" title="<fmt:message key='editor.plain.tbI.title'/>">italic</a>
+ <a href="#" class="tool tMONO" title="<fmt:message key='editor.plain.tbMONO.title'/>">mono</a>
+ <a href="#" class="tool tCSS" title="<fmt:message key='editor.plain.tbCSS.title'/>">%%</a>
+ <a href="#" class="tool tFONT" title="<fmt:message key='editor.plain.tbFONT.title'/>">font</a>
+ <a href="#" class="tool tCOLOR" title="<fmt:message key='editor.plain.tbCOLOR.title'/>">color</a>
+ <!--
+ <a href="#" class="tool tSUP" title="<fmt:message key='editor.plain.tbSUP.title'/>">sup</a>
+ <a href="#" class="tool tSUB" title="<fmt:message key='editor.plain.tbSUB.title'/>">sub</a>
+ <a href="#" class="tool tSTRIKE" title="<fmt:message key='editor.plain.tbSTRIKE.title'/>">strike</a>
+ -->
</fieldset>
<fieldset class="unit">
- <legend><fmt:message key='editor.plain.extra'/></legend>
- <a href="#" class="tool tACL" title="<fmt:message key='editor.plain.tbACL.title'/>">acl</a>
- <a href="#" class="tool tIMG" title="<fmt:message key='editor.plain.tbIMG.title'/>">img</a>
- <a href="#" class="tool tTABLE" title="<fmt:message key='editor.plain.tbTABLE.title'/>">table</a>
- <a href="#" class="tool tPLUGIN" title="<fmt:message key='editor.plain.tbPLUGIN.title'/>">plugin</a>
- <%--
- <a href="#" class="tool tTOC" title="<fmt:message key='editor.plain.tbTOC.title'/>">toc</a>
- --%>
- <a href="#" class="tool tDL" title="<fmt:message key='editor.plain.tbDL.title'/>">dl</a>
- <a href="#" class="tool tCODE" title="<fmt:message key='editor.plain.tbCODE.title'/>">code</a>
- <a href="#" class="tool tTAB" title="<fmt:message key='editor.plain.tbTAB.title'/>">tab</a>
- <a href="#" class="tool tSIGN" title="<fmt:message key='editor.plain.tbSIGN.title'/>">sign</a>
- <%-- --%>
+ <legend><fmt:message key='editor.plain.extra'/></legend>
+ <a href="#" class="tool tACL" title="<fmt:message key='editor.plain.tbACL.title'/>">acl</a>
+ <a href="#" class="tool tIMG" title="<fmt:message key='editor.plain.tbIMG.title'/>">img</a>
+ <a href="#" class="tool tTABLE" title="<fmt:message key='editor.plain.tbTABLE.title'/>">table</a>
+ <a href="#" class="tool tPLUGIN" title="<fmt:message key='editor.plain.tbPLUGIN.title'/>">plugin</a>
+ <%--
+ <a href="#" class="tool tTOC" title="<fmt:message key='editor.plain.tbTOC.title'/>">toc</a>
+ --%>
+ <a href="#" class="tool tDL" title="<fmt:message key='editor.plain.tbDL.title'/>">dl</a>
+ <a href="#" class="tool tCODE" title="<fmt:message key='editor.plain.tbCODE.title'/>">code</a>
+ <a href="#" class="tool tTAB" title="<fmt:message key='editor.plain.tbTAB.title'/>">tab</a>
+ <a href="#" class="tool tSIGN" title="<fmt:message key='editor.plain.tbSIGN.title'/>">sign</a>
+ <%-- --%>
</fieldset>
<fieldset class="unit lastUnit">
@@ -164,22 +162,22 @@
</fieldset>
<div class="clearbox">
- <p id="findDialog" style="display:none;">
- <%--<label for="tbFIND" ><fmt:message key="editor.plain.find"/>--%>
- <input type="text" name="tbFIND" id="tbFIND" size="16" value="find"/>
- <%--</label>--%>
- <label for="tbMatchCASE"><input type="checkbox" name="tbMatchCASE" id="tbMatchCASE" />
- <fmt:message key="editor.plain.matchcase"/></label>
- <label for="tbREGEXP" ><input type="checkbox" name="tbREGEXP" id="tbREGEXP" />
- <fmt:message key="editor.plain.regexp"/></label>
-
- <%--<label for="tbREPLACE" ><fmt:message key="editor.plain.replace"/>--%>
- <input type="text" name="tbREPLACE" id="tbREPLACE" size="16" />
- <%--</label>--%>
- <a class="btn" id="doreplace"><span><span><fmt:message key='editor.plain.find.submit' /></span></span></a>
- <label for="tbGLOBAL"><input type="checkbox" name="tbGLOBAL" id="tbGLOBAL" checked="checked" />
- <fmt:message key="editor.plain.global"/></label>
- </p>
+ <p id="findDialog" style="display:none;">
+ <%--<label for="tbFIND" ><fmt:message key="editor.plain.find"/>--%>
+ <input type="text" name="tbFIND" id="tbFIND" size="16" value="find"/>
+ <%--</label>--%>
+ <label for="tbMatchCASE"><input type="checkbox" name="tbMatchCASE" id="tbMatchCASE" />
+ <fmt:message key="editor.plain.matchcase"/></label>
+ <label for="tbREGEXP" ><input type="checkbox" name="tbREGEXP" id="tbREGEXP" />
+ <fmt:message key="editor.plain.regexp"/></label>
+
+ <%--<label for="tbREPLACE" ><fmt:message key="editor.plain.replace"/>--%>
+ <input type="text" name="tbREPLACE" id="tbREPLACE" size="16" />
+ <%--</label>--%>
+ <a class="btn" id="doreplace"><span><span><fmt:message key='editor.plain.find.submit' /></span></span></a>
+ <label for="tbGLOBAL"><input type="checkbox" name="tbGLOBAL" id="tbGLOBAL" checked="checked" />
+ <fmt:message key="editor.plain.global"/></label>
+ </p>
</div>
</div><%-- end of the toolbar --%>