You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by br...@apache.org on 2009/06/14 21:11:09 UTC
svn commit: r784605 [5/6] - in /incubator/jspwiki/trunk: ./ src/WebContent/
src/WebContent/WEB-INF/classes/templates/ src/WebContent/scripts/
src/WebContent/templates/default/ src/WebContent/templates/default/editors/
src/WebContent/templates/default/i...
Modified: incubator/jspwiki/trunk/src/WebContent/scripts/jspwiki-prefs.js
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/scripts/jspwiki-prefs.js?rev=784605&r1=784604&r2=784605&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/scripts/jspwiki-prefs.js (original)
+++ incubator/jspwiki/trunk/src/WebContent/scripts/jspwiki-prefs.js Sun Jun 14 19:11:08 2009
@@ -27,6 +27,11 @@
var WikiPreferences =
{
+ /*
+ Function: onPageLoad()
+ Register a onbeforeunload handler to show a popup when the user leaves
+ the Preferences page without saving.
+ */
onPageLoad: function(){
window.onbeforeunload = (function(){
@@ -36,8 +41,28 @@
}) ) return "prefs.areyousure".localize();
}).bind(this);
+
+ /*
+ Make an immedieate change to the position of the Favorites block
+ (aka left-menu) according to the setting prefOrientation dropdown.
+ The setting is persisted only when submitting the form. (savePrefs)
+ */
+ $('prefOrientation').addEvent('click',function(){
+ $('wikibody')
+ .removeClass('fav-left|fav-right')
+ .addClass(this.getValue());
+ });
+
},
-
+
+ /*
+ Function: savePrefs()
+ Save all user preferences to the Wiki UserPrefs cookie.
+ This function is called as form onsubmit handler of the UserPref page.
+
+ FIXME: could this be done server side -- no since some prefs are only
+ known client-side, only persisted through cookies.
+ */
savePrefs: function(){
var prefs = {
'prefSkin':'SkinName',
@@ -60,7 +85,6 @@
var WikiGroup =
{
MembersID : "membersfield",
- //GroupTltID : "grouptemplate",
GroupID : "groupfield",
NewGroupID : "newgroup",
GroupInfoID : "groupinfo",
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/Favorites.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/Favorites.jsp?rev=784605&r1=784604&r2=784605&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Favorites.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Favorites.jsp Sun Jun 14 19:11:08 2009
@@ -25,8 +25,6 @@
<div id="favorites">
- <wiki:Include page="UserBox.jsp" />
-
<div id="hiddenmorepopup">
<ul id="morepopup">
<wiki:CheckRequestContext context='view|info|diff|upload'>
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/FindContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/FindContent.jsp?rev=784605&r1=784604&r2=784605&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/FindContent.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/FindContent.jsp Sun Jun 14 19:11:08 2009
@@ -41,16 +41,18 @@
<s:checkbox name="details" id="details" />
<fmt:message key="find.details" />
- <select name="scope" id="scope">
- <option value="" <c:if test="${empty param.scope}">selected="selected"</c:if> ><fmt:message key='find.scope.all' /></option>
- <option value="author:" <c:if test='${param.scope eq "author:"}'>selected="selected"</c:if> ><fmt:message key='find.scope.authors' /></option>
- <option value="name:" <c:if test='${param.scope eq "name:"}'>selected="selected"</c:if> ><fmt:message key='find.scope.pagename' /></option>
- <option value="contents:" <c:if test='${param.scope eq "contents:"}'>selected="selected"</c:if> ><fmt:message key='find.scope.content' /></option>
- <option value="attachment:" <c:if test='${param.scope eq "attachment:"}'>selected="selected"</c:if> ><fmt:message key='find.scope.attach' /></option>
- </select>
-
- <s:submit name="search" id="ok" value="<fmt:message key='find.submit.find' />" />
- <s:submit name="go" id="go" value="<fmt:message key='find.submit.go' />" />
+ <s:select name="${param.scope}" id="scope">
+ <s:option value="" ><fmt:message key='find.scope.all' /></s:option>
+ <s:option value="author:" ><fmt:message key='find.scope.authors' /></s:option>
+ <s:option value="name:" ><fmt:message key='find.scope.pagename' /></s:option>
+ <s:option value="contents:" ><fmt:message key='find.scope.content' /></s:option>
+ <s:option value="attachment:" ><fmt:message key='find.scope.attach' /></s:option>
+ </s:select>
+
+ <c:set var="submitfind" scope="page"><fmt:message key="find.submit.find"/></c:set>
+ <s:submit name="search" id="ok" value="${submitfind}" />
+ <c:set var="submitgo" scope="page"><fmt:message key="find.submit.go"/></c:set>
+ <s:submit name="go" id="go" value="${submitgo}" />
<s:hidden name="start" id="start" value="0" />
<s:hidden name="maxItems" id="maxitems" value="20" />
@@ -86,27 +88,27 @@
<td><span class="gBar"><%= searchref.getScore() %></span></td>
</tr>
- <c:if test="${wikiActionBean.details == 'true'}">
- <%
+ <c:if test="${wikiActionBean.details == 'true'}"><%
+
String[] contexts = searchref.getContexts();
if( (contexts != null) && (contexts.length > 0) )
{
- %>
- <tr class="odd">
+
+ %><tr class="odd">
<td colspan="2">
- <div class="fragment">
- <%
+ <div class="fragment"><%
+
for (int i = 0; i < contexts.length; i++)
{
- %>
- <%= (i > 0 ) ? "<span class='fragment_ellipsis'> ... </span>" : "" %>
- <%= contexts[i] %>
- <%
+
+ %><%= (i > 0 ) ? "<span class='fragment_ellipsis'> ... </span>" : ""
+ %><%= contexts[i] %><%
+
}
- %>
- </div>
- </td>
- </tr>
+
+ %></div>
+ </td>
+ </tr>
<%
}
%>
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/PageActionsBottom.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/PageActionsBottom.jsp?rev=784605&r1=784604&r2=784605&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/PageActionsBottom.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/PageActionsBottom.jsp Sun Jun 14 19:11:08 2009
@@ -23,9 +23,8 @@
<wiki:CheckRequestContext context='view|diff|edit|upload|info'>
<div id='actionsBottom' class="pageactions">
<wiki:PageExists>
-
- <a href="#top" class="action quick2top" title="<fmt:message key='actions.gototop' />">«</a>
-
+ <ul>
+ <li>
<wiki:CheckVersion mode="latest">
<fmt:message key="info.lastmodified">
<fmt:param><wiki:PageVersion/></fmt:param>
@@ -40,9 +39,12 @@
<fmt:param><wiki:Author/></fmt:param>
</fmt:message>
</wiki:CheckVersion>
-
- <wiki:RSSImageLink mode="wiki" />
-
+ </li>
+ <li><wiki:RSSImageLink mode="wiki" /></li>
+ <li><a href="#top"
+ class="action quick2top"
+ title="<fmt:message key='actions.gototop' />">«</a></li>
+ </ul>
</wiki:PageExists>
<wiki:NoSuchPage><fmt:message key="actions.notcreated" /></wiki:NoSuchPage>
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/SearchBox.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/SearchBox.jsp?rev=784605&r1=784604&r2=784605&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/SearchBox.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/SearchBox.jsp Sun Jun 14 19:11:08 2009
@@ -42,18 +42,18 @@
</div>
<div id="searchboxMenu" style='visibility:hidden;'>
<div id="searchTools">
- <a href="#" id='quickView' class='action'
+ <a href="#" id='quickView' class='btn'
onclick="SearchBox.navigate( '<wiki:Link format="url" page="Main"/>','<fmt:message key="sbox.view.title"/>' );"
- title="<fmt:message key="sbox.view.title"/>"><fmt:message key="sbox.view"/></a>
- <a href="#" id='quickEdit' class='action'
+ title="<fmt:message key="sbox.view.title"/>"><span><span><fmt:message key="sbox.view"/></span></span></a>
+ <a href="#" id='quickEdit' class='btn'
onclick="SearchBox.navigate( '<wiki:Link format="url" context="edit" page="Main"/>','<fmt:message key="sbox.edit.title"/>' );"
- title="<fmt:message key="sbox.edit.title"/>"><fmt:message key="sbox.edit"/></a>
- <a href="#" id='quickClone' class='action'
+ title="<fmt:message key="sbox.edit.title"/>"><span><span><fmt:message key="sbox.edit"/></span></span></a>
+ <a href="#" id='quickClone' class='btn'
onclick="return SearchBox.navigate( '<wiki:Link format="url" page="Main" context="edit" />', '<fmt:message key="sbox.clone.title"/>', true );"
- title="<fmt:message key="sbox.clone.title"/>"><fmt:message key="sbox.clone"/></a>
- <a href="#" id="advancedSearch" class='action'
+ title="<fmt:message key="sbox.clone.title"/>"><span><span><fmt:message key="sbox.clone"/></span></span></a>
+ <a href="#" id="advancedSearch" class='btn'
onclick="SearchBox.navigate( '<wiki:BaseURL />Search.jsp?query=Main','<wiki:Variable var="pagename"/>' )"
- title="<fmt:message key="sbox.find.title"/> [ f ]"><fmt:message key="sbox.find"/></a>
+ title="<fmt:message key="sbox.find.title"/> [ f ]"><span><span><fmt:message key="sbox.find"/></span></span></a>
</div>
<div id="searchResult">
<fmt:message key='sbox.search.result' />
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=784605&r1=784604&r2=784605&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/UserBox.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/UserBox.jsp Sun Jun 14 19:11:08 2009
@@ -51,10 +51,10 @@
<c:set var="loginTitle"><fmt:message key='actions.login.title' /></c:set>
<s:link
beanclass="org.apache.wiki.action.LoginActionBean"
- class="action login"
+ class="btn login"
title="${loginTitle}">
<s:param name="redirect" value="${wikiContext.page.name}" />
- <fmt:message key="actions.login"/>
+ <span><span><fmt:message key="actions.login"/></span></span>
</s:link>
</wiki:Permission>
</wiki:CheckRequestContext>
@@ -64,9 +64,9 @@
<c:set var="logoutTitle"><fmt:message key='actions.logout.title' /></c:set>
<s:link
beanclass="org.apache.wiki.action.LoginActionBean" event="logout"
- class="action logout"
+ class="btn logout"
title="${logoutTitle}">
- <fmt:message key="actions.logout"/>
+ <span><span><fmt:message key="actions.logout"/></span></span>
</s:link>
</wiki:UserCheck>
@@ -75,10 +75,10 @@
<c:set var="prefsTitle"><fmt:message key='actions.prefs.title' /></c:set>
<s:link
beanclass="org.apache.wiki.action.UserPreferencesActionBean"
- class="action prefs" accesskey="p"
+ class="btn prefs" accesskey="p"
title="${prefsTitle}">
<s:param name="redirect" value="${wikiContext.page.name}" />
- <fmt:message key="actions.prefs"/>
+ <span><span><fmt:message key="actions.prefs"/></span></span>
</s:link>
</wiki:CheckRequestContext>
</wiki:CheckRequestContext>
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=784605&r1=784604&r2=784605&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp Sun Jun 14 19:11:08 2009
@@ -32,7 +32,8 @@
<s:errors />
<s:form beanclass="org.apache.wiki.action.EditActionBean" class="wikiform"
- id="editform" method="post" acceptcharset="UTF-8" enctype="application/x-www-form-urlencoded" >
+ id="editform" method="post" acceptcharset="UTF-8" enctype="application/x-www-form-urlencoded"
+ onsubmit="window.onbeforeunload = null;">
<%-- If any conflicts, print the conflicting text here --%>
<c:if test="${not empty wikiActionBean.conflictText}">
@@ -68,119 +69,139 @@
<s:label for="changenote" name="changenote" />
</td>
<td>
- <s:text name="changenote" id="changenote" size="80" maxlength="80" />
+ <s:text name="changenote" id="changenote" size="50" maxlength="80" />
</td>
</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" />
+ <s:checkbox id="remember" name="remember" />
+ <s:label for="remember" name="remember" />
+ </td>
+ </tr>
+ <tr>
+ <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>
<%-- Toolbar --%>
- <div id="tools">
- <h4><fmt:message key='editor.plain.toolbar' /></h4>
- <div id="toolbuttons">
- <span>
- <a href="#" class="tool" rel="" id="tbLink" title="<fmt:message key='editor.plain.tbLink.title' />">link</a>
- <a href="#" class="tool" rel="break" id="tbH1" title="<fmt:message key='editor.plain.tbH1.title' />">h1</a>
- <a href="#" class="tool" rel="break" id="tbH2" title="<fmt:message key='editor.plain.tbH2.title' />">h2</a>
- <a href="#" class="tool" rel="break" id="tbH3" title="<fmt:message key='editor.plain.tbH3.title' />">h3</a>
- </span>
- <span>
- <a href="#" class="tool" rel="" id="tbB" title="<fmt:message key='editor.plain.tbB.title' />">bold</a>
- <a href="#" class="tool" rel="" id="tbI" title="<fmt:message key='editor.plain.tbI.title' />">italic</a>
- <a href="#" class="tool" rel="" id="tbMONO" title="<fmt:message key='editor.plain.tbMONO.title' />">mono</a>
- <a href="#" class="tool" rel="" id="tbSUP" title="<fmt:message key='editor.plain.tbSUP.title' />">sup</a>
- <a href="#" class="tool" rel="" id="tbSUB" title="<fmt:message key='editor.plain.tbSUB.title' />">sub</a>
- <a href="#" class="tool" rel="" id="tbSTRIKE" title="<fmt:message key='editor.plain.tbSTRIKE.title' />">strike</a>
- </span>
- <span>
- <a href="#" class="tool" rel="" id="tbBR" title="<fmt:message key='editor.plain.tbBR.title' />">br</a>
- <a href="#" class="tool" rel="break" id="tbHR" title="<fmt:message key='editor.plain.tbHR.title' />">hr</a>
- <a href="#" class="tool" rel="break" id="tbPRE" title="<fmt:message key='editor.plain.tbPRE.title' />">pre</a>
- <a href="#" class="tool" rel="break" id="tbCODE" title="<fmt:message key='editor.plain.tbCODE.title' />">code</a>
- <a href="#" class="tool" rel="break" id="tbDL" title="<fmt:message key='editor.plain.tbDL.title' />">dl</a>
- </span>
- <span>
- <a href="#" class="tool" rel="break" id="tbTOC" title="<fmt:message key='editor.plain.tbTOC.title' />">toc</a>
- <a href="#" class="tool" rel="break" id="tbTAB" title="<fmt:message key='editor.plain.tbTAB.title' />">tab</a>
- <a href="#" class="tool" rel="break" id="tbTABLE" title="<fmt:message key='editor.plain.tbTABLE.title' />">table</a>
- <a href="#" class="tool" rel="" id="tbIMG" title="<fmt:message key='editor.plain.tbIMG.title' />">img</a>
- <a href="#" class="tool" rel="break" id="tbQUOTE" title="<fmt:message key='editor.plain.tbQUOTE.title' />">quote</a>
- <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>
- <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>
- </div>
-
- <%-- Toolbar extras --%>
- <div id="toolextra" class="clearbox" style="display:none;">
- <span>
- <input type="checkbox" name="tabcompletion" id="tabcompletion" <%=TextUtil.isPositive((String)session.getAttribute("tabcompletion")) ? "checked='checked'" : ""%> />
- <label for="tabcompletion" title="<fmt:message key='editor.plain.tabcompletion.title' />"><fmt:message key="editor.plain.tabcompletion" /></label>
- </span>
- <span>
- <input type="checkbox" name="smartpairs" id="smartpairs" <%=TextUtil.isPositive((String)session.getAttribute("smartpairs")) ? "checked='checked'" : ""%> />
- <label for="smartpairs" title="<fmt:message key='editor.plain.smartpairs.title' />"><fmt:message key="editor.plain.smartpairs" /></label>
- </span>
- </div>
-
- <%-- Search bar --%>
- <div id="searchbar">
- <span>
- <label for="tbFIND"><fmt:message key="editor.plain.find" /></label>
- <input type="text" name="tbFIND" id="tbFIND" size="16" />
- <label for="tbREPLACE"><fmt:message key="editor.plain.replace" /></label>
- <input type="text" name="tbREPLACE" id="tbREPLACE" size="16" />
- <input type="button" name="doreplace" id="doreplace" value="<fmt:message key='editor.plain.find.submit' />" />
- </span>
- <span>
- <input type="checkbox" name="tbMatchCASE" id="tbMatchCASE" />
- <label for="tbMatchCASE"><fmt:message key="editor.plain.matchcase" /></label>
- </span>
- <span>
- <input type="checkbox" name="tbREGEXP" id="tbREGEXP" />
- <label for="tbREGEXP"><fmt:message key="editor.plain.regexp" /></label>
- </span>
- <span>
- <input type="checkbox" name="tbGLOBAL" id="tbGLOBAL" checked="checked" />
- <label for="tbGLOBAL"><fmt:message key="editor.plain.global" /></label>
- </span>
- </div>
- <div class="clearbox"></div>
+ <div id="toolbar" class="line">
+
+ <div id="configDialog" style="display:none;">
+ <label for="tabcompletion" title="<fmt:message key='editor.plain.tabcompletion.title'/>">
+ <input type="checkbox" name="tabcompletion" id="tabcompletion" /><fmt:message key="editor.plain.tabcompletion"/></label>
+ <br />
+ <label for="smartpairs" title="<fmt:message key='editor.plain.smartpairs.title'/>">
+ <input type="checkbox" name="smartpairs" id="smartpairs" /><fmt:message key="editor.plain.smartpairs"/></label>
</div>
-
+
+ <fieldset class="unit">
+ <legend><fmt:message key='editor.plain.action'/></legend>
+ <a href="#" class="tool tUNDO" title="<fmt:message key='editor.plain.undo.title'/>">undo</a>
+ <a href="#" class="tool tREDO" title="<fmt:message key='editor.plain.redo.title'/>">redo</a>
+ <a href="#" class="tool tSEARCH" title="<fmt:message key='editor.plain.find.title'/>">find</a>
+ <a href="#" class="tool tCONFIG" title="<fmt:message key='editor.plain.config.title'/>">config</a>
+ </fieldset>
+
+ <fieldset class="unit">
+ <legend><fmt:message key='editor.plain.insert'/></legend>
+ <a href="#" class="tool tLink" title="<fmt:message key='editor.plain.tbLink.title'/>">link</a>
+ <a href="#" class="tool tH1" title="<fmt:message key='editor.plain.tbH1.title'/>">h1</a>
+ <a href="#" class="tool tH2" title="<fmt:message key='editor.plain.tbH2.title'/>">h2</a>
+ <a href="#" class="tool tH3" title="<fmt:message key='editor.plain.tbH3.title'/>">h3</a>
+ <a href="#" class="tool tPRE" title="<fmt:message key='editor.plain.tbPRE.title'/>">pre</a>
+ <a href="#" class="tool tHR" title="<fmt:message key='editor.plain.tbHR.title'/>">hr</a>
+ <a href="#" class="tool tBR" title="<fmt:message key='editor.plain.tbBR.title'/>">br</a>
+ <a href="#" class="tool tCHAR" title="<fmt:message key='editor.plain.tbCHAR.title'/>">special</a>
+ </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>
+ -->
+ </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>
+ <%-- --%>
+ </fieldset>
+
+ <fieldset class="unit lastUnit">
+ <legend><fmt:message key="editor.plain.livepreview"/></legend>
+
+ <a href="#" class="tool tHORZ" title="<fmt:message key='editor.plain.tbHORZ.title'/>">tile-horz</a>
+ <a href="#" class="tool tVERT" title="<fmt:message key='editor.plain.tbVERT.title'/>">tile-vert</a>
+ <label for="autopreview" title="<fmt:message key='editor.plain.livepreview.title'/>">
+ <input type="checkbox" name="autopreview" id="autopreview" <%=TextUtil.isPositive((String)session.getAttribute("autopreview")) ? "checked='checked'" : ""%> />On</label>
+
+ </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>
+ </div>
+
+ </div><%-- end of the toolbar --%>
+
<%-- You knew this would be here somewhere. Yes, it's the textarea where the user
actually edits stuff. --%>
- <div>
- <s:textarea id="editorarea" name="text" class="editor" rows="20" cols="80" />
- <div class="clearbox" ></div>
- </div>
+ <div id="editor-content" class="line" style="clear:both;">
- <wiki:CheckRequestContext context="comment">
- <fieldset>
- <legend><fmt:message key="editor.commentsignature" /></legend>
- <p>
- <s:label for="author" accesskey="n" name="author" />
- <s:text id="author" name="author" />
- <s:checkbox id="remember" name="remember" />
- <s:label for="remember" name="remember" />
- </p>
- <p>
- <s:label for="link" accesskey="m" name="editor.plain.email" />
- <s:text id="link" name="link" size="24" />
- </p>
- </fieldset>
- </wiki:CheckRequestContext>
-
- <div id="livepreviewheader">
- <s:checkbox id="livePreview" name="livePreview" />
- <c:set var="livePreviewTitle" scope="page"><fmt:message key="editor.plain.livepreview.title"/></c:set>
- <s:label for="livePreview" title="${livePreviewTitle}" name="livePreview" />
- <span id="previewSpin" class="spin" style="position:absolute;display:none;"></span>
+ <div class="unit size1of2">
+ <div class="editor-container">
+ <%-- js-insert: <div id="snipetoc"><ul>...</ul></div> --%>
+ <s:textarea id="editorarea" name="text" class="editor" rows="20" cols="80" />
+ <%-- js insert: <div class="resize-bar"></div> --%>
+ </div>
+ </div>
+
+ <div class="unit size1of2 lastUnit">
+ <div id="previewspin" class="spin" style="display:none;"><fmt:message key="common.ajax.loading"/></div>
+ <div id="livepreview" class="xflow"></div>
+ </div>
+
</div>
- <div id="livepreview"></div>
<%-- Spam detection fields --%>
<wiki:SpamProtect />
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/images/application_tile_horizontal.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/images/application_tile_horizontal.png?rev=784605&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/application_tile_horizontal.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/application_tile_horizontal.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/images/application_tile_vertical.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/images/application_tile_vertical.png?rev=784605&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/application_tile_vertical.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/application_tile_vertical.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/images/arrleft.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/images/arrleft.gif?rev=784605&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/arrleft.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/images/arrright.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/images/arrright.gif?rev=784605&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/arrright.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/images/bg-button.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/images/bg-button.gif?rev=784605&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/bg-button.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/images/circle-256.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/images/circle-256.png?rev=784605&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/circle-256.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/images/cog.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/images/cog.png?rev=784605&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/cog.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/cog.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/images/color_wheel.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/images/color_wheel.png?rev=784605&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/color_wheel.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/color_wheel.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/images/cursor.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/images/cursor.gif?rev=784605&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/cursor.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/images/find.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/images/find.png?rev=784605&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/find.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/find.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/images/font.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/images/font.png?rev=784605&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/font.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/font.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/images/key.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/images/key.png?rev=784605&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/key.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/key.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/images/paintbrush.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/images/paintbrush.png?rev=784605&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/paintbrush.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/paintbrush.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/images/plugin.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/images/plugin.png?rev=784605&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/plugin.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/plugin.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/images/redo.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/images/redo.gif?rev=784605&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/redo.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/redo.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/images/text_letter_omega.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/images/text_letter_omega.png?rev=784605&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/text_letter_omega.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/text_letter_omega.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/images/undo.gif
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/images/undo.gif?rev=784605&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/undo.gif
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/undo.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jspwiki/trunk/src/WebContent/templates/default/images/vcard.png
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/images/vcard.png?rev=784605&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/vcard.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/jspwiki/trunk/src/WebContent/templates/default/images/vcard.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream