Author: ajaquith
Date: Mon Mar 1 05:09:37 2010
New Revision: 917380
URL: http://svn.apache.org/viewvc?rev=917380&view=rev
Log:
Edit.jsp, Wiki.jsp, and PageInfo.jsp changed to put the edit tab on the right.
For editing, the live-preview feature was moved to a new "Preview" tab, also on
the right. The View tab now simply displays the most recent save.
Modified:
incubator/jspwiki/trunk/src/WebContent/templates/default/Edit.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/PageInfo.jsp
incubator/jspwiki/trunk/src/WebContent/templates/default/Wiki.jsp
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/Edit.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/Edit.jsp?rev=917380&r1=917379&r2=917380&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Edit.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Edit.jsp Mon Mar
1 05:09:37 2010
@@ -21,6 +21,7 @@
<%@ 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 errorPage="/Error.jsp" %>
<s:layout-render name="${templates['layout/DefaultLayout.jsp']}">
<%-- Page title should say Edit: + pagename --%>
@@ -41,21 +42,10 @@
<wiki:TabbedSection defaultTab="edit">
<%-- View tab --%>
- <wiki:Tab id="view" titleKey="view.tab" accesskey="v"
- onclick="Stripes.submitFormEvent('editform', 'preview',
'previewContent', null);">
- <div class="information">
- <fmt:message key="preview.info" />
- </div>
- <div id="previewContent">
- Page contents go here.
- </div>
+ <wiki:Tab id="view" titleKey="view.tab" accesskey="v">
+ <wiki:InsertPage/>
</wiki:Tab>
- <%-- Editor tab --%>
- <wiki:Tab id="edit" titleKey="edit.tab.edit" accesskey="e">
- <wiki:Editor/>
- </wiki:Tab>
-
<%-- Attachments tab --%>
<wiki:Tab id="attachments" accesskey="a"
title="${wiki:attachmentsTitle(request.Locale,
wikiActionBean.attachments)}">
@@ -67,6 +57,20 @@
<jsp:include page="${templates['tabs/PageInfoTab.jsp']}" />
</wiki:Tab>
+ <%-- Editor tab --%>
+ <wiki:Tab id="edit" titleKey="edit.tab.edit" accesskey="e">
+ <wiki:Editor/>
+ </wiki:Tab>
+
+ <%-- Preview tab --%>
+ <wiki:Tab id="preview" titleKey="preview.tab" accesskey="p"
+ onclick="Stripes.submitFormEvent('editform', 'preview',
'previewContent', null);">
+ <div class="information">
+ <fmt:message key="preview.info" />
+ </div>
+ <div id="previewContent"></div>
+ </wiki:Tab>
+
<%-- Help tab --%>
<wiki:Tab id="help" titleKey="edit.tab.help" accesskey="h">
<wiki:InsertPage page="EditPageHelp" />
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/PageInfo.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/PageInfo.jsp?rev=917380&r1=917379&r2=917380&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/PageInfo.jsp
(original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/PageInfo.jsp Mon
Mar 1 05:09:37 2010
@@ -21,6 +21,7 @@
<%@ 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 errorPage="/Error.jsp" %>
<s:layout-render name="${templates['layout/DefaultLayout.jsp']}">
<s:layout-component name="content">
<wiki:TabbedSection defaultTab="${param.tab}">
@@ -40,14 +41,6 @@
<wiki:Param name="page" value="${wikiActionBean.page.name}" />
</wiki:Tab>
- <%-- Edit tab --%>
- <wiki:Permission permission="edit">
- <wiki:Tab id="edit" titleKey="edit.tab.edit" accesskey="e"
- beanclass="org.apache.wiki.action.EditActionBean" event="edit">
- <wiki:Param name="page" value="${wikiActionBean.page.name}" />
- </wiki:Tab>
- </wiki:Permission>
-
<%-- Attachments tab --%>
<wiki:Tab id="attachments" accesskey="a"
title="${wiki:attachmentsTitle(request.Locale,
wikiActionBean.attachments)}">
@@ -125,6 +118,15 @@
<jsp:include page="${'tabs/PageInfoTab.jsp'}" />
</wiki:Tab>
+
+ <%-- Edit tab --%>
+ <wiki:Permission permission="edit">
+ <wiki:Tab id="edit" titleKey="edit.tab.edit" accesskey="e"
+ beanclass="org.apache.wiki.action.EditActionBean" event="edit">
+ <wiki:Param name="page" value="${wikiActionBean.page.name}" />
+ </wiki:Tab>
+ </wiki:Permission>
+
</wiki:PageExists>
</wiki:TabbedSection>
</s:layout-component>
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/Wiki.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/Wiki.jsp?rev=917380&r1=917379&r2=917380&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Wiki.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Wiki.jsp Mon Mar
1 05:09:37 2010
@@ -28,7 +28,7 @@
<%@ page import="org.apache.wiki.api.WikiPage" %>
<%@ page import="org.apache.wiki.attachment.*" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
-<%@ page errorPage="${templates['Error.jsp']}" %>
+<%@ page errorPage="/Error.jsp" %>
<%
WikiContext c = WikiContextFactory.findContext( pageContext );
WikiPage p = c.getPage();
@@ -131,14 +131,6 @@
</wiki:PageType>
</wiki:Tab>
- <%-- Edit tab --%>
- <wiki:Permission permission="edit">
- <wiki:Tab id="edit" titleKey="edit.tab.edit" accesskey="e"
- beanclass="org.apache.wiki.action.EditActionBean" event="edit">
- <wiki:Param name="page" value="${wikiActionBean.page.name}" />
- </wiki:Tab>
- </wiki:Permission>
-
<%-- Attachments tab --%>
<wiki:Tab id="attachments" accesskey="a"
title="${wiki:attachmentsTitle(request.Locale,
wikiActionBean.attachments)}"
@@ -151,6 +143,15 @@
beanclass="org.apache.wiki.action.ViewActionBean" event="info">
<wiki:Param name="page" value="${wikiActionBean.page.name}" />
</wiki:Tab>
+
+ <%-- Edit tab --%>
+ <wiki:Permission permission="edit">
+ <wiki:Tab id="edit" titleKey="edit.tab.edit" accesskey="e"
+ beanclass="org.apache.wiki.action.EditActionBean" event="edit">
+ <wiki:Param name="page" value="${wikiActionBean.page.name}" />
+ </wiki:Tab>
+ </wiki:Permission>
+
</wiki:PageExists>
</wiki:TabbedSection>
