roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r232817 [2/2] - in /incubator/roller/branches/roller_2.0: metadata/xdoclet/ src/org/roller/presentation/bookmarks/actions/ src/org/roller/presentation/tags/menu/ src/org/roller/presentation/weblog/actions/ src/org/roller/presentation/websit...
Date Mon, 15 Aug 2005 14:52:58 GMT
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=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/menu.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/menu.css Mon Aug 15 07:51:59 2005
@@ -1,6 +1,47 @@
+/* ======================================================================
+menu.css: CSS layout and styles for Roller tabbed menu
+====================================================================== */
+
+/* rounded corners */
+
+div.menu-tl {
+    padding: 5px 5px 0px 5px; margin: 0px; height:100%;
+    background: url("images/menutab-tl.png") no-repeat left top;    
+    background-repeat: no-repeat;
+}
+div.menu-tr {
+    margin: 0px; height:100%;
+    background: url("images/menutab-tr.png") no-repeat right top;    
+    background-repeat: no-repeat;
+}
+
+/* style selected and unselected menu links*/
+
+td.menuTabSelected a:link, td.menuTabSelected a:visited, td.menuTabSelected a:hover, td.menuTabSelected a:active {
+    color: black;
+    text-decoration: none;
+    font-weight: bold;
+}
+td.menuTabUnselected a:link, td.menuTabUnselected a:visited, td.menuTabUnselected a:hover, td.menuTabUnselected a:active {
+    color: black;
+    text-decoration: none;
+}
+a.menuItemSelected:link, a.menuItemSelected:visited, a.menuItemSelected:hover, a.menuItemSelected:active {
+    color: black;
+    text-decoration: none;
+    font-weight: bold;
+}
+a.menuItemUnselected:link, a.menuItemUnselected:visited, a.menuItemUnselected:hover, a.menuItemUnselected:active {
+    color: black;
+    text-decoration: none;
+}
+
+/* ----------------------------------------------------------------------
+Menu tab table (the tabs)
+---------------------------------------------------------------------- */
 
 .menuTabTable {
-    height: 25px;
+    height: 27px;
 }
 td.menuTabSeparator {
     width: 10px;
@@ -8,7 +49,6 @@
 td.menuTabSelected {
     padding: 0px; 
     margin: 0px;
-    font-weight: bold;
     background: url("images/menutab-sel.png");
 }
 td.menuTabUnselected {
@@ -16,43 +56,21 @@
     margin: 0px;
     background: url("images/menutab-unsel.png");
 }
-div.menu-tl {
-    padding: 5px 5px 0px 5px; margin: 0px; height:100%;
-    background: url("images/menutab-tl.png") no-repeat left top;    
-    background-repeat: no-repeat;
-}
-div.menu-tr {
-    margin: 0px; height:100%;
-    background: url("images/menutab-tr.png") no-repeat right top;    
-    background-repeat: no-repeat;
-}
+
+/* ----------------------------------------------------------------------
+Menu item table (the bar below the tabs)
+---------------------------------------------------------------------- */
 
 .menuItemTable {
     width: 100%;
-    height: 25px;
-    background-color: #bdbdbd;
+    height: 27px;
+    background-color: #c6ab74;
 }
-.menuItem {
+.menuItemSelected, .menuItemUnselected {
     padding: 0px 5px 0px 5px; /* TRBL */
 }
-.menuItemSelected {
-    font-weight: bold;
-}
-
-.menuItemTable a:link, .menuItemTable a:visited, .menuItemTable a:hover, .menuItemTable a:active {
-    color: #FFF;
-    text-decoration: none;
-}
 
-.menuTabTable a:link, .menuTabTable a:visited, .menuTabTable a:hover, .menuTabTable a:active {
-    color: #FFF;
-    text-decoration: none;
-}
 
-.menuTabUnselected a:link, .menuTabUnselected a:visited, .menuTabUnselected a:hover, .menuTabUnselected a:active {
-    color: black;
-    text-decoration: none;
-}
 
 
 

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=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/roller.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/roller.css Mon Aug 15 07:51:59 2005
@@ -1,24 +1,35 @@
 /* ======================================================================
-roller.css: CSS styles for Roller editor/admin UI
+roller.css: Base CSS styles for Roller web UI (colors, fonts, etc.)
 ====================================================================== */
 
-/* ----------------------------------------------------------------------
-Editor look and feel styles
----------------------------------------------------------------------- */
-
-#wrapper {
-    background: white;
+.bannerBox {
+    background: url("images/two-banner.png") repeat-x top;
+    height: 78px; 
+    width: 100%;
 }
-
-table.bannerBox {
+.statusBox {
+    height: 25px; 
     width: 100%;
-    background: url("images/two-topgrey.png") repeat-x top;
+    background: #ad3431;
+    color: white;
 }
-
-#footer {
-    padding: 0px;
+.statusBox a {
+    color: white;
+}
+.statusBox a:link {
+    color: white;
+}
+.statusBox a:visited {
+    color: white;
+}
+.bannerLeft {
+    float: left; 
+    padding: 4px 15px 4px 15px;
+}
+.bannerRight {
+    float: right; 
+    padding: 4px 15px 4px 15px;
 }
-
 .sidebarfade {
     padding: 0px; 
     width: 100%;
@@ -33,157 +44,155 @@
 ---------------------------------------------------------------------- */
 
 body {
-    height: 100%;
     background: white;
-    margin: 0;
-    padding: 0;
+    margin: 0px;
+    padding: 0px;
     font: small Verdana,Arial,Sans-serif;
     font: x-small/1.5em Verdana, Arial, Helvetica, sans-serif;
     font-size: 69%;
 }
-
-input, select, option {
-    font: small Verdana,Arial,Sans-serif;
-    color: black;
-    font: small/1.5em Verdana, Arial, Helvetica, sans-serif;
-    font-size: 100%;
-}
-
 p {
     background: transparent;
     color: #000000;
 }
-
+p.subtitle {
+    border-top: 1px grey solid;
+    margin: 5px 0px 15px 0px;
+}
+p.pagetip {
+    margin: 0px 0px 15px 0px;
+}
 h1 {
     background: transparent;
-    color: #e93e3e;
-    letter-spacing: 0.2em;
+    color: #ad3537;
     font-size: x-large;
     font-weight: bold;
+    margin: 10px 0px 5px 0px;
 }
-
 h2 {
     background: transparent;
-    color: #e93e3e;
-    letter-spacing: 0.2em;
+    color: #ad3537;
     font-size: large;
     font-weight: bold;
 }
-
 h3 {
     background: transparent;
-    color: #e93e3e;
-    letter-spacing: 0.2em;
+    color: #ad3537;
     font-weight: bold;
 }
-
 div.sidebarfade h3 {
     margin: 0px; padding: 0px; 
 }
-
 img {
     border: 0px;
+    overflow: auto;
 }
-
 img.w3c {
     border: 0px;
     height: 31px;
     width: 88px;
     margin-right: 5px;
 }
-
 a {
     background: transparent;
     text-decoration: none;
 }
-
 a:link {
     background: transparent;
-    color: #5241b5;
+    color: #ad3537;
     text-decoration: underline;
 }
-
 a:visited {
     background: transparent;
-    color: #5241b5;
+    color: #ad3537;
     text-decoration: underline;
 }
-
 a:hover {
     text-decoration: none;
 }
-
 a:active {
     text-decoration: underline overline;
 }
 
+/* ----------------------------------------------------------------------
+form layout styles
+---------------------------------------------------------------------- */
+
+input, select, option {
+    font: small Verdana,Arial,Sans-serif;
+    color: black;
+    font: small/1.5em Verdana, Arial, Helvetica, sans-serif;
+    font-size: 100%;
+}
 textarea {
    margin: 3px 0px 0px 0px;
 }
-
-.details {
-   font-size: small;
-   color: grey;
+div.row { 
+   padding: 2px; 
 }
-
-div.helptext {
-   background: #f0f0f0;
-   border: 1px #c0c0c0 solid;
-   padding: 2px;
-   margin: 30px 10px 10px 0px;
-   width: 75%; 
+div.formrow {
+   float: left:
+   width: 80%;
 }
-
-/* ----------------------------------------------------------------------
-Main page styles
----------------------------------------------------------------------- */
-
-div.entryTitleBox {
-   padding: 3px;
-   margin: 3px;
-   background: #c6c3c6;
-   color: white;
-   font-size: medium;
+label.formrow {
+   float: left;
+   text-align: right;
+   width: 20%;
+   padding-right: 1em;
 }
-
-div.entryBox {
-   padding: 3px;
-   margin: 3px;
-   border: 1px #c0c0c0 solid;
+label.formrow {
+   float: left;
+   text-align: right;
+   width: 15%;
+   padding-right: 1em;
 }
-
-div.entryBoxPinned {
+div.buttonBox {
+   width: 98%; 
+   border: 1px solid black;
+   background-color: #f3f3f3;
    padding: 3px;
-   margin: 3px;
-   border: 1px #c0c0c0 solid;
-   background: #e5e5e5;
-}
-
-a.entryTitle, a:active.entryTitle, a:visited.entryTitle {
-   color: #e93e3e;
-   font-size: medium;
-   font-weight: bold;
+   margin-top: 5em;
+   clear: both;
 }
-
-span.hotBlogs, a.hotBlogs, a:active.hotBlogs, a:visited.hotBlogs, ul.hotBlogs {
+.left {
    font-size: small;
-   padding-left:0px;
-   list-style-type:none
+   width: 136px;
 }
-
-span.entryDetails, a.entryDetails, a:active.entryDetails, a:visited.entryDetails {
+.leftTitle {
    font-size: small;
-   color: grey;
+   font-weight: bold;
 }
-
-p.websiteDescription {
-   text-style: italics;
+.formtable { 
+    width: 100%; 
+    border-collapse: collapse; 
+} 
+.formtable td.label, .formtable td.field, .formtable td.description  {
+    vertical-align: top;
+    border-style: solid;
+    border-width: 0px 0px 1px 0px;
+    border-color: #e5e5e5;
+    padding: 4px 10px 4px 10px;
+}
+.formtable td.label { 
+    text-align: right;
+    width: 15%; 
+}
+.formtable td.field { 
+    width: 30%; 
+}
+.formtable td.description { 
+    width: 55%; 
 }
 
-.version {
-   font-size: small;
-   color: grey;
-   text-align: center;
+div.sideformrow {
+   float: left:
+   width: 100%;
+}
+label.sideformrow {
+   float: left;
+   text-align: right;
+   width: 30%;
+   padding-right: 1em;
 }
 
 /* ----------------------------------------------------------------------
@@ -194,56 +203,46 @@
     border-collapse: collapse; 
     width: 100%;
 }
-
 table.rollertable th, table.rollertable th {
     border: 1px solid #ccc;
-    background: #c6c3c6;
+    background: #c6ab74;
 }
-
 table.rollertable th {
     font-size: 1.5em;
     color: white;
 }
-
 table.rollertable td, table.rollertable tbody td {
-    border: 1px solid #ccc;
+    border: 1px solid #c6ab74;
     vertical-align: top;
 }
-
 table.rollertable tbody td {
     padding: 3px;
 }
-
 table.rollertable td.center {
     text-align: center;
 }
-
 .rollertable_even td {
     border: 1px solid #ccc;
     background: #EEEEEE;
-    color: white;
+    color: black;
     vertical-align: top;
 }
-
 .rollertable_odd td{
     border: 1px solid #ccc;
     background: inherit;
     vertical-align: top;
-    color: white;
+    color: black;
 }
-
 td.rollertable_entry, div.rollertable_entry {
     border: 1px solid #ccc;
     background: inherit;
     padding: 5px;
     vertical-align: top;
 }
-
 td.propname {
     padding: 0px 0px 0px 3em;
     vertical-align: top;
 }
-
 table.edit th {
     text-align: right;
     padding-right: 5px;
@@ -259,13 +258,11 @@
     right: 20px;
     font-size: 11px;
 }
-
 .hCalendarDay {
 	border-width: thin;
 	font-size: .9em;
 	text-align: center;
 }
-
 .hCalendarDayCurrent {
 	border-style: dotted;
 	border-width: thin;
@@ -273,32 +270,27 @@
 	font-weight: bolder;
 	text-align: center;
 }
-
 .hCalendarDayLinked {
 	border-width: thin;
 	font-size: .9em;
 	font-weight: bolder;
 	text-align: center;
 }
-
 .hCalendarDayNameRow {
 	font-size: .9em;
 	background-color: #eee;
     border-bottom: 1px solid #ccc;
 	text-align: center;
 }
-
 .hCalendarDayNotInMonth {
 	background: transparent;
 	color: #AAAAAA;
 	font-size: .9em;
 	text-align: center;
 }
-
 .hCalendarNextPrev {
 	text-align: center;
 }
-
 .hCalendarMonthYearRow {
 	font-weight: bold;
 	text-align: center;
@@ -318,38 +310,31 @@
     padding: 3px;
     width: 98%;
 }
-
 .error {
     background: transparent;
     color: #FF0000;
 }
-
 .warning {
     background: transparent;
     color: #FF0000;
     font-size: .9em;
 }
-
 .errors, .messages, .warnings {
     padding: 5px;
-    margin-top: 10px;
+    margin: 10px 0px 10px 0px;
 }
-
 .errors {
    background-color: #fcc;
    border: 1px solid red;
 }
-
 .messages {
    background-color: #cfc;
    border: 1px solid green;
 }
-
 .warnings {
    background-color:#FFFFAA;
    border: 1px solid yellow;
 }
-
 div.error {
     background-color: #ffcccc;
     border: 1px solid #000000;
@@ -361,7 +346,6 @@
     text-align: left;
     vertical-align: bottom;
 }
-
 div.output {
     background-color: #e0e0e0;
     border: 1px solid #CCCC99;
@@ -381,18 +365,15 @@
 div.NN4 {
     display: none;
 }
-
 div.rNavigationBar {
     margin-bottom: 20px;
     margin-right: 10px;
 }
-
 .entryDate {
     background: transparent;
     color: #989898;
     font-style: italic;
 }
-
 .commentTitle {
     background: #FFFFDD;
     border: 1px solid #000;
@@ -402,12 +383,10 @@
     font-size: .9em;
     width: 98%;
 }
-
 .version {
     font-size: x-small;
     color: #808080;
 }
-
 .page {
     visibility: hidden;
     position: absolute;
@@ -418,7 +397,6 @@
     width: 80%;
     height: 40em;
 }
-
 .tab {
     background-color: white;
     border-top: 1px gray solid;
@@ -431,54 +409,59 @@
 }
 
 /* ----------------------------------------------------------------------
-form layout styles
+Main page styles
 ---------------------------------------------------------------------- */
 
-div.row { 
-   padding: 2px; 
+div.entryTitleBox {
+   padding: 4px;
+   margin: 4px 0px 4px 0px;
+   background: #c6ab74;
+   color: white;
+   font-size: medium;
 }
-
-div.formrow {
-   float: left:
-   width: 80%;
+div.entryBox {
+   padding: 4px;
+   margin: 4px 0px 4px 0px;
+   border: 1px #c6ab74 solid;
 }
-
-label.formrow {
-   float: left;
-   text-align: right;
-   width: 20%;
-   padding-right: 1em;
+div.entryBoxPinned {
+   padding: 4px;
+   margin: 4px 0px 4px 0px;
+   border: 1px #c0c0c0 solid;
+   background: #e5e5e5;
 }
-
-div.sideformrow {
-   float: left:
-   width: 80%;
+a.entryTitle, a:active.entryTitle, a:visited.entryTitle {
+   color: #ad3537;
+   font-size: medium;
+   font-weight: bold;
 }
-
-label.formrow {
-   float: left;
-   text-align: right;
-   width: 30%;
-   padding-right: 1em;
+span.hotBlogs, a.hotBlogs, a:active.hotBlogs, a:visited.hotBlogs, ul.hotBlogs {
+   font-size: small;
+   padding-left:0px;
+   list-style-type:none
 }
-
-div.buttonBox {
-   width: 98%; 
-   border: 1px solid black;
-   background-color: #f3f3f3;
-   padding: 3px;
-   margin-top: 5em;
-   clear: both;
+span.entryDetails, a.entryDetails, a:active.entryDetails, a:visited.entryDetails {
+   font-size: small;
+   color: grey;
 }
-
-.left {
+p.websiteDescription {
+   text-style: italics;
+}
+.version {
    font-size: small;
-   width: 136px;
+   color: grey;
+   text-align: center;
 }
-
-.leftTitle {
+.details {
    font-size: small;
-   font-weight: bold;
+   color: grey;
+}
+div.helptext {
+   background: #f0f0f0;
+   border: 1px #c0c0c0 solid;
+   padding: 2px;
+   margin: 30px 10px 10px 0px;
+   width: 75%; 
 }
 
 /* ----------------------------------------------------------------------
@@ -493,48 +476,41 @@
    padding: 10px;
    overflow: auto;
 }
-
 div.centerTitle {
     border: 1px solid #ccc;
-    background: #c6c3c6;
+    background: #c6ab74;
     color: black;
     font-weight: bolder;
     font-size: large;
     text-align: center;
 }
-
 div.control {
     width: 100%; 
-    background: #c6c3c6;
+    background: #c6ab74;
     padding: 4px;  
     margin: 5px 5px 5px 0px; 
 }
-
 div.controlToggle {
     width: 100%; 
     padding: 4px;  
     margin: 5px 5px 5px 0px;
     background: url("images/two-togglegrey.png") repeat-x top;
 }
-
 a.controlToggle {
     color: black;
     background: transparent;
     text-decoration: none;
 }
-
 a.controlToggle:link {
     color: black;
     background: transparent;
     text-decoration: none;
 }
-
 a.controlToggle:visited {
     color: black;
     background: transparent;
     text-decoration: none;
 }
-
 a.controlToggle:hover {
     color: black;
     background: transparent;

Modified: incubator/roller/branches/roller_2.0/web/theme/status.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/status.jsp?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/status.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/status.jsp Mon Aug 15 07:51:59 2005
@@ -1,5 +1,4 @@
-<%@ include file="/taglibs.jsp" %>
-<%
+<%@ include file="/taglibs.jsp" %><%
 RollerContext rctx = RollerContext.getRollerContext(request);
 RollerSession rollerSession = RollerSession.getRollerSession(request);
 UserData user = rollerSession.getAuthenticatedUser();
@@ -7,37 +6,39 @@
 String absURL = rctx.getAbsoluteContextUrl(request);
 boolean allowNewUsers = RollerConfig.getBooleanProperty("users.registration.enabled");
 %>
-<table class="bannerBox">
-	<tr>
-	
-		<td align="left">
-			<% if (user != null) { %>
-			    <fmt:message key="mainPage.loggedInAs" />:
-                 [<b><%= user.getUserName() %></b>].
-                 <% if (website != null) { %>
-                    <fmt:message key="mainPage.currentWebsite" />:
-                    [<b><a href='<%= absURL + "/page/" + website.getHandle() %>'><%= website.getHandle() %></a></b>]
-                 <% } %> 
-            <% } %>
-		</td>
-		
-		<td align="right">
-		    <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 class="bannerBox">
+   <img src="<%= request.getContextPath() %>/theme/images/two-bigbadge2.png" 
+      style="padding: 13px 0px 0px 15px;"/>
+</div>
 
-		</td>
-		
-	</tr>
-</table>
+<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/tiles-adminpage.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/tiles-adminpage.jsp?rev=232817&r1=232816&r2=232817&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 Mon Aug 15 07:51:59 2005
@@ -7,29 +7,40 @@
     <tiles:insert attribute="head" />     
     <link rel="stylesheet" type="text/css" media="all"
         href="<%= request.getContextPath() %>/theme/layout.css" />
+<style type="text/css">
+.formtable td.label { 
+    text-align: right;
+    width: 30%; 
+}
+.formtable td.field { 
+    width: 50%; 
+}
+.formtable td.description { 
+    width: 0%; 
+}
+</style>
 </head>
 <body>
 
 <div id="wrapper">
    
-    <div id="banner">
-        <tiles:insert attribute="status" /><br />
-        <div id="menu">
-            <roller:Menu model="admin-menu.xml" view="/menu-tabbed.vm" />
-        </div>
+    <div id="header">
+        <tiles:insert attribute="status" />
     </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">
+            <tiles:insert attribute="footer" />
+        </div>
     </div>
 
     <div id="rightcontent"> 
        <tiles:insert attribute="sidebar" />
-    </div>
-    
-    <div id="footer" class="clearfix">
-        <tiles:insert attribute="footer" />
     </div>
     
 </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=232817&r1=232816&r2=232817&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 Mon Aug 15 07:51:59 2005
@@ -7,32 +7,44 @@
     <tiles:insert attribute="head" />     
     <link rel="stylesheet" type="text/css" media="all"
         href="<%= request.getContextPath() %>/theme/layout.css" />
+<style type="text/css">
+.formtable td.label { 
+    text-align: right;
+    width: 30%; 
+}
+.formtable td.field { 
+    width: 50%; 
+}
+.formtable td.description { 
+    width: 0%; 
+}
+</style>
 </head>
 <body>
 <div id="wrapper"> 
    
-    <div id="banner">
-        <tiles:insert attribute="status" /><br />
-        <div id="menu">
-            <roller:Menu model="editor-menu.xml" view="/menu-tabbed.vm" />
-        </div>
+    <div id="header">
+        <tiles:insert attribute="status" />
     </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" />    
+        <tiles:insert attribute="content" />   
+        <div id="footer">
+            <tiles:insert attribute="footer" />
+        </div> 
     </div>
     
     <div id="rightcontent"> 
        <tiles:insert attribute="sidebar" />
     </div>  
- 
-    <div id="footer">
-        <tiles:insert attribute="footer" />
-    </div> 
+
    
 </div>
 </body>

Modified: incubator/roller/branches/roller_2.0/web/theme/tiles-footer.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/tiles-footer.jsp?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/tiles-footer.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/tiles-footer.jsp Mon Aug 15 07:51:59 2005
@@ -1,7 +1,7 @@
 <%@ include file="/taglibs.jsp" %>
-<br />
-<br />
-<br />
+
+<div style="margin: 10px 4px 4px 4px;">
+
 <a href="http://www.rollerweblogger.org">
     Powered by Roller Weblogger</a> | 
 
@@ -16,6 +16,8 @@
 
 <a href="http://sourceforge.net/mail/?group_id=47722">
     <fmt:message key="footer.mailingLists" /></a>
+    
+</div>
 
 
 

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=232817&r1=232816&r2=232817&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 Mon Aug 15 07:51:59 2005
@@ -7,28 +7,13 @@
     <tiles:insert attribute="head" />     
     <link rel="stylesheet" type="text/css" media="all"
         href="<%= request.getContextPath() %>/theme/layout.css" />
-<style type="text/css">
-#banner {
-    height: 30px; 
-}
-#centercontent {
-    margin: 0px 230px 15px 15px;
-    padding: 0px 25px 0px 0px;
-}
-#rightcontent {
-    position: absolute;
-    top:     35px;
-    right:   10px;
-    width:  230px;
-}
-</style>
 </head>
 <body>
 
 <div id="wrapper">
    
-    <div id="banner">
-        <tiles:insert attribute="status" /><br />
+    <div id="header">
+        <tiles:insert attribute="status" />
     </div>
     
     <div id="leftcontent"> 
@@ -36,16 +21,15 @@
     
     <div id="centercontent">   
         <tiles:insert attribute="content" />    
+        <div id="footer">
+            <tiles:insert attribute="footer" />
+        </div> 
     </div>
     
     <div id="rightcontent"> 
        <tiles:insert attribute="sidebar" />
     </div>  
  
-    <div id="footer">
-        <tiles:insert attribute="footer" />
-    </div> 
-
 </div>
 
 </body>

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=232817&r1=232816&r2=232817&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 Mon Aug 15 07:51:59 2005
@@ -8,37 +8,37 @@
     <link rel="stylesheet" type="text/css" media="all"
         href="<%= request.getContextPath() %>/theme/layout.css" />
 <style type="text/css">
-#banner {
-    height: 30px; 
-}
-#centercontent {
-    margin: 0px 350px 50px 10px;
-    padding: 10px;
-}
-#rightcontent {
-    position: absolute;
-    top:     35px;
-    right:   10px;
-    width:  340px;
+label.formrow {
+   float: left;
+   text-align: right;
+   width: 30%;
+   padding-right: 1em;
 }
 </style>
 </head>
 <body>
-<div id="wrapper">    
-    <div id="banner">
-        <tiles:insert attribute="status" /><br />
+
+<div id="wrapper"> 
+   
+    <div id="header">
+        <tiles:insert attribute="status" />
     </div>
+    
     <div id="leftcontent"> 
     </div>
+    
     <div id="centercontent">   
         <tiles:insert attribute="content" />    
+        <div id="footer">
+            <tiles:insert attribute="footer" />
+        </div> 
     </div>
+    
     <div id="rightcontent"> 
        <tiles:insert attribute="sidebar" />
-    </div>   
-    <div id="footer">
-        <tiles:insert attribute="footer" />
-    </div>    
+    </div> 
+    
 </div>
+
 </body>
 </html>

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=232817&r1=232816&r2=232817&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 Mon Aug 15 07:51:59 2005
@@ -7,39 +7,12 @@
     <tiles:insert attribute="head" />     
     <link rel="stylesheet" type="text/css" media="all"
         href="<%= request.getContextPath() %>/theme/layout.css" />
-<style type="text/css">
-#banner {
-    height: 30px; 
-}
-#centercontent {
-    margin:0px 0px 50px 10px;
-    padding:10px;
-}
-.formtable { width:100%; } 
-.formtable td {
-    vertical-align: top;
-    border-style: solid;
-    border-width: 0px 0px 1px 0px;
-    border-color: #e5e5e5;
-    padding: 10px;
-}
-.formtable td.label { 
-    text-align: right;
-    width: 15%; 
-}
-.formtable td.field { 
-    width: 30%; 
-}
-.formtable td.description { 
-    width: 55%; 
-}
-</style>
 </head>
 <body>
 <div id="wrapper"> 
    
-    <div id="banner">
-        <tiles:insert attribute="status" /><br />
+    <div id="header">
+        <tiles:insert attribute="status" />
     </div>
     
     <div id="leftcontent"> 
@@ -48,14 +21,14 @@
     <div id="centercontent">   
         <tiles:insert attribute="messages" />    
         <tiles:insert attribute="content" />    
+        <div id="footer">
+            <tiles:insert attribute="footer" />
+        </div>  
     </div>
     
     <div id="rightcontent"> 
     </div> 
-  
-    <div id="footer">
-        <tiles:insert attribute="footer" />
-    </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=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/CategoriesForm.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/CategoriesForm.jsp Mon Aug 15 07:51:59 2005
@@ -27,8 +27,15 @@
 <p>
 <c:choose>
     <c:when test="${empty categoryPath}">
-       <h1><fmt:message key="categoriesForm.rootTitle" /></h1>
-       <p><fmt:message key="categoriesForm.rootPrompt" /></p>
+    <h1><fmt:message key="categoriesForm.rootTitle" /></h1>
+    <p class="subtitle">
+        <fmt:message key="categoriesForm.subtitle" >
+            <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
+        </fmt:message>
+    </p>  
+    <p class="pagetip">
+        <fmt:message key="categoriesForm.rootPrompt" />
+    </p> 
     </c:when>
     
     <c:when test="${!(empty categoryPath)}">
@@ -54,7 +61,6 @@
 </c:choose>
 </p>
 
-<br />
 
 <%-- Form is a table of categories each with checkbox --%>
 
@@ -62,7 +68,6 @@
 <input type="hidden" name="method" /> 
 <html:hidden property="parentId" /> 
 
-<p>
 <%-- Select-all button --%>
 <input type="button" value="<fmt:message key='categoriesForm.checkAll' />" 
    onclick="setChecked(1)" /></input>
@@ -84,7 +89,8 @@
     <html:options collection="allCategories" 
         property="id" labelProperty="path"/>
 </html:select>
-</p>
+
+<p />
 
 <table class="rollertable">
 

Modified: incubator/roller/branches/roller_2.0/web/weblog/CategoriesSidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/CategoriesSidebar.jsp?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/CategoriesSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/CategoriesSidebar.jsp Mon Aug 15 07:51:59 2005
@@ -19,8 +19,6 @@
 			</p>
 			
 			<br />
-			<br />
-			<br />
 			
             </div>
         </div>

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=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/CustomPingTargetEdit.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/CustomPingTargetEdit.jsp Mon Aug 15 07:51:59 2005
@@ -1,5 +1,12 @@
 <%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
-
+<script type="text/javascript">
+// <!--
+function cancel() {
+    document.pingTargetForm.method.value="cancel"; 
+    document.pingTargetForm.submit();
+}
+// -->
+</script> 
 <br />
 <h1><fmt:message key="pingTarget.pingTarget" /></h1>
 
@@ -15,13 +22,14 @@
 
     <div class="formrow">
        <label for="pingUrl" class="formrow"><fmt:message key="pingTarget.pingUrl" /></label>
-       <html:text property="pingUrl" size="100" maxlength="255" />
+       <html:text property="pingUrl" size="45" maxlength="255" />
     </div>
 
     <p/>
     <div class="formrow">
        <label for="" class="formrow">&nbsp;</label>
-       <input type="submit" value='<fmt:message key="pingTarget.save" />' />
+       <input type="submit" value='<fmt:message key="pingTarget.save" />' />&nbsp;
+       <input type="button" value='<fmt:message key="application.cancel" />' onclick="cancel()"></input>
     </div>
 
 </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=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/CustomPingTargets.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/CustomPingTargets.jsp Mon Aug 15 07:51:59 2005
@@ -1,15 +1,19 @@
 <%@ page import="org.roller.presentation.RollerRequest"%>
 <%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
 
-<br />
 <h1><fmt:message key="customPingTargets.customPingTargets" /></h1>
+<p class="subtitle">
+   <fmt:message key="customPingTargets.subtitle" >
+       <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
+   </fmt:message>
+</p>  
 
 <c:choose>
   <c:when test="${allowCustomTargets}">
     <!-- Only show the form if custom targets are allowed -->
-    <p/>
+    <p class="pagetip">
     <fmt:message key="customPingTargets.explanation"/>
-    <p/>
+    </p>
 
     <table class="rollertable">
     
@@ -62,19 +66,23 @@
     
     </table>
     
-    <p/>
+    <br />
+    
     <html:form action="/editor/customPingTargets" method="post">
         <div class="control">
            <html:hidden property="method" value="addNew" />
            <input type="submit" value='<fmt:message key="pingTarget.addNew"/>' />
         </div>
     </html:form>
-    <p/>
   </c:when>
+  
   <c:otherwise>
      <!--  Otherwise custom targets are not allowed; explain the situation to the user -->
-    <fmt:message key="customPingTargets.disAllowedExplanation"/>
+    <p class="pagetip">
+        <fmt:message key="customPingTargets.disAllowedExplanation"/>
+    </p>
   </c:otherwise>
+  
 </c:choose>
 
 <%@ 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=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/Pings.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/Pings.jsp Mon Aug 15 07:51:59 2005
@@ -1,11 +1,14 @@
 <%@ page import="org.roller.presentation.RollerRequest"%>
 <%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
 
-<br />
 <h1><fmt:message key="pings.title" /></h1>
-
-<p/>
-<fmt:message key="pings.explanation"/>
+<p class="subtitle">
+   <fmt:message key="pings.subtitle" >
+       <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
+   </fmt:message>
+</p>  
+<p class="pagetip">
+    <fmt:message key="pings.explanation"/>
 <p/>
 
 <p/>
@@ -90,18 +93,11 @@
   </c:forEach>
 </table>
 
-<p/>
-&nbsp;
-<p/>
-&nbsp;
-<p/>
+<br />
 
 <c:if test="${allowCustomTargets}">
-  <p/>
   <h2><fmt:message key="pings.customPingTargets"/></h2>
-  <p/>
-
-
+  
   <p/>
   <c:choose>
     <c:when test="${!empty customPingTargets}">

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=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp Mon Aug 15 07:51:59 2005
@@ -63,9 +63,19 @@
 <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}" />
+            </fmt:message>
+        </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}" />
+            </fmt:message>
+        </p>
     </c:otherwise>
 </c:choose>
 
@@ -397,7 +407,6 @@
 
         </c:if>
     </div>
-    <br />
 
     
     <%-- ================================================================== --%>

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=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp Mon Aug 15 07:51:59 2005
@@ -8,15 +8,14 @@
 <div class="sidebarfade">
     <div class="menu-tr">
         <div class="menu-tl">
-            <div class="sidebarBody">
-            
-                <h3><fmt:message key="weblogEdit.draftEntries" /></h3>
+            <div class="sidebarBody"> 
+        
+                <h3><fmt:message key="weblogEdit.pendingEntries" /></h3>
                 <hr />
-                
-                <c:if test="${empty model.recentDraftEntries}">
+                <c:if test="${empty model.recentPendingEntries}">
                    <fmt:message key="application.none" />
                 </c:if>
-                <c:forEach var="post" items="${model.recentDraftEntries}">
+                <c:forEach var="post" items="${model.recentPendingEntries}">
                     <roller:link page="/editor/weblog.do">
                        <roller:linkparam
                            id="<%= RollerRequest.WEBLOGENTRYID_KEY %>"
@@ -28,7 +27,8 @@
                            </str:truncateNicely>
                     </roller:link>
                     <br />
-                </c:forEach> 
+                </c:forEach>
+                <br />
                 <br />
                 
             </div>
@@ -38,19 +38,18 @@
 
 <br />
 
-<c:if test="${model.rollerSession.userAuthorizedToAuthor}">
-
 <div class="sidebarfade">
     <div class="menu-tr">
         <div class="menu-tl">
             <div class="sidebarBody">
             
-                <h3><fmt:message key="weblogEdit.publishedEntries" /></h3>
+                <h3><fmt:message key="weblogEdit.draftEntries" /></h3>
                 <hr />
-                <c:if test="${empty model.recentPublishedEntries}">
+                
+                <c:if test="${empty model.recentDraftEntries}">
                    <fmt:message key="application.none" />
                 </c:if>
-                <c:forEach var="post" items="${model.recentPublishedEntries}">
+                <c:forEach var="post" items="${model.recentDraftEntries}">
                     <roller:link page="/editor/weblog.do">
                        <roller:linkparam
                            id="<%= RollerRequest.WEBLOGENTRYID_KEY %>"
@@ -60,9 +59,10 @@
                            <str:truncateNicely lower="50">
                               <c:out value="${post.title}" />
                            </str:truncateNicely>
-                    </roller:link>                    
+                    </roller:link>
                     <br />
-                </c:forEach>
+                </c:forEach> 
+                <br />
                 <br />
                 
             </div>
@@ -70,19 +70,21 @@
     </div>
 </div>
 
-<br />  
- 
+<br />
+
+<c:if test="${model.rollerSession.userAuthorizedToAuthor}">
+
 <div class="sidebarfade">
     <div class="menu-tr">
         <div class="menu-tl">
-            <div class="sidebarBody"> 
-        
-                <h3><fmt:message key="weblogEdit.pendingEntries" /></h3>
+            <div class="sidebarBody">
+            
+                <h3><fmt:message key="weblogEdit.publishedEntries" /></h3>
                 <hr />
-                <c:if test="${empty model.recentPendingEntries}">
+                <c:if test="${empty model.recentPublishedEntries}">
                    <fmt:message key="application.none" />
                 </c:if>
-                <c:forEach var="post" items="${model.recentPendingEntries}">
+                <c:forEach var="post" items="${model.recentPublishedEntries}">
                     <roller:link page="/editor/weblog.do">
                        <roller:linkparam
                            id="<%= RollerRequest.WEBLOGENTRYID_KEY %>"
@@ -92,16 +94,19 @@
                            <str:truncateNicely lower="50">
                               <c:out value="${post.title}" />
                            </str:truncateNicely>
-                    </roller:link>
+                    </roller:link>                    
                     <br />
                 </c:forEach>
                 <br />
+                <br />
                 
             </div>
         </div>
     </div>
 </div>
 
+<br />  
+ 
 </c:if>
 
 <br />

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=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogEntryRemove.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogEntryRemove.jsp Mon Aug 15 07:51:59 2005
@@ -1,34 +1,35 @@
 <%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
 
-<h3>
+<h2>
 <jsp:useBean id="weblogEntryFormEx"  scope="session"
     class="org.roller.presentation.weblog.formbeans.WeblogEntryFormEx"/>
 <fmt:message key="weblogEntryRemove.removeWeblogEntry" /> [<jsp:getProperty name="weblogEntryFormEx" property="title"/>]
-</h3>
+</h2>
 
 <p><fmt:message key="weblogEntryRemove.areYouSure" /></p>
 <p>
-Entry title = [<jsp:getProperty name="weblogEntryFormEx" property="title"/>]<br />
-Entry id = [<jsp:getProperty name="weblogEntryFormEx" property="id"/>]
+<fmt:message key="weblogEntryRemove.entryTitle" /> = [<jsp:getProperty name="weblogEntryFormEx" property="title"/>]<br />
+<fmt:message key="weblogEntryRemove.entryId" /> = [<jsp:getProperty name="weblogEntryFormEx" property="id"/>]
 </p>
 
-<div style="float:left">
-<html:form action="/editor/weblog" method="post">
-    <input type="submit" value='<fmt:message key="weblogEntryRemove.yes" />' /></input>
-    <html:hidden property="method" value="remove"/></input>
-    <html:hidden property="id" /></input>
-</html:form>
-</div>
-
-<div style="float:left">
-<html:form action="/editor/weblog" method="post">
-    <input type="submit" value='<fmt:message key="weblogEntryRemove.no" />' /></input>
-    <html:hidden property="method" value="cancel"/></input>
-    <html:hidden property="id" /></input>
-</html:form>
-</div>
-
-<br />
-<br />
+<table>
+    <tr>
+        <td>
+            <html:form action="/editor/weblog" method="post">
+                <input type="submit" value='<fmt:message key="weblogEntryRemove.yes" />' /></input>
+                <html:hidden property="method" value="remove"/></input>
+                <html:hidden property="id" /></input>
+            </html:form>
+        </div>
+        </td>
+        <td>
+            <html:form action="/editor/weblog" method="post">
+                <input type="submit" value='<fmt:message key="weblogEntryRemove.no" />' /></input>
+                <html:hidden property="method" value="cancel"/></input>
+                <html:hidden property="id" /></input>
+            </html:form>
+        </td>
+    </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=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogQuery.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogQuery.jsp Mon Aug 15 07:51:59 2005
@@ -5,55 +5,61 @@
 %>
 
 <h1><fmt:message key="weblogEntryQuery.title" /></h1>
-
-<table class="rollertable">
-
-   <c:forEach var="post" items="${model.recentWeblogEntries}">
-      <tr>
-         <td class="rollertable_entry" width="100%" >
-
-            <roller:link page="/editor/weblog.do">
-                <roller:linkparam
-                    id="<%= RollerRequest.WEBLOGENTRYID_KEY %>"
-                    name="post" property="id" />
-                    <roller:linkparam id="method" value="edit" />
-                    <img src='<c:url value="/images/Edit16.png"/>' border="0" alt="icon" title="Edit" />
-                    <c:out value="${post.displayTitle}" />
-            </roller:link>
+<p class="subtitle">
+    <fmt:message key="weblogEntryQuery.subtitle" >
+        <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
+    </fmt:message>
+</p>
+<p class="pagetip">
+    <fmt:message key="weblogEntryQuery.tip" />
+</p>
+
+<div class="entryTitleBox">
+    <fmt:message key="weblogEntryQuery.queryResults" />
+</div>
+
+<c:forEach var="post" items="${model.recentWeblogEntries}">
+
+    <div class="entryBox">
+    
+        <roller:link page="/editor/weblog.do">
+            <roller:linkparam
+                id="<%= RollerRequest.WEBLOGENTRYID_KEY %>"
+                name="post" property="id" />
+                <roller:linkparam id="method" value="edit" />
+                <img src='<c:url value="/images/Edit16.png"/>' border="0" alt="icon" title="Edit" />
+                <c:out value="${post.displayTitle}" />
+        </roller:link>
+        <br />
+
+        <span class="entryDetails">
+            <fmt:message key="weblogEdit.category" /> [<c:out value="${post.category.path}" />] |
+            <fmt:formatDate value="${post.pubTime}" type="both" dateStyle="medium" timeStyle="medium" />
+            <c:if test="${!empty post.link}">
+              <a href='<c:out value="${post.link}" />' class="entryDetails">
+                 <fmt:message key="weblogEdit.link" />
+              </a>
+            </c:if>
+            <a href='<c:out value="${model.baseURL}" /><c:out value="${post.permaLink}" />'
+                class="entrypermalink" title="entry permalink">#</a>
             <br />
+            <br />
+        </span>
 
-            <span class="entryDetails">
-                <fmt:message key="weblogEdit.category" /> [<c:out value="${post.category.path}" />] |
-                <fmt:formatDate value="${post.pubTime}" type="both" dateStyle="medium" timeStyle="medium" />
-                <c:if test="${!empty post.link}">
-                  <a href='<c:out value="${post.link}" />' class="entryDetails">
-                     <fmt:message key="weblogEdit.link" />
-                  </a>
-                </c:if>
-                <a href='<c:out value="${model.baseURL}" /><c:out value="${post.permaLink}" />'
-                    class="entrypermalink" title="entry permalink">#</a>
-                <br />
-                <br />
-            </span>
-
+        <div style="overflow:auto">
             <roller:ApplyPlugins name="post" skipFlag="true" scope="page" />
-
-         </td>
-       <tr>
-   </c:forEach>
-   
-   <c:if test="${empty model.recentWeblogEntries}" >
-      <tr>
-          <td height="400px">
-              <fmt:message key="weblogEntryQuery.noneFound" />
-          </td>
-      </tr>
-   </c:if>
+        </div>
+        
+    </div>
+
+</c:forEach>
+
+<c:if test="${empty model.recentWeblogEntries}" >
+   <fmt:message key="weblogEntryQuery.noneFound" />
+   <br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br />
+</c:if>
    
-</table>
-
 <%@ include file="/theme/footer.jsp" %>
-
 
 <script type="text/javascript">
 <!--

Modified: incubator/roller/branches/roller_2.0/web/weblog/WeblogQuerySidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/WeblogQuerySidebar.jsp?rev=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogQuerySidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogQuerySidebar.jsp Mon Aug 15 07:51:59 2005
@@ -21,7 +21,7 @@
   <%-- filter by category --%>
   
     <div class="sideformrow">
-        <label for="categoryId" class="formrow">
+        <label for="categoryId" class="sideformrow">
             <fmt:message key="weblogEntryQuery.label.category" /></label>          
         <html:select property="categoryId" size="1" tabindex="4">
             <html:option key="weblogEntryQuery.label.any" value="" />
@@ -33,14 +33,14 @@
   <%-- filter by date --%>
   
     <div class="sideformrow">
-        <label for="startDateString" class="formrow">
+        <label for="startDateString" class="sideformrow">
            <fmt:message key="weblogEntryQuery.label.startDate" />:
         </label>
         <roller:Date property="startDateString" dateFormat='<%= model.getShortDateFormat() %>' />
     </div>
 
     <div class="sideformrow">
-        <label for="endDateString" class="formrow">
+        <label for="endDateString" class="sideformrow">
            <fmt:message key="weblogEntryQuery.label.endDate" />:
         </label>
         <roller:Date property="endDateString" dateFormat='<%= model.getShortDateFormat() %>' />
@@ -50,7 +50,7 @@
   <%-- limit number of results --%>
   
     <div class="sideformrow">
-        <label for="maxEntries" class="formrow">
+        <label for="maxEntries" class="sideformrow">
             <fmt:message key="weblogEntryQuery.label.maxEntries" />
         </label>
         <html:select property="maxEntries" size="1" tabindex="4">
@@ -65,7 +65,7 @@
   <%-- filter by status --%>
 
     <div class="sideformrow">
-        <label for="status" class="formrow">
+        <label for="status" class="sideformrow">
             <fmt:message key="weblogEntryQuery.label.status" />:
             <br />
             <br />

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=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/referers.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/referers.jsp Mon Aug 15 07:51:59 2005
@@ -2,6 +2,15 @@
 
 <%-- 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}" />
+    </fmt:message>
+</p>  
+<p class="pagetip">
+    <fmt:message key="referers.tip" />
+</p>
+
 <html:form action="/editor/referers" method="post">
 <input type="hidden" name="method" value="delete" />
 
@@ -30,8 +39,8 @@
 <br />
 <input type="submit" value='<fmt:message key="referers.deleteSelected" />' /></input>
 </html:form>
-
-<br />
+
+<br />
 
 <%-- Form allows reset of day hits --%>
 <h1><fmt:message key="referers.hitCounters" /></h1>

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=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/CommonPingTargets.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/CommonPingTargets.jsp Mon Aug 15 07:51:59 2005
@@ -3,10 +3,13 @@
 
 <br />
 <h1><fmt:message key="commonPingTargets.commonPingTargets" /></h1>
+<p class="subtitle">
+    <fmt:message key="commonPingTargets.subtitle" >
+        <fmt:param value="${model.weblogEntry.website.handle}" />
+    </fmt:message>
+</p>
 
-<p/>
-<fmt:message key="commonPingTargets.explanation"/>
-<p/>
+<p/><fmt:message key="commonPingTargets.explanation"/><p/>
 
 <table class="rollertable">
 

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=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/CreateWebsite.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/CreateWebsite.jsp Mon Aug 15 07:51:59 2005
@@ -13,7 +13,7 @@
 </script>
 
 <h1><fmt:message key="createWebsite.title" /></h1>
-<p><fmt:message key="createWebsite.prompt" /></p>
+<p class="subtitle"><fmt:message key="createWebsite.prompt" /></p>
 
 <br /> 
 <html:form action="/editor/createWebsite" method="post" focus="handle">
@@ -78,7 +78,9 @@
     <td class="description"><fmt:message key="createWebsite.tip.theme" /></td>
 </tr>
 </table>
-    
+
+<br />
+   
 <input type="submit" value='<fmt:message key="createWebsite.button.save" />'></input>
 <input type="button" value='<fmt:message key="createWebsite.button.cancel" />' onclick="cancel()"></input>
     

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=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/InviteMember.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/InviteMember.jsp Mon Aug 15 07:51:59 2005
@@ -1,6 +1,10 @@
 <%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
 <script type="text/javascript">
 // <!--
+function cancel() {
+    document.inviteMemberForm.method.value="cancel"; 
+    document.inviteMemberForm.submit();
+}
 function createRequestObject() {
     var ro;
     var browser = navigator.appName;
@@ -70,7 +74,8 @@
 <p><fmt:message key="inviteMember.description" /></p>
 
 <html:form action="/editor/inviteMember" method="post" focus="userName">
-
+    <input name="method" type="hidden" value="save" />
+    
     <div class="formrow">
        <label for="userName" class="formrow" />
            <fmt:message key="inviteMember.userName" /></label>
@@ -87,7 +92,7 @@
        </div>
     </div>    
     
-     <div class="formrow">
+     <div class="permissionsMask">
        <label for="userName" class="formrow" />
            <fmt:message key="inviteMember.permissions" /></label>
        <input type="radio" name="permissionsMask" value="3"  />
@@ -99,14 +104,8 @@
     </div>
                   
     <br />      
-    <div class="control">
-       <input type="submit" value='<fmt:message key="inviteMember.button.save" />'></input>
-    </div>
-    
-    <div class="helptext">
-        <img src="../images/TipOfTheDay16.gif" alt="info-icon" align="bottom" />
-        <fmt:message key="memberPermissions.permissionHelp" />
-    </div> 
+    <input type="submit" value='<fmt:message key="inviteMember.button.save" />'></input>
+    <input type="button" value='<fmt:message key="application.cancel" />' onclick="cancel()"></input>
 
 </html:form>
 

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=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/MemberPermissions.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/MemberPermissions.jsp Mon Aug 15 07:51:59 2005
@@ -1,5 +1,7 @@
 <%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
 
+<div class="prop"></div> <%-- force minimum height --%>
+        
 <script>
 // <!--  
 function save() {
@@ -17,6 +19,11 @@
 </script>
 
 <h1><fmt:message key="memberPermissions.title" /></h1>
+<p class="subtitle">
+    <fmt:message key="memberPermissions.subtitle" >
+        <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
+    </fmt:message>
+</p>
 
 <p><fmt:message key="memberPermissions.description" /></p>
 
@@ -68,31 +75,17 @@
            </roller:row>
        </c:forEach>
     </table>
-        
-    <p>
-        <img src="../images/ComposeMail16.gif" alt="mail-icon" align="bottom" />
-        <roller:link page="/editor/inviteMember.do">
-           <fmt:message key="memberPermissions.inviteMember" />
-        </roller:link>
-    </p>
-    
+    <br />
+     
     <div class="control">
        <input type="button" onclick="javascript:save()"
        value='<fmt:message key="memberPermissions.button.save" />'></input>
     </div>
     
-    <div class="helptext">
-        <img src="../images/TipOfTheDay16.gif" alt="info-icon" align="bottom" />
-        <fmt:message key="memberPermissions.whyInvite" />
-    </div> 
-    
-    <div class="helptext">
-        <img src="../images/TipOfTheDay16.gif" alt="info-icon" align="bottom" />
-        <fmt:message key="memberPermissions.permissionHelp" />
-    </div> 
-    
 </html:form>
     
+<div class="clear"></div> <%-- force minimum height --%>
+        
 <%@ 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=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp Mon Aug 15 07:51:59 2005
@@ -9,11 +9,10 @@
 </script>
 
 <h1><fmt:message key="yourProfile.title" /></h1>
-<p><fmt:message key="yourProfile.description" /></p>
+<p class="subtitle"><fmt:message key="yourProfile.description" /></p>
 
 <html:form action="/editor/yourProfile" method="post" focus="fullName">
     <input type="hidden" name="method" value="save"></input> 
-    <html:hidden property="userName" /></input>
     <html:hidden property="id" /></input>  
     <html:hidden property="password" /></input>  
     <html:hidden property="enabled" /></input>
@@ -21,6 +20,12 @@
 <table class="formtable">
 
 <tr>
+    <td class="label"><label for="userName" /><fmt:message key="userSettings.username" /></label></td>
+    <td class="field"><html:text style="background: #e5e5e5" property="userName" readonly="true" /></td>
+    <td class="description"><fmt:message key="yourProfile.tip.userName" /></td>
+</tr>
+
+<tr>
     <td class="label"><label for="fullName" /><fmt:message key="userSettings.fullname" /></label></td>
     <td class="field"><html:text property="fullName" size="30" maxlength="30" /></td>
     <td class="description"><fmt:message key="userRegister.tip.fullName" /></td>
@@ -70,7 +75,6 @@
     
 </table>
 
-<br />
 <br />
 
 <input type="submit" value='<fmt:message key="userSettings.button.save" />'></input>

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=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp Mon Aug 15 07:51:59 2005
@@ -1,6 +1,5 @@
 <%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
 <% pageContext.setAttribute("leftPage","/website/YourWebsitesSidebar.jsp"); %>
-
 <script type="text/javascript">
 <!--
 function selectWebsiteAction(id, action) 
@@ -55,8 +54,10 @@
     <input type="hidden" name="method" value="select" />		  
 
     <c:if test="${!empty model.pendings}">
+    
         <h1><fmt:message key="yourWebsites.invitations" /></h1>    
-        <p><fmt:message key="yourWebsites.invitationsPrompt" /></p>
+        <p class="subtitle"><fmt:message key="yourWebsites.invitationsPrompt" /></p>
+        
         <c:forEach var="invite" items="${model.pendings}">
             <fmt:message key="yourWebsites.youAreInvited" >
                <fmt:param value="${invite.website.handle}" />
@@ -75,20 +76,23 @@
     <c:choose>
     
         <c:when test="${!empty model.permissions}">
+        
             <h1><fmt:message key="yourWebsites.title" /></h1>    
-            <p><fmt:message key="yourWebsites.prompt" /></p>
-            <table cellspacing="6px" cellpadding="4px" width="100%" >
-
+            <p class="subtitle"><fmt:message key="yourWebsites.prompt" /></p>
+            
+            <div class="entryTitleBox" style="margin: 0px 20px 0px 0px">
+                <fmt:message key="yourWebsites.existingWebsites" />
+            </div>
+    
                 <c:forEach var="perms" items="${model.permissions}">
-                    <tr>  
-                       <td style="border: 1px solid grey" >
+                
+                    <div class="entryBox" style="margin: 0px 40px 0px 0px; border-width: 0px 0px 1px 0px;">  
                        
                            <table width="100%">
                            <tr>
-                           <td width="80%">
+                           <td width="80%" style="padding: 0px 10px 0px 10px">
                       
                                <h3 style="border-bottom: 1px #e5e5e5 solid; margin:0px; padding:5px">
-                                   <fmt:message key='yourWebsites.weblog' />:
                                    <c:out value="${perms.website.name}" />
                                    [<c:out value="${perms.website.handle}" />] 
                                </h3>
@@ -114,7 +118,7 @@
                                
                            </td>
                            
-                           <td width="20%" align="center">
+                           <td width="20%" align="left">
 
                                    <fmt:message key='yourWebsites.actions' />                       
                                    <br />
@@ -141,14 +145,13 @@
 
                            </td>
                            </tr>
-                           </table>
                            
-                       </td>
-                    </tr>
+                       </table>
+                    
+                    </div>
+                    
                 </c:forEach>
-                
-            </table>
-    
+                    
         </c:when>
                   
     </c:choose>

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=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp Mon Aug 15 07:51:59 2005
@@ -43,8 +43,6 @@
             </p>
             
 			<br />
-			<br />
-			<br />
 			
             </div>
         </div>

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=232817&r1=232816&r2=232817&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 Mon Aug 15 07:51:59 2005
@@ -1,4 +1,16 @@
 <%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<script type="text/javascript">
+<!--
+function previewImage(theme) {
+    <% String ctxPath = request.getContextPath(); %>
+    document.preview.src="<%= ctxPath %>/images/preview/sm-theme-" + theme + ".png";
+}
+function cancel() {
+    document.weblogTemplateForm.method.value="cancel"; 
+    document.weblogTemplateForm.submit();
+}
+-->
+</script>
 
 <roller:StatusMessage/>
 
@@ -31,10 +43,11 @@
 
     <html:hidden property="id"/>
     <html:hidden property="name"/>
+    <input type="hidden" name="method" value="update" />
 
     <br />
     <input type="submit" value='<fmt:message key="pageForm.save" />' /></input>
-    <html:hidden property="method" value="update"/>
+    <input type="button" value='<fmt:message key="application.done" />' onclick="cancel()" /></input>
 
 </html:form>
 

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=232817&r1=232816&r2=232817&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 Mon Aug 15 07:51:59 2005
@@ -4,6 +4,14 @@
 <roller:StatusMessage/>
 
 <h1><fmt:message key="pagesForm.title" /></h1>
+<p class="subtitle">
+   <fmt:message key="pagesForm.subtitle" >
+       <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
+   </fmt:message>
+</p>  
+<p class="pagetip">
+   <fmt:message key="pagesForm.tip" />
+</p>
 
 <c:if test="${website.editorTheme ne customTheme}">
 <p><fmt:message key="pagesForm.themesReminder"><fmt:param value="${website.editorTheme}"/></fmt:message></p>
@@ -54,19 +62,6 @@
 </table>
 
 <p><fmt:message key="pagesForm.hiddenNote" /></p>
-
-<%-- form to add a new page --%>
-<h2><fmt:message key="pagesForm.addNewPage" /></h2>
-<html:form action="/editor/page" method="post" focus="name">
-
-    <fmt:message key="pagesForm.name"/>: <html:text property="name" size="30"/>
-	
-	<input type="submit" value='<fmt:message key="pagesForm.add" />' />
-	<input type="hidden" property="template" 
-		value="<html><body><fmt:message key="pagesForm.emptyPage" /></body></html>" />
-	<html:hidden property="method" value="add"/>
-	
-</html:form>
 
 <%@ 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=232817&r1=232816&r2=232817&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 Mon Aug 15 07:51:59 2005
@@ -3,7 +3,12 @@
 <roller:StatusMessage/>
 
 <h1><fmt:message key="websiteSettings.title" /></h1>
-
+<p class="subtitle">
+   <fmt:message key="websiteSettings.subtitle" >
+       <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
+   </fmt:message>
+</p>  
+   
 <html:form action="/editor/website" method="post">
     <html:hidden property="method" value="update"/></input>
 
@@ -16,70 +21,115 @@
     <html:hidden property="enabled"/></input>
     <html:hidden property="defaultCategoryId"/></input>
 
-<table>
+<table class="formtable">
 
     <tr>
-        <td class="propname"><fmt:message key="websiteSettings.websiteTitle" />
-        <td><html:text property="name" size="40"/></input></td>
+        <td class="label"><fmt:message key="websiteSettings.websiteTitle" />
+        <td class="field"><html:text property="name" size="40"/></input></td>
+        <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
     </tr>
 
     <tr>
-        <td class="propname"><fmt:message key="websiteSettings.websiteDescription" /></td>
-        <td><html:textarea property="description" rows="3" cols="40"/></td>
+        <td class="label"><fmt:message key="websiteSettings.websiteDescription" /></td>
+        <td class="field"><html:textarea property="description" rows="3" cols="40"/></td>
+        <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
     </tr>
 
     <tr>
-        <td class="propname"><fmt:message key="websiteSettings.emailAddress" />
-        <td><html:text property="emailAddress" size="40"/></input></td>
+        <td class="label"><fmt:message key="websiteSettings.emailAddress" />
+        <td class="field"><html:text property="emailAddress" size="40"/></input></td>
+        <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
     </tr>
 
     <tr>
-        <td class="propname"><fmt:message key="websiteSettings.emailFromAddress" />
-        <td><html:text property="emailFromAddress" size="40"/></input></td>
+        <td class="label"><fmt:message key="websiteSettings.emailFromAddress" />
+        <td class="field"><html:text property="emailFromAddress" size="40"/></input></td>
+        <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
     </tr>
 
     <tr>
-        <td class="propname"><fmt:message key="websiteSettings.homePage" /></td>
-        <td>
+        <td class="label"><fmt:message key="websiteSettings.homePage" /></td>
+        <td class="field">
             <html:select property="defaultPageId" size="1">
                 <html:options collection="pages"
                     property="id" labelProperty="name" />
             </html:select>
         </td>
+        <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
+    </tr>
+    
+    <tr>
+        <td class="label"><fmt:message key="websiteSettings.editor" /></td>
+        <td class="field">
+            <html:select property="editorPage" size="1">
+                <html:options name="editorPagesList" />
+            </html:select></p>
+       </td>
+        <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
     </tr>
 
+    
+    <%-- ***** Comment settings ***** --%>
+    
     <tr>
-        <td><h2><fmt:message key="websiteSettings.commentSettings" /></h2></td>
-        <td></td>
+        <td colspan="3"><h2><fmt:message key="websiteSettings.commentSettings" /></h2></td>
     </tr>
 
     <tr>
-        <td class="propname"><fmt:message key="websiteSettings.allowComments" /></td>
-        <td><html:checkbox property="allowComments" /></input></td>
+        <td class="label"><fmt:message key="websiteSettings.allowComments" /></td>
+        <td class="field"><html:checkbox property="allowComments" /></input></td>
+        <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
     </tr>
 <%
 boolean emailComments = RollerRuntimeConfig.getBooleanProperty("users.comments.emailnotify");
 if (emailComments) { %>
     <tr>
-        <td class="propname"><fmt:message key="websiteSettings.emailComments" /></td>
-        <td><html:checkbox property="emailComments" onclick="toggleNextRow(this)" /></input></td>
+        <td class="label"><fmt:message key="websiteSettings.emailComments" /></td>
+        <td class="field"><html:checkbox property="emailComments" onclick="toggleNextRow(this)" /></input></td>
+        <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
     </tr>
 
     <tr <c:if test="${!websiteFormEx.emailComments}">style="display: none"</c:if>>
-        <td class="propname"><fmt:message key="websiteSettings.emailFromAddress" /></td>
-        <td><html:text size="50" property="emailFromAddress" /></input></td>
+        <td class="label"><fmt:message key="websiteSettings.emailFromAddress" /></td>
+        <td class="field"><html:text size="50" property="emailFromAddress" /></input></td>
+        <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
     </tr>
+<% } %>
 
+    <%-- ***** Blogger API setting settings ***** --%>
+    
     <tr>
-        <td><h2><fmt:message key="websiteSettings.formatting" /></h2></td>
-        <td></td>
+        <td colspan="3"><h2><fmt:message key="websiteSettings.bloggerApi" /></h2></td>
+    </tr>
+
+    <tr>
+        <td class="label"><fmt:message key="websiteSettings.enableBloggerApi" /></td>
+        <td class="field"><html:checkbox property="enableBloggerApi" /></input></td>
+        <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
+    </tr>
+
+    <tr>
+        <td class="label"><fmt:message key="websiteSettings.bloggerApiCategory" /></td>
+        <td class="field">
+            <html:select property="bloggerCategoryId" size="1">
+                <html:options collection="bloggerCategories"
+                    property="id" labelProperty="path" />
+            </html:select>
+        </td>
+        <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
+    </tr>
+
+    <%-- ***** Plugins "formatting" settings ***** --%>
+
+    <tr>
+        <td colspan="3"><h2><fmt:message key="websiteSettings.formatting" /></h2></td>
     </tr>
-<% } %>
+
 
 <% if (org.roller.presentation.velocity.ContextLoader.hasPlugins()) { %>
     <tr>
-        <td class="propname">Default Entry Formatters <br />(applied in the listed order)</td>
-        <td>
+        <td class="label">Default Entry Formatters <br />(applied in the listed order)</td>
+        <td class="field">
         <logic:iterate id="plugin" type="org.roller.presentation.velocity.PagePlugin"
             collection="<%= org.roller.presentation.velocity.ContextLoader.getPagePlugins() %>">
             <html:multibox property="defaultPluginsArray"
@@ -90,57 +140,28 @@
             <br />
         </logic:iterate>
         </td>
+        <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
     </tr>
 <% } else { %>
     <html:hidden property="defaultPlugins" />
 <% } %>
 
-    <tr>
-        <td><h2><fmt:message key="websiteSettings.editorSettings" /></h2></td>
-        <td></td>
-    </tr>
-
-    <tr>
-        <td class="propname"><fmt:message key="websiteSettings.editor" /></td>
-        <td>
-            <html:select property="editorPage" size="1">
-                <html:options name="editorPagesList" />
-            </html:select></p>
-       </td>
-    </tr>
-
-    <tr>
-        <td><h2><fmt:message key="websiteSettings.bloggerApi" /></h2></td>
-        <td></td>
-    </tr>
-
-    <tr>
-        <td class="propname"><fmt:message key="websiteSettings.enableBloggerApi" /></td>
-        <td><html:checkbox property="enableBloggerApi" /></input></td>
-    </tr>
-
-    <tr>
-        <td class="propname"><fmt:message key="websiteSettings.bloggerApiCategory" /></td>
-        <td>
-            <html:select property="bloggerCategoryId" size="1">
-                <html:options collection="bloggerCategories"
-                    property="id" labelProperty="path" />
-            </html:select>
-        </td>
-    </tr>
 
+    <%-- ***** Spam prevention settings ***** --%>
+    
     <tr>
-        <td><h2><fmt:message key="websiteSettings.spamPrevention" /></h2></td>
-        <td></td>
+        <td colspan="3"><h2><fmt:message key="websiteSettings.spamPrevention" /></h2></td>
     </tr>
 
     <tr>
-        <td class="propname"><fmt:message key="websiteSettings.ignoreUrls" /></td>
-        <td><html:textarea property="ignoreWords" rows="7" cols="40"/></td>
+        <td class="label"><fmt:message key="websiteSettings.ignoreUrls" /></td>
+        <td class="field"><html:textarea property="ignoreWords" rows="7" cols="40"/></td>
+        <td class="description"><%-- <fmt:message key="websiteSettings.tip." /> --%></td>
     </tr>
 
 </table>
 
+<br />
 <div class="control">
     <input type="submit" value='<fmt:message key="websiteSettings.button.update" />' />
 </div>

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=232817&r1=232816&r2=232817&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/rollerProperties.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/rollerProperties.jsp Mon Aug 15 07:51:59 2005
@@ -16,13 +16,13 @@
 
 <input type="hidden" name="method" value="update">
 
-    <table border="0">
+    <table class="formtable">
     
     <x:forEach select="$configDefs//config-def[@name='global-properties']/display-group">
         <c:set var="displayGroupKey"><x:out select="@key"/></c:set>
     
         <tr>
-            <td colspan="2"><h2><fmt:message key="${displayGroupKey}" /></h2></td>
+            <td colspan="3"><h2><fmt:message key="${displayGroupKey}" /></h2></td>
         </tr>
     
         <x:forEach select="property-def">
@@ -30,19 +30,19 @@
             <c:set var="name"><x:out select="@name"/></c:set>
         
             <tr>
-                <td class="propname"><fmt:message key="${propLabelKey}" /></td>
+                <td class="label"><fmt:message key="${propLabelKey}" /></td>
               
                 <%-- choose the right html input element for the display --%>
                 <x:choose>
                 
                   <%-- "string" type means use a simple textbox --%>
                   <x:when select="type='string'">
-                    <td><input type="text" name='<c:out value="${name}"/>' value='<c:out value="${RollerProps[name].value}"/>' size="35" /></td>
+                    <td class="field"><input type="text" name='<c:out value="${name}"/>' value='<c:out value="${RollerProps[name].value}"/>' size="35" /></td>
                   </x:when>
                   
                   <%-- "text" type means use a full textarea --%>
                   <x:when select="type='text'">
-                    <td>
+                    <td class="field">
                       <textarea name='<c:out value="${name}"/>' rows="<x:out select="rows"/>" cols="<x:out select="cols"/>"><c:out value="${RollerProps[name].value}"/></textarea>
                     </td>
                   </x:when>
@@ -51,19 +51,21 @@
                   <x:when select="type='boolean'">
                     <c:choose>
                       <c:when test="${RollerProps[name].value eq 'true'}">
-                          <td><input type="checkbox" name='<c:out value="${name}"/>' CHECKED></td>
+                          <td class="field"><input type="checkbox" name='<c:out value="${name}"/>' CHECKED></td>
                       </c:when>
                       <c:otherwise>
-                          <td><input type="checkbox" name='<c:out value="${name}"/>'></td>
+                          <td class="field"><input type="checkbox" name='<c:out value="${name}"/>'></td>
                       </c:otherwise>
                     </c:choose>
                   </x:when>
                   
                   <%-- if it's something we don't understand then use textbox --%>
                   <x:otherwise>
-                    <td><input type="text" name='<c:out value="${name}"/>' size="50" /></td>
+                    <td class="field"><input type="text" name='<c:out value="${name}"/>' size="50" /></td>
                   </x:otherwise>
                 </x:choose>
+                
+                <td class="description"><%-- <fmt:message key="" /> --%></td>
             </tr>
           
         </x:forEach>
@@ -76,9 +78,10 @@
 
     </table>
     
-            <div class="control">
-                <input class="buttonBox" type="submit" value="<fmt:message key="configForm.save"/>"/>
-            </div>
+    <div class="control">
+        <input class="buttonBox" type="submit" value="<fmt:message key="configForm.save"/>"/>
+    </div>
+    
 <form>
 
 

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=232817&r1=232816&r2=232817&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 Mon Aug 15 07:51:59 2005
@@ -4,7 +4,7 @@
 String customTheme = org.roller.pojos.Theme.CUSTOM;
 request.setAttribute("customTheme", customTheme);
 boolean allowCustom = org.roller.config.RollerRuntimeConfig.getBooleanProperty("themes.customtheme.allowed");
-request.setAttribute("allowCustom", new Boolean(allowCustom));
+request.setAttribute("allowCustom", new Boolean(allowCustom));
 
 String username = "";
 try {
@@ -16,6 +16,14 @@
 }
 %>
 <h1><fmt:message key="themeEditor.title" /></h1>
+<p class="subtitle">
+   <fmt:message key="themeEditor.subtitle" >
+       <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
+   </fmt:message>
+</p>  
+<p class="pagetip">
+   <fmt:message key="themeEditor.tip" />
+</p>
 
 <form action="themeEditor.do" method="post">
 
@@ -26,7 +34,7 @@
         <tr>
             <td>
                 <p>
-                    Your current theme is : <b><c:out value="${currentTheme}"/></b><br/>
+                    <fmt:message key="themeEditor.yourCurrentTheme" />: <b><c:out value="${currentTheme}"/></b><br/>
                     
                     <c:choose>
                         <c:when test="${currentTheme ne previewTheme}" >
@@ -46,8 +54,7 @@
                         </c:when>
                         
                         <c:when test="${(currentTheme ne customTheme) and allowCustom}">
-                            If you like you may customize a personal copy of this theme.<br/>
-                            <fmt:message key="themeEditor.saveWarning" /><br/>
+                            <fmt:message key="themeEditor.youMayCustomize" /><br/>
                             <input type="button" 
                                 value='<fmt:message key="themeEditor.customize" />'
                                 name="customizeButton" 
@@ -112,4 +119,4 @@
     // -->
 </script>
 
-<%@ include file="/theme/footer.jsp"%>
+<%@ 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=232817&r1=232816&r2=232817&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 Mon Aug 15 07:51:59 2005
@@ -3,12 +3,21 @@
 <roller:StatusMessage/>
 
 <h1><fmt:message key="uploadFiles.title" /></h1>
+<p class="subtitle">
+    <fmt:message key="uploadFiles.subtitle" >
+        <fmt:param value="${model.rollerSession.currentWebsite.handle}" />
+    </fmt:message>
+</p>  
+<p class="pagetip">
+    <fmt:message key="uploadFiles.tip" />
+</p>
+
 <roller:FileUpload />
-
-<br />
 
-<h1><fmt:message key="uploadFiles.manageFiles" /></h1>
+<br />
 
+<h1><fmt:message key="uploadFiles.manageFiles" /></h1>
+    
 <html:form action="/editor/uploadFiles" method="post">
     <roller:FileManager />
     <table>



Mime
View raw message