roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r240407 [3/3] - in /incubator/roller/branches/roller_2.0: metadata/xdoclet/ src/org/roller/presentation/ src/org/roller/presentation/bookmarks/actions/ src/org/roller/presentation/filters/ src/org/roller/presentation/planet/ src/org/roller/...
Date Sat, 27 Aug 2005 11:47:37 GMT
Modified: 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=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/head.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/head.jsp Sat Aug 27 04:46:10 2005
@@ -1,28 +1,16 @@
-<%@ 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>  
+<%@ include file="/taglibs.jsp" %>
+<link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath()
%>/theme/layout.css" />
+<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/menu.css" />
+<link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath()
%>/theme/calendar.css" />      
+<link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath()
%>/theme/tan/colors.css" />  
+<script type="text/javascript" src="<%= request.getContextPath() %>/theme/scripts/roller.js"></script>
  
+<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=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/layout.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/layout.css Sat Aug 27 04:46:10 2005
@@ -8,14 +8,13 @@
 #banner {
     height: 105px; 
     margin: 0px;
-    padding: 0px;
+    padding: 0px 0px 0px 0px;
 }
 #menu {
     padding: 0px 15px 0px 15px;
 }
 #centercontent {
-    margin: 15px 260px 0px 15px;
-    padding: 0px;
+    margin: 15px 15px 0px 15px;
 }
 #rightcontent {
     position: absolute;

Added: incubator/roller/branches/roller_2.0/web/theme/menu-admin.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/menu-admin.jsp?rev=240407&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/menu-admin.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/theme/menu-admin.jsp Sat Aug 27 04:46:10 2005
@@ -0,0 +1,6 @@
+<%@ include file="/taglibs.jsp" %>
+
+<roller:Menu model="admin-menu.xml" view="/menu-tabbed.vm" />
+
+
+

Added: incubator/roller/branches/roller_2.0/web/theme/menu-editor.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/menu-editor.jsp?rev=240407&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/menu-editor.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/theme/menu-editor.jsp Sat Aug 27 04:46:10 2005
@@ -0,0 +1,5 @@
+<%@ include file="/taglibs.jsp" %>
+
+<roller:Menu model="editor-menu.xml" view="/menu-tabbed.vm" />
+
+

Modified: incubator/roller/branches/roller_2.0/web/theme/menu.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/menu.css?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/menu.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/menu.css Sat Aug 27 04:46:10 2005
@@ -64,6 +64,7 @@
 .menuItemTable {
     width: 100%;
     height: 27px;
+    padding: 0px 0px 0px 10px;
     /* CUSTOMIZABLE background-color: #c6ab74; */
 }
 .menuItemSelected, .menuItemUnselected {

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=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/roller.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/roller.css Sat Aug 27 04:46:10 2005
@@ -1,5 +1,8 @@
 /* ======================================================================
-roller.css: Base CSS styles for Roller web UI (colors, fonts, etc.)
+roller.css: Base CSS styles for Roller web UI
+
+CUSTOMIZABLE color and background image setttings have been separated out
+and placed in separate colors.css files for different color schemes.
 ====================================================================== */
 
 .bannerBox {
@@ -7,21 +10,20 @@
     height: 78px; 
     width: 100%;
 }
-.statusBox {
+.bannerStatusBox {
     height: 25px; 
     width: 100%;
     /* CUSTOMIZABLE background: #ad3431; */
-    color: white;
 }
-.statusBox a {
-    /* CUSTOMIZABLE color: white; */
+/* 
+CUSTOMIZABLE
+.bannerStatusBox a {
 }
-.statusBox a:link {
-    /* CUSTOMIZABLE color: white; */
+.bannerStatusBox a:link {
 }
-.statusBox a:visited {
-    /* CUSTOMIZABLE color: white; */
+.bannerStatusBox a:visited {
 }
+*/
 .bannerLeft {
     float: left; 
     padding: 4px 15px 4px 15px;
@@ -453,6 +455,7 @@
    text-style: italics;
 }
 .yourWeblogBox {
+   width: 80%;
    padding: 4px;
    margin: 4px 0px 4px 0px;
 }

Modified: 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=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/sun/colors.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/sun/colors.css Sat Aug 27 04:46:10 2005
@@ -1,5 +1,5 @@
 
-/* Customizable colors and images */
+/* SUN : Customizable colors and images */
 
 /* ------------------------------------------------------------------------ */
 /* add colors and images to roller.css */
@@ -10,17 +10,17 @@
 .sidebarfade {
     background: url("two-sidebarfade.png") repeat-x top;
 }
-.statusBox {
+.bannerStatusBox {
     background: #dee7e7;
     color: black;
 }
-.statusBox a {
+.bannerStatusBox a {
     color: black;
 }
-.statusBox a:link {
+.bannerStatusBox a:link {
     color: black;
 }
-.statusBox a:visited {
+.bannerStatusBox a:visited {
     color: black;
 }
 h1 {

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=240407&r1=240406&r2=240407&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 Sat Aug 27 04:46:10 2005
@@ -1,5 +1,5 @@
 
-/* Customizable colors and images */
+/* TAN : Customizable colors and images */
 
 /* ------------------------------------------------------------------------ */
 /* add colors and images to roller.css */
@@ -8,19 +8,19 @@
     background: url("two-banner.png") repeat-x top;
 }
 .sidebarfade {
-    background: url("two-sidebarfade.png") repeat-x top;
+    background: url("two-sidebarfade.png") repeat-x bottom;
 }
-.statusBox {
+.bannerStatusBox {
     background: #ad3431;
     color: white;
 }
-.statusBox a {
+.bannerStatusBox a {
     color: white;
 }
-.statusBox a:link {
+.bannerStatusBox a:link {
     color: white;
 }
-.statusBox a:visited {
+.bannerStatusBox a:visited {
     color: white;
 }
 h1 {
@@ -89,7 +89,7 @@
 }
 .menuItemTable {
     background-color: #c6ab74;
-    color: white;
+    color: black;
 }
 td.menuTabSelected a:link, td.menuTabSelected a:visited, td.menuTabSelected a:hover, td.menuTabSelected
a:active {
     color: black;

Modified: incubator/roller/branches/roller_2.0/web/theme/tan/two-sidebarfade.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/tan/two-sidebarfade.png?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
Binary files - no diff available.

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=240407&r1=240406&r2=240407&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 Sat Aug 27 04:46:10
2005
@@ -1,12 +1,12 @@
 <% 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>
-    <%-- 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" />
+<title><%= RollerRuntimeConfig.getProperty("site.shortName") %></title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<tiles:insert attribute="head" />     
+<style type="text/css">
+   <tiles:insert attribute="styles" />
+</style>
 </head>
 <body>
 
@@ -14,6 +14,7 @@
    
     <div id="banner">
         <tiles:insert attribute="banner" />
+        <tiles:insert attribute="bannerStatus" />
     </div>
     
     <div id="leftcontent"> 

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=240407&r1=240406&r2=240407&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 Sat Aug 27 04:46:10
2005
@@ -1,12 +1,9 @@
 <% 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>
-    <%-- 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" />
+<title><%= RollerRuntimeConfig.getProperty("site.shortName") %></title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<tiles:insert attribute="head" />     
 <style type="text/css">
 label.formrow {
    float: left;
@@ -14,6 +11,7 @@
    width: 30%;
    padding-right: 1em;
 }
+<tiles:insert attribute="styles" />
 </style>
 </head>
 <body>
@@ -22,6 +20,7 @@
    
     <div id="banner">
         <tiles:insert attribute="banner" />
+        <tiles:insert attribute="bannerStatus" />
     </div>
     
     <div id="leftcontent"> 

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=240407&r1=240406&r2=240407&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 Sat Aug 27 04:46:10
2005
@@ -1,30 +1,23 @@
 <% 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>
-    <%-- 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" />
+<title><%= RollerRuntimeConfig.getProperty("site.shortName") %></title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<tiles:insert attribute="head" />     
 <style type="text/css">
-#centercontent {
-    margin: 15px 60px 0px 15px;
-    padding: 0px;
-}
-#rightcontent {
-    position: absolute;
-    top:   120px;
-    right:  15px;
-    width: 50px;
+#banner {
+    height: 30px;
 }
+<tiles:insert attribute="styles" />
 </style>
 </head>
 <body>
+
 <div id="wrapper"> 
    
     <div id="banner">
         <tiles:insert attribute="banner" />
+        <tiles:insert attribute="bannerStatus" />
     </div>
     
     <div id="leftcontent"> 

Added: incubator/roller/branches/roller_2.0/web/theme/tiles-tabbedpage.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/tiles-tabbedpage.jsp?rev=240407&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/tiles-tabbedpage.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/theme/tiles-tabbedpage.jsp Sat Aug 27 04:46:10
2005
@@ -0,0 +1,44 @@
+<% 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.shortName") %>: <c:out value="${model.title}"
/></title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<tiles:insert attribute="head" />     
+<style type="text/css">
+#banner {
+    height: 30px; 
+}
+<tiles:insert attribute="styles" />
+</style>
+</head>
+<body>
+
+<div id="wrapper"> 
+   
+    <div id="banner">
+        <tiles:insert attribute="bannerStatus" />
+    </div>
+    
+    <div id="menu">
+        <h1><c:out value="${model.title}" /></h1>
+        <tiles:insert attribute="menu" />
+    </div>
+    
+    <div id="leftcontent"> 
+    </div>
+    
+    <div id="centercontent">   
+        <tiles:insert attribute="messages" /> 
+        <tiles:insert attribute="content" />   
+        <div id="footer">
+            <tiles:insert attribute="footer" />
+        </div> 
+    </div>
+    
+    <div id="rightcontent"> 
+       <tiles:insert attribute="sidebar" />
+    </div>  
+   
+</div>
+</body>
+</html>

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=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/CategoriesForm.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/CategoriesForm.jsp Sat Aug 27 04:46:10
2005
@@ -27,7 +27,7 @@
     <c:when test="${empty model.categoryPath}">
     <p class="subtitle">
         <fmt:message key="categoriesForm.subtitle" >
-            <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
+            <fmt:param value="${model.website.handle}" />
         </fmt:message>
     </p>  
     <p class="pagetip">

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=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/CategoryDeleteOK.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/CategoryDeleteOK.jsp Sat Aug 27 04:46:10
2005
@@ -25,7 +25,7 @@
 
 <html:form action="/editor/categoryDelete" method="post">
 
-	<html:hidden property="catid" />
+	<html:hidden property="catId" />
 	<html:hidden property="confirmDelete" />
 
 	<c:if test="${categoryDeleteForm.inUse}" >

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=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/CategoryForm.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/CategoryForm.jsp Sat Aug 27 04:46:10 2005
@@ -1,18 +1,17 @@
 <%@ include file="/taglibs.jsp" %>
 
 
-<h3>
-<img src='<c:url value="/images/Folder24.png"/>' alt="category" align="absmiddle"
/>
+<p class="subtitle">
 <c:if test="${state == 'add'}">
-    <fmt:message key="categoryForm.addCategory" /></h3>
+    <fmt:message key="categoryForm.add.subtitle" /></h3>
 </c:if>
 <c:if test="${state == 'edit'}">
-    <fmt:message key="categoryForm.editCategory" />
+    <fmt:message key="categoryForm.edit.subtitle" />
 </c:if>
 <c:if test="${state == 'correct'}">
-    <fmt:message key="categoryForm.correctCategory" />
+    <fmt:message key="categoryForm.correct.subtitle" />
 </c:if>
-</h3>
+</p>
 
 <p>
 <b><fmt:message key="categoriesForm.path" /></b>:
@@ -29,9 +28,6 @@
     <html:hidden property="method" name="method" value="update"/>
     <html:hidden property="id" />
     <html:hidden property="parentId" />
-    
-    <input type="hidden" name="<%= RollerRequest.PARENTID_KEY %>" 
-    	value="<%= request.getAttribute(RollerRequest.PARENTID_KEY) %>" />
 
     <table>
 
@@ -54,9 +50,13 @@
     
     <p>
     <input type="submit" value="<fmt:message key='categoryForm.save' />" />
+    <c:url var="categoriesUrl" value="/editor/categories.do">
+       <c:param name="method" value="selectCategory" />
+       <c:param name="weblog" value="${model.website.handle}" />
+       <c:param name="categoryid" value="${requestScope.parentId}" />
+    </c:url>
     <input type="button" value="<fmt:message key='categoryForm.cancel' />" 
-        onclick="window.location = 'categories.do?method=selectCategory&amp;categoryid=<%=
-        request.getAttribute(RollerRequest.PARENTID_KEY) %>'" />
+        onclick="window.location = '<c:out value="${categoriesUrl}" />'" />
     </p>
 
 </html:form>

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=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/CustomPingTargets.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/CustomPingTargets.jsp Sat Aug 27 04:46:10
2005
@@ -3,7 +3,7 @@
 
 <p class="subtitle">
    <fmt:message key="customPingTargets.subtitle" >
-       <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
+       <fmt:param value="${model.website.handle}" />
    </fmt:message>
 </p>  
 

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=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/Pings.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/Pings.jsp Sat Aug 27 04:46:10 2005
@@ -3,7 +3,7 @@
 
 <p class="subtitle">
    <fmt:message key="pings.subtitle" >
-       <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
+       <fmt:param value="${model.website.handle}" />
    </fmt:message>
 </p>  
 <p class="pagetip">

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=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp Sat Aug 27 04:46:10 2005
@@ -47,7 +47,7 @@
 }
 function publish() {
     <c:choose>
-	    <c:when test="${model.rollerSession.userAuthorizedToAuthor}">
+	    <c:when test="${model.userAuthorizedToAuthor}">
 	        document.weblogEntryFormEx.status.value = "PUBLISHED";
 	    </c:when>
 	    <c:otherwise>
@@ -82,6 +82,7 @@
     <html:hidden property="day"/>
     <html:hidden property="id"/>
     <html:hidden property="creatorId"/>
+    <html:hidden property="websiteId"/>
     <html:hidden property="anchor"/>
     <html:hidden property="updateTime"/>
     <html:hidden property="status"/>
@@ -287,12 +288,12 @@
      <fmt:message key="weblogEdit.rightToLeft" />
      <br />
 
-     <c:if test="${model.rollerSession.adminUser}">
+     <c:if test="${model.rollerSession.globalAdminUser}">
          <html:checkbox property="pinnedToMain" />
          <fmt:message key="weblogEdit.pinnedToMain" />
          <br />
      </c:if>
-     <c:if test="${!model.rollerSession.adminUser}">
+     <c:if test="${!model.rollerSession.globalAdminUser}">
          <html:hidden property="pinnedToMain" />
      </c:if>
 
@@ -338,7 +339,7 @@
         
             <c:choose>
             
-	            <c:when test="${model.rollerSession.userAuthorizedToAuthor}" >       

+	            <c:when test="${model.userAuthorizedToAuthor}" >        
                     <input type="button" name="post"
 	                       value='<fmt:message key="weblogEdit.post" />'
 	                       onclick="publish()" />
@@ -352,7 +353,7 @@
 	                </c:if>
 	            </c:when> 
 	            
-	            <c:when test="${model.rollerSession.userAuthorized}" > 
+	            <c:when test="${model.userAuthorized}" > 
                     <c:if test="${weblogEntryFormEx.status == 'DRAFT'}">       
 		                <input type="button" name="post"
 		                       value='<fmt:message key="weblogEdit.submitForReview" />'
@@ -409,7 +410,7 @@
     
     <%-- ================================================================== --%>
     <%-- Trackback control --%>
-    <c:if test="${!empty weblogEntryFormEx.id && model.rollerSession.userAuthorizedToAuthor}">
+    <c:if test="${!empty weblogEntryFormEx.id && model.userAuthorizedToAuthor}">
         <br />
         <br />
         <a name="trackbacks"></a>
@@ -426,7 +427,7 @@
     <%-- ================================================================== --%>
     <%-- Comments of this weblog entry --%>
 
-    <c:if test="${model.editMode && !empty model.comments && model.rollerSession.userAuthorizedToAuthor}"
>
+    <c:if test="${model.editMode && !empty model.comments && model.userAuthorizedToAuthor}"
>
         <br />
         <br />
         <a name="comments"></a>

Modified: incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp Sat Aug 27 04:46:10
2005
@@ -11,7 +11,7 @@
             <div class="sidebarBody"> 
         
 <h3><fmt:message key="weblogEdit.pendingEntries" /></h3>
-<hr />
+
 <c:if test="${empty model.recentPendingEntries}">
    <fmt:message key="application.none" />
 </c:if>
@@ -29,23 +29,10 @@
     </roller:link>
     <br />
 </c:forEach>
-<br />
-<br />
-                
-            </div>
-        </div>
-    </div>
-</div>
-
-<br />
-
-<div class="sidebarfade">
-    <div class="menu-tr">
-        <div class="menu-tl">
-            <div class="sidebarBody">
-            
+    
+         
+<hr />            
 <h3><fmt:message key="weblogEdit.draftEntries" /></h3>
-<hr />
 
 <c:if test="${empty model.recentDraftEntries}">
    <fmt:message key="application.none" />
@@ -63,26 +50,14 @@
            </str:truncateNicely>
     </roller:link>
     <br />
-</c:forEach> 
-<br />
-<br />
-                
-            </div>
-        </div>
-    </div>
-</div>
+</c:forEach>             
 
-<br />
 
-<c:if test="${model.rollerSession.userAuthorizedToAuthor}">
-
-<div class="sidebarfade">
-    <div class="menu-tr">
-        <div class="menu-tl">
-            <div class="sidebarBody">
+<c:if test="${model.userAuthorizedToAuthor}">
             
-<h3><fmt:message key="weblogEdit.publishedEntries" /></h3>
 <hr />
+<h3><fmt:message key="weblogEdit.publishedEntries" /></h3>
+
 <c:if test="${empty model.recentPublishedEntries}">
    <fmt:message key="application.none" />
 </c:if>
@@ -100,18 +75,13 @@
     </roller:link>                    
     <br />
 </c:forEach>
-<br />
-<br />
                 
             </div>
         </div>
     </div>
 </div>
-
-<br />  
  
 </c:if>
 
-<br />
 
 

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=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogQuery.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogQuery.jsp Sat Aug 27 04:46:10 2005
@@ -6,7 +6,7 @@
 
 <p class="subtitle">
     <fmt:message key="weblogEntryQuery.subtitle" >
-        <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
+        <fmt:param value="${model.website.handle}" />
     </fmt:message>
 </p>
 <p class="pagetip">

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=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/referers.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/referers.jsp Sat Aug 27 04:46:10 2005
@@ -3,7 +3,7 @@
 <%-- Form allows deleting of referers --%>
 <p class="subtitle">
     <fmt:message key="referers.subtitle" >
-        <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
+        <fmt:param value="${model.website.handle}" />
     </fmt:message>
 </p>  
 <p class="pagetip">

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=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/CreateWebsite.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/CreateWebsite.jsp Sat Aug 27 04:46:10
2005
@@ -12,6 +12,8 @@
 -->
 </script>
 
+<h1><fmt:message key="createWebsite.title" /></h1>
+
 <p class="subtitle"><fmt:message key="createWebsite.prompt" /></p>
 
 <br /> 

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=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/InviteMember.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/InviteMember.jsp Sat Aug 27 04:46:10
2005
@@ -10,9 +10,7 @@
 // -->
 </script> 
 
-<h1><fmt:message key="inviteMember.title" /></h1>
-
-<p><fmt:message key="inviteMember.description" /></p>
+<p class="subtitle"><fmt:message key="inviteMember.description" /></p>
 
 <html:form action="/editor/inviteMember" method="post" focus="userName">
     <input name="method" type="hidden" value="save" />

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=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/MemberPermissions.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/MemberPermissions.jsp Sat Aug 27 04:46:10
2005
@@ -20,7 +20,7 @@
 
 <p class="subtitle">
     <fmt:message key="memberPermissions.subtitle" >
-        <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
+        <fmt:param value="${model.website.handle}" />
     </fmt:message>
 </p>
 

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=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp Sat Aug 27 04:46:10 2005
@@ -8,6 +8,7 @@
 -->
 </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=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp Sat Aug 27 04:46:10
2005
@@ -4,19 +4,7 @@
 <div class="prop"></div> <%-- force minimum height --%>
 
 <script type="text/javascript">
-<!--
-function selectWebsiteAction(id, action) 
-{
-    document.yourWebsitesForm.method.value = action;
-    document.yourWebsitesForm.websiteId.value = id;
-    document.yourWebsitesForm.submit();
-} 
-function manageWeblog(id) 
-{
-    document.yourWebsitesForm.method.value = "newEntry";
-    document.yourWebsitesForm.websiteId.value = id;
-    document.yourWebsitesForm.submit();
-} 
+<!-- 
 function acceptInvite(id) 
 {
     document.yourWebsitesForm.method.value = "accept";
@@ -124,18 +112,34 @@
 
                            <fmt:message key='yourWebsites.actions' />             
         
                            <br />
+                           
+                           <c:url value="/editor/weblog.do" var="newEntry">
+                               <c:param name="method" value="create" />
+                               <c:param name="weblog" value="${perms.website.handle}"
/>
+                           </c:url>
                            <img src='<c:url value="/images/New16.gif"/>' />
-                           <a href='javascript:selectWebsiteAction("<c:out value='${perms.website.id}'/>",
"newEntry")'>
+                           <a href='<c:out value="${newEntry}" />'>
                                <fmt:message key="yourWebsites.newEntry" /></a>
                            <br />
+                           
+                           <c:url value="/editor/weblogQuery.do" var="editEntries">
+                               <c:param name="method" value="query" />
+                               <c:param name="weblog" value="${perms.website.handle}"
/>
+                           </c:url>
                            <img src='<c:url value="/images/Edit16.png"/>' />
-                           <a href='javascript:selectWebsiteAction("<c:out value='${perms.website.id}'/>",
"editEntries")'>
+                           <a href='<c:out value="${editEntries}" />'>
                                <fmt:message key="yourWebsites.editEntries" /></a>

                            <br />
+                           
+                           <c:url value="/editor/website.do" var="manageWeblog">
+                               <c:param name="method" value="edit" />
+                               <c:param name="weblog" value="${perms.website.handle}"
/>
+                           </c:url>
                            <img src='<c:url value="/images/Edit16.png"/>' />
-                           <a href='javascript:selectWebsiteAction("<c:out value='${perms.website.id}'/>",
"manageWeblog")'>
+                           <a href='<c:out value="${manageWeblog}" />'>
                                <fmt:message key="yourWebsites.manage" /></a>

                            <br />
+                           
                            <c:choose>
                                <c:when test="${perms.website.adminUserCount == 1 &&
perms.permissionMask == 3}">
                                    <%-- <fmt:message key="yourWebsites.notAllowed"
/> --%>

Modified: incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp Sat Aug 27 04:46:10
2005
@@ -28,7 +28,7 @@
                 <fmt:message key="yourWebsites.editProfile.desc" />
             </p>
             
-            <c:if test="${model.rollerSession.adminUser}">               
+            <c:if test="${model.rollerSession.globalAdminUser}">               
                 <p>
                     <h3>
                     <roller:link forward="rollerConfig">

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=240407&r1=240406&r2=240407&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 Sat Aug 27 04:46:10 2005
@@ -5,7 +5,7 @@
 
 <p class="subtitle">
    <fmt:message key="pagesForm.subtitle" >
-       <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
+       <fmt:param value="${model.website.handle}" />
    </fmt:message>
 </p>  
 <p class="pagetip">
@@ -36,7 +36,7 @@
             <td class="center">
                <roller:link forward="editPage">
                   <roller:linkparam id="username" name="user" property="userName" />
-                  <roller:linkparam id="pageid" name="p" property="id" />
+                  <roller:linkparam id="pageId" name="p" property="id" />
                   <img src='<c:url value="/images/Edit16.png"/>' border="0" alt="icon"
/>
                </roller:link>
             </td>
@@ -46,7 +46,7 @@
                  <c:when test="${p.id != website.defaultPageId}">
                    <roller:link forward="removePage.ok">
                       <roller:linkparam id="username" name="user" property="userName"
/>
-                      <roller:linkparam id="pageid" name="p" property="id" />
+                      <roller:linkparam id="pageId" name="p" property="id" />
                       <img src='<c:url value="/images/Remove16.gif"/>' border="0"
alt="icon" />
                    </roller:link>
                  </c:when>

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=240407&r1=240406&r2=240407&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 Sat Aug 27 04:46:10
2005
@@ -4,7 +4,7 @@
 
 <p class="subtitle">
    <fmt:message key="websiteSettings.subtitle" >
-       <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
+       <fmt:param value="${model.website.handle}" />
    </fmt:message>
 </p>  
    

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=240407&r1=240406&r2=240407&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 Sat Aug 27 04:46:10
2005
@@ -5,11 +5,12 @@
 request.setAttribute("customTheme", customTheme);
 boolean allowCustom = org.roller.config.RollerRuntimeConfig.getBooleanProperty("themes.customtheme.allowed");
 request.setAttribute("allowCustom", new Boolean(allowCustom));
+RollerRequest rreq = RollerRequest.getRollerRequest(request);
 
 String username = "";
 try {
     RollerSession rollerSession = RollerSession.getRollerSession(request);
-    WebsiteData wd = rollerSession.getCurrentWebsite();
+    WebsiteData wd = rreq.getWebsite();
     username = wd.getHandle();
 } catch (Exception e) {
     throw new ServletException(e);
@@ -17,7 +18,7 @@
 %>
 <p class="subtitle">
    <fmt:message key="themeEditor.subtitle" >
-       <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
+       <fmt:param value="${model.website.handle}" />
    </fmt:message>
 </p>  
 <p class="pagetip">

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=240407&r1=240406&r2=240407&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 Sat Aug 27 04:46:10 2005
@@ -4,7 +4,7 @@
 
 <p class="subtitle">
     <fmt:message key="uploadFiles.subtitle" >
-        <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
+        <fmt:param value="${model.website.handle}" />
     </fmt:message>
 </p>  
 <p class="pagetip">



Mime
View raw message