You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2006/06/12 20:49:29 UTC
svn commit: r413725 [2/3] - in /incubator/roller/branches/roller_3.0:
metadata/xdoclet/ src/org/apache/roller/ui/authoring/ajax/
src/org/apache/roller/ui/authoring/struts/actions/
src/org/apache/roller/ui/rendering/servlets/ web/WEB-INF/ web/WEB-INF/cl...
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CategoryForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CategoryForm.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CategoryForm.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CategoryForm.jsp Mon Jun 12 11:49:26 2006
@@ -15,67 +15,67 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ include file="/taglibs.jsp" %>
-
-
-<p class="subtitle">
-<c:if test="${state == 'add'}">
- <fmt:message key="categoryForm.add.subtitle" />
-
-</c:if>
-<c:if test="${state == 'edit'}">
- <fmt:message key="categoryForm.edit.subtitle" />
-</c:if>
-<c:if test="${state == 'correct'}">
- <fmt:message key="categoryForm.correct.subtitle" />
-</c:if>
-</p>
-
-<p>
-<b><fmt:message key="categoriesForm.path" /></b>:
-<c:if test="${!empty parentCategory.parent.path}">
- <c:out value="${parentCategory.parent.path}" />
-</c:if>
-<c:if test="${empty parentCategory.parent.path}">
- /
-</c:if>
-</p>
-
-<html:form action="/editor/categorySave" method="post" focus="name">
-
- <html:hidden property="method" name="method" value="update"/>
- <html:hidden property="id" />
- <html:hidden property="parentId" />
-
- <table>
-
- <tr>
- <td><fmt:message key="categoryForm.name" /></td>
- <td><html:text property="name" size="70" maxlength="255" /></td>
- </tr>
-
- <tr>
- <td><fmt:message key="categoryForm.description" /></td>
- <td><html:textarea property="description" rows="5" cols="50" /></td>
- </tr>
-
- <tr>
- <td><fmt:message key="categoryForm.image" /></td>
- <td><html:textarea property="image" rows="5" cols="50" /></td>
- </tr>
-
- </table>
-
- <p>
- <input type="submit" value="<fmt:message key='categoryForm.save' />" />
- <c:url var="categoriesUrl" value="/editor/categories.do">
- <c:param name="method" value="selectCategory" />
- <c:param name="weblog" value="${model.website.handle}" />
- <c:param name="categoryid" value="${requestScope.parentId}" />
- </c:url>
- <input type="button" value="<fmt:message key='categoryForm.cancel' />"
- onclick="window.location = '<c:out value="${categoriesUrl}" />'" />
- </p>
-
-</html:form>
-
+<%@ include file="/taglibs.jsp" %>
+
+
+<p class="subtitle">
+<c:if test="${state == 'add'}">
+ <fmt:message key="categoryForm.add.subtitle" />
+
+</c:if>
+<c:if test="${state == 'edit'}">
+ <fmt:message key="categoryForm.edit.subtitle" />
+</c:if>
+<c:if test="${state == 'correct'}">
+ <fmt:message key="categoryForm.correct.subtitle" />
+</c:if>
+</p>
+
+<p>
+<b><fmt:message key="categoriesForm.path" /></b>:
+<c:if test="${!empty parentCategory.parent.path}">
+ <c:out value="${parentCategory.parent.path}" />
+</c:if>
+<c:if test="${empty parentCategory.parent.path}">
+ /
+</c:if>
+</p>
+
+<html:form action="/roller-ui/authoring/categorySave" method="post" focus="name">
+
+ <html:hidden property="method" name="method" value="update"/>
+ <html:hidden property="id" />
+ <html:hidden property="parentId" />
+
+ <table>
+
+ <tr>
+ <td><fmt:message key="categoryForm.name" /></td>
+ <td><html:text property="name" size="70" maxlength="255" /></td>
+ </tr>
+
+ <tr>
+ <td><fmt:message key="categoryForm.description" /></td>
+ <td><html:textarea property="description" rows="5" cols="50" /></td>
+ </tr>
+
+ <tr>
+ <td><fmt:message key="categoryForm.image" /></td>
+ <td><html:textarea property="image" rows="5" cols="50" /></td>
+ </tr>
+
+ </table>
+
+ <p>
+ <input type="submit" value="<fmt:message key='categoryForm.save' />" />
+ <c:url var="categoriesUrl" value="/roller-ui/authoring/categories.do">
+ <c:param name="method" value="selectCategory" />
+ <c:param name="weblog" value="${model.website.handle}" />
+ <c:param name="categoryid" value="${requestScope.parentId}" />
+ </c:url>
+ <input type="button" value="<fmt:message key='categoryForm.cancel' />"
+ onclick="window.location = '<c:out value="${categoriesUrl}" />'" />
+ </p>
+
+</html:form>
+
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CommentManagement.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CommentManagement.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CommentManagement.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CommentManagement.jsp Mon Jun 12 11:49:26 2006
@@ -50,7 +50,7 @@
</fmt:message>
</p>
<p>
- <c:url value="/editor/weblog.do" var="entryLink">
+ <c:url value="/roller-ui/authoring/weblog.do" var="entryLink">
<c:param name="method" value="edit" />
<c:param name="weblog" value="${model.website.handle}" />
<c:param name="entryid" value="${model.weblogEntry.id}" />
@@ -160,7 +160,7 @@
<%-- ============================================================= --%>
<% String path = model.getWebsite()==null
- ? "/admin/commentManagement" : "/editor/commentManagement"; %>
+ ? "/admin/commentManagement" : "/roller-ui/authoring/commentManagement"; %>
<html:form action="<%= path %>" method="post">
<input type="hidden" name="method" value="update"/>
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CommentManagementSidebar.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CommentManagementSidebar.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CommentManagementSidebar.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CommentManagementSidebar.jsp Mon Jun 12 11:49:26 2006
@@ -34,7 +34,7 @@
<p><fmt:message key="commentManagement.sidebarDescription" /></p>
<% String path = model.getWebsite()==null
- ? "/admin/commentQuery" : "/editor/commentQuery"; %>
+ ? "/admin/commentQuery" : "/roller-ui/authoring/commentQuery"; %>
<html:form action="<%= path %>" method="post">
<c:if test="${!empty model.website}">
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CreateWebsite.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CreateWebsite.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CreateWebsite.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CreateWebsite.jsp Mon Jun 12 11:49:26 2006
@@ -42,7 +42,7 @@
<p class="subtitle"><fmt:message key="createWebsite.prompt" /></p>
<br />
-<html:form action="/editor/createWebsite" method="post" focus="handle">
+<html:form action="/roller-ui/authoring/createWebsite" method="post" focus="handle">
<input type="hidden" name="method" value="save"></input>
<table class="formtable">
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CustomPingTargetDeleteOK.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CustomPingTargetDeleteOK.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CustomPingTargetDeleteOK.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CustomPingTargetDeleteOK.jsp Mon Jun 12 11:49:26 2006
@@ -29,7 +29,7 @@
<table>
<tr>
<td>
-<html:form action="/editor/customPingTargets" method="post">
+<html:form action="/roller-ui/authoring/customPingTargets" method="post">
<input type="hidden" name="weblog" value='<c:out value="${model.website.handle}" />' />
<html:hidden property="method" value="deleteConfirmed" />
<html:hidden property="id" />
@@ -39,7 +39,7 @@
</html:form>
</td>
<td>
-<html:form action="/editor/customPingTargets" method="post">
+<html:form action="/roller-ui/authoring/customPingTargets" method="post">
<input type="hidden" name="weblog" value='<c:out value="${model.website.handle}" />' />
<!-- Results in returning to the view on common ping targets. -->
<div class="control">
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CustomPingTargetEdit.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CustomPingTargetEdit.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CustomPingTargetEdit.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CustomPingTargetEdit.jsp Mon Jun 12 11:49:26 2006
@@ -31,7 +31,7 @@
</fmt:message>
</p>
-<html:form action="/editor/customPingTargets" method="post" focus="name">
+<html:form action="/roller-ui/authoring/customPingTargets" method="post" focus="name">
<html:hidden property="method" value="save" />
<html:hidden property="id" />
<input type="hidden" name="weblog" value='<c:out value="${model.website.handle}" />' />
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CustomPingTargets.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CustomPingTargets.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CustomPingTargets.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/CustomPingTargets.jsp Mon Jun 12 11:49:26 2006
@@ -58,7 +58,7 @@
</td>
<td class="rollertable" align="center">
- <roller:link page="/editor/customPingTargets.do">
+ <roller:link page="/roller-ui/authoring/customPingTargets.do">
<roller:linkparam
id="<%= RollerRequest.PINGTARGETID_KEY %>"
name="pingTarget" property="id" />
@@ -72,7 +72,7 @@
</td>
<td class="rollertable" align="center">
- <roller:link page="/editor/customPingTargets.do">
+ <roller:link page="/roller-ui/authoring/customPingTargets.do">
<roller:linkparam
id="<%= RollerRequest.PINGTARGETID_KEY %>"
name="pingTarget" property="id" />
@@ -92,7 +92,7 @@
<br />
- <html:form action="/editor/customPingTargets" method="post">
+ <html:form action="/roller-ui/authoring/customPingTargets" method="post">
<div class="control">
<html:hidden property="method" value="addNew" />
<input type="hidden" name="weblog" value='<c:out value="${model.website.handle}" />' />
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/FolderForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/FolderForm.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/FolderForm.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/FolderForm.jsp Mon Jun 12 11:49:26 2006
@@ -15,65 +15,65 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ include file="/taglibs.jsp" %>
-
-<c:if test="${!empty parentFolder.parent.path}">
- <c:set var="folderName" value="${parentFolder.parent.path}" />
-</c:if>
-<c:if test="${empty parentFolder.parent.path}">
- <c:set var="folderName" value="/" />
-</c:if>
-
-<p class="subtitle">
-<c:if test="${state == 'add'}">
- <fmt:message key="folderForm.add.subtitle" >
- <fmt:param value="${folderName}" />
- </fmt:message>
-</c:if>
-<c:if test="${state == 'edit'}">
- <fmt:message key="folderForm.edit.subtitle" >
- <fmt:param value="${folderName}" />
- </fmt:message>
-</c:if>
-<c:if test="${state == 'correct'}">
- <fmt:message key="folderForm.correct.subtitle" >
- <fmt:param value="${folderName}" />
- </fmt:message>
-</c:if>
-</p>
-
-<p>
-<b><fmt:message key="bookmarksForm.path" /></b>:
-<c:out value="${folderName}" />
-</p>
-
-<html:form action="/editor/folderSave" method="post" focus="name">
-
- <html:hidden property="method" name="method" value="update"/>
- <html:hidden property="id" />
-
- <input type="hidden" name="<%= RollerRequest.PARENTID_KEY %>"
- value="<%= request.getAttribute(RollerRequest.PARENTID_KEY) %>" />
-
- <table>
-
- <tr>
- <td><fmt:message key="folderForm.name" /></td>
- <td><html:text property="name" size="70" maxlength="255" /></td>
- </tr>
-
- <tr>
- <td><fmt:message key="folderForm.description" /></td>
- <td><html:textarea property="description" rows="5" cols="50" /></td>
- </tr>
- </table>
-
- <p>
- <input type="submit" value="<fmt:message key='folderForm.save' />" />
- <input type="button" value="<fmt:message key='folderForm.cancel' />"
- onclick="window.location = 'bookmarks.do?method=selectFolder&folderId=<%=
- request.getAttribute(RollerRequest.PARENTID_KEY) %>'" />
- </p>
-
-</html:form>
-
+<%@ include file="/taglibs.jsp" %>
+
+<c:if test="${!empty parentFolder.parent.path}">
+ <c:set var="folderName" value="${parentFolder.parent.path}" />
+</c:if>
+<c:if test="${empty parentFolder.parent.path}">
+ <c:set var="folderName" value="/" />
+</c:if>
+
+<p class="subtitle">
+<c:if test="${state == 'add'}">
+ <fmt:message key="folderForm.add.subtitle" >
+ <fmt:param value="${folderName}" />
+ </fmt:message>
+</c:if>
+<c:if test="${state == 'edit'}">
+ <fmt:message key="folderForm.edit.subtitle" >
+ <fmt:param value="${folderName}" />
+ </fmt:message>
+</c:if>
+<c:if test="${state == 'correct'}">
+ <fmt:message key="folderForm.correct.subtitle" >
+ <fmt:param value="${folderName}" />
+ </fmt:message>
+</c:if>
+</p>
+
+<p>
+<b><fmt:message key="bookmarksForm.path" /></b>:
+<c:out value="${folderName}" />
+</p>
+
+<html:form action="/roller-ui/authoring/folderSave" method="post" focus="name">
+
+ <html:hidden property="method" name="method" value="update"/>
+ <html:hidden property="id" />
+
+ <input type="hidden" name="<%= RollerRequest.PARENTID_KEY %>"
+ value="<%= request.getAttribute(RollerRequest.PARENTID_KEY) %>" />
+
+ <table>
+
+ <tr>
+ <td><fmt:message key="folderForm.name" /></td>
+ <td><html:text property="name" size="70" maxlength="255" /></td>
+ </tr>
+
+ <tr>
+ <td><fmt:message key="folderForm.description" /></td>
+ <td><html:textarea property="description" rows="5" cols="50" /></td>
+ </tr>
+ </table>
+
+ <p>
+ <input type="submit" value="<fmt:message key='folderForm.save' />" />
+ <input type="button" value="<fmt:message key='folderForm.cancel' />"
+ onclick="window.location = 'bookmarks.do?method=selectFolder&folderId=<%=
+ request.getAttribute(RollerRequest.PARENTID_KEY) %>'" />
+ </p>
+
+</html:form>
+
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/InviteMember.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/InviteMember.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/InviteMember.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/InviteMember.jsp Mon Jun 12 11:49:26 2006
@@ -30,7 +30,7 @@
<p class="subtitle"><fmt:message key="inviteMember.subtitle" /></p>
<p><fmt:message key="inviteMember.prompt" /></p>
-<html:form action="/editor/inviteMember" method="post" focus="userName">
+<html:form action="/roller-ui/authoring/inviteMember" method="post" focus="userName">
<html:hidden property="websiteId" />
<input name="method" type="hidden" value="send" />
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/Maintenance.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/Maintenance.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/Maintenance.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/Maintenance.jsp Mon Jun 12 11:49:26 2006
@@ -19,7 +19,7 @@
<p class="subtitle"><fmt:message key="maintenance.subtitle" /></p>
-<html:form action="/editor/maintenance" method="post">
+<html:form action="/roller-ui/authoring/maintenance" method="post">
<input type="hidden" name="method" value="" />
<input type="hidden" name="weblog" value='<c:out value="${model.website.handle}" />' />
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/MemberPermissions.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/MemberPermissions.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/MemberPermissions.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/MemberPermissions.jsp Mon Jun 12 11:49:26 2006
@@ -41,7 +41,7 @@
<p><fmt:message key="memberPermissions.description" /></p>
-<html:form action="/editor/memberPermissions" method="post">
+<html:form action="/roller-ui/authoring/memberPermissions" method="post">
<html:hidden property="websiteId" />
<table class="rollertable">
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/MemberPermissionsSidebar.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/MemberPermissionsSidebar.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/MemberPermissionsSidebar.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/MemberPermissionsSidebar.jsp Mon Jun 12 11:49:26 2006
@@ -26,7 +26,7 @@
<h3><fmt:message key="mainPage.actions" /></h3>
<hr size="1" noshade="noshade" />
<img src='<c:url value="/images/email_edit.png"/>' alt="mail-icon" align="bottom" />
- <c:url value="/editor/inviteMember.do" var="inviteUrl">
+ <c:url value="/roller-ui/authoring/inviteMember.do" var="inviteUrl">
<c:param name="weblog" value="${model.website.handle}" />
</c:url>
<a href='<c:out value="${inviteUrl}" />'>
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/Pings.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/Pings.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/Pings.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/Pings.jsp Mon Jun 12 11:49:26 2006
@@ -76,7 +76,7 @@
<td class="rollertable" align="center" >
<c:choose>
<c:when test="${isEnabled[pingTarget.id]}">
- <roller:link page="/editor/pingSetup.do">
+ <roller:link page="/roller-ui/authoring/pingSetup.do">
<roller:linkparam
id="<%= RollerRequest.PINGTARGETID_KEY %>"
name="pingTarget" property="id" />
@@ -88,7 +88,7 @@
</roller:link>
</c:when>
<c:otherwise >
- <roller:link page="/editor/pingSetup.do">
+ <roller:link page="/roller-ui/authoring/pingSetup.do">
<roller:linkparam
id="<%= RollerRequest.PINGTARGETID_KEY %>"
name="pingTarget" property="id" />
@@ -103,7 +103,7 @@
</td>
<td class="rollertable">
- <roller:link page="/editor/pingSetup.do">
+ <roller:link page="/roller-ui/authoring/pingSetup.do">
<roller:linkparam
id="<%= RollerRequest.PINGTARGETID_KEY %>"
name="pingTarget" property="id" />
@@ -173,7 +173,7 @@
<td class="rollertable" align="center" >
<c:choose>
<c:when test="${isEnabled[pingTarget.id]}">
- <roller:link page="/editor/pingSetup.do">
+ <roller:link page="/roller-ui/authoring/pingSetup.do">
<roller:linkparam
id="<%= RollerRequest.PINGTARGETID_KEY %>"
name="pingTarget" property="id" />
@@ -185,7 +185,7 @@
</roller:link>
</c:when>
<c:otherwise >
- <roller:link page="/editor/pingSetup.do">
+ <roller:link page="/roller-ui/authoring/pingSetup.do">
<roller:linkparam
id="<%= RollerRequest.PINGTARGETID_KEY %>"
name="pingTarget" property="id" />
@@ -200,7 +200,7 @@
</td>
<td class="rollertable">
- <roller:link page="/editor/pingSetup.do">
+ <roller:link page="/roller-ui/authoring/pingSetup.do">
<roller:linkparam
id="<%= RollerRequest.PINGTARGETID_KEY %>"
name="pingTarget" property="id" />
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/UploadFile.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/UploadFile.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/UploadFile.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/UploadFile.jsp Mon Jun 12 11:49:26 2006
@@ -15,161 +15,161 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ include file="/taglibs.jsp" %>
-<%@ page import="org.apache.struts.util.RequestUtils" %>
-<%@ page import="java.util.Hashtable" %>
-<%@ page import="java.util.ResourceBundle" %>
-
-<%
-BasePageModel model = (BasePageModel)request.getAttribute("model");
-ResourceBundle bundle = ResourceBundle.getBundle("ApplicationResources");
-%>
-
-<script type="text/javascript">
-<!--
-function validate() {
- valid = false;
- for (i=0; i<5; i++) {
- var field = document.getElementById("uploadFile" + i);
- if (!isblank(field.value)) {
- valid = true;
- break;
- }
- }
- if (!valid) window.alert('<fmt:message key="uploadFiles.noFilesSpecified" />');
- else document.forms[0].submit();
-}
-// -->
-</script>
-
-<p class="subtitle">
- <fmt:message key="uploadFiles.subtitle" >
- <fmt:param value="${model.website.handle}" />
- </fmt:message>
-</p>
-<p class="pagetip">
- <fmt:message key="uploadFiles.tip" />
-</p>
-<p class="pagetip">
-<fmt:message key="uploadFiles.quotaNote">
- <fmt:param value="${model.maxFileMB}" />
- <fmt:param value="${model.maxDirMB}" />
-</fmt:message>
-</p>
-
-<%-- --------------------------
-File upload form, but only if it's enabled and weblog is under quota
---%>
-
-<c:choose>
- <c:when test="${!model.uploadEnabled}">
- <span class="error"><fmt:message key="uploadFiles.uploadDisabled" /></span>
- </c:when>
- <c:when test="${model.overQuota}">
- <span class="error"><fmt:message key="uploadFiles.exceededQuota" /></span>
- <br />
- </c:when>
- <c:otherwise>
- <% String edit = RequestUtils.computeURL( pageContext,
- "uploadFiles", null, null, null, new Hashtable(), null, false); %>
- <form name="uploadFiles" method="post" action="<%= edit %>" enctype="multipart/form-data">
- <br />
-
- <input type="file" name="uploadedFile0" id="uploadFile0" size="30" /><br />
-
- <div id="fileControl1" class="miscControl">
- <input type="file" name="uploadedFile1" id="uploadFile1" size="30" /><br />
- </div>
-
- <div id="fileControl2" class="miscControl">
- <input type="file" name="uploadedFile2" id="uploadFile2" size="30" /><br />
- </div>
-
- <div id="fileControl3" class="miscControl">
- <input type="file" name="uploadedFile3" id="uploadFile3" size="30" /><br />
- </div>
-
- <div id="fileControl4" class="miscControl">
- <input type="file" name="uploadedFile4" id="uploadFile4" size="30" /><br />
- </div>
-
- <br />
- <br />
-
- <input name="submitButton" type="button" onclick="validate()"
- value='<%= bundle.getString("uploadFiles.upload") %>' />
- <input type="hidden" name="method" value="upload" />
- <input type="hidden" name="weblog" value='<%= model.getWebsite().getHandle() %>'>
- <br />
- <br />
-
- </form>
- </c:otherwise>
-</c:choose>
-
-<%-- --------------------------
-Table of files, each with link, size and checkbox
---%>
-
-<h1><fmt:message key="uploadFiles.manageFiles" /></h1>
-<html:form action="/editor/uploadFiles" method="post">
-
- <table class="rollertable">
-
- <tr class="rHeaderTr">
- <th class="rollertable" width="95%">Filename</th>
- <th class="rollertable">Size</td>
- <th class="rollertable">Delete</td>
- </tr>
-
- <c:forEach var="loopfile" items="${model.files}" >
- <roller:row oddStyleClass="rollertable_odd" evenStyleClass="rollertable_even">
- <td class="rollertable">
- <img src='<c:url value="/images/image.png"/>' style="padding:0px" />
- <a href='<c:out value="${model.resourcesBaseURL}" />/<c:out value="${loopfile.name}" />'>
- <c:out value="${loopfile.name}" />
- </a>
- </td>
- <td class="rollertable" align="right">
- <fmt:formatNumber value="${loopfile.length / 1024}" type="number" maxFractionDigits="2" /> KB
- </td>
- <td class="rollertable" align="center">
- <input type="checkbox" name="deleteFiles" value='<c:out value="${loopfile.name}" />' />
- </td>
- </roller:row>
-
- </c:forEach>
-
- <tr>
- <td></td>
- <td></td>
- <td><fmt:formatNumber value="${model.totalSize / 1024}" type="number" maxFractionDigits="2" /> KB</td>
- </tr>
- </table>
-
- <table>
- <tr>
- <td align="left">
- <input type="submit" value='<fmt:message key="uploadFiles.button.delete" />' /></input>
- </td>
- </tr>
- </table>
-
- <input type=hidden name="weblog" value='<c:out value="${model.website.handle}" />' />
- <input type="hidden" name="method" value="delete"></input>
-
-</html:form>
-
-<%--
-Added by Matt Raible since the focus javascript generated by Struts uses
-a name reference and IE seems to only focus on file inputs via elements[0]?
---%>
-<script type="text/javascript">
-<!--
- document.forms[0].elements[0].focus();
-// -->
-</script>
-
-
-
-
+<%@ include file="/taglibs.jsp" %>
+<%@ page import="org.apache.struts.util.RequestUtils" %>
+<%@ page import="java.util.Hashtable" %>
+<%@ page import="java.util.ResourceBundle" %>
+
+<%
+BasePageModel model = (BasePageModel)request.getAttribute("model");
+ResourceBundle bundle = ResourceBundle.getBundle("ApplicationResources");
+%>
+
+<script type="text/javascript">
+<!--
+function validate() {
+ valid = false;
+ for (i=0; i<5; i++) {
+ var field = document.getElementById("uploadFile" + i);
+ if (!isblank(field.value)) {
+ valid = true;
+ break;
+ }
+ }
+ if (!valid) window.alert('<fmt:message key="uploadFiles.noFilesSpecified" />');
+ else document.forms[0].submit();
+}
+// -->
+</script>
+
+<p class="subtitle">
+ <fmt:message key="uploadFiles.subtitle" >
+ <fmt:param value="${model.website.handle}" />
+ </fmt:message>
+</p>
+<p class="pagetip">
+ <fmt:message key="uploadFiles.tip" />
+</p>
+<p class="pagetip">
+<fmt:message key="uploadFiles.quotaNote">
+ <fmt:param value="${model.maxFileMB}" />
+ <fmt:param value="${model.maxDirMB}" />
+</fmt:message>
+</p>
+
+<%-- --------------------------
+File upload form, but only if it's enabled and weblog is under quota
+--%>
+
+<c:choose>
+ <c:when test="${!model.uploadEnabled}">
+ <span class="error"><fmt:message key="uploadFiles.uploadDisabled" /></span>
+ </c:when>
+ <c:when test="${model.overQuota}">
+ <span class="error"><fmt:message key="uploadFiles.exceededQuota" /></span>
+ <br />
+ </c:when>
+ <c:otherwise>
+ <% String edit = RequestUtils.computeURL( pageContext,
+ "uploadFiles", null, null, null, new Hashtable(), null, false); %>
+ <form name="uploadFiles" method="post" action="<%= edit %>" enctype="multipart/form-data">
+ <br />
+
+ <input type="file" name="uploadedFile0" id="uploadFile0" size="30" /><br />
+
+ <div id="fileControl1" class="miscControl">
+ <input type="file" name="uploadedFile1" id="uploadFile1" size="30" /><br />
+ </div>
+
+ <div id="fileControl2" class="miscControl">
+ <input type="file" name="uploadedFile2" id="uploadFile2" size="30" /><br />
+ </div>
+
+ <div id="fileControl3" class="miscControl">
+ <input type="file" name="uploadedFile3" id="uploadFile3" size="30" /><br />
+ </div>
+
+ <div id="fileControl4" class="miscControl">
+ <input type="file" name="uploadedFile4" id="uploadFile4" size="30" /><br />
+ </div>
+
+ <br />
+ <br />
+
+ <input name="submitButton" type="button" onclick="validate()"
+ value='<%= bundle.getString("uploadFiles.upload") %>' />
+ <input type="hidden" name="method" value="upload" />
+ <input type="hidden" name="weblog" value='<%= model.getWebsite().getHandle() %>'>
+ <br />
+ <br />
+
+ </form>
+ </c:otherwise>
+</c:choose>
+
+<%-- --------------------------
+Table of files, each with link, size and checkbox
+--%>
+
+<h1><fmt:message key="uploadFiles.manageFiles" /></h1>
+<html:form action="/roller-ui/authoring/uploadFiles" method="post">
+
+ <table class="rollertable">
+
+ <tr class="rHeaderTr">
+ <th class="rollertable" width="95%">Filename</th>
+ <th class="rollertable">Size</td>
+ <th class="rollertable">Delete</td>
+ </tr>
+
+ <c:forEach var="loopfile" items="${model.files}" >
+ <roller:row oddStyleClass="rollertable_odd" evenStyleClass="rollertable_even">
+ <td class="rollertable">
+ <img src='<c:url value="/images/image.png"/>' style="padding:0px" />
+ <a href='<c:out value="${model.resourcesBaseURL}" />/<c:out value="${loopfile.name}" />'>
+ <c:out value="${loopfile.name}" />
+ </a>
+ </td>
+ <td class="rollertable" align="right">
+ <fmt:formatNumber value="${loopfile.length / 1024}" type="number" maxFractionDigits="2" /> KB
+ </td>
+ <td class="rollertable" align="center">
+ <input type="checkbox" name="deleteFiles" value='<c:out value="${loopfile.name}" />' />
+ </td>
+ </roller:row>
+
+ </c:forEach>
+
+ <tr>
+ <td></td>
+ <td></td>
+ <td><fmt:formatNumber value="${model.totalSize / 1024}" type="number" maxFractionDigits="2" /> KB</td>
+ </tr>
+ </table>
+
+ <table>
+ <tr>
+ <td align="left">
+ <input type="submit" value='<fmt:message key="uploadFiles.button.delete" />' /></input>
+ </td>
+ </tr>
+ </table>
+
+ <input type=hidden name="weblog" value='<c:out value="${model.website.handle}" />' />
+ <input type="hidden" name="method" value="delete"></input>
+
+</html:form>
+
+<%--
+Added by Matt Raible since the focus javascript generated by Struts uses
+a name reference and IE seems to only focus on file inputs via elements[0]?
+--%>
+<script type="text/javascript">
+<!--
+ document.forms[0].elements[0].focus();
+// -->
+</script>
+
+
+
+
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEdit.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEdit.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEdit.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEdit.jsp Mon Jun 12 11:49:26 2006
@@ -82,7 +82,7 @@
</c:otherwise>
</c:choose>
-<html:form action="/editor/weblog" method="post" focus="title">
+<html:form action="/roller-ui/authoring/weblog" method="post" focus="title">
<html:hidden property="day"/>
<html:hidden property="id"/>
<html:hidden property="creatorId"/>
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEditSidebar.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEditSidebar.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEditSidebar.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEditSidebar.jsp Mon Jun 12 11:49:26 2006
@@ -32,7 +32,7 @@
<c:choose>
<c:when test="${model.commentCount > 0}">
- <c:url value="/editor/commentManagement.do" var="commentManagement">
+ <c:url value="/roller-ui/authoring/commentManagement.do" var="commentManagement">
<c:param name="method" value="query" />
<c:param name="weblog" value="${model.website.handle}" />
<c:param name="entryid" value="${model.weblogEntry.id}" />
@@ -59,7 +59,7 @@
<span><fmt:message key="application.none" /></span>
</c:if>
<c:forEach var="post" items="${model.recentPendingEntries}">
- <span class="entryEditSidebarLink"><roller:link page="/editor/weblog.do">
+ <span class="entryEditSidebarLink"><roller:link page="/roller-ui/authoring/weblog.do">
<roller:linkparam
id="<%= RollerRequest.WEBLOGENTRYID_KEY %>"
name="post" property="id" />
@@ -81,7 +81,7 @@
<span><fmt:message key="application.none" /></span>
</c:if>
<c:forEach var="post" items="${model.recentDraftEntries}">
- <span class="entryEditSidebarLink"><roller:link page="/editor/weblog.do">
+ <span class="entryEditSidebarLink"><roller:link page="/roller-ui/authoring/weblog.do">
<roller:linkparam
id="<%= RollerRequest.WEBLOGENTRYID_KEY %>"
name="post" property="id" />
@@ -105,7 +105,7 @@
<span><fmt:message key="application.none" /></span>
</c:if>
<c:forEach var="post" items="${model.recentPublishedEntries}">
- <span class="entryEditSidebarLink"><roller:link page="/editor/weblog.do">
+ <span class="entryEditSidebarLink"><roller:link page="/roller-ui/authoring/weblog.do">
<roller:linkparam
id="<%= RollerRequest.WEBLOGENTRYID_KEY %>"
name="post" property="id" />
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEntryManagement.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEntryManagement.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEntryManagement.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEntryManagement.jsp Mon Jun 12 11:49:26 2006
@@ -157,7 +157,7 @@
</td>
<td>
- <roller:link page="/editor/weblog.do">
+ <roller:link page="/roller-ui/authoring/weblog.do">
<roller:linkparam
id="<%= RollerRequest.WEBLOGENTRYID_KEY %>"
name="post" property="id" />
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEntryManagementSidebar.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEntryManagementSidebar.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEntryManagementSidebar.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEntryManagementSidebar.jsp Mon Jun 12 11:49:26 2006
@@ -34,7 +34,7 @@
<p><fmt:message key="weblogEntryQuery.sidebarDescription" /></p>
-<html:form action="/editor/weblogEntryManagement" method="post" focus="title">
+<html:form action="/roller-ui/authoring/weblogEntryManagement" method="post" focus="title">
<input type="hidden" name="weblog" value='<c:out value="${model.website.handle}" />' />
<html:hidden name="method" property="method" value="query"/>
<html:hidden property="count" />
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEntryRemove.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEntryRemove.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEntryRemove.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WeblogEntryRemove.jsp Mon Jun 12 11:49:26 2006
@@ -32,7 +32,7 @@
<table>
<tr>
<td>
- <html:form action="/editor/weblog" method="post">
+ <html:form action="/roller-ui/authoring/weblog" method="post">
<input type="submit" value='<fmt:message key="weblogEntryRemove.yes" />' /></input>
<html:hidden property="method" value="remove"/></input>
<html:hidden property="id" /></input>
@@ -40,7 +40,7 @@
</div>
</td>
<td>
- <html:form action="/editor/weblog" method="post">
+ <html:form action="/roller-ui/authoring/weblog" method="post">
<input type="submit" value='<fmt:message key="weblogEntryRemove.no" />' /></input>
<html:hidden property="method" value="cancel"/></input>
<html:hidden property="id" /></input>
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WebsiteRemove.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WebsiteRemove.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WebsiteRemove.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/WebsiteRemove.jsp Mon Jun 12 11:49:26 2006
@@ -15,47 +15,47 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ include file="/taglibs.jsp" %>
-
-<p class="subtitle">
-<fmt:message key="websiteRemove.subtitle" />
-</p>
-
-<p>
-<fmt:message key="websiteRemove.youSure">
- <fmt:param value="${website.name}" />
-</fmt:message>
-<br/>
-<span class="warning">
- <fmt:message key="websiteSettings.removeWebsiteWarning" />
-</span>
-</p>
-
-<p>
-<fmt:message key="websiteRemove.websiteId" /> = [<c:out value="${website.id}" />]
-<br />
-<fmt:message key="websiteRemove.websiteName" /> = [<c:out value="${website.name}" />]
-</p>
-
-<table>
-<tr>
- <td>
- <html:form action="/editor/website" method="post">
- <input type="submit" value='<fmt:message key="application.yes" />' ></input>
- <html:hidden property="method" value="remove"/></input>
- <html:hidden property="id" /></input>
- </html:form>
- </td>
- <td>
- <html:form action="/editor/website" method="post">
- <input type="submit" value='<fmt:message key="application.no" />' ></input>
- <input type="hidden" name="weblog" value='<c:out value="${website.handle}" />' />
- <html:hidden property="id" /></input>
- <html:hidden property="method" value="edit"/></input>
- </html:form>
- </td>
-</tr>
-</table>
-
-
-
+<%@ include file="/taglibs.jsp" %>
+
+<p class="subtitle">
+<fmt:message key="websiteRemove.subtitle" />
+</p>
+
+<p>
+<fmt:message key="websiteRemove.youSure">
+ <fmt:param value="${website.name}" />
+</fmt:message>
+<br/>
+<span class="warning">
+ <fmt:message key="websiteSettings.removeWebsiteWarning" />
+</span>
+</p>
+
+<p>
+<fmt:message key="websiteRemove.websiteId" /> = [<c:out value="${website.id}" />]
+<br />
+<fmt:message key="websiteRemove.websiteName" /> = [<c:out value="${website.name}" />]
+</p>
+
+<table>
+<tr>
+ <td>
+ <html:form action="/roller-ui/authoring/website" method="post">
+ <input type="submit" value='<fmt:message key="application.yes" />' ></input>
+ <html:hidden property="method" value="remove"/></input>
+ <html:hidden property="id" /></input>
+ </html:form>
+ </td>
+ <td>
+ <html:form action="/roller-ui/authoring/website" method="post">
+ <input type="submit" value='<fmt:message key="application.no" />' ></input>
+ <input type="hidden" name="weblog" value='<c:out value="${website.handle}" />' />
+ <html:hidden property="id" /></input>
+ <html:hidden property="method" value="edit"/></input>
+ </html:form>
+ </td>
+</tr>
+</table>
+
+
+
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/YourProfile.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/YourProfile.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/YourProfile.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/YourProfile.jsp Mon Jun 12 11:49:26 2006
@@ -19,7 +19,7 @@
<p class="subtitle"><fmt:message key="yourProfile.description" /></p>
-<html:form action="/editor/yourProfile" method="post" focus="fullName">
+<html:form action="/roller-ui/authoring/yourProfile" method="post" focus="fullName">
<input type="hidden" name="method" value="save"></input>
<table class="formtable">
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/YourWebsites.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/YourWebsites.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/YourWebsites.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/YourWebsites.jsp Mon Jun 12 11:49:26 2006
@@ -24,7 +24,7 @@
<%-- PROMPT: Welcome... you have no blog --%>
<c:when test="${empty model.permissions && empty model.pendings}">
<p><fmt:message key="yourWebsites.prompt.noBlog" />
- <roller:link page="/editor/createWebsite.do">
+ <roller:link page="/roller-ui/authoring/createWebsite.do">
<fmt:message key="yourWebsites.createOne" />
</roller:link></p>
</c:when>
@@ -37,7 +37,7 @@
<fmt:message key="yourWebsites.youAreInvited" >
<fmt:param value="${invite.website.handle}" />
</fmt:message>
- <c:url value="/editor/yourWebsites.do" var="acceptInvite">
+ <c:url value="/roller-ui/authoring/yourWebsites.do" var="acceptInvite">
<c:param name="method" value="accept" />
<c:param name="inviteId" value="${invite.id}" />
</c:url>
@@ -45,7 +45,7 @@
<fmt:message key="yourWebsites.accept" />
</a>
|
- <c:url value="/editor/yourWebsites.do" var="declineInvite">
+ <c:url value="/roller-ui/authoring/yourWebsites.do" var="declineInvite">
<c:param name="method" value="decline" />
<c:param name="inviteId" value="${invite.id}" />
</c:url>
@@ -99,7 +99,7 @@
<td class="mm_table_actions" width="20%" align="left" >
- <c:url value="/editor/weblog.do" var="newEntry">
+ <c:url value="/roller-ui/authoring/weblog.do" var="newEntry">
<c:param name="method" value="create" />
<c:param name="weblog" value="${perms.website.handle}" />
</c:url>
@@ -108,7 +108,7 @@
<fmt:message key="yourWebsites.newEntry" /></a>
<br />
- <c:url value="/editor/weblogEntryManagement.do" var="editEntries">
+ <c:url value="/roller-ui/authoring/weblogEntryManagement.do" var="editEntries">
<c:param name="method" value="query" />
<c:param name="weblog" value="${perms.website.handle}" />
</c:url>
@@ -118,7 +118,7 @@
<br />
<%-- // I'm not sure this link needs to be here
- <c:url value="/editor/commentManagement.do" var="manageComments">
+ <c:url value="/roller-ui/authoring/commentManagement.do" var="manageComments">
<c:param name="method" value="query" />
<c:param name="weblog" value="${perms.website.handle}" />
</c:url>
@@ -129,7 +129,7 @@
--%>
<c:if test="${perms.permissionMask == 3}">
- <c:url value="/editor/website.do" var="manageWeblog">
+ <c:url value="/roller-ui/authoring/website.do" var="manageWeblog">
<c:param name="method" value="edit" />
<c:param name="weblog" value="${perms.website.handle}" />
</c:url>
@@ -142,7 +142,7 @@
<%-- authors and limited bloggers can resign, but admin cannot resign if he/she is the last admin in the blog --%>
<c:if test="${perms.permissionMask == 0 || perms.permissionMask == 1 || perms.website.adminUserCount > 1 }">
<img src='<c:url value="/images/delete.png"/>' />
- <c:url value="/editor/yourWebsites.do" var="resignWeblog">
+ <c:url value="/roller-ui/authoring/yourWebsites.do" var="resignWeblog">
<c:param name="method" value="resign" />
<c:param name="weblog" value="${perms.website.handle}" />
</c:url>
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/bake-weblog.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/bake-weblog.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/bake-weblog.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/bake-weblog.jsp Mon Jun 12 11:49:26 2006
@@ -15,17 +15,17 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ include file="/taglibs.jsp" %>
-
-<div id="content" style="margin-top: 40px">
-
-<roller:StatusMessage/>
-<html:errors />
-
-<h3>Bake your Weblog Template</h3>
-
- <html:form action="/editor/bake" method="post">
- <input type="submit" value="Bake" />
- <input type=hidden name="method" value="bake" />
- </html:form>
-</div>
+<%@ include file="/taglibs.jsp" %>
+
+<div id="content" style="margin-top: 40px">
+
+<roller:StatusMessage/>
+<html:errors />
+
+<h3>Bake your Weblog Template</h3>
+
+ <html:form action="/roller-ui/authoring/bake" method="post">
+ <input type="submit" value="Bake" />
+ <input type=hidden name="method" value="bake" />
+ </html:form>
+</div>
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-page.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-page.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-page.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-page.jsp Mon Jun 12 11:49:26 2006
@@ -15,91 +15,91 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ include file="/taglibs.jsp" %>
-<script type="text/javascript">
-<!--
-function previewImage(theme) {
- <% String ctxPath = request.getContextPath(); %>
- document.preview.src="<%= ctxPath %>/images/preview/sm-theme-" + theme + ".png";
-}
-function cancel() {
- document.weblogTemplateForm.method.value="cancel";
- document.weblogTemplateForm.submit();
-}
--->
-</script>
-
-<roller:StatusMessage/>
-
-<html:form action="/editor/page" method="post">
-
- <p class="subtitle">
- <fmt:message key="pageForm.editPage" />:
- <bean:write name="weblogTemplateForm" property="name" />
- </p>
-
- <table>
- <tr>
- <td><fmt:message key="pageForm.name" /><br />
- <c:choose>
- <c:when test="${page.required}">
- <html:text style="background: #e5e5e5" property="name" size="50" readonly="true"/>
- </c:when>
- <c:otherwise>
- <html:text property="name" size="50"/>
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
- <tr>
- <td><fmt:message key="pageForm.link" /><br />
- <c:choose>
- <c:when test="${page.required}">
- <html:text style="background: #e5e5e5" property="link" size="50" readonly="true"/>
- </c:when>
- <c:otherwise>
- <html:text property="link" size="50"/>
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
- <tr>
- <td><fmt:message key="pageForm.description" /><br />
- <c:choose>
- <c:when test="${page.required}">
- <html:textarea style="background: #e5e5e5" property="description" rows="3" cols="50" readonly="true"/>
- </c:when>
- <c:otherwise>
- <html:textarea property="description" rows="3" cols="50"/>
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
- </table>
-
- <fmt:message key="pageForm.template" /><br />
- <html:textarea property="contents" cols="80" rows="30" style="width: 100%" />
-
- <html:hidden property="id"/>
- <html:hidden property="name"/>
- <input type="hidden" name="method" value="update" />
- <input type="hidden" name="weblog" value='<c:out value="${model.website.handle}" />' />
-
- <br />
- <input type="submit" value='<fmt:message key="pageForm.save" />' /></input>
- <input type="button" value='<fmt:message key="application.done" />' onclick="cancel()" /></input>
-
-</html:form>
-
-<%--
-Added by Matt Raible since the focus javascript generated by Struts
-doesn't seem to work for forms with duplicate named elements.
---%>
-<script type="text/javascript">
-<!--
- document.forms[0].elements[0].focus();
-// -->
-</script>
-
-
-
+<%@ include file="/taglibs.jsp" %>
+<script type="text/javascript">
+<!--
+function previewImage(theme) {
+ <% String ctxPath = request.getContextPath(); %>
+ document.preview.src="<%= ctxPath %>/images/preview/sm-theme-" + theme + ".png";
+}
+function cancel() {
+ document.weblogTemplateForm.method.value="cancel";
+ document.weblogTemplateForm.submit();
+}
+-->
+</script>
+
+<roller:StatusMessage/>
+
+<html:form action="/roller-ui/authoring/page" method="post">
+
+ <p class="subtitle">
+ <fmt:message key="pageForm.editPage" />:
+ <bean:write name="weblogTemplateForm" property="name" />
+ </p>
+
+ <table>
+ <tr>
+ <td><fmt:message key="pageForm.name" /><br />
+ <c:choose>
+ <c:when test="${page.required}">
+ <html:text style="background: #e5e5e5" property="name" size="50" readonly="true"/>
+ </c:when>
+ <c:otherwise>
+ <html:text property="name" size="50"/>
+ </c:otherwise>
+ </c:choose>
+ </td>
+ </tr>
+ <tr>
+ <td><fmt:message key="pageForm.link" /><br />
+ <c:choose>
+ <c:when test="${page.required}">
+ <html:text style="background: #e5e5e5" property="link" size="50" readonly="true"/>
+ </c:when>
+ <c:otherwise>
+ <html:text property="link" size="50"/>
+ </c:otherwise>
+ </c:choose>
+ </td>
+ </tr>
+ <tr>
+ <td><fmt:message key="pageForm.description" /><br />
+ <c:choose>
+ <c:when test="${page.required}">
+ <html:textarea style="background: #e5e5e5" property="description" rows="3" cols="50" readonly="true"/>
+ </c:when>
+ <c:otherwise>
+ <html:textarea property="description" rows="3" cols="50"/>
+ </c:otherwise>
+ </c:choose>
+ </td>
+ </tr>
+ </table>
+
+ <fmt:message key="pageForm.template" /><br />
+ <html:textarea property="contents" cols="80" rows="30" style="width: 100%" />
+
+ <html:hidden property="id"/>
+ <html:hidden property="name"/>
+ <input type="hidden" name="method" value="update" />
+ <input type="hidden" name="weblog" value='<c:out value="${model.website.handle}" />' />
+
+ <br />
+ <input type="submit" value='<fmt:message key="pageForm.save" />' /></input>
+ <input type="button" value='<fmt:message key="application.done" />' onclick="cancel()" /></input>
+
+</html:form>
+
+<%--
+Added by Matt Raible since the focus javascript generated by Struts
+doesn't seem to work for forms with duplicate named elements.
+--%>
+<script type="text/javascript">
+<!--
+ document.forms[0].elements[0].focus();
+// -->
+</script>
+
+
+
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-pages-sidebar.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-pages-sidebar.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-pages-sidebar.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-pages-sidebar.jsp Mon Jun 12 11:49:26 2006
@@ -15,30 +15,30 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ include file="/taglibs.jsp" %>
-
-<div class="sidebarFade">
- <div class="menu-tr">
- <div class="menu-tl">
-
-<div class="sidebarInner">
- <h3><fmt:message key="pagesForm.addNewPage" /></h3>
- <hr size="1" noshade="noshade" />
-
- <html:form action="/editor/page" method="post" focus="name">
-
- <fmt:message key="pagesForm.name"/>: <input type="text" name="name" size="12" />
-
- <input type="submit" value='<fmt:message key="pagesForm.add" />' />
- <input type="hidden" name="weblog" value='<c:out value="${model.website.handle}" />' />
- <html:hidden property="method" value="add"/>
-
- </html:form>
- <br />
-
-</div>
- </div>
- </div>
-</div>
-
-
+<%@ include file="/taglibs.jsp" %>
+
+<div class="sidebarFade">
+ <div class="menu-tr">
+ <div class="menu-tl">
+
+<div class="sidebarInner">
+ <h3><fmt:message key="pagesForm.addNewPage" /></h3>
+ <hr size="1" noshade="noshade" />
+
+ <html:form action="/roller-ui/authoring/page" method="post" focus="name">
+
+ <fmt:message key="pagesForm.name"/>: <input type="text" name="name" size="12" />
+
+ <input type="submit" value='<fmt:message key="pagesForm.add" />' />
+ <input type="hidden" name="weblog" value='<c:out value="${model.website.handle}" />' />
+ <html:hidden property="method" value="add"/>
+
+ </html:form>
+ <br />
+
+</div>
+ </div>
+ </div>
+</div>
+
+
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-website.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-website.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-website.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/edit-website.jsp Mon Jun 12 11:49:26 2006
@@ -27,7 +27,7 @@
</fmt:message>
</p>
-<html:form action="/editor/website" method="post">
+<html:form action="/roller-ui/authoring/website" method="post">
<html:hidden property="method" value="update"/></input>
<html:hidden property="id"/></input>
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/export-entries.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/export-entries.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/export-entries.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/export-entries.jsp Mon Jun 12 11:49:26 2006
@@ -25,7 +25,7 @@
<roller:StatusMessage/>
-<html:form action="/editor/exportEntries" method="post" focus="title">
+<html:form action="/roller-ui/authoring/exportEntries" method="post" focus="title">
<html:hidden name="method" property="method" value="export"/>
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/import-entries.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/import-entries.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/import-entries.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/import-entries.jsp Mon Jun 12 11:49:26 2006
@@ -21,7 +21,7 @@
<roller:StatusMessage/>
-<html:form action="/editor/importEntries" method="post" focus="title">
+<html:form action="/roller-ui/authoring/importEntries" method="post" focus="title">
<html:hidden name="method" property="method" value="importEntries"/>
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/import.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/import.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/import.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/import.jsp Mon Jun 12 11:49:26 2006
@@ -28,7 +28,7 @@
<fmt:message key="bookmarksImport.prompt" />
</p>
-<html:form action="/editor/importBookmarks" method="post" enctype="multipart/form-data">
+<html:form action="/roller-ui/authoring/importBookmarks" method="post" enctype="multipart/form-data">
<input name="weblog" type="hidden" value='<c:out value="${model.website.handle}" />' />
<html:file property="bookmarksFile" />
<br />
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/referers.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/referers.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/referers.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/referers.jsp Mon Jun 12 11:49:26 2006
@@ -15,56 +15,56 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ include file="/taglibs.jsp" %>
-
-<%-- Form allows deleting of referers --%>
-<p class="subtitle">
- <fmt:message key="referers.subtitle" >
- <fmt:param value="${model.website.handle}" />
- </fmt:message>
-</p>
-<p class="pagetip">
- <fmt:message key="referers.tip" />
-</p>
-
-<html:form action="/editor/referers" method="post">
-<input type=hidden name="weblog" value='<c:out value="${model.website.handle}" />' />
-<input type="hidden" name="method" value="delete" />
-
-<%-- Table of referers, with check box for each --%>
-<table width="75%" class="rollertable" >
- <tr class="rollertable">
- <th class="rollertable"></th>
- <th class="rollertable"><fmt:message key="referers.url" /></th>
- <th class="rollertable"><fmt:message key="referers.hits" /></th>
- </tr>
-
- <c:forEach var="referer" items="${referers}">
- <tr>
- <td class="rollertable">
- <input type="checkbox" name="id" value='<c:out value="${referer.id}" />' />
- </td>
- <td class="rollertable">
- <c:out value="${referer.displayUrl}" escapeXml="false" />
- </td>
- <td class="rollertable"><c:out value="${referer.dayHits}" /></td>
- </tr>
- </c:forEach>
-
-</table>
-
-<br />
-<input type="submit" value='<fmt:message key="referers.deleteSelected" />' /></input>
-</html:form>
-
-<br />
-
-<%-- Form allows reset of day hits --%>
-<h1><fmt:message key="referers.hitCounters" /></h1>
-<p><fmt:message key="referers.hits" />: <c:out value="${pageHits}"/></p>
-<html:form action="/editor/referers" method="post">
- <input type=hidden name="weblog" value='<c:out value="${model.website.handle}" />' />
- <input type="hidden" name="method" value="reset" />
- <input type="submit" value='<fmt:message key="referers.reset" />' /></input>
-</html:form>
-
+<%@ include file="/taglibs.jsp" %>
+
+<%-- Form allows deleting of referers --%>
+<p class="subtitle">
+ <fmt:message key="referers.subtitle" >
+ <fmt:param value="${model.website.handle}" />
+ </fmt:message>
+</p>
+<p class="pagetip">
+ <fmt:message key="referers.tip" />
+</p>
+
+<html:form action="/roller-ui/authoring/referers" method="post">
+<input type=hidden name="weblog" value='<c:out value="${model.website.handle}" />' />
+<input type="hidden" name="method" value="delete" />
+
+<%-- Table of referers, with check box for each --%>
+<table width="75%" class="rollertable" >
+ <tr class="rollertable">
+ <th class="rollertable"></th>
+ <th class="rollertable"><fmt:message key="referers.url" /></th>
+ <th class="rollertable"><fmt:message key="referers.hits" /></th>
+ </tr>
+
+ <c:forEach var="referer" items="${referers}">
+ <tr>
+ <td class="rollertable">
+ <input type="checkbox" name="id" value='<c:out value="${referer.id}" />' />
+ </td>
+ <td class="rollertable">
+ <c:out value="${referer.displayUrl}" escapeXml="false" />
+ </td>
+ <td class="rollertable"><c:out value="${referer.dayHits}" /></td>
+ </tr>
+ </c:forEach>
+
+</table>
+
+<br />
+<input type="submit" value='<fmt:message key="referers.deleteSelected" />' /></input>
+</html:form>
+
+<br />
+
+<%-- Form allows reset of day hits --%>
+<h1><fmt:message key="referers.hitCounters" /></h1>
+<p><fmt:message key="referers.hits" />: <c:out value="${pageHits}"/></p>
+<html:form action="/roller-ui/authoring/referers" method="post">
+ <input type=hidden name="weblog" value='<c:out value="${model.website.handle}" />' />
+ <input type="hidden" name="method" value="reset" />
+ <input type="submit" value='<fmt:message key="referers.reset" />' /></input>
+</html:form>
+
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/remove-page.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/remove-page.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/remove-page.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/remove-page.jsp Mon Jun 12 11:49:26 2006
@@ -15,46 +15,46 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ include file="/taglibs.jsp" %>
-
-
-<p class="subtitle">
-<fmt:message key="pageRemove.subtitle" />
-</p>
-
-<p>
-<fmt:message key="pageRemove.youSure">
- <fmt:param value="${page.name}" />
-</fmt:message>
-
-</p>
-
-<p>
-<fmt:message key="pageRemove.pageId" /> = [<c:out value="${page.id}" />]
-<br />
-<fmt:message key="pageRemove.pageName" /> = [<c:out value="${page.name}" />]
-</p>
-
-<table>
-<tr>
- <td>
- <html:form action="/editor/page" method="post">
- <input type="submit" value='<fmt:message key="application.yes" />' ></input>
- <html:hidden property="method" value="remove"/></input>
- <html:hidden property="id" /></input>
- <input type="hidden" name="weblog" value='<c:out value="${model.website.handle}" />' />
- </html:form>
- </td>
- <td>
- <html:form action="/editor/page" method="post">
- <input type="submit" value='<fmt:message key="application.no" />' ></input>
- <html:hidden property="id" /></input>
- <html:hidden property="method" value="cancel"/></input>
- <input type="hidden" name="weblog" value='<c:out value="${model.website.handle}" />' />
- </html:form>
- </td>
-</tr>
-</table>
-
-
-
+<%@ include file="/taglibs.jsp" %>
+
+
+<p class="subtitle">
+<fmt:message key="pageRemove.subtitle" />
+</p>
+
+<p>
+<fmt:message key="pageRemove.youSure">
+ <fmt:param value="${page.name}" />
+</fmt:message>
+
+</p>
+
+<p>
+<fmt:message key="pageRemove.pageId" /> = [<c:out value="${page.id}" />]
+<br />
+<fmt:message key="pageRemove.pageName" /> = [<c:out value="${page.name}" />]
+</p>
+
+<table>
+<tr>
+ <td>
+ <html:form action="/roller-ui/authoring/page" method="post">
+ <input type="submit" value='<fmt:message key="application.yes" />' ></input>
+ <html:hidden property="method" value="remove"/></input>
+ <html:hidden property="id" /></input>
+ <input type="hidden" name="weblog" value='<c:out value="${model.website.handle}" />' />
+ </html:form>
+ </td>
+ <td>
+ <html:form action="/roller-ui/authoring/page" method="post">
+ <input type="submit" value='<fmt:message key="application.no" />' ></input>
+ <html:hidden property="id" /></input>
+ <html:hidden property="method" value="cancel"/></input>
+ <input type="hidden" name="weblog" value='<c:out value="${model.website.handle}" />' />
+ </html:form>
+ </td>
+</tr>
+</table>
+
+
+
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/spellcheck-entry.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/spellcheck-entry.jsp?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/spellcheck-entry.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/authoring/spellcheck-entry.jsp Mon Jun 12 11:49:26 2006
@@ -39,7 +39,7 @@
<roller:StatusMessage/>
-<html:form action="/editor/weblog" method="post">
+<html:form action="/roller-ui/authoring/weblog" method="post">
<bean:define id="text" name="weblogEntryFormEx"
property="text" type="java.lang.String" />
<input type="hidden" name="method" value="spellCheck"/>
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/security.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/security.xml?rev=413725&r1=413724&r2=413725&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/security.xml (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/security.xml Mon Jun 12 11:49:26 2006
@@ -43,7 +43,7 @@
<property name="objectDefinitionSource">
<value>
PATTERN_TYPE_APACHE_ANT
- /editor/**=admin,editor
+ /roller-ui/authoring/**=admin,editor
/admin/**=admin
/rewrite-status*=admin
/roller-ui/login-redirect.jsp=admin,editor