Author: agilliland
Date: Tue May 22 13:44:46 2007
New Revision: 540742
URL: http://svn.apache.org/viewvc?view=rev&rev=540742
Log:
a bit of reorg for struts2 jsps now that we no longer need extra struts2
subdirectory.
Added:
roller/trunk/web/WEB-INF/jsps/admin/CacheInfo.jsp
- copied unchanged from r540687,
roller/trunk/web/WEB-INF/jsps/admin/struts2/CacheInfo.jsp
roller/trunk/web/WEB-INF/jsps/admin/CommonPingTargetAdd.jsp
- copied unchanged from r540687,
roller/trunk/web/WEB-INF/jsps/admin/struts2/CommonPingTargetAdd.jsp
roller/trunk/web/WEB-INF/jsps/admin/CommonPingTargetConfirm.jsp
- copied unchanged from r540687,
roller/trunk/web/WEB-INF/jsps/admin/struts2/CommonPingTargetConfirm.jsp
roller/trunk/web/WEB-INF/jsps/admin/CreateUser.jsp
- copied unchanged from r540687,
roller/trunk/web/WEB-INF/jsps/admin/struts2/CreateUser.jsp
roller/trunk/web/WEB-INF/jsps/admin/GlobalCommentManagement.jsp
- copied unchanged from r540687,
roller/trunk/web/WEB-INF/jsps/admin/struts2/GlobalCommentManagement.jsp
roller/trunk/web/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp
- copied unchanged from r540687,
roller/trunk/web/WEB-INF/jsps/admin/struts2/GlobalCommentManagementSidebar.jsp
roller/trunk/web/WEB-INF/jsps/admin/GlobalConfig.jsp
- copied unchanged from r540687,
roller/trunk/web/WEB-INF/jsps/admin/struts2/GlobalConfig.jsp
roller/trunk/web/WEB-INF/jsps/admin/ModifyUser.jsp
- copied unchanged from r540687,
roller/trunk/web/WEB-INF/jsps/admin/struts2/ModifyUser.jsp
roller/trunk/web/WEB-INF/jsps/core/CreateWeblog.jsp
- copied unchanged from r540687,
roller/trunk/web/WEB-INF/jsps/core/struts2/CreateWeblog.jsp
roller/trunk/web/WEB-INF/jsps/core/Login.jsp
- copied unchanged from r540687,
roller/trunk/web/WEB-INF/jsps/core/struts2/Login.jsp
roller/trunk/web/WEB-INF/jsps/core/MainMenu.jsp
- copied unchanged from r540687,
roller/trunk/web/WEB-INF/jsps/core/struts2/MainMenu.jsp
roller/trunk/web/WEB-INF/jsps/core/MainMenuSidebar.jsp
- copied unchanged from r540687,
roller/trunk/web/WEB-INF/jsps/core/struts2/MainMenuSidebar.jsp
roller/trunk/web/WEB-INF/jsps/core/Profile.jsp
- copied unchanged from r540687,
roller/trunk/web/WEB-INF/jsps/core/struts2/Profile.jsp
roller/trunk/web/WEB-INF/jsps/core/Register.jsp
- copied unchanged from r540687,
roller/trunk/web/WEB-INF/jsps/core/struts2/Register.jsp
roller/trunk/web/WEB-INF/jsps/core/Setup.jsp
- copied unchanged from r540687,
roller/trunk/web/WEB-INF/jsps/core/struts2/Setup.jsp
roller/trunk/web/WEB-INF/jsps/core/Welcome.jsp
- copied unchanged from r540687,
roller/trunk/web/WEB-INF/jsps/core/struts2/Welcome.jsp
roller/trunk/web/WEB-INF/jsps/editor/
- copied from r540687, roller/trunk/web/WEB-INF/jsps/authoring/struts2/
roller/trunk/web/WEB-INF/jsps/editor/BookmarkAdd.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/BookmarkAdd.jsp
roller/trunk/web/WEB-INF/jsps/editor/BookmarkEdit.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/BookmarkEdit.jsp
roller/trunk/web/WEB-INF/jsps/editor/Bookmarks.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/Bookmarks.jsp
roller/trunk/web/WEB-INF/jsps/editor/BookmarksImport.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/BookmarksImport.jsp
roller/trunk/web/WEB-INF/jsps/editor/BookmarksSidebar.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/BookmarksSidebar.jsp
roller/trunk/web/WEB-INF/jsps/editor/Categories.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/Categories.jsp
roller/trunk/web/WEB-INF/jsps/editor/CategoriesSidebar.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/CategoriesSidebar.jsp
roller/trunk/web/WEB-INF/jsps/editor/CategoryAdd.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/CategoryAdd.jsp
roller/trunk/web/WEB-INF/jsps/editor/CategoryEdit.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/CategoryEdit.jsp
roller/trunk/web/WEB-INF/jsps/editor/CategoryRemove.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/CategoryRemove.jsp
roller/trunk/web/WEB-INF/jsps/editor/Comments.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/Comments.jsp
roller/trunk/web/WEB-INF/jsps/editor/CommentsSidebar.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/CommentsSidebar.jsp
roller/trunk/web/WEB-INF/jsps/editor/CustomPingTargetAdd.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/CustomPingTargetAdd.jsp
roller/trunk/web/WEB-INF/jsps/editor/CustomPingTargetConfirm.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/CustomPingTargetConfirm.jsp
roller/trunk/web/WEB-INF/jsps/editor/CustomPingTargetEdit.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/CustomPingTargetEdit.jsp
roller/trunk/web/WEB-INF/jsps/editor/CustomPingTargets.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/CustomPingTargets.jsp
roller/trunk/web/WEB-INF/jsps/editor/Entries.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/Entries.jsp
roller/trunk/web/WEB-INF/jsps/editor/EntriesSidebar.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/EntriesSidebar.jsp
roller/trunk/web/WEB-INF/jsps/editor/EntryAdd.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/EntryAdd.jsp
roller/trunk/web/WEB-INF/jsps/editor/EntryEdit.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/EntryEdit.jsp
roller/trunk/web/WEB-INF/jsps/editor/EntryRemove.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/EntryRemove.jsp
roller/trunk/web/WEB-INF/jsps/editor/EntrySidebar.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/EntrySidebar.jsp
roller/trunk/web/WEB-INF/jsps/editor/FolderAdd.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/FolderAdd.jsp
roller/trunk/web/WEB-INF/jsps/editor/FolderEdit.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/FolderEdit.jsp
roller/trunk/web/WEB-INF/jsps/editor/Maintenance.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/Maintenance.jsp
roller/trunk/web/WEB-INF/jsps/editor/Members.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/Members.jsp
roller/trunk/web/WEB-INF/jsps/editor/MembersInvite.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/MembersInvite.jsp
roller/trunk/web/WEB-INF/jsps/editor/MembersSidebar.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/MembersSidebar.jsp
roller/trunk/web/WEB-INF/jsps/editor/Pings.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/Pings.jsp
roller/trunk/web/WEB-INF/jsps/editor/Referrers.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/Referrers.jsp
roller/trunk/web/WEB-INF/jsps/editor/Resources.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/Resources.jsp
roller/trunk/web/WEB-INF/jsps/editor/StylesheetEdit.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/StylesheetEdit.jsp
roller/trunk/web/WEB-INF/jsps/editor/StylesheetEditError.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/StylesheetEditError.jsp
roller/trunk/web/WEB-INF/jsps/editor/TemplateEdit.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/TemplateEdit.jsp
roller/trunk/web/WEB-INF/jsps/editor/TemplateRemove.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/TemplateRemove.jsp
roller/trunk/web/WEB-INF/jsps/editor/Templates.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/Templates.jsp
roller/trunk/web/WEB-INF/jsps/editor/TemplatesSidebar.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/TemplatesSidebar.jsp
roller/trunk/web/WEB-INF/jsps/editor/ThemeEdit.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/ThemeEdit.jsp
roller/trunk/web/WEB-INF/jsps/editor/WeblogConfig.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/WeblogConfig.jsp
roller/trunk/web/WEB-INF/jsps/editor/WeblogRemoveConfirm.jsp
- copied unchanged from r540741,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/WeblogRemoveConfirm.jsp
roller/trunk/web/WEB-INF/jsps/tiles/head-ajax.jsp
- copied unchanged from r540687,
roller/trunk/web/WEB-INF/jsps/tiles/struts2/head-ajax.jsp
roller/trunk/web/WEB-INF/jsps/tiles/menu.jsp
- copied unchanged from r540687,
roller/trunk/web/WEB-INF/jsps/tiles/struts2/menu.jsp
Removed:
roller/trunk/web/WEB-INF/jsps/admin/struts2/
roller/trunk/web/WEB-INF/jsps/authoring/struts2/
roller/trunk/web/WEB-INF/jsps/core/struts2/
roller/trunk/web/WEB-INF/jsps/tiles/struts2/
Modified:
roller/trunk/web/WEB-INF/tiles.xml
Modified: roller/trunk/web/WEB-INF/tiles.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/tiles.xml?view=diff&rev=540742&r1=540741&r2=540742
==============================================================================
--- roller/trunk/web/WEB-INF/tiles.xml (original)
+++ roller/trunk/web/WEB-INF/tiles.xml Tue May 22 13:44:46 2007
@@ -21,42 +21,42 @@
"http://struts.apache.org/dtds/tiles-config_2_0.dtd";>
<tiles-definitions>
- <definition name=".tiles-mainmenupage"
template="/WEB-INF/jsps/tiles/struts2/tiles-mainmenupage.jsp">
- <put name="bannerStatus"
value="/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp" />
- <put name="head" value="/WEB-INF/jsps/tiles/struts2/head.jsp"
/>
- <put name="styles" value="/WEB-INF/jsps/tiles/struts2/empty.jsp"
/>
- <put name="messages"
value="/WEB-INF/jsps/tiles/struts2/messages.jsp" />
+ <definition name=".tiles-mainmenupage"
template="/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp">
+ <put name="bannerStatus" value="/WEB-INF/jsps/tiles/bannerStatus.jsp"
/>
+ <put name="head" value="/WEB-INF/jsps/tiles/head.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
+ <put name="messages" value="/WEB-INF/jsps/tiles/messages.jsp" />
<put name="content" value="${content}" />
- <put name="sidebar" value="/WEB-INF/jsps/tiles/struts2/empty.jsp"
/>
- <put name="footer"
value="/WEB-INF/jsps/tiles/struts2/footer.jsp" />
+ <put name="sidebar" value="/WEB-INF/jsps/tiles/empty.jsp" />
+ <put name="footer" value="/WEB-INF/jsps/tiles/footer.jsp" />
</definition>
- <definition name=".tiles-tabbedpage"
template="/WEB-INF/jsps/tiles/struts2/tiles-tabbedpage.jsp">
- <put name="bannerStatus"
value="/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp" />
- <put name="head" value="/WEB-INF/jsps/tiles/struts2/head.jsp"
/>
- <put name="styles" value="/WEB-INF/jsps/tiles/struts2/empty.jsp"
/>
- <put name="menu" value="/WEB-INF/jsps/tiles/struts2/menu.jsp"
/>
- <put name="messages"
value="/WEB-INF/jsps/tiles/struts2/messages.jsp" />
+ <definition name=".tiles-tabbedpage"
template="/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp">
+ <put name="bannerStatus" value="/WEB-INF/jsps/tiles/bannerStatus.jsp"
/>
+ <put name="head" value="/WEB-INF/jsps/tiles/head.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
+ <put name="menu" value="/WEB-INF/jsps/tiles/menu.jsp" />
+ <put name="messages" value="/WEB-INF/jsps/tiles/messages.jsp" />
<put name="content" value="${content}" />
- <put name="sidebar" value="/WEB-INF/jsps/tiles/struts2/empty.jsp"
/>
- <put name="footer"
value="/WEB-INF/jsps/tiles/struts2/footer.jsp" />
+ <put name="sidebar" value="/WEB-INF/jsps/tiles/empty.jsp" />
+ <put name="footer" value="/WEB-INF/jsps/tiles/footer.jsp" />
</definition>
- <definition name=".tiles-simplepage"
template="/WEB-INF/jsps/tiles/struts2/tiles-simplepage.jsp">
- <put name="banner" value="/WEB-INF/jsps/tiles/struts2/empty.jsp"
/>
- <put name="bannerStatus"
value="/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp" />
- <put name="head" value="/WEB-INF/jsps/tiles/struts2/head.jsp"
/>
- <put name="styles"
value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
- <put name="messages"
value="/WEB-INF/jsps/tiles/struts2/messages.jsp" />
+ <definition name=".tiles-simplepage"
template="/WEB-INF/jsps/tiles/tiles-simplepage.jsp">
+ <put name="banner" value="/WEB-INF/jsps/tiles/empty.jsp" />
+ <put name="bannerStatus" value="/WEB-INF/jsps/tiles/bannerStatus.jsp"
/>
+ <put name="head" value="/WEB-INF/jsps/tiles/head.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp"
/>
+ <put name="messages" value="/WEB-INF/jsps/tiles/messages.jsp" />
<put name="content" value="${content}" />
- <put name="footer"
value="/WEB-INF/jsps/tiles/struts2/footer.jsp" />
+ <put name="footer" value="/WEB-INF/jsps/tiles/footer.jsp" />
</definition>
- <definition name=".tiles-errorpage"
template="/WEB-INF/jsps/tiles/struts2/tiles-errorpage.jsp">
- <put name="head" value="/WEB-INF/jsps/tiles/struts2/head.jsp"
/>
- <put name="messages"
value="/WEB-INF/jsps/tiles/struts2/messages.jsp" />
+ <definition name=".tiles-errorpage"
template="/WEB-INF/jsps/tiles/tiles-errorpage.jsp">
+ <put name="head" value="/WEB-INF/jsps/tiles/head.jsp" />
+ <put name="messages" value="/WEB-INF/jsps/tiles/messages.jsp" />
<put name="content" value="${content}" />
- <put name="footer"
value="/WEB-INF/jsps/tiles/struts2/footer.jsp" />
+ <put name="footer" value="/WEB-INF/jsps/tiles/footer.jsp" />
</definition>
@@ -77,78 +77,78 @@
<!-- core pages (and associates) -->
<definition name=".Setup" extends=".tiles-simplepage" >
- <put name="content" value="/WEB-INF/jsps/core/struts2/Setup.jsp" />
+ <put name="content" value="/WEB-INF/jsps/core/Setup.jsp" />
</definition>
<definition name=".Login" extends=".tiles-simplepage" >
- <put name="content" value="/WEB-INF/jsps/core/struts2/Login.jsp" />
+ <put name="content" value="/WEB-INF/jsps/core/Login.jsp" />
</definition>
<definition name=".Register" extends=".tiles-simplepage" >
- <put name="content" value="/WEB-INF/jsps/core/struts2/Register.jsp" />
+ <put name="content" value="/WEB-INF/jsps/core/Register.jsp" />
</definition>
<definition name=".Welcome" extends=".tiles-simplepage" >
- <put name="content" value="/WEB-INF/jsps/core/struts2/Welcome.jsp" />
+ <put name="content" value="/WEB-INF/jsps/core/Welcome.jsp" />
</definition>
<definition name=".Profile" extends=".tiles-simplepage" >
- <put name="content" value="/WEB-INF/jsps/core/struts2/Profile.jsp" />
+ <put name="content" value="/WEB-INF/jsps/core/Profile.jsp" />
</definition>
<definition name=".CreateWeblog" extends=".tiles-simplepage" >
- <put name="content"
value="/WEB-INF/jsps/core/struts2/CreateWeblog.jsp" />
+ <put name="content" value="/WEB-INF/jsps/core/CreateWeblog.jsp" />
</definition>
<definition name=".MainMenu" extends=".tiles-mainmenupage" >
- <put name="content" value="/WEB-INF/jsps/core/struts2/MainMenu.jsp" />
- <put name="sidebar"
value="/WEB-INF/jsps/core/struts2/MainMenuSidebar.jsp" />
- <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp"
/>
+ <put name="content" value="/WEB-INF/jsps/core/MainMenu.jsp" />
+ <put name="sidebar" value="/WEB-INF/jsps/core/MainMenuSidebar.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" />
</definition>
<!-- global admin pages (and associates) -->
<definition name=".GlobalConfig" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/admin/struts2/GlobalConfig.jsp" />
+ <put name="content" value="/WEB-INF/jsps/admin/GlobalConfig.jsp" />
</definition>
<definition name=".UserAdmin" extends=".tiles-tabbedpage" >
- <put name="content" value="/WEB-INF/jsps/admin/struts2/UserAdmin.jsp"
/>
+ <put name="content" value="/WEB-INF/jsps/admin/UserAdmin.jsp" />
</definition>
<definition name=".CreateUser" extends=".tiles-tabbedpage" >
- <put name="content" value="/WEB-INF/jsps/admin/struts2/CreateUser.jsp"
/>
+ <put name="content" value="/WEB-INF/jsps/admin/CreateUser.jsp" />
</definition>
<definition name=".ModifyUser" extends=".tiles-tabbedpage" >
- <put name="content" value="/WEB-INF/jsps/admin/struts2/ModifyUser.jsp"
/>
+ <put name="content" value="/WEB-INF/jsps/admin/ModifyUser.jsp" />
</definition>
<definition name=".GlobalCommentManagement" extends=".tiles-tabbedpage" >
- <put name="head" value="/WEB-INF/jsps/tiles/struts2/head-ajax.jsp" />
- <put name="content"
value="/WEB-INF/jsps/admin/struts2/GlobalCommentManagement.jsp" />
- <put name="sidebar"
value="/WEB-INF/jsps/admin/struts2/GlobalCommentManagementSidebar.jsp" />
- <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp"
/>
+ <put name="head" value="/WEB-INF/jsps/tiles/head-ajax.jsp" />
+ <put name="content"
value="/WEB-INF/jsps/admin/GlobalCommentManagement.jsp" />
+ <put name="sidebar"
value="/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" />
</definition>
<definition name=".CommonPingTargets" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/admin/struts2/CommonPingTargets.jsp" />
+ <put name="content" value="/WEB-INF/jsps/admin/CommonPingTargets.jsp"
/>
</definition>
<definition name=".CommonPingTargetConfirm" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/admin/struts2/CommonPingTargetConfirm.jsp" />
+ <put name="content"
value="/WEB-INF/jsps/admin/CommonPingTargetConfirm.jsp" />
</definition>
<definition name=".CommonPingTargetAdd" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/admin/struts2/CommonPingTargetAdd.jsp" />
+ <put name="content"
value="/WEB-INF/jsps/admin/CommonPingTargetAdd.jsp" />
</definition>
<definition name=".CommonPingTargetEdit" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/admin/struts2/CommonPingTargetEdit.jsp" />
+ <put name="content"
value="/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp" />
</definition>
<definition name=".CacheInfo" extends=".tiles-tabbedpage" >
- <put name="content" value="/WEB-INF/jsps/admin/struts2/CacheInfo.jsp"
/>
+ <put name="content" value="/WEB-INF/jsps/admin/CacheInfo.jsp" />
</definition>
<definition name=".PlanetSubscriptions" extends=".tiles-tabbedpage" >
@@ -166,173 +166,173 @@
<!-- weblog editor pages (and associates) -->
<definition name=".EntryAdd" extends=".tiles-tabbedpage" >
- <put name="head" value="/WEB-INF/jsps/tiles/struts2/head-ajax.jsp" />
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/EntryAdd.jsp" />
- <put name="sidebar"
value="/WEB-INF/jsps/authoring/struts2/EntrySidebar.jsp" />
- <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp"
/>
+ <put name="head" value="/WEB-INF/jsps/tiles/head-ajax.jsp" />
+ <put name="content" value="/WEB-INF/jsps/editor/EntryAdd.jsp" />
+ <put name="sidebar" value="/WEB-INF/jsps/editor/EntrySidebar.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" />
</definition>
<definition name=".EntryEdit" extends=".tiles-tabbedpage" >
- <put name="head" value="/WEB-INF/jsps/tiles/struts2/head-ajax.jsp" />
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/EntryEdit.jsp" />
- <put name="sidebar"
value="/WEB-INF/jsps/authoring/struts2/EntrySidebar.jsp" />
- <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp"
/>
+ <put name="head" value="/WEB-INF/jsps/tiles/head-ajax.jsp" />
+ <put name="content" value="/WEB-INF/jsps/editor/EntryEdit.jsp" />
+ <put name="sidebar" value="/WEB-INF/jsps/editor/EntrySidebar.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" />
</definition>
<definition name=".EntryRemove" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/EntryRemove.jsp" />
- <put name="styles"
value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+ <put name="content" value="/WEB-INF/jsps/editor/EntryRemove.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
</definition>
<definition name=".Entries" extends=".tiles-tabbedpage" >
- <put name="head" value="/WEB-INF/jsps/tiles/struts2/head-ajax.jsp" />
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/Entries.jsp" />
- <put name="sidebar"
value="/WEB-INF/jsps/authoring/struts2/EntriesSidebar.jsp" />
- <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp"
/>
+ <put name="head" value="/WEB-INF/jsps/tiles/head-ajax.jsp" />
+ <put name="content" value="/WEB-INF/jsps/editor/Entries.jsp" />
+ <put name="sidebar" value="/WEB-INF/jsps/editor/EntriesSidebar.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" />
</definition>
<definition name=".Comments" extends=".tiles-tabbedpage" >
- <put name="head" value="/WEB-INF/jsps/tiles/struts2/head-ajax.jsp" />
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/Comments.jsp" />
- <put name="sidebar"
value="/WEB-INF/jsps/authoring/struts2/CommentsSidebar.jsp" />
- <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp"
/>
+ <put name="head" value="/WEB-INF/jsps/tiles/head-ajax.jsp" />
+ <put name="content" value="/WEB-INF/jsps/editor/Comments.jsp" />
+ <put name="sidebar" value="/WEB-INF/jsps/editor/CommentsSidebar.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" />
</definition>
<definition name=".Categories" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/Categories.jsp" />
- <put name="sidebar"
value="/WEB-INF/jsps/authoring/struts2/CategoriesSidebar.jsp" />
- <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp"
/>
+ <put name="content" value="/WEB-INF/jsps/editor/Categories.jsp" />
+ <put name="sidebar" value="/WEB-INF/jsps/editor/CategoriesSidebar.jsp"
/>
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" />
</definition>
<definition name=".CategoryAdd" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/CategoryAdd.jsp" />
- <put name="styles"
value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+ <put name="content" value="/WEB-INF/jsps/editor/CategoryAdd.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
</definition>
<definition name=".CategoryEdit" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/CategoryEdit.jsp" />
- <put name="styles"
value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+ <put name="content" value="/WEB-INF/jsps/editor/CategoryEdit.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
</definition>
<definition name=".CategoryRemove" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/CategoryRemove.jsp" />
- <put name="styles"
value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+ <put name="content" value="/WEB-INF/jsps/editor/CategoryRemove.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
</definition>
<definition name=".Bookmarks" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/Bookmarks.jsp" />
- <put name="sidebar"
value="/WEB-INF/jsps/authoring/struts2/BookmarksSidebar.jsp" />
- <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp"
/>
+ <put name="content" value="/WEB-INF/jsps/editor/Bookmarks.jsp" />
+ <put name="sidebar" value="/WEB-INF/jsps/editor/BookmarksSidebar.jsp"
/>
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" />
</definition>
<definition name=".BookmarkAdd" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/BookmarkAdd.jsp" />
- <put name="styles"
value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+ <put name="content" value="/WEB-INF/jsps/editor/BookmarkAdd.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
</definition>
<definition name=".BookmarkEdit" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/BookmarkEdit.jsp" />
- <put name="styles"
value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+ <put name="content" value="/WEB-INF/jsps/editor/BookmarkEdit.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
</definition>
<definition name=".BookmarksImport" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/BookmarksImport.jsp" />
- <put name="styles"
value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+ <put name="content" value="/WEB-INF/jsps/editor/BookmarksImport.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
</definition>
<definition name=".FolderAdd" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/FolderAdd.jsp" />
- <put name="styles"
value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+ <put name="content" value="/WEB-INF/jsps/editor/FolderAdd.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
</definition>
<definition name=".FolderEdit" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/FolderEdit.jsp" />
- <put name="styles"
value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+ <put name="content" value="/WEB-INF/jsps/editor/FolderEdit.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
</definition>
<definition name=".Resources" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/Resources.jsp" />
+ <put name="content" value="/WEB-INF/jsps/editor/Resources.jsp" />
</definition>
<definition name=".Referrers" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/Referrers.jsp" />
+ <put name="content" value="/WEB-INF/jsps/editor/Referrers.jsp" />
</definition>
<!-- weblog admin pages (and associates) -->
<definition name=".WeblogConfig" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/WeblogConfig.jsp" />
+ <put name="content" value="/WEB-INF/jsps/editor/WeblogConfig.jsp" />
</definition>
<definition name=".WeblogRemoveConfirm" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/WeblogRemoveConfirm.jsp" />
- <put name="styles"
value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+ <put name="content"
value="/WEB-INF/jsps/editor/WeblogRemoveConfirm.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
</definition>
<definition name=".ThemeEdit" extends=".tiles-tabbedpage" >
- <put name="head" value="/WEB-INF/jsps/tiles/struts2/head-ajax.jsp" />
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/ThemeEdit.jsp" />
+ <put name="head" value="/WEB-INF/jsps/tiles/head-ajax.jsp" />
+ <put name="content" value="/WEB-INF/jsps/editor/ThemeEdit.jsp" />
</definition>
<definition name=".StylesheetEdit" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/StylesheetEdit.jsp" />
- <put name="styles"
value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+ <put name="content" value="/WEB-INF/jsps/editor/StylesheetEdit.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
</definition>
<definition name=".StylesheetEditError" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/StylesheetEditError.jsp" />
- <put name="styles"
value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+ <put name="content"
value="/WEB-INF/jsps/editor/StylesheetEditError.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
</definition>
<definition name=".Templates" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/Templates.jsp" />
- <put name="sidebar"
value="/WEB-INF/jsps/authoring/struts2/TemplatesSidebar.jsp" />
- <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp"
/>
+ <put name="content" value="/WEB-INF/jsps/editor/Templates.jsp" />
+ <put name="sidebar" value="/WEB-INF/jsps/editor/TemplatesSidebar.jsp"
/>
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" />
</definition>
<definition name=".TemplateEdit" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/TemplateEdit.jsp" />
- <put name="styles"
value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+ <put name="content" value="/WEB-INF/jsps/editor/TemplateEdit.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
</definition>
<definition name=".TemplateRemove" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/TemplateRemove.jsp" />
- <put name="styles"
value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+ <put name="content" value="/WEB-INF/jsps/editor/TemplateRemove.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
</definition>
<definition name=".Members" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/Members.jsp" />
- <put name="sidebar"
value="/WEB-INF/jsps/authoring/struts2/MembersSidebar.jsp" />
- <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp"
/>
+ <put name="content" value="/WEB-INF/jsps/editor/Members.jsp" />
+ <put name="sidebar" value="/WEB-INF/jsps/editor/MembersSidebar.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" />
</definition>
<definition name=".MembersInvite" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/MembersInvite.jsp" />
- <put name="styles"
value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+ <put name="content" value="/WEB-INF/jsps/editor/MembersInvite.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-nosidebar.jsp" />
</definition>
<definition name=".Pings" extends=".tiles-tabbedpage" >
- <put name="content" value="/WEB-INF/jsps/authoring/struts2/Pings.jsp"
/>
+ <put name="content" value="/WEB-INF/jsps/editor/Pings.jsp" />
</definition>
<definition name=".CustomPingTargets" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/CustomPingTargets.jsp" />
+ <put name="content" value="/WEB-INF/jsps/editor/CustomPingTargets.jsp"
/>
</definition>
<definition name=".CustomPingTargetConfirm" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/CustomPingTargetConfirm.jsp" />
+ <put name="content"
value="/WEB-INF/jsps/editor/CustomPingTargetConfirm.jsp" />
</definition>
<definition name=".CustomPingTargetAdd" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/CustomPingTargetAdd.jsp" />
+ <put name="content"
value="/WEB-INF/jsps/editor/CustomPingTargetAdd.jsp" />
</definition>
<definition name=".CustomPingTargetEdit" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/CustomPingTargetEdit.jsp" />
+ <put name="content"
value="/WEB-INF/jsps/editor/CustomPingTargetEdit.jsp" />
</definition>
<definition name=".Maintenance" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/struts2/Maintenance.jsp" />
+ <put name="content" value="/WEB-INF/jsps/editor/Maintenance.jsp" />
</definition>
</tiles-definitions>
