roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r239735 [2/2] - in /incubator/roller/branches/roller_2.0: metadata/xdoclet/ nbproject/ src/org/roller/presentation/ src/org/roller/presentation/bookmarks/actions/ src/org/roller/presentation/planet/ src/org/roller/presentation/weblog/action...
Date Wed, 24 Aug 2005 19:18:27 GMT
Modified: incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksForm.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksForm.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksForm.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksForm.jsp Wed Aug 24 12:16:58 2005
@@ -1,4 +1,4 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 <% pageContext.setAttribute("leftPage","/bookmarks/BookmarksSidebar.jsp"); %>
 
 <%-- JavaScript for bookmarks table --%> 
@@ -32,10 +32,8 @@
 //-->
 </script>
 
-<p>
 <c:choose>
-    <c:when test="${empty folderPath}">
-       <h1><fmt:message key="bookmarksForm.rootTitle" /></h1>
+    <c:when test="${empty model.folderPath}">
        <p class="subtitle">
            <fmt:message key="bookmarksForm.subtitle" >
                <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
@@ -46,28 +44,23 @@
        </p>
     </c:when>
     
-    <c:when test="${!(empty folderPath)}">
-        <h1>
-            <fmt:message key="bookmarksForm.folder" />
-            [<c:out value="${folder.name}" />]
-        </h1>
-        <p>
-        <b><fmt:message key="bookmarksForm.path" /></b>:
-        <c:forEach var="folder" items="${folderPath}">
+    <c:otherwise>
+        <p class="subtitle">
+        <fmt:message key="bookmarksForm.path" />:
+        <c:forEach var="loopfolder" items="${model.folderPath}">
             /
             <roller:link page="/editor/bookmarks.do">
                 <roller:linkparam id="method" value="selectFolder" />
                 <roller:linkparam 
                     id="<%= RollerRequest.FOLDERID_KEY %>" 
-                    name="folder" property="id" />
-                <c:out value="${folder.name}" />
+                    name="loopfolder" property="id" />
+                <c:out value="${loopfolder.name}" />
             </roller:link>
         </c:forEach>
         <p>
         <p><fmt:message key="bookmarksForm.folderPrompt" /></p>
-    </c:when>
+    </c:otherwise>
 </c:choose>
-</p>
 
 <%-- Form is a table of folders followed by bookmarks, each with checkbox --%>
 
@@ -111,12 +104,12 @@
     </tr>
 
     <%-- Folders --%>
-    <c:forEach var="folder" items="${folders}" >
+    <c:forEach var="loopfolder" items="${model.folder.folders}" >
         <roller:row oddStyleClass="rollertable_odd" evenStyleClass="rollertable_even">
 
             <td class="rollertable">
                 <html:multibox property="selectedFolders">
-                    <c:out value="${folder.id}" />
+                    <c:out value="${loopfolder.id}" />
                 </html:multibox>
             </td>
 
@@ -128,20 +121,20 @@
                    <roller:linkparam id="method" value="selectFolder" />
                    <roller:linkparam 
                        id="<%= RollerRequest.FOLDERID_KEY %>" 
-                       name="folder" property="id" />
-                   <str:truncateNicely lower="15" upper="20" ><c:out value="${folder.name}" /></str:truncateNicely>
+                       name="loopfolder" property="id" />
+                   <str:truncateNicely lower="15" upper="20" ><c:out value="${loopfolder.name}" /></str:truncateNicely>
                </roller:link>
             </td>
 
             <td class="rollertable">
-                <str:truncateNicely lower="30" upper="35" ><c:out value="${folder.description}" /></str:truncateNicely>
+                <str:truncateNicely lower="30" upper="35" ><c:out value="${loopfolder.description}" /></str:truncateNicely>
             </td>
 
             <td class="rollertable" align="center">
                <roller:link page="/editor/folderEdit.do">
                    <roller:linkparam 
                        id="<%= RollerRequest.FOLDERID_KEY %>" 
-                       name="folder" property="id" />
+                       name="loopfolder" property="id" />
                    <img src='<c:url value="/images/Edit16.png"/>' border="0" alt="icon" />
                </roller:link>
             </td>
@@ -152,38 +145,38 @@
     </c:forEach>
 
     <%-- Bookmarks --%>
-    <c:forEach var="bookmark" items="${bookmarks}" >
+    <c:forEach var="loopbookmark" items="${model.folder.bookmarks}" >
         <roller:row oddStyleClass="rollertable_odd" evenStyleClass="rollertable_even">
 
             <td class="rollertable">
                 <html:multibox property="selectedBookmarks">
-                    <c:out value="${bookmark.id}" />
+                    <c:out value="${loopbookmark.id}" />
                 </html:multibox>
             </td>
 
             <td class="rollertable" align="center"><img src='<c:url value="/images/Bookmark16.png"/>' alt="icon" /></td>
             
             <td class="rollertable">
-                <str:truncateNicely lower="15" upper="20" ><c:out value="${bookmark.name}" /></str:truncateNicely>
+                <str:truncateNicely lower="15" upper="20" ><c:out value="${loopbookmark.name}" /></str:truncateNicely>
             </td>
 
             <td class="rollertable">
-                <str:truncateNicely lower="30" upper="35" ><c:out value="${bookmark.description}" /></str:truncateNicely>
+                <str:truncateNicely lower="30" upper="35" ><c:out value="${loopbookmark.description}" /></str:truncateNicely>
             </td>
 
             <td class="rollertable" align="center">
                <roller:link page="/editor/bookmarkEdit.do">
                    <roller:linkparam 
                        id="<%= RollerRequest.BOOKMARKID_KEY %>" 
-                       name="bookmark" property="id" />                   
+                       name="loopbookmark" property="id" />                   
                    <img src='<c:url value="/images/Edit16.png"/>' border="0" alt="icon" 
                        title="<fmt:message key='bookmarksForm.edit.tip' />" />
                </roller:link>
             </td>
 
             <td class="rollertable" align="center">
-                <c:if test="${!empty bookmark.url}" >
-                   <a href="<c:out value='${bookmark.url}'/>">
+                <c:if test="${!empty loopbookmark.url}" >
+                   <a href="<c:out value='${loopbookmark.url}'/>">
                        <img src='<c:url value="/images/WebVisit16.png"/>' border="0" alt="icon" 
                            title="<fmt:message key='bookmarksForm.visitLink.tip' />" />
                    </a>
@@ -196,5 +189,3 @@
 </table>
 
 </html:form>
-
-<%@ include file="/theme/footer.jsp" %>
\ No newline at end of file

Modified: incubator/roller/branches/roller_2.0/web/bookmarks/FolderForm.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/bookmarks/FolderForm.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/bookmarks/FolderForm.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/bookmarks/FolderForm.jsp Wed Aug 24 12:16:58 2005
@@ -1,4 +1,4 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 
 <h3>
 <img src='<c:url value="/images/Folder24.png" />' alt="folder" align="absmiddle" />
@@ -53,4 +53,3 @@
 
 </html:form>
 
-<%@ include file="/theme/footer.jsp" %>
\ No newline at end of file

Modified: incubator/roller/branches/roller_2.0/web/bookmarks/import.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/bookmarks/import.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/bookmarks/import.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/bookmarks/import.jsp Wed Aug 24 12:16:58 2005
@@ -1,4 +1,4 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 
 <h1><fmt:message key="bookmarksImport.title" /></h1>
 <p><fmt:message key="bookmarksImport.prompt" /></p>
@@ -20,4 +20,4 @@
 // -->
 </script>
 
-<%@ include file="/theme/footer.jsp" %>
+

Modified: incubator/roller/branches/roller_2.0/web/error.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/error.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/error.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/error.jsp Wed Aug 24 12:16:58 2005
@@ -1,8 +1,8 @@
 <%@ include file="/taglibs.jsp" %>
 <tiles:insert page="/theme/tiles-simplepage.jsp">
    <tiles:put name="content"  value="/errorBody.jsp" />
-   <tiles:put name="status"   value="/theme/status.jsp" />
-   <tiles:put name="footer"   value="/theme/tiles-footer.jsp" />
-   <tiles:put name="head"     value="/theme/tiles-head.jsp" />
+   <tiles:put name="banner"   value="/theme/banner.jsp" />
+   <tiles:put name="footer"   value="/theme/footer.jsp" />
+   <tiles:put name="head"     value="/theme/head.jsp" />
    <tiles:put name="messages" value="/theme/messages.jsp" />
 </tiles:insert>

Modified: incubator/roller/branches/roller_2.0/web/login.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/login.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/login.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/login.jsp Wed Aug 24 12:16:58 2005
@@ -1,8 +1,8 @@
 <%@ include file="/taglibs.jsp" %>
 <tiles:insert page="/theme/tiles-simplepage.jsp">
    <tiles:put name="content"  value="/loginBody.jsp" />
-   <tiles:put name="status"   value="/theme/status.jsp" />
-   <tiles:put name="footer"   value="/theme/tiles-footer.jsp" />
-   <tiles:put name="head"     value="/theme/tiles-head.jsp" />
+   <tiles:put name="banner"   value="/theme/banner.jsp" />
+   <tiles:put name="footer"   value="/theme/footer.jsp" />
+   <tiles:put name="head"     value="/theme/head.jsp" />
    <tiles:put name="messages" value="/theme/messages.jsp" />
 </tiles:insert>

Modified: incubator/roller/branches/roller_2.0/web/main.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/main.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/main.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/main.jsp Wed Aug 24 12:16:58 2005
@@ -3,8 +3,7 @@
 page import="java.util.Locale" %><%
 pageContext.setAttribute("leftPage","main-sidebar.jsp");
 %><%@ 
-include file="/taglibs.jsp" %><%@ 
-include file="/theme/header.jsp" %><%
+include file="/taglibs.jsp" %><%
 request.setAttribute("pinnedPosts",
 	((MainPageAction.MainPageData)request.getAttribute("data")).getWeblogEntriesPinnedToMain(5));
 request.setAttribute("recentPosts",
@@ -92,7 +91,5 @@
 
          </div>
     </c:forEach>
-
-<%@ include file="/theme/footer.jsp" %>
 
 

Modified: incubator/roller/branches/roller_2.0/web/planet.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/planet.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/planet.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/planet.jsp Wed Aug 24 12:16:58 2005
@@ -2,8 +2,7 @@
 <%@ 
 page import="org.roller.presentation.planet.PlanetAction" %><%@ 
 page import="java.util.Locale" %><%@ 
-include file="/taglibs.jsp" %><%@ 
-include file="/theme/header.jsp" %>
+include file="/taglibs.jsp" %>
 
 <table>
 <tr>
@@ -167,6 +166,5 @@
 
 <br />
 
-<%@ include file="/theme/footer.jsp" %>
 <% } catch (Exception e) {e.printStackTrace();} %>
 

Modified: incubator/roller/branches/roller_2.0/web/planet/PlanetConfig.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/planet/PlanetConfig.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/planet/PlanetConfig.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/planet/PlanetConfig.jsp Wed Aug 24 12:16:58 2005
@@ -1,4 +1,4 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 <script type="text/javascript">
 <!--
 function refreshEntries()
@@ -18,7 +18,6 @@
     <html:hidden property="method" value="saveConfig" />
     <html:hidden property="id" />
     
-    <h1><fmt:message key="planetConfig.pageTitle" /></h1>
     <p class="subtitle"><fmt:message key="planetConfig.subtitle" /></p>
     <p><fmt:message key="planetConfig.prompt" /></p>
 
@@ -88,7 +87,6 @@
 </html:form>
 
 
-<%@ include file="/theme/footer.jsp" %>
 
 
 

Modified: incubator/roller/branches/roller_2.0/web/planet/PlanetGroups.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/planet/PlanetGroups.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/planet/PlanetGroups.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/planet/PlanetGroups.jsp Wed Aug 24 12:16:58 2005
@@ -1,4 +1,4 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 <script type="text/javascript">
 <!--
 function cancelEditing()
@@ -15,7 +15,6 @@
 </script>
 <c:if test="${!(model.unconfigured)}" >
 
-    <h1><fmt:message key="planetGroups.pagetitle" /></h1>
     <p class="subtitle"><fmt:message key="planetGroups.subtitle" /></p>
 
     <p>
@@ -126,6 +125,6 @@
     <fmt:message key="planetGroups.unconfigured" />
 </c:if>
 
-<%@ include file="/theme/footer.jsp" %>
+
 
 

Modified: incubator/roller/branches/roller_2.0/web/planet/PlanetSubscriptions.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/planet/PlanetSubscriptions.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/planet/PlanetSubscriptions.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/planet/PlanetSubscriptions.jsp Wed Aug 24 12:16:58 2005
@@ -1,4 +1,4 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 <script type="text/javascript">
 <!--
 function cancelEditing()
@@ -151,4 +151,3 @@
     <fmt:message key="planetSubscriptions.unconfigured" />
 </c:if>
 
-<%@ include file="/theme/footer.jsp" %>

Added: incubator/roller/branches/roller_2.0/web/theme/adminsidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/adminsidebar.jsp?rev=239735&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/adminsidebar.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/theme/adminsidebar.jsp Wed Aug 24 12:16:58 2005
@@ -0,0 +1,37 @@
+<%@ include file="/taglibs.jsp" %><%
+RollerContext rctx = RollerContext.getRollerContext(request);
+RollerSession rollerSession = RollerSession.getRollerSession(request);
+UserData user = rollerSession.getAuthenticatedUser();
+WebsiteData website = rollerSession.getCurrentWebsite();
+String absURL = rctx.getAbsoluteContextUrl(request);
+boolean allowNewUsers = RollerConfig.getBooleanProperty("users.registration.enabled");
+%>
+
+<div class="sidebarfade">
+    <div class="menu-tr">
+        <div class="menu-tl">
+            <div class="sidebarBody">
+            
+                <h3><fmt:message key="mainPage.status" /></h3>
+                <hr />
+                <c:if test="${!empty model.rollerSession.authenticatedUser}" >
+                    <fmt:message key="mainPage.loggedInAs" />:
+                     [<b> <c:out value="${model.rollerSession.authenticatedUser.userName}" /></b>]
+                </c:if>
+                <p>
+                    <img align="center" src='<c:url value="/images/TipOfTheDay16.gif"/>' />
+                    <fmt:message key="mainPage.adminWarning" />
+                </p>
+
+			<br />
+			<br />
+					
+            </div>
+        </div>
+    </div>
+</div>	
+
+<br />
+
+
+

Added: incubator/roller/branches/roller_2.0/web/theme/banner.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/banner.jsp?rev=239735&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/banner.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/theme/banner.jsp Wed Aug 24 12:16:58 2005
@@ -0,0 +1,46 @@
+<%@ include file="/taglibs.jsp" %><%
+RollerContext rctx = RollerContext.getRollerContext(request);
+RollerSession rollerSession = RollerSession.getRollerSession(request);
+UserData user = rollerSession.getAuthenticatedUser();
+WebsiteData website = rollerSession.getCurrentWebsite();
+String absURL = rctx.getAbsoluteContextUrl(request);
+boolean allowNewUsers = RollerConfig.getBooleanProperty("users.registration.enabled");
+%>
+<div class="bannerBox">
+   <img src='<c:url value="/theme/tan/two-bigbadge-shadow.png" />' 
+      style="margin: 15px 0px 0px 15px;" />
+   <%-- <img src='<c:url value="/theme/sun/bsclogo.png" />' 
+           style="margin: 0px 0px 0px 0px;" align="left" /> --%>
+</div>
+
+<div class="statusBox">
+    
+    <div class="bannerLeft">
+        <% if (user != null) { %>
+            <fmt:message key="mainPage.loggedInAs" />:
+             [<b><%= user.getUserName() %></b>]
+        <% } %>
+    </div>
+
+    <div class="bannerRight">
+        <roller:link forward="main">
+            <fmt:message key="mainPage.frontPage" />
+        </roller:link>
+        | <roller:link forward="yourWebsites">
+            <fmt:message key="mainPage.mainMenu" />
+        </roller:link>
+        <% if (user != null) { %>
+            | <html:link forward="logout-redirect"><fmt:message key="navigationBar.logout"/></html:link>
+        <% } else if (allowNewUsers) { %>
+            | <html:link forward="login-redirect"><fmt:message key="navigationBar.login"/></html:link>
+            | <html:link forward="registerUser"><fmt:message key="navigationBar.register"/></html:link>
+        <% } else { %>
+            | <html:link forward="login-redirect"><fmt:message key="navigationBar.login"/></html:link>
+        <% } %>
+
+    </div>
+    
+</div>
+
+
+

Modified: incubator/roller/branches/roller_2.0/web/theme/blue/colors.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/blue/colors.css?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/blue/colors.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/blue/colors.css Wed Aug 24 12:16:58 2005
@@ -65,11 +65,15 @@
 }
 div.entryBoxPinned {
    background: #e5e5e5; 
+   border: 1px #c0c0c0 solid;
 }
 a.entryTitle, a:active.entryTitle, a:visited.entryTitle {
    color: #00038a; 
    font-size: medium;
    font-weight: bold;
+}
+div.yourWeblogBox {
+   border-top: 1px #00038a solid;
 }
 
 /* ------------------------------------------------------------------------ */

Added: incubator/roller/branches/roller_2.0/web/theme/editorsidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/editorsidebar.jsp?rev=239735&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/editorsidebar.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/theme/editorsidebar.jsp Wed Aug 24 12:16:58 2005
@@ -0,0 +1,38 @@
+<%@ include file="/taglibs.jsp" %><%
+RollerContext rctx = RollerContext.getRollerContext(request);
+RollerSession rollerSession = RollerSession.getRollerSession(request);
+UserData user = rollerSession.getAuthenticatedUser();
+WebsiteData website = rollerSession.getCurrentWebsite();
+String absURL = rctx.getAbsoluteContextUrl(request);
+boolean allowNewUsers = RollerConfig.getBooleanProperty("users.registration.enabled");
+%>
+
+<div class="sidebarfade">
+    <div class="menu-tr">
+        <div class="menu-tl">
+            <div class="sidebarBody">
+            
+                <h3><fmt:message key="mainPage.status" /></h3>
+                <hr />
+                <c:if test="${!empty model.rollerSession.authenticatedUser}" >
+                    <fmt:message key="mainPage.loggedInAs" />:
+                     [<b> <c:out value="${model.rollerSession.authenticatedUser.userName}" /></b>]
+                </c:if>
+                <br />
+                <c:if test="${!empty model.rollerSession.currentWebsite}" >
+                    <fmt:message key="mainPage.weblog" />:
+                     [<b> <c:out value="${model.rollerSession.currentWebsite.handle}" /></b>]
+                </c:if>
+
+			<br />
+			<br />
+					
+            </div>
+        </div>
+    </div>
+</div>	
+
+<br />
+
+
+

Modified: incubator/roller/branches/roller_2.0/web/theme/footer.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/footer.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/footer.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/footer.jsp Wed Aug 24 12:16:58 2005
@@ -1,7 +1,28 @@
+<%@ include file="/taglibs.jsp" %>
+
 <%-- 
-we now use Tiles, but for now the header.jsp and footer.jsp
-includes have been left in place in the JSP files.
+Default footer for all pages.
+You can override it with your own file via WEB-INF/tiles-def.xml
 --%>
+
+<div style="margin: 25px 4px 4px 4px; border-top: 1px solid grey">
+
+<a href="http://www.rollerweblogger.org">
+    Powered by Roller Weblogger</a> | 
+
+<a href="http://opensource.atlassian.com/projects/roller/Dashboard.jspa">
+    <fmt:message key="footer.reportIssue" /></a> | 
+
+<a href="http://www.rollerweblogger.org/wiki/Wiki.jsp?page=UserGuide">
+    <fmt:message key="footer.userGuide" /></a> | 
+
+<a href="http://www.rollerweblogger.org/wiki/Wiki.jsp?page=RollerMacros">
+    <fmt:message key="footer.macros" /></a> | 
+
+<a href="http://sourceforge.net/mail/?group_id=47722">
+    <fmt:message key="footer.mailingLists" /></a>
+    
+</div>
 
 
 

Added: incubator/roller/branches/roller_2.0/web/theme/head.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/head.jsp?rev=239735&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/head.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/theme/head.jsp Wed Aug 24 12:16:58 2005
@@ -0,0 +1,28 @@
+<%@ include file="/taglibs.jsp" %>
+
+<%-- 
+This default stuff goes in the HTML head element of each page
+You can override it with your own file via WEB-INF/tiles-def.xml
+--%>
+
+<script type="text/javascript"
+    src="<%= request.getContextPath() %>/theme/scripts/roller.js"></script> 
+   
+<link rel="stylesheet" type="text/css" media="all"
+     href="<%= request.getContextPath() %>/theme/roller.css" />
+     
+<link rel="stylesheet" type="text/css" media="all"
+     href="<%= request.getContextPath() %>/theme/tan/colors.css" />
+     
+<link rel="stylesheet" type="text/css" media="all"
+     href="<%= request.getContextPath() %>/theme/menu.css" />
+<link rel="stylesheet" type="text/css" media="all"
+     href="<%= request.getContextPath() %>/theme/calendar.css" />        
+<script type="text/javascript"
+    src="<%= request.getContextPath() %>/tags/calendar.js"></script>
+<script type="text/javascript"
+    src="<%= request.getContextPath() %>/theme/scripts/overlib.js"
+    ><!-- overLIB (c) Erik Bosrup --></script>  
+
+
+

Modified: incubator/roller/branches/roller_2.0/web/theme/layout.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/layout.css?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/layout.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/layout.css Wed Aug 24 12:16:58 2005
@@ -5,13 +5,13 @@
 #wrapper {
     width: 100%;
 }
-#header {
+#banner {
     height: 105px; 
     margin: 0px;
     padding: 0px;
 }
 #menu {
-    padding: 0px 0px 0px 0px;
+    padding: 0px 15px 0px 15px;
 }
 #centercontent {
     margin: 15px 260px 0px 15px;

Modified: incubator/roller/branches/roller_2.0/web/theme/roller.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/roller.css?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/roller.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/roller.css Wed Aug 24 12:16:58 2005
@@ -55,8 +55,8 @@
     color: #000000;
 }
 p.subtitle {
-    border-top: 1px grey solid;
     margin: 5px 0px 15px 0px;
+    font-size: 120%;
 }
 p.pagetip {
     margin: 0px 0px 15px 0px;
@@ -66,7 +66,7 @@
     /* CUSTOMIZABLE color: #ad3537; */
     font-size: x-large;
     font-weight: bold;
-    margin: 10px 0px 5px 0px;
+    margin: 10px 0px 10px 0px;
 }
 h2 {
     background: transparent;
@@ -427,18 +427,18 @@
 div.entryBox {
    padding: 4px;
    margin: 4px 0px 4px 0px;
-   /* CUSTOMIZABLE border: 1px #c6ab74 solid;
+   /* CUSTOMIZABLE border: 1px #c6ab74 solid; */
 }
 div.entryBoxPinned {
    padding: 4px;
    margin: 4px 0px 4px 0px;
-   border: 1px #c0c0c0 solid;
+   /* CUSTOMIZABLE border: 1px #c0c0c0 solid; */
    /* CUSTOMIZABLE background: #e5e5e5; */
 }
 a.entryTitle, a:active.entryTitle, a:visited.entryTitle {
-   /* CUSTOMIZABLE color: #ad3537; */
    font-size: medium;
    font-weight: bold;
+   /* CUSTOMIZABLE color: #ad3537; */
 }
 span.hotBlogs, a.hotBlogs, a:active.hotBlogs, a:visited.hotBlogs, ul.hotBlogs {
    font-size: small;
@@ -451,6 +451,10 @@
 }
 p.websiteDescription {
    text-style: italics;
+}
+.yourWeblogBox {
+   padding: 4px;
+   margin: 4px 0px 4px 0px;
 }
 .version {
    font-size: small;

Added: incubator/roller/branches/roller_2.0/web/theme/sidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/sidebar.jsp?rev=239735&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/sidebar.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/theme/sidebar.jsp Wed Aug 24 12:16:58 2005
@@ -0,0 +1,5 @@
+
+<%-- default is no sidebar --%>
+
+
+

Added: incubator/roller/branches/roller_2.0/web/theme/styles.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/styles.jsp?rev=239735&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/styles.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/theme/styles.jsp Wed Aug 24 12:16:58 2005
@@ -0,0 +1,14 @@
+<%--
+Styles override for editor and admin pages
+You can override it with your own file via WEB-INF/tiles-def.xml
+--%>
+
+#rightcontent {
+    position: absolute;
+    top:   215px;
+    right:  15px;
+    width: 230px;
+}
+
+
+

Added: incubator/roller/branches/roller_2.0/web/theme/sun/bsclogo.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/sun/bsclogo.png?rev=239735&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_2.0/web/theme/sun/bsclogo.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/branches/roller_2.0/web/theme/sun/colors.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/sun/colors.css?rev=239735&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/sun/colors.css (added)
+++ incubator/roller/branches/roller_2.0/web/theme/sun/colors.css Wed Aug 24 12:16:58 2005
@@ -0,0 +1,103 @@
+
+/* Customizable colors and images */
+
+/* ------------------------------------------------------------------------ */
+/* add colors and images to roller.css */
+
+.bannerBox {
+    background: url("two-banner.png") repeat-x top;
+}
+.sidebarfade {
+    background: url("two-sidebarfade.png") repeat-x top;
+}
+.statusBox {
+    background: #dee7e7;
+    color: black;
+}
+.statusBox a {
+    color: black;
+}
+.statusBox a:link {
+    color: black;
+}
+.statusBox a:visited {
+    color: black;
+}
+h1 {
+    color: #e77100;
+}
+h2 {
+    color: black;
+}
+h3 {
+    color: black;
+}
+a:link {
+    color: #31556b;
+}
+a:visited {
+    color: #31556b;
+}
+table.rollertable th, table.rollertable th {
+    background: #52829c;
+}
+table.rollertable td, table.rollertable tbody td {
+    border: 1px solid #52829c;
+}
+a.entryTitle, a:active.entryTitle, a:visited.entryTitle {
+   color: black;
+}
+div.centerTitle {
+    background: #dee7ef;
+}
+div.control {
+    background: #dee7ef; 
+}
+div.controlToggle {
+    background: url("two-togglegrey.png") repeat-x top; 
+}
+div.entryTitleBox {
+   background: red; 
+   color: white; 
+}
+div.entryBox {
+   border: 1px red solid;
+}
+div.entryBoxPinned {
+   background: #e5e5e5; 
+   border: 1px #c0c0c0 solid;
+}
+a.entryTitle, a:active.entryTitle, a:visited.entryTitle {
+   color: #ad3537; 
+}
+div.yourWeblogBox {
+   border-top: 1px #ad3537 solid;
+}
+
+/* ------------------------------------------------------------------------ */
+/* add colors and iamges to menu.css */
+
+td.menuTabSelected {
+    background: url("menutab-sel.png");
+}
+td.menuTabUnselected {
+    background: url("menutab-unsel.png");
+}
+.menuItemTable {
+    background-color: #52829c;
+    color: white;
+}
+td.menuTabSelected a:link, td.menuTabSelected a:visited, td.menuTabSelected a:hover, td.menuTabSelected a:active {
+    color: white;
+}
+td.menuTabUnselected a:link, td.menuTabUnselected a:visited, td.menuTabUnselected a:hover, td.menuTabUnselected a:active {
+    color: white;
+}
+a.menuItemSelected:link, a.menuItemSelected:visited, a.menuItemSelected:hover, a.menuItemSelected:active {
+    color: white;
+}
+a.menuItemUnselected:link, a.menuItemUnselected:visited, a.menuItemUnselected:hover, a.menuItemUnselected:active {
+    color: white;
+}
+
+

Added: incubator/roller/branches/roller_2.0/web/theme/sun/menutab-sel.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/sun/menutab-sel.png?rev=239735&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_2.0/web/theme/sun/menutab-sel.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/roller/branches/roller_2.0/web/theme/sun/menutab-sel.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/branches/roller_2.0/web/theme/sun/menutab-unsel.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/sun/menutab-unsel.png?rev=239735&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_2.0/web/theme/sun/menutab-unsel.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/roller/branches/roller_2.0/web/theme/sun/menutab-unsel.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/branches/roller_2.0/web/theme/sun/two-banner.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/sun/two-banner.png?rev=239735&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_2.0/web/theme/sun/two-banner.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/branches/roller_2.0/web/theme/sun/two-sidebarfade.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/sun/two-sidebarfade.png?rev=239735&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_2.0/web/theme/sun/two-sidebarfade.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/branches/roller_2.0/web/theme/sun/two-togglegrey.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/sun/two-togglegrey.png?rev=239735&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_2.0/web/theme/sun/two-togglegrey.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/roller/branches/roller_2.0/web/theme/tan/colors.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/tan/colors.css?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/tan/colors.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/tan/colors.css Wed Aug 24 12:16:58 2005
@@ -67,11 +67,15 @@
 }
 div.entryBoxPinned {
    background: #e5e5e5; 
+   border: 1px #c0c0c0 solid;
 }
 a.entryTitle, a:active.entryTitle, a:visited.entryTitle {
    color: #ad3537; 
    font-size: medium;
    font-weight: bold;
+}
+div.yourWeblogBox {
+   border-top: 1px #c6ab74 solid;
 }
 
 /* ------------------------------------------------------------------------ */

Modified: incubator/roller/branches/roller_2.0/web/theme/tiles-adminpage.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/tiles-adminpage.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/tiles-adminpage.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/tiles-adminpage.jsp Wed Aug 24 12:16:58 2005
@@ -1,33 +1,30 @@
 <% response.setContentType("text/html; charset=UTF-8"); %><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <%@ include file="/taglibs.jsp" %><html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-    <title><%= RollerRuntimeConfig.getProperty("site.name") %></title>
+    <title><%= RollerRuntimeConfig.getProperty("site.name") %>: <c:out value="${model.title}" /></title>
     <%-- this is included so cached pages can still set contentType --%>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <tiles:insert attribute="head" />     
     <link rel="stylesheet" type="text/css" media="all"
         href="<%= request.getContextPath() %>/theme/layout.css" />
 <style type="text/css">
-#rightcontent {
-    position: absolute;
-    top:   147px;
-    right:  15px;
-    width: 230px;
-}
+   <tiles:insert attribute="styles" />
 </style>
 </head>
 <body>
 
 <div id="wrapper">
    
-    <div id="header">
-        <tiles:insert attribute="status" />
+    <div id="banner">
+        <tiles:insert attribute="banner" />
+    </div>
+
+    <div id="menu">
+        <h1><c:out value="${model.title}" /></h1>
+        <roller:Menu model="admin-menu.xml" view="/menu-tabbed.vm" />
     </div>
 
     <div id="centercontent">        
-        <div id="menu">
-            <roller:Menu model="admin-menu.xml" view="/menu-tabbed.vm" />
-        </div>
         <tiles:insert attribute="messages" />    
         <tiles:insert attribute="content" />    
         <div id="footer" class="clearfix">
@@ -36,7 +33,6 @@
     </div>
 
     <div id="rightcontent"> 
-       <tiles:insert attribute="default-sidebar" />
        <tiles:insert attribute="sidebar" />
     </div>
     

Modified: incubator/roller/branches/roller_2.0/web/theme/tiles-editorpage.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/tiles-editorpage.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/tiles-editorpage.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/tiles-editorpage.jsp Wed Aug 24 12:16:58 2005
@@ -1,35 +1,32 @@
 <% response.setContentType("text/html; charset=UTF-8"); %><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <%@ include file="/taglibs.jsp" %><html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-    <title><%= RollerRuntimeConfig.getProperty("site.name") %></title>
+    <title><%= RollerRuntimeConfig.getProperty("site.name") %>: <c:out value="${model.title}" /></title>
     <%-- this is included so cached pages can still set contentType --%>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <tiles:insert attribute="head" />     
     <link rel="stylesheet" type="text/css" media="all"
         href="<%= request.getContextPath() %>/theme/layout.css" />
 <style type="text/css">
-#rightcontent {
-    position: absolute;
-    top:   147px;
-    right:  15px;
-    width: 230px;
-}
+   <tiles:insert attribute="styles" />
 </style>
 </head>
 <body>
 <div id="wrapper"> 
    
-    <div id="header">
-        <tiles:insert attribute="status" />
+    <div id="banner">
+        <tiles:insert attribute="banner" />
+    </div>
+    
+    <div id="menu">
+        <h1><c:out value="${model.title}" /></h1>
+        <roller:Menu model="editor-menu.xml" view="/menu-tabbed.vm" />
     </div>
     
     <div id="leftcontent"> 
     </div>
     
     <div id="centercontent">   
-        <div id="menu">
-            <roller:Menu model="editor-menu.xml" view="/menu-tabbed.vm" />
-        </div>
         <tiles:insert attribute="messages" /> 
         <tiles:insert attribute="content" />   
         <div id="footer">
@@ -38,10 +35,8 @@
     </div>
     
     <div id="rightcontent"> 
-       <tiles:insert attribute="default-sidebar" />
        <tiles:insert attribute="sidebar" />
     </div>  
-
    
 </div>
 </body>

Modified: incubator/roller/branches/roller_2.0/web/theme/tiles-frontpage.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/tiles-frontpage.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/tiles-frontpage.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/tiles-frontpage.jsp Wed Aug 24 12:16:58 2005
@@ -12,14 +12,15 @@
 
 <div id="wrapper">
    
-    <div id="header">
-        <tiles:insert attribute="status" />
+    <div id="banner">
+        <tiles:insert attribute="banner" />
     </div>
     
     <div id="leftcontent"> 
     </div>
     
-    <div id="centercontent">   
+    <div id="centercontent"> 
+        <h1><c:out value="${model.title}" /></h1>
         <tiles:insert attribute="content" />    
         <div id="footer">
             <tiles:insert attribute="footer" />

Modified: incubator/roller/branches/roller_2.0/web/theme/tiles-mainmenupage.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/tiles-mainmenupage.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/tiles-mainmenupage.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/tiles-mainmenupage.jsp Wed Aug 24 12:16:58 2005
@@ -20,14 +20,15 @@
 
 <div id="wrapper"> 
    
-    <div id="header">
-        <tiles:insert attribute="status" />
+    <div id="banner">
+        <tiles:insert attribute="banner" />
     </div>
     
     <div id="leftcontent"> 
     </div>
     
     <div id="centercontent">   
+        <h1><c:out value="${model.title}" /></h1>
         <tiles:insert attribute="messages" /> 
         <tiles:insert attribute="content" />    
         <div id="footer">

Modified: incubator/roller/branches/roller_2.0/web/theme/tiles-simplepage.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/tiles-simplepage.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/tiles-simplepage.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/tiles-simplepage.jsp Wed Aug 24 12:16:58 2005
@@ -23,8 +23,8 @@
 <body>
 <div id="wrapper"> 
    
-    <div id="header">
-        <tiles:insert attribute="status" />
+    <div id="banner">
+        <tiles:insert attribute="banner" />
     </div>
     
     <div id="leftcontent"> 

Modified: incubator/roller/branches/roller_2.0/web/weblog/CategoriesForm.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/CategoriesForm.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/CategoriesForm.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/CategoriesForm.jsp Wed Aug 24 12:16:58 2005
@@ -1,5 +1,4 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
-<% pageContext.setAttribute("leftPage","/weblog/CategoriesSidebar.jsp"); %>
+<%@ include file="/taglibs.jsp" %>
 
 <%-- JavaScript for categories table --%> 
 <script type="text/javascript">
@@ -24,10 +23,8 @@
 //-->
 </script>
 
-<p>
 <c:choose>
-    <c:when test="${empty categoryPath}">
-    <h1><fmt:message key="categoriesForm.rootTitle" /></h1>
+    <c:when test="${empty model.categoryPath}">
     <p class="subtitle">
         <fmt:message key="categoriesForm.subtitle" >
             <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
@@ -38,28 +35,23 @@
     </p> 
     </c:when>
     
-    <c:when test="${!(empty categoryPath)}">
-        <h1>
-            <fmt:message key="categoriesForm.parent" />
-            [<c:out value="${category.name}" />]
-        </h1>
+    <c:otherwise>
         <p>
         <b><fmt:message key="categoriesForm.path" /></b>:
-        <c:forEach var="category" items="${categoryPath}">
+        <c:forEach var="loopcategory" items="${model.categoryPath}">
             /
             <roller:link page="/editor/categories.do">
                 <roller:linkparam id="method" value="selectCategory" />
                 <roller:linkparam 
                     id="<%= RollerRequest.WEBLOGCATEGORYID_KEY %>" 
-                    name="category" property="id" />
-                <c:out value="${category.name}" />
+                    name="loopcategory" property="id" />
+                <c:out value="${loopcategory.name}" />
             </roller:link>
         </c:forEach>
         </p>
         <p><fmt:message key="categoriesForm.categoryPrompt" /></p>
-    </c:when>
+    </c:otherwise>
 </c:choose>
-</p>
 
 
 <%-- Form is a table of categories each with checkbox --%>
@@ -104,12 +96,12 @@
     </tr>
 
     <%-- Categories --%>
-    <c:forEach var="category" items="${categories}" >
+    <c:forEach var="loopcategory" items="${model.category.weblogCategories}" >
         <roller:row oddStyleClass="rollertable_odd" evenStyleClass="rollertable_even">
 
             <td class="rollertable">
                 <html:multibox property="selectedCategories">
-                    <c:out value="${category.id}" />
+                    <c:out value="${loopcategory.id}" />
                 </html:multibox>
             </td>
 
@@ -121,20 +113,20 @@
                    <roller:linkparam id="method" value="selectCategory" />
                    <roller:linkparam 
                        id="<%= RollerRequest.WEBLOGCATEGORYID_KEY %>" 
-                       name="category" property="id" />
-                   <str:truncateNicely lower="15" upper="20" ><c:out value="${category.name}" /></str:truncateNicely>
+                       name="loopcategory" property="id" />
+                   <str:truncateNicely lower="15" upper="20" ><c:out value="${loopcategory.name}" /></str:truncateNicely>
                </roller:link>
             </td>
 
             <td class="rollertable">
-                <str:truncateNicely lower="30" upper="35" ><c:out value="${category.description}" /></str:truncateNicely>
+                <str:truncateNicely lower="30" upper="35" ><c:out value="${loopcategory.description}" /></str:truncateNicely>
             </td>
 
             <td class="rollertable" align="center">
                <roller:link page="/editor/categoryEdit.do">
                    <roller:linkparam 
                        id="<%= RollerRequest.WEBLOGCATEGORYID_KEY %>" 
-                       name="category" property="id" />
+                       name="loopcategory" property="id" />
                    <img src='<c:url value="/images/Edit16.png"/>' border="0" alt="icon" />
                </roller:link>
             </td>
@@ -143,7 +135,7 @@
                <roller:link page="/editor/categoryDelete.do">
                    <roller:linkparam 
 	                   id="<%= RollerRequest.WEBLOGCATEGORYID_KEY %>" 
-	                   name="category" property="id" />
+	                   name="loopcategory" property="id" />
                    <roller:linkparam 
 	                   id="method" value="deleteSelected" />
                    <img src='<c:url value="/images/Remove16.gif"/>' border="0" alt="icon" />
@@ -157,4 +149,3 @@
 
 </html:form>
 
-<%@ include file="/theme/footer.jsp" %>
\ No newline at end of file

Modified: incubator/roller/branches/roller_2.0/web/weblog/CategoryDeleteOK.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/CategoryDeleteOK.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/CategoryDeleteOK.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/CategoryDeleteOK.jsp Wed Aug 24 12:16:58 2005
@@ -1,6 +1,6 @@
 <% 
 try { 
-%><%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+%><%@ include file="/taglibs.jsp" %>
 
 <script type="text/javascript">
 <!-- 
@@ -53,8 +53,6 @@
 
 </html:form>
 
-
-<%@ include file="/theme/footer.jsp" %>
 
 <% 
 } catch (Throwable e) {

Modified: incubator/roller/branches/roller_2.0/web/weblog/CategoryForm.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/CategoryForm.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/CategoryForm.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/CategoryForm.jsp Wed Aug 24 12:16:58 2005
@@ -1,4 +1,4 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 
 
 <h3>
@@ -61,5 +61,3 @@
 
 </html:form>
 
-
-<%@ include file="/theme/footer.jsp" %>
\ No newline at end of file

Modified: incubator/roller/branches/roller_2.0/web/weblog/CustomPingTargetDeleteOK.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/CustomPingTargetDeleteOK.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/CustomPingTargetDeleteOK.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/CustomPingTargetDeleteOK.jsp Wed Aug 24 12:16:58 2005
@@ -1,7 +1,4 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
-
-<br />
-<h1><fmt:message key="pingTarget.confirmRemoveTitle" /></h1>
+<%@ include file="/taglibs.jsp" %>
 
 <p/>
 <fmt:message key="pingTarget.confirmCustomRemove" />
@@ -33,4 +30,4 @@
 </td>
 </tr>
 </table>
-<%@ include file="/theme/footer.jsp" %>
+

Modified: incubator/roller/branches/roller_2.0/web/weblog/CustomPingTargetEdit.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/CustomPingTargetEdit.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/CustomPingTargetEdit.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/CustomPingTargetEdit.jsp Wed Aug 24 12:16:58 2005
@@ -1,4 +1,4 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 <script type="text/javascript">
 // <!--
 function cancel() {
@@ -7,8 +7,6 @@
 }
 // -->
 </script> 
-<br />
-<h1><fmt:message key="pingTarget.pingTarget" /></h1>
 
 <br />
 <html:form action="/editor/customPingTargets" method="post" focus="name">
@@ -34,4 +32,3 @@
 
 </html:form>
 
-<%@ include file="/theme/footer.jsp" %>

Modified: incubator/roller/branches/roller_2.0/web/weblog/CustomPingTargets.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/CustomPingTargets.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/CustomPingTargets.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/CustomPingTargets.jsp Wed Aug 24 12:16:58 2005
@@ -1,7 +1,6 @@
 <%@ page import="org.roller.presentation.RollerRequest"%>
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 
-<h1><fmt:message key="customPingTargets.customPingTargets" /></h1>
 <p class="subtitle">
    <fmt:message key="customPingTargets.subtitle" >
        <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
@@ -85,4 +84,4 @@
   
 </c:choose>
 
-<%@ include file="/theme/footer.jsp" %>
+

Modified: incubator/roller/branches/roller_2.0/web/weblog/PingResult.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/PingResult.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/PingResult.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/PingResult.jsp Wed Aug 24 12:16:58 2005
@@ -1,5 +1,5 @@
 <%@ page import="org.roller.presentation.RollerRequest"%>
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 
 <!-- This page consists only of result messages from the ping -->
 
@@ -12,4 +12,4 @@
 <form>
 </div>
 
-<%@ include file="/theme/footer.jsp" %>
+

Modified: incubator/roller/branches/roller_2.0/web/weblog/Pings.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/Pings.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/Pings.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/Pings.jsp Wed Aug 24 12:16:58 2005
@@ -1,7 +1,6 @@
 <%@ page import="org.roller.presentation.RollerRequest"%>
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 
-<h1><fmt:message key="pings.title" /></h1>
 <p class="subtitle">
    <fmt:message key="pings.subtitle" >
        <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
@@ -186,4 +185,4 @@
   </c:if><!-- end if non-empty custom targets list -->
 </c:if><!-- end if custom ping targets are allowed -->
 
-<%@ include file="/theme/footer.jsp" %>
+

Modified: incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp Wed Aug 24 12:16:58 2005
@@ -1,4 +1,4 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 <%@ page import="org.roller.pojos.*" %>
 <%@ page import="org.roller.presentation.weblog.formbeans.WeblogEntryFormEx" %>
 <%@ page import="org.roller.presentation.weblog.actions.WeblogEntryPageModel" %>
@@ -62,7 +62,6 @@
 
 <c:choose>
     <c:when test="${empty weblogEntryFormEx.id}">
-        <h1><fmt:message key="weblogEdit.title.newEntry" /></h1>
         <p class="subtitle">
             <fmt:message key="weblogEdit.subtitle.newEntry" >
                 <fmt:param value="${model.weblogEntry.website.handle}" />
@@ -70,7 +69,6 @@
         </p>
     </c:when>
     <c:otherwise>
-        <h1><fmt:message key="weblogEdit.title.editEntry" /></h1>
         <p class="subtitle">
             <fmt:message key="weblogEdit.subtitle.editEntry" >
                 <fmt:param value="${model.weblogEntry.website.handle}" />
@@ -488,7 +486,6 @@
         src="<%= request.getContextPath() %>/keepalive.jsp" ></iframe>
 --%>
 
-<%@ include file="/theme/footer.jsp" %>
 
 <script type="text/javascript">
 <!--

Modified: incubator/roller/branches/roller_2.0/web/weblog/WeblogEntryRemove.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/WeblogEntryRemove.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogEntryRemove.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogEntryRemove.jsp Wed Aug 24 12:16:58 2005
@@ -1,4 +1,4 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 
 <h2>
 <jsp:useBean id="weblogEntryFormEx"  scope="session"
@@ -32,4 +32,3 @@
     </tr>
 </table>
 
-<%@ include file="/theme/footer.jsp" %>

Modified: incubator/roller/branches/roller_2.0/web/weblog/WeblogQuery.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/WeblogQuery.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogQuery.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogQuery.jsp Wed Aug 24 12:16:58 2005
@@ -1,10 +1,9 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 <%@ page import="org.roller.presentation.weblog.actions.WeblogQueryPageModel" %>
 <%
 WeblogQueryPageModel model = (WeblogQueryPageModel)request.getAttribute("model");
 %>
 
-<h1><fmt:message key="weblogEntryQuery.title" /></h1>
 <p class="subtitle">
     <fmt:message key="weblogEntryQuery.subtitle" >
         <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
@@ -58,8 +57,6 @@
    <fmt:message key="weblogEntryQuery.noneFound" />
    <br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br />
 </c:if>
-   
-<%@ include file="/theme/footer.jsp" %>
 
 <script type="text/javascript">
 <!--

Modified: incubator/roller/branches/roller_2.0/web/weblog/bake-weblog.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/bake-weblog.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/bake-weblog.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/bake-weblog.jsp Wed Aug 24 12:16:58 2005
@@ -1,4 +1,4 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp"%>
+<%@ include file="/taglibs.jsp" %>
 
 <div id="content" style="margin-top: 40px">
 
@@ -12,5 +12,3 @@
         <input type=hidden name="method" value="bake" />
     </html:form>
 </div>
-
-<%@ include file="/theme/footer.jsp"%>
\ No newline at end of file

Modified: incubator/roller/branches/roller_2.0/web/weblog/export-entries.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/export-entries.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/export-entries.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/export-entries.jsp Wed Aug 24 12:16:58 2005
@@ -1,4 +1,4 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 <%@ page import="org.roller.presentation.BasePageModel" %>
 <%
 BasePageModel model = (BasePageModel)request.getAttribute("model");
@@ -59,4 +59,3 @@
     
 </html:form>
 
-<%@ include file="/theme/footer.jsp" %>

Modified: incubator/roller/branches/roller_2.0/web/weblog/import-entries.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/import-entries.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/import-entries.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/import-entries.jsp Wed Aug 24 12:16:58 2005
@@ -1,4 +1,4 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 
 <h1><fmt:message key="weblogEntryImport.title" /></h1>
 
@@ -28,5 +28,3 @@
     </table>
 
 </html:form>
-
-<%@ include file="/theme/footer.jsp" %>
\ No newline at end of file

Modified: incubator/roller/branches/roller_2.0/web/weblog/referers.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/referers.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/referers.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/referers.jsp Wed Aug 24 12:16:58 2005
@@ -1,7 +1,6 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 
 <%-- Form allows deleting of referers --%>
-<h1><fmt:message key="referers.todaysReferers" /></h1>
 <p class="subtitle">
     <fmt:message key="referers.subtitle" >
         <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
@@ -50,4 +49,3 @@
     <input type="submit" value='<fmt:message key="referers.reset" />' /></input>
 </html:form>
 
-<%@ include file="/theme/footer.jsp" %>

Modified: incubator/roller/branches/roller_2.0/web/weblog/spellcheck-entry.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/spellcheck-entry.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/spellcheck-entry.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/spellcheck-entry.jsp Wed Aug 24 12:16:58 2005
@@ -2,7 +2,7 @@
 <%@ include file="/taglibs.jsp" %>
 <%@ page import="org.roller.model.RollerSpellCheck,com.swabunga.spell.event.SpellCheckEvent" %>
 <%@ page import="org.apache.commons.lang.StringUtils,java.util.*" %>
-<%@ include file="/theme/header.jsp" %>
+
 <script type="text/javascript">
 <!--
     function postWeblogEntry(activeForm,publish)
@@ -82,5 +82,4 @@
 
 </html:form>
 
-    
-<%@ include file="/theme/footer.jsp" %>
\ No newline at end of file
+    
\ No newline at end of file

Modified: incubator/roller/branches/roller_2.0/web/website/CommonPingTargetDeleteOK.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/CommonPingTargetDeleteOK.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/CommonPingTargetDeleteOK.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/CommonPingTargetDeleteOK.jsp Wed Aug 24 12:16:58 2005
@@ -1,7 +1,7 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 
 <br />
-<h1><fmt:message key="pingTarget.confirmRemoveTitle" /></h1>
+<h1><fmt:message key="" /></h1>
 
 <p/>
 <fmt:message key="pingTarget.confirmCommonRemove" />
@@ -33,4 +33,4 @@
 </td>
 </tr>
 </table>
-<%@ include file="/theme/footer.jsp" %>
+

Modified: incubator/roller/branches/roller_2.0/web/website/CommonPingTargetEdit.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/CommonPingTargetEdit.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/CommonPingTargetEdit.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/CommonPingTargetEdit.jsp Wed Aug 24 12:16:58 2005
@@ -1,7 +1,5 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 
-<br />
-<h1><fmt:message key="pingTarget.pingTarget" /></h1>
 
 <br />
 <html:form action="/admin/commonPingTargets" method="post" focus="name">
@@ -26,4 +24,4 @@
 
 </html:form>
 
-<%@ include file="/theme/footer.jsp" %>
+

Modified: incubator/roller/branches/roller_2.0/web/website/CommonPingTargets.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/CommonPingTargets.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/CommonPingTargets.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/CommonPingTargets.jsp Wed Aug 24 12:16:58 2005
@@ -1,8 +1,6 @@
 <%@ page import="org.roller.presentation.RollerRequest"%>
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 
-<br />
-<h1><fmt:message key="commonPingTargets.commonPingTargets" /></h1>
 <p class="subtitle">
     <fmt:message key="commonPingTargets.subtitle" />
 </p>
@@ -69,4 +67,3 @@
 </html:form>
 <p/>
 
-<%@ include file="/theme/footer.jsp" %>

Modified: incubator/roller/branches/roller_2.0/web/website/CreateWebsite.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/CreateWebsite.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/CreateWebsite.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/CreateWebsite.jsp Wed Aug 24 12:16:58 2005
@@ -1,4 +1,4 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 <script type="text/javascript">
 <!--
 function previewImage(theme) {
@@ -12,7 +12,6 @@
 -->
 </script>
 
-<h1><fmt:message key="createWebsite.title" /></h1>
 <p class="subtitle"><fmt:message key="createWebsite.prompt" /></p>
 
 <br /> 
@@ -86,6 +85,6 @@
     
 </html:form>
 
-<%@ include file="/theme/footer.jsp" %>
+
 
 

Modified: incubator/roller/branches/roller_2.0/web/website/InviteMember.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/InviteMember.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/InviteMember.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/InviteMember.jsp Wed Aug 24 12:16:58 2005
@@ -1,5 +1,5 @@
 <%@ include file="/taglibs.jsp" %>
-<%@ include file="/theme/header.jsp" %>
+
 <script type="text/javascript">
 // <!--
 function cancel() {
@@ -50,6 +50,6 @@
 
 </html:form>
 
-<%@ include file="/theme/footer.jsp" %>
+
 
 

Modified: incubator/roller/branches/roller_2.0/web/website/InviteMemberDone.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/InviteMemberDone.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/InviteMemberDone.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/InviteMemberDone.jsp Wed Aug 24 12:16:58 2005
@@ -1,4 +1,4 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 
 <h1><fmt:message key="inviteMemberDone.title" /></h1>
 
@@ -15,6 +15,6 @@
                 
 <br />
 
-<%@ include file="/theme/footer.jsp" %>
+
 
 

Modified: incubator/roller/branches/roller_2.0/web/website/Maintenance.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/Maintenance.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/Maintenance.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/Maintenance.jsp Wed Aug 24 12:16:58 2005
@@ -1,4 +1,4 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 
 <h1><fmt:message key="maintenance.title" /></h1>
     
@@ -18,6 +18,6 @@
     		  
 </html:form>
 
-<%@ include file="/theme/footer.jsp" %>
+
 
 

Modified: incubator/roller/branches/roller_2.0/web/website/MemberPermissions.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/MemberPermissions.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/MemberPermissions.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/MemberPermissions.jsp Wed Aug 24 12:16:58 2005
@@ -1,4 +1,4 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 
 <div class="prop"></div> <%-- force minimum height --%>
         
@@ -18,7 +18,6 @@
 // -->
 </script>
 
-<h1><fmt:message key="memberPermissions.title" /></h1>
 <p class="subtitle">
     <fmt:message key="memberPermissions.subtitle" >
         <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
@@ -86,6 +85,6 @@
     
 <div class="clear"></div> <%-- force minimum height --%>
         
-<%@ include file="/theme/footer.jsp" %>
+
 
 

Modified: incubator/roller/branches/roller_2.0/web/website/UserAdmin.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/UserAdmin.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/UserAdmin.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/UserAdmin.jsp Wed Aug 24 12:16:58 2005
@@ -1,4 +1,4 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 <script type="text/javascript">
 // <!--
 function cancel() {
@@ -12,7 +12,6 @@
 <%-- If user name is not specified, then allow user to choose a user to be loaded --%>
 <c:if test="${empty userAdminForm.userName}">
 
-    <h1><fmt:message key="userAdmin.title.searchUser" /></h1>
     <p class="subtitle"><fmt:message key="userAdmin.subtitle.searchUser" /></p>
 
     <html:form action="/admin/user" method="post" focus="userName">
@@ -43,12 +42,7 @@
 <c:if test="${not empty userAdminForm.userName || userAdminForm.newUser == true}">
 
     <c:choose>
-        <c:when test="${not empty userAdminForm.userName}">
-            <h1>
-                <fmt:message key="userAdmin.title.editUser" >
-                    <fmt:param value="${userAdminForm.userName}" />
-                </fmt:message>
-            </h1>			
+        <c:when test="${not empty userAdminForm.userName}">		
             <p class="subtitle"><fmt:message key="userAdmin.subtitle.editUser" /></p>
         </c:when>
         <c:otherwise>
@@ -156,6 +150,6 @@
     
 </c:if>
 
-<%@ include file="/theme/footer.jsp" %>
+
 
 

Modified: incubator/roller/branches/roller_2.0/web/website/UserNew.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/UserNew.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/UserNew.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/UserNew.jsp Wed Aug 24 12:16:58 2005
@@ -1,4 +1,4 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp"%>
+<%@ include file="/taglibs.jsp" %>
 <%
 String ctxPath = request.getContextPath();
 boolean allowNewUsers = RollerRuntimeConfig.getBooleanProperty("users.registration.enabled");
@@ -17,7 +17,6 @@
 -->
 </script>
 
-<h1><fmt:message key="newUser.addNewUser" /></h1>
 <p><fmt:message key="userRegister.prompt" /></p>
 
 <html:form action="/user" method="post" focus="userName">
@@ -93,5 +92,4 @@
 } // end allowNewUsers check
 %>
 
-<%@ include file="/theme/footer.jsp"%>
 

Modified: incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp Wed Aug 24 12:16:58 2005
@@ -1,4 +1,4 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 <script type="text/javascript">
 <!--
 function cancel() {
@@ -8,7 +8,6 @@
 -->
 </script>
 
-<h1><fmt:message key="yourProfile.title" /></h1>
 <p class="subtitle"><fmt:message key="yourProfile.description" /></p>
 
 <html:form action="/editor/yourProfile" method="post" focus="fullName">

Modified: incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp Wed Aug 24 12:16:58 2005
@@ -1,4 +1,4 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 <% pageContext.setAttribute("leftPage","/website/YourWebsitesSidebar.jsp"); %>
 
 <div class="prop"></div> <%-- force minimum height --%>
@@ -46,12 +46,13 @@
     <input type="hidden" name="websiteId" value="" />
     <input type="hidden" name="method" value="select" />		  
 
+<p class="subtitle"><fmt:message key="yourWebsites.subtitle" /></p>
+
 <%-- Choose appropriate prompt at start of page --%>
 <c:choose>
 
-    <c:when test="${empty model.permissions && empty model.pendings}">
-        <h1><fmt:message key="yourWebsites.title.welcomeNoBlog" /></h1>    
-        <p class="subtitle"><fmt:message key="yourWebsites.subtitle.welcomeNoBlog" /></p>        
+    <c:when test="${empty model.permissions && empty model.pendings}"> 
+        <p><fmt:message key="yourWebsites.subtitle.welcomeNoBlog" /></p>        
         <p>
         <fmt:message key="yourWebsites.prompt.welcomeNoBlog" />
         <roller:link page="/editor/createWebsite.do">
@@ -60,9 +61,8 @@
         </p>
     </c:when>
     
-    <c:when test="${!empty model.pendings}">    
-        <h1><fmt:message key="yourWebsites.invitations" /></h1>    
-        <p class="subtitle"><fmt:message key="yourWebsites.invitationsPrompt" /></p>
+    <c:when test="${!empty model.pendings}">      
+        <p><fmt:message key="yourWebsites.invitationsPrompt" /></p>
         
         <c:forEach var="invite" items="${model.pendings}">
             <fmt:message key="yourWebsites.youAreInvited" >
@@ -82,17 +82,12 @@
 </c:choose>
             
 <c:if test="${!empty model.permissions}">
-
-    <h1><fmt:message key="yourWebsites.title" /></h1>    
-    <p class="subtitle"><fmt:message key="yourWebsites.prompt" /></p>
-
-    <div class="entryTitleBox" >
-        <fmt:message key="yourWebsites.existingWebsites" />
-    </div>
+    <h2><fmt:message key="yourWebsites.weblogs.title" /></h2>
+    <p class="subtitle"><fmt:message key="yourWebsites.weblogs.prompt" /></p>
 
         <c:forEach var="perms" items="${model.permissions}">
 
-            <div class="entryBox">  
+            <div class="yourWeblogBox">  
 
                    <table width="100%">
                    <tr>
@@ -169,4 +164,4 @@
 
 <div class="clear"></div> <%-- force minimum height --%>
 
-<%@ include file="/theme/footer.jsp" %>
+

Modified: incubator/roller/branches/roller_2.0/web/website/edit-page.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/edit-page.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/edit-page.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/edit-page.jsp Wed Aug 24 12:16:58 2005
@@ -1,4 +1,4 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 <script type="text/javascript">
 <!--
 function previewImage(theme) {
@@ -16,7 +16,10 @@
 
 <html:form action="/editor/page" method="post">
 
-	<h1><fmt:message key="pageForm.editPage" />:<bean:write name="weblogTemplateForm" property="name" /></h1>
+	<p class="subtitle">
+        <fmt:message key="pageForm.editPage" />:
+        <bean:write name="weblogTemplateForm" property="name" />
+	</p>
 	
     <table>
         <tr>
@@ -61,6 +64,5 @@
 // -->
 </script>
 
-<%@ include file="/theme/footer.jsp" %>
 
 

Modified: incubator/roller/branches/roller_2.0/web/website/edit-pages-sidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/edit-pages-sidebar.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/edit-pages-sidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/edit-pages-sidebar.jsp Wed Aug 24 12:16:58 2005
@@ -25,5 +25,4 @@
     </div>
 </div>	
 
-<%@ include file="/theme/footer.jsp" %>
 

Modified: incubator/roller/branches/roller_2.0/web/website/edit-pages.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/edit-pages.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/edit-pages.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/edit-pages.jsp Wed Aug 24 12:16:58 2005
@@ -1,9 +1,8 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %><%
+<%@ include file="/taglibs.jsp" %><%
 request.setAttribute("customTheme", org.roller.pojos.Theme.CUSTOM); %>
 
 <roller:StatusMessage/>
 
-<h1><fmt:message key="pagesForm.title" /></h1>
 <p class="subtitle">
    <fmt:message key="pagesForm.subtitle" >
        <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
@@ -63,5 +62,5 @@
 
 <p><fmt:message key="pagesForm.hiddenNote" /></p>
 
-<%@ include file="/theme/footer.jsp" %>
+
 

Modified: incubator/roller/branches/roller_2.0/web/website/edit-website.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/edit-website.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/edit-website.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/edit-website.jsp Wed Aug 24 12:16:58 2005
@@ -1,8 +1,7 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 
 <roller:StatusMessage/>
 
-<h1><fmt:message key="websiteSettings.title" /></h1>
 <p class="subtitle">
    <fmt:message key="websiteSettings.subtitle" >
        <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
@@ -168,5 +167,4 @@
         
 </html:form>
 
-<%@ include file="/theme/footer.jsp" %>
 

Modified: incubator/roller/branches/roller_2.0/web/website/remove-page.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/remove-page.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/remove-page.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/remove-page.jsp Wed Aug 24 12:16:58 2005
@@ -1,4 +1,4 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 
 
 <h3>
@@ -32,5 +32,5 @@
 </tr>
 </table>
 
-<%@ include file="/theme/footer.jsp" %>
+
 

Modified: incubator/roller/branches/roller_2.0/web/website/rollerProperties.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/rollerProperties.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/rollerProperties.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/rollerProperties.jsp Wed Aug 24 12:16:58 2005
@@ -1,6 +1,5 @@
 <%@ taglib uri="http://java.sun.com/jstl/xml" prefix="x" %>
 <%@ include file="/taglibs.jsp" %>
-<%@ include file="/theme/header.jsp" %>
 
 <%-- Start by parsing our config defs using the jstl xml toolkit --%>
 <%-- Then we'll progress through the config defs and print out the form --%>
@@ -11,7 +10,6 @@
 
 <roller:StatusMessage/>
 
-<h1><fmt:message key="configForm.title" /></h1>
 <p class="subtitle"><fmt:message key="configForm.subtitle" /></a>
 <p><fmt:message key="configForm.prompt" /></a>
 
@@ -87,5 +85,3 @@
     
 <form>
 
-
-<%@ include file="/theme/footer.jsp" %>
\ No newline at end of file

Modified: incubator/roller/branches/roller_2.0/web/website/theme-editor.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/theme-editor.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/theme-editor.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/theme-editor.jsp Wed Aug 24 12:16:58 2005
@@ -1,4 +1,4 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp"%>
+<%@ include file="/taglibs.jsp" %>
 <%
 // this just makes the name for a custom theme available to our jstl EL
 String customTheme = org.roller.pojos.Theme.CUSTOM;
@@ -15,7 +15,6 @@
     throw new ServletException(e);
 }
 %>
-<h1><fmt:message key="themeEditor.title" /></h1>
 <p class="subtitle">
    <fmt:message key="themeEditor.subtitle" >
        <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
@@ -119,4 +118,4 @@
     // -->
 </script>
 
-<%@ include file="/theme/footer.jsp"%>
+

Modified: incubator/roller/branches/roller_2.0/web/website/upload-file.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/upload-file.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/upload-file.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/upload-file.jsp Wed Aug 24 12:16:58 2005
@@ -1,8 +1,7 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 
 <roller:StatusMessage/>
 
-<h1><fmt:message key="uploadFiles.title" /></h1>
 <p class="subtitle">
     <fmt:message key="uploadFiles.subtitle" >
         <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
@@ -41,5 +40,5 @@
 </script>
 
 
-<%@ include file="/theme/footer.jsp" %>
+
 

Modified: incubator/roller/branches/roller_2.0/web/website/welcome.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/welcome.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/welcome.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/welcome.jsp Wed Aug 24 12:16:58 2005
@@ -1,4 +1,4 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 
 <h2><fmt:message key="welcome.title" /></h2>
 
@@ -7,5 +7,5 @@
 <p><a href='<c:out value="${contextURL}"/>/login-redirect.jsp'><fmt:message key="welcome.clickHere" /></a> 
 <fmt:message key="welcome.toLoginAndPost" /></p>
 
-<%@ include file="/theme/footer.jsp" %>
+
 



Mime
View raw message