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/05/27 02:09:10 UTC
svn commit: r409779 - in /incubator/roller/branches/roller_3.0/web: ./
WEB-INF/ WEB-INF/jsps/ WEB-INF/jsps/admin/ WEB-INF/jsps/tiles/ theme/
Author: agilliland
Date: Fri May 26 17:09:08 2006
New Revision: 409779
URL: http://svn.apache.org/viewvc?rev=409779&view=rev
Log:
moving the rest of the tiles layout jsps under WEB-INF/jsps/tiles/
also moved the main page jsps under WEB-INF/jsps/admin/
Added:
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/main-sidebar.jsp
- copied unchanged from r409774, incubator/roller/branches/roller_3.0/web/main-sidebar.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/main.jsp
- copied unchanged from r409774, incubator/roller/branches/roller_3.0/web/main.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/banner.jsp
- copied unchanged from r409774, incubator/roller/branches/roller_3.0/web/theme/banner.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/bannerStatus.jsp
- copied unchanged from r409774, incubator/roller/branches/roller_3.0/web/theme/bannerStatus.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/css-nosidebar.jsp
- copied unchanged from r409774, incubator/roller/branches/roller_3.0/web/theme/css-nosidebar.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/css-sidebar.jsp
- copied unchanged from r409774, incubator/roller/branches/roller_3.0/web/theme/css-sidebar.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/empty.jsp
- copied unchanged from r409774, incubator/roller/branches/roller_3.0/web/theme/empty.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/footer.jsp
- copied unchanged from r409774, incubator/roller/branches/roller_3.0/web/theme/footer.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/footerMain.jsp
- copied unchanged from r409774, incubator/roller/branches/roller_3.0/web/theme/footerMain.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/head-main.jsp
- copied, changed from r409774, incubator/roller/branches/roller_3.0/web/theme/head-main.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/head.jsp
- copied unchanged from r409774, incubator/roller/branches/roller_3.0/web/theme/head.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/menu-admin.jsp
- copied unchanged from r409774, incubator/roller/branches/roller_3.0/web/theme/menu-admin.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/menu-editor.jsp
- copied unchanged from r409774, incubator/roller/branches/roller_3.0/web/theme/menu-editor.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/messages.jsp
- copied unchanged from r409774, incubator/roller/branches/roller_3.0/web/theme/messages.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/search.jsp
- copied unchanged from r409774, incubator/roller/branches/roller_3.0/web/theme/search.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/searchResults.jsp
- copied unchanged from r409774, incubator/roller/branches/roller_3.0/web/theme/searchResults.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/tiles-frontpage.jsp
- copied unchanged from r409774, incubator/roller/branches/roller_3.0/web/theme/tiles-frontpage.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/tiles-mainmenupage.jsp
- copied unchanged from r409774, incubator/roller/branches/roller_3.0/web/theme/tiles-mainmenupage.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/tiles-simplepage.jsp
- copied unchanged from r409774, incubator/roller/branches/roller_3.0/web/theme/tiles-simplepage.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
- copied unchanged from r409774, incubator/roller/branches/roller_3.0/web/theme/tiles-tabbedpage.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/title.jsp
- copied unchanged from r409774, incubator/roller/branches/roller_3.0/web/theme/title.jsp
Removed:
incubator/roller/branches/roller_3.0/web/main-sidebar.jsp
incubator/roller/branches/roller_3.0/web/main.jsp
incubator/roller/branches/roller_3.0/web/theme/banner.jsp
incubator/roller/branches/roller_3.0/web/theme/bannerStatus.jsp
incubator/roller/branches/roller_3.0/web/theme/css-nosidebar.jsp
incubator/roller/branches/roller_3.0/web/theme/css-sidebar.jsp
incubator/roller/branches/roller_3.0/web/theme/empty.jsp
incubator/roller/branches/roller_3.0/web/theme/footer.jsp
incubator/roller/branches/roller_3.0/web/theme/footerMain.jsp
incubator/roller/branches/roller_3.0/web/theme/head-main.jsp
incubator/roller/branches/roller_3.0/web/theme/head.jsp
incubator/roller/branches/roller_3.0/web/theme/menu-admin.jsp
incubator/roller/branches/roller_3.0/web/theme/menu-editor.jsp
incubator/roller/branches/roller_3.0/web/theme/messages.jsp
incubator/roller/branches/roller_3.0/web/theme/search.jsp
incubator/roller/branches/roller_3.0/web/theme/searchResults.jsp
incubator/roller/branches/roller_3.0/web/theme/tiles-frontpage.jsp
incubator/roller/branches/roller_3.0/web/theme/tiles-mainmenupage.jsp
incubator/roller/branches/roller_3.0/web/theme/tiles-simplepage.jsp
incubator/roller/branches/roller_3.0/web/theme/tiles-tabbedpage.jsp
incubator/roller/branches/roller_3.0/web/theme/title.jsp
Modified:
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/403.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/404.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/head-planet.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/error.jsp
incubator/roller/branches/roller_3.0/web/WEB-INF/tiles-defs.xml
incubator/roller/branches/roller_3.0/web/login.jsp
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/403.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/403.jsp?rev=409779&r1=409778&r2=409779&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/403.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/403.jsp Fri May 26 17:09:08 2006
@@ -15,14 +15,14 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ include file="/taglibs.jsp" %>
-<%@ page isErrorPage="true" %>
-<tiles:insert page="/theme/tiles-simplepage.jsp">
- <tiles:put name="banner" value="/theme/banner.jsp" />
- <tiles:put name="bannerStatus" value="/theme/bannerStatus.jsp" />
- <tiles:put name="head" value="/theme/head.jsp" />
- <tiles:put name="styles" value="/theme/empty.jsp" />
- <tiles:put name="messages" value="/theme/messages.jsp" />
- <tiles:put name="content" value="/WEB-INF/jsps/403Body.jsp" />
- <tiles:put name="footer" value="/theme/footer.jsp" />
+<%@ include file="/taglibs.jsp" %>
+<%@ page isErrorPage="true" %>
+<tiles:insert page="/WEB-INF/jsps/tiles/tiles-simplepage.jsp">
+ <tiles:put name="banner" value="/WEB-INF/jsps/tiles/banner.jsp" />
+ <tiles:put name="bannerStatus" value="/WEB-INF/jsps/tiles/bannerStatus.jsp" />
+ <tiles:put name="head" value="/WEB-INF/jsps/tiles/head.jsp" />
+ <tiles:put name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
+ <tiles:put name="messages" value="/WEB-INF/jsps/tiles/messages.jsp" />
+ <tiles:put name="content" value="/WEB-INF/jsps/403Body.jsp" />
+ <tiles:put name="footer" value="/WEB-INF/jsps/tiles/footer.jsp" />
</tiles:insert>
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/404.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/404.jsp?rev=409779&r1=409778&r2=409779&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/404.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/404.jsp Fri May 26 17:09:08 2006
@@ -15,14 +15,14 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ include file="/taglibs.jsp" %>
-<%@ page isErrorPage="true" %>
-<tiles:insert page="/theme/tiles-simplepage.jsp">
- <tiles:put name="banner" value="/theme/banner.jsp" />
- <tiles:put name="bannerStatus" value="/theme/bannerStatus.jsp" />
- <tiles:put name="head" value="/theme/head.jsp" />
- <tiles:put name="styles" value="/theme/empty.jsp" />
- <tiles:put name="messages" value="/theme/messages.jsp" />
- <tiles:put name="content" value="/WEB-INF/jsps/404Body.jsp" />
- <tiles:put name="footer" value="/theme/footer.jsp" />
+<%@ include file="/taglibs.jsp" %>
+<%@ page isErrorPage="true" %>
+<tiles:insert page="/WEB-INF/jsps/tiles/tiles-simplepage.jsp">
+ <tiles:put name="banner" value="/WEB-INF/jsps/tiles/banner.jsp" />
+ <tiles:put name="bannerStatus" value="/WEB-INF/jsps/tiles/bannerStatus.jsp" />
+ <tiles:put name="head" value="/WEB-INF/jsps/tiles/head.jsp" />
+ <tiles:put name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
+ <tiles:put name="messages" value="/WEB-INF/jsps/tiles/messages.jsp" />
+ <tiles:put name="content" value="/WEB-INF/jsps/404Body.jsp" />
+ <tiles:put name="footer" value="/WEB-INF/jsps/tiles/footer.jsp" />
</tiles:insert>
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/head-planet.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/head-planet.jsp?rev=409779&r1=409778&r2=409779&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/head-planet.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/admin/head-planet.jsp Fri May 26 17:09:08 2006
@@ -15,7 +15,7 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ include file="/theme/head.jsp" %>
+<%@ include file="/WEB-INF/jsps/tiles/head.jsp" %>
<link rel="alternate" type="application/rss+xml"
title="RSS feed for planet page" href="<%= request.getContextPath() %>/planetrss" />
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/error.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/error.jsp?rev=409779&r1=409778&r2=409779&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/error.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/error.jsp Fri May 26 17:09:08 2006
@@ -15,14 +15,14 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ include file="/taglibs.jsp" %>
-<%@ page isErrorPage="true" %>
-<tiles:insert page="/theme/tiles-simplepage.jsp">
- <tiles:put name="banner" value="/theme/banner.jsp" />
- <tiles:put name="bannerStatus" value="/theme/bannerStatus.jsp" />
- <tiles:put name="head" value="/theme/head.jsp" />
- <tiles:put name="styles" value="/theme/empty.jsp" />
- <tiles:put name="messages" value="/theme/messages.jsp" />
- <tiles:put name="content" value="/WEB-INF/jsps/errorBody.jsp" />
- <tiles:put name="footer" value="/theme/footer.jsp" />
+<%@ include file="/taglibs.jsp" %>
+<%@ page isErrorPage="true" %>
+<tiles:insert page="/WEB-INF/jsps/tiles/tiles-simplepage.jsp">
+ <tiles:put name="banner" value="/WEB-INF/jsps/tiles/banner.jsp" />
+ <tiles:put name="bannerStatus" value="/WEB-INF/jsps/tiles/bannerStatus.jsp" />
+ <tiles:put name="head" value="/WEB-INF/jsps/tiles/head.jsp" />
+ <tiles:put name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
+ <tiles:put name="messages" value="/WEB-INF/jsps/tiles/messages.jsp" />
+ <tiles:put name="content" value="/WEB-INF/jsps/errorBody.jsp" />
+ <tiles:put name="footer" value="/WEB-INF/jsps/tiles/footer.jsp" />
</tiles:insert>
Copied: incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/head-main.jsp (from r409774, incubator/roller/branches/roller_3.0/web/theme/head-main.jsp)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/head-main.jsp?p2=incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/head-main.jsp&p1=incubator/roller/branches/roller_3.0/web/theme/head-main.jsp&r1=409774&r2=409779&rev=409779&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/theme/head-main.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/jsps/tiles/head-main.jsp Fri May 26 17:09:08 2006
@@ -15,7 +15,7 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ include file="/theme/head.jsp" %>
+<%@ include file="/WEB-INF/jsps/tiles/head.jsp" %>
<link rel="alternate" type="application/atom+xml"
title="Atom feed for main page" href="<%= request.getContextPath() %>/atom" />
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/tiles-defs.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/tiles-defs.xml?rev=409779&r1=409778&r2=409779&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/tiles-defs.xml (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/tiles-defs.xml Fri May 26 17:09:08 2006
@@ -21,61 +21,61 @@
"http://jakarta.apache.org/struts/dtds/tiles-config_1_1.dtd">
<tiles-definitions>
-<definition name=".tiles-frontpage" path="/theme/tiles-frontpage.jsp">
- <put name="banner" value="/theme/banner.jsp" />
- <put name="title" value="/theme/title.jsp" />
- <put name="bannerStatus" value="/theme/bannerStatus.jsp" />
- <put name="head" value="/theme/head.jsp" />
- <put name="styles" value="/theme/css-sidebar.jsp" />
+<definition name=".tiles-frontpage" path="/WEB-INF/jsps/tiles/tiles-frontpage.jsp">
+ <put name="banner" value="/WEB-INF/jsps/tiles/banner.jsp" />
+ <put name="title" value="/WEB-INF/jsps/tiles/title.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-sidebar.jsp" />
<put name="content" value="${content}" />
- <put name="search" value="/theme/search.jsp" />
- <put name="sidebar" value="/theme/empty.jsp" />
- <put name="footer" value="/theme/footer.jsp" />
+ <put name="search" value="/WEB-INF/jsps/tiles/search.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-mainmenupage" path="/theme/tiles-mainmenupage.jsp">
- <put name="bannerStatus" value="/theme/bannerStatus.jsp" />
- <put name="head" value="/theme/head.jsp" />
- <put name="styles" value="/theme/empty.jsp" />
- <put name="messages" value="/theme/messages.jsp" />
+<definition name=".tiles-mainmenupage" path="/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="/theme/empty.jsp" />
- <put name="footer" value="/theme/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" path="/theme/tiles-tabbedpage.jsp">
- <put name="bannerStatus" value="/theme/bannerStatus.jsp" />
- <put name="head" value="/theme/head.jsp" />
- <put name="styles" value="/theme/empty.jsp" />
+<definition name=".tiles-tabbedpage" path="/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="${menu}" />
- <put name="messages" value="/theme/messages.jsp" />
+ <put name="messages" value="/WEB-INF/jsps/tiles/messages.jsp" />
<put name="content" value="${content}" />
- <put name="sidebar" value="/theme/empty.jsp" />
- <put name="footer" value="/theme/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" path="/theme/tiles-simplepage.jsp">
- <put name="banner" value="/theme/empty.jsp" />
- <put name="bannerStatus" value="/theme/bannerStatus.jsp" />
- <put name="head" value="/theme/head.jsp" />
- <put name="styles" value="/theme/css-nosidebar.jsp" />
- <put name="messages" value="/theme/messages.jsp" />
+<definition name=".tiles-simplepage" path="/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="/theme/footer.jsp" />
+ <put name="footer" value="/WEB-INF/jsps/tiles/footer.jsp" />
</definition>
<definition name=".tiles-editorpage" extends=".tiles-tabbedpage" >
- <put name="menu" value="/theme/menu-editor.jsp" />
+ <put name="menu" value="/WEB-INF/jsps/tiles/menu-editor.jsp" />
</definition>
<definition name=".tiles-adminpage" extends=".tiles-tabbedpage" >
- <put name="menu" value="/theme/menu-admin.jsp" />
+ <put name="menu" value="/WEB-INF/jsps/tiles/menu-admin.jsp" />
</definition>
<definition name=".main" extends=".tiles-frontpage" >
- <put name="content" value="/main.jsp" />
- <put name="head" value="/theme/head-main.jsp" />
- <put name="sidebar" value="/main-sidebar.jsp" />
+ <put name="content" value="/WEB-INF/jsps/admin/main.jsp" />
+ <put name="head" value="/WEB-INF/jsps/tiles/head-main.jsp" />
+ <put name="sidebar" value="/WEB-INF/jsps/admin/main-sidebar.jsp" />
</definition>
<definition name=".planet" extends=".tiles-frontpage" >
@@ -90,7 +90,7 @@
<definition name=".YourWebsites" extends=".tiles-mainmenupage" >
<put name="content" value="/WEB-INF/jsps/authoring/YourWebsites.jsp" />
<put name="sidebar" value="/WEB-INF/jsps/authoring/YourWebsitesSidebar.jsp" />
- <put name="styles" value="/theme/css-sidebar.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" />
</definition>
<definition name=".YourProfile" extends=".tiles-simplepage" >
@@ -106,8 +106,8 @@
<put name="content" value="/WEB-INF/jsps/authoring/welcome.jsp" />
</definition>
<definition name=".search" extends=".tiles-simplepage" >
- <put name="content" value="/theme/searchResults.jsp" />
- <put name="banner" value="/theme/banner.jsp" />
+ <put name="content" value="/WEB-INF/jsps/tiles/searchResults.jsp" />
+ <put name="banner" value="/WEB-INF/jsps/tiles/banner.jsp" />
</definition>
@@ -116,22 +116,22 @@
<definition name=".WeblogEdit" extends=".tiles-editorpage" >
<put name="content" value="/WEB-INF/jsps/authoring/WeblogEdit.jsp" />
<put name="sidebar" value="/WEB-INF/jsps/authoring/WeblogEditSidebar.jsp" />
- <put name="styles" value="/theme/css-sidebar.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" />
</definition>
<definition name=".WeblogEntryManagement" extends=".tiles-editorpage" >
<put name="content" value="/WEB-INF/jsps/authoring/WeblogEntryManagement.jsp" />
<put name="sidebar" value="/WEB-INF/jsps/authoring/WeblogEntryManagementSidebar.jsp" />
- <put name="styles" value="/theme/css-sidebar.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" />
</definition>
<definition name=".CommentManagement" extends=".tiles-editorpage" >
<put name="content" value="/WEB-INF/jsps/authoring/CommentManagement.jsp" />
<put name="sidebar" value="/WEB-INF/jsps/authoring/CommentManagementSidebar.jsp" />
- <put name="styles" value="/theme/css-sidebar.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" />
</definition>
<definition name=".CategoriesForm" extends=".tiles-editorpage" >
<put name="content" value="/WEB-INF/jsps/authoring/CategoriesForm.jsp" />
<put name="sidebar" value="/WEB-INF/jsps/authoring/CategoriesSidebar.jsp" />
- <put name="styles" value="/theme/css-sidebar.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" />
</definition>
<definition name=".referers" extends=".tiles-editorpage" >
<put name="content" value="/WEB-INF/jsps/authoring/referers.jsp" />
@@ -139,7 +139,7 @@
<definition name=".BookmarksForm" extends=".tiles-editorpage" >
<put name="content" value="/WEB-INF/jsps/authoring/BookmarksForm.jsp" />
<put name="sidebar" value="/WEB-INF/jsps/authoring/BookmarksSidebar.jsp" />
- <put name="styles" value="/theme/css-sidebar.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" />
</definition>
<definition name=".upload-file" extends=".tiles-editorpage" >
<put name="content" value="/WEB-INF/jsps/authoring/UploadFile.jsp" />
@@ -175,17 +175,17 @@
<definition name=".edit-pages" extends=".tiles-editorpage" >
<put name="content" value="/WEB-INF/jsps/authoring/edit-pages.jsp" />
<put name="sidebar" value="/WEB-INF/jsps/authoring/edit-pages-sidebar.jsp" />
- <put name="styles" value="/theme/css-sidebar.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" />
</definition>
<definition name=".CommentManagementGlobal" extends=".tiles-adminpage" >
<put name="content" value="/WEB-INF/jsps/authoring/CommentManagement.jsp" />
<put name="sidebar" value="/WEB-INF/jsps/authoring/CommentManagementSidebar.jsp" />
- <put name="styles" value="/theme/css-sidebar.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" />
</definition>
<definition name=".MemberPermissions" extends=".tiles-editorpage" >
<put name="content" value="/WEB-INF/jsps/authoring/MemberPermissions.jsp" />
<put name="sidebar" value="/WEB-INF/jsps/authoring/MemberPermissionsSidebar.jsp" />
- <put name="styles" value="/theme/css-sidebar.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/css-sidebar.jsp" />
</definition>
<definition name=".CustomPingTargets" extends=".tiles-editorpage" >
<put name="content" value="/WEB-INF/jsps/authoring/CustomPingTargets.jsp" />
Modified: incubator/roller/branches/roller_3.0/web/login.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/login.jsp?rev=409779&r1=409778&r2=409779&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/login.jsp (original)
+++ incubator/roller/branches/roller_3.0/web/login.jsp Fri May 26 17:09:08 2006
@@ -15,13 +15,13 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ include file="/taglibs.jsp" %>
-<tiles:insert page="/theme/tiles-simplepage.jsp">
- <tiles:put name="banner" value="/theme/banner.jsp" />
- <tiles:put name="bannerStatus" value="/theme/bannerStatus.jsp" />
- <tiles:put name="head" value="/theme/head.jsp" />
- <tiles:put name="styles" value="/theme/empty.jsp" />
- <tiles:put name="messages" value="/theme/messages.jsp" />
- <tiles:put name="content" value="/loginBody.jsp" />
- <tiles:put name="footer" value="/theme/footer.jsp" />
+<%@ include file="/taglibs.jsp" %>
+<tiles:insert page="/WEB-INF/jsps/tiles/tiles-simplepage.jsp">
+ <tiles:put name="banner" value="/WEB-INF/jsps/tiles/banner.jsp" />
+ <tiles:put name="bannerStatus" value="/WEB-INF/jsps/tiles/bannerStatus.jsp" />
+ <tiles:put name="head" value="/WEB-INF/jsps/tiles/head.jsp" />
+ <tiles:put name="styles" value="/WEB-INF/jsps/tiles/empty.jsp" />
+ <tiles:put name="messages" value="/WEB-INF/jsps/tiles/messages.jsp" />
+ <tiles:put name="content" value="/loginBody.jsp" />
+ <tiles:put name="footer" value="/WEB-INF/jsps/tiles/footer.jsp" />
</tiles:insert>