roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r226354 - in /incubator/roller/branches/roller_2.0: src/org/roller/business/ src/org/roller/pojos/ src/org/roller/presentation/website/formbeans/ web/ web/WEB-INF/ web/WEB-INF/classes/ web/bookmarks/ web/theme/ web/theme/scripts/ web/weblog...
Date Fri, 29 Jul 2005 12:08:35 GMT
Author: snoopdave
Date: Fri Jul 29 05:08:14 2005
New Revision: 226354

URL: http://svn.apache.org/viewcvs?rev=226354&view=rev
Log:
Group blogging UI almost complete

Added:
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/menu-list.vm
      - copied, changed from r225383, incubator/roller/branches/roller_2.0/web/WEB-INF/classes/menu-tabbed.vm
    incubator/roller/branches/roller_2.0/web/main-sidebar.jsp
    incubator/roller/branches/roller_2.0/web/weblog/CategoriesSidebar.jsp
    incubator/roller/branches/roller_2.0/web/website/MemberPermissionsSidebar.jsp
    incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp
Modified:
    incubator/roller/branches/roller_2.0/src/org/roller/business/UserManagerImpl.java
    incubator/roller/branches/roller_2.0/src/org/roller/pojos/WebsiteData.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/formbeans/CreateWebsiteForm.java
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
    incubator/roller/branches/roller_2.0/web/WEB-INF/editor-menu.xml
    incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksForm.jsp
    incubator/roller/branches/roller_2.0/web/local-banner.jspf
    incubator/roller/branches/roller_2.0/web/main.jsp
    incubator/roller/branches/roller_2.0/web/taglibs.jsp
    incubator/roller/branches/roller_2.0/web/theme/layout.css
    incubator/roller/branches/roller_2.0/web/theme/menu.css
    incubator/roller/branches/roller_2.0/web/theme/roller.css
    incubator/roller/branches/roller_2.0/web/theme/scripts/roller.js
    incubator/roller/branches/roller_2.0/web/theme/status.jsp
    incubator/roller/branches/roller_2.0/web/weblog/CategoriesForm.jsp
    incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp
    incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp
    incubator/roller/branches/roller_2.0/web/weblog/WeblogQuery.jsp
    incubator/roller/branches/roller_2.0/web/weblog/editor-text.jsp
    incubator/roller/branches/roller_2.0/web/weblog/referers.jsp
    incubator/roller/branches/roller_2.0/web/website/InviteMember.jsp
    incubator/roller/branches/roller_2.0/web/website/MemberPermissions.jsp
    incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp
    incubator/roller/branches/roller_2.0/web/website/edit-website.jsp
    incubator/roller/branches/roller_2.0/web/website/upload-file.jsp

Modified: incubator/roller/branches/roller_2.0/src/org/roller/business/UserManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/business/UserManagerImpl.java?rev=226354&r1=226353&r2=226354&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/business/UserManagerImpl.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/business/UserManagerImpl.java Fri Jul 29 05:08:14 2005
@@ -259,7 +259,7 @@
             new Date());
         website.setEditorTheme(theme);
         website.setLocale(locale);
-        website.setTimezone(timeZone);
+        website.setTimeZone(timeZone);
         website.save();
 
         WeblogCategoryData rootCat = wmgr.createWeblogCategory(

Modified: incubator/roller/branches/roller_2.0/src/org/roller/pojos/WebsiteData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/pojos/WebsiteData.java?rev=226354&r1=226353&r2=226354&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/pojos/WebsiteData.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/pojos/WebsiteData.java Fri Jul 29 05:08:14 2005
@@ -426,13 +426,13 @@
      * @ejb:persistent-field
      * @hibernate.property column="timeZone" non-null="true" unique="false"
      */
-    public String getTimezone()
+    public String getTimeZone()
     {
         return this.timeZone;
     }
 
     /** @ejb:persistent-field */
-    public void setTimezone(String timeZone)
+    public void setTimeZone(String timeZone)
     {
         this.timeZone = timeZone;
     }
@@ -675,11 +675,11 @@
         {
             if (TimeZone.getDefault() != null) 
             {
-                this.setTimezone( TimeZone.getDefault().getID() );
+                this.setTimeZone( TimeZone.getDefault().getID() );
             }
             else
             {
-                this.setTimezone("America/New_York");
+                this.setTimeZone("America/New_York");
             }
         }
         return TimeZone.getTimeZone(timeZone);

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/formbeans/CreateWebsiteForm.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/formbeans/CreateWebsiteForm.java?rev=226354&r1=226353&r2=226354&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/formbeans/CreateWebsiteForm.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/formbeans/CreateWebsiteForm.java Fri Jul 29 05:08:14 2005
@@ -90,6 +90,6 @@
         wd.setName(name);
         wd.setDescription(description);
         wd.setLocale(this.locale);
-        wd.setTimezone(timeZone);
+        wd.setTimeZone(timeZone);
     }
 }

Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties?rev=226354&r1=226353&r2=226354&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties Fri Jul 29 05:08:14 2005
@@ -324,10 +324,11 @@
 
 inviteMember.title=Invite New Member
 inviteMember.description=You can invite any user to join this website
-inviteMember.userName=Username of user to be invited
-inviteMember.adminstrator=Admin
+inviteMember.userName=Username
+inviteMember.administrator=Admin
 inviteMember.author=Author
 inviteMember.limited=Limited
+inviteMember.permissions=Permissions
 
 inviteMember.button.save=Send invitation
 
@@ -424,7 +425,11 @@
 mainPage.hits=hits
 mainPage.link=Link
 mainPage.rss.tip=Combined RSS feed for site.
+
+mainPage.actions=Actions
+mainPage.status=Status
 mainPage.loggedInAs=Logged in as
+mainPage.currentWebsite=Editing website
 
 # --------------------------------------------------------------------- Maintenance
 
@@ -445,6 +450,7 @@
 memberPermissions.author=Author
 memberPermissions.limited=Limited
 memberPermissions.remove=Remove
+memberPermissions.inviteMember=Invite new member
 
 memberPermissions.button.save=Save
 
@@ -677,7 +683,7 @@
 referers.hits=Day Hits
 referers.deleteSelected=Delete Selected
 
-referers.hitCounters=Hit Counters
+referers.hitCounters=Hits Counted Today
 referers.reset=Reset Hit Count
 
 referers.deletedReferers=Deleted specified referers
@@ -699,25 +705,24 @@
 tabbedmenu.weblog.newEntry=New Entry
 tabbedmenu.weblog.archives=Archives
 tabbedmenu.weblog.categories=Categories
+tabbedmenu.bookmarks.allFolders=Bookmarks
+tabbedmenu.bookmarks.import=Import
 tabbedmenu.weblog.referers=Referers
-tabbedmenu.weblog.pingSetup=Pings
-tabbedmenu.weblog.customPingTargets=Custom Ping Targets
-tabbedmenu.weblog.export=Export
-tabbedmenu.weblog.import=Import
-tabbedmenu.weblog.flushCache=Flush Cache
+tabbedmenu.website.files=Uploads
 
-tabbedmenu.bookmarks=Bookmarks
-tabbedmenu.bookmarks.allFolders=All Folders
-tabbedmenu.bookmarks.import=Import
 
 tabbedmenu.website=Website
 tabbedmenu.website.settings=Settings
-tabbedmenu.website.files=Files
 tabbedmenu.website.themes=Theme
 tabbedmenu.website.pages=Templates
 tabbedmenu.website.members=Members
 tabbedmenu.website.inviteMember=Invite Member
 tabbedmenu.website.maintenance=Maintenance
+tabbedmenu.weblog.pingSetup=Pings
+tabbedmenu.weblog.customPingTargets=Custom Ping Targets
+tabbedmenu.weblog.export=Export
+tabbedmenu.weblog.import=Import
+tabbedmenu.weblog.flushCache=Flush Cache
 
 tabbedmenu.admin=Admin
 tabbedmenu.admin.config=Configuration
@@ -902,6 +907,7 @@
 # ------------------------------------------------------ Weblog Entry Export/Import
 
 weblogEntryQuery.title=Weblog Entry Archive
+weblogEntryQuery.description=Search weblog entry archives by category, date, and status.
 
 weblogEntryQuery.filterByCategory=Filter By Category
 weblogEntryQuery.filterByPublishTime=Filter By Publish Time
@@ -936,7 +942,9 @@
 
 weblogEntryQuery.label.maxEntries=Max Entries
 
-weblogEntryQuery.button.query=Query
+weblogEntryQuery.section.searchResults=Search Results
+
+weblogEntryQuery.button.query=Search
 weblogEntryQuery.button.export=Export
 
 # ---------------------------------------------------------------------- Weblog Main
@@ -969,6 +977,8 @@
 websiteSettings.bloggerApiCategory=Category for posts received via Blogger API 
 websiteSettings.spamPrevention=Spam Prevention
 websiteSettings.ignoreUrls=Ignore referering URLs that<br />contain any of these<br />(comma separated) words
+websiteSettings.editorSettings=Editor
+websiteSettings.commentSettings=Comments
 
 websiteSettings.button.update=Update Website Settings
 websiteSettings.button.rebuildIndex=Rebuild Search Index
@@ -992,13 +1002,13 @@
 # ------------------------------------------------------------------- Your websites
 
 yourWebsites.title=Your Websites
-yourWebsites.description=These are the websites of which you are a member. You may select one and it will become your current website. If you would like to end your membership, you may resign.
+yourWebsites.description=Click website title to select it as your current website.
 yourWebsites.invited=You've been invited to join the website
 yourWebsites.accept=accept
 yourWebsites.decline=decline
-
+yourWebsites.createWebsite=Create new website
 yourWebsites.tableTitle=Title
-yourWebsites.escription=Description
+yourWebsites.tableDescription=Description
 yourWebsites.permissions=Permissions
 yourWebsites.select=Select
 yourWebsites.resign=Resign

Copied: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/menu-list.vm (from r225383, incubator/roller/branches/roller_2.0/web/WEB-INF/classes/menu-tabbed.vm)
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/menu-list.vm?p2=incubator/roller/branches/roller_2.0/web/WEB-INF/classes/menu-list.vm&p1=incubator/roller/branches/roller_2.0/web/WEB-INF/classes/menu-tabbed.vm&r1=225383&r2=226354&rev=226354&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/menu-tabbed.vm (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/menu-list.vm Fri Jul 29 05:08:14 2005
@@ -1,54 +1,29 @@
-
-
-<table class="tmTabTable" cellspacing="0" >
-<tr>
-  #foreach( $menu in $menuModel.getMenus() )
+<div id="menu">
+#foreach( $menu in $menuModel.getMenus() )
     #if( $menu.isPermitted( $req ) )
 	    #if( $menu.isSelected( $req ) )
-	  	<td class="tmSelectedSepLeft"></td>
-	    <td class="tmSelectedMenu">
-	    #else
-	  	<td class="tmSepLeft"></td>
-	    <td class="tmMenu">
-	    #end
-	
-	    <a href="$menu.getUrl( $ctx )">$text.get( $menu.getName() )</a> 
-	
-	    </td>
-	    #if( $menu.isSelected( $req ))
-	  	<td class="tmSelectedSepRight"></td>
+	  	<dl class="menuSelected">
 	    #else
-	  	<td class="tmSepRight"></td>
+	  	<dl class="menuUnselected">
 	    #end
+	       <dt onmouseover="javascript:showMenu('smenu${velocityCount}');">
+	          <a href="$menu.getUrl( $ctx )">$text.get($menu.getName())</a>
+	       </dt>
+	       <dd id="smenu${velocityCount}">
+	          <ul>
+	          #foreach( $item in $menu.getMenuItems() )
+                 #if ( $item.isSelected( $req ) )
+                 <a class="itemSelected" href="$item.getUrl($ctx)">$text.get( $item.getName() )</a> 
+    	             #else
+                 <a class="itemUnselected" href="$item.getUrl($ctx)">$text.get( $item.getName() )</a> 
+                 #end
+	          #end
+	          </ul>
+	       </dd>
+        </dl>
     #end
-  #end
-</tr>
-</table>
+#end
+</menu>
+
 
-<table class="tmItemTable" cellspacing="0">
-<tr>
-  <td class="tmItemLeft"></td>
-  <td class="tmItemCell">
-  #set( $count = 0 )
-  #set( $currentMenu = $menuModel.getSelectedMenu( $req ) )
-  #if( $currentMenu.isPermitted( $req ) ) 
-    #foreach( $item in $currentMenu.getMenuItems() )
-      #if ($item.isPermitted($req))
-          #if ( $count > 0 )
-            &nbsp;|&nbsp; 
-          #end
-          #if ( $item.isSelected( $req ) )
-          <a class="tmItemLinkSelected" href="$item.getUrl($ctx)">$text.get( $item.getName() )</a> 
-    	      #else
-          <a class="tmItemLink" href="$item.getUrl($ctx)">$text.get( $item.getName() )</a> 
-          #end
-    
-          #set( $count = $count + 1 )
-      #end
-    #end
-  #end
-  </td>
-  <td class="tmItemRight"></td>
-</tr>
-</table>
 

Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/editor-menu.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/editor-menu.xml?rev=226354&r1=226353&r2=226354&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/editor-menu.xml (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/editor-menu.xml Fri Jul 29 05:08:14 2005
@@ -34,9 +34,6 @@
         <menu-item forward="yourWebsites" name="tabbedmenu.user.websites"
                                           perms="any"
                                           roles="editor,admin" />
-        <menu-item forward="createWebsite"   name="tabbedmenu.createWebsite"
-                                          perms="any"
-                                          roles="editor,admin" />
     </menu>
     
     <menu name="tabbedmenu.weblog" perms="admin,author,limited">
@@ -45,29 +42,20 @@
         <menu-item forward="weblogQuery"  name="tabbedmenu.weblog.archives" 
                                           perms="admin,author,limited" />
         <menu-item forward="categories"   name="tabbedmenu.weblog.categories" />
+        <menu-item forward="bookmarks"    name="tabbedmenu.bookmarks.allFolders" />
+        <menu-item forward="uploadFiles"  name="tabbedmenu.website.files" />
         <menu-item forward="referers"     name="tabbedmenu.weblog.referers" />
-        <menu-item forward="pingSetup"    name="tabbedmenu.weblog.pingSetup" 
-                                          disabledProperty="pings.disablePingUsage" />
-        <menu-item forward="customPingTargets" name="tabbedmenu.weblog.customPingTargets" 
-                                          disabledProperty="pings.disallowCustomTargets" />
-        <!-- These need work...
-        <menu-item forward="exportEntries" name="tabbedmenu.weblog.export"  />
-        <menu-item forward="importEntries" name="tabbedmenu.weblog.import"  /> -->
-    </menu>
-
-    <menu name="tabbedmenu.bookmarks">
-        <menu-item forward="bookmarks"       name="tabbedmenu.bookmarks.allFolders" />
-        <menu-item forward="importBookmarks" name="tabbedmenu.bookmarks.import" />
     </menu>
 
     <menu name="tabbedmenu.website">
         <menu-item forward="editWebsite"       name="tabbedmenu.website.settings" />
-        <menu-item forward="uploadFiles"       name="tabbedmenu.website.files" />
         <menu-item forward="editTheme"         name="tabbedmenu.website.themes" />
         <menu-item forward="editPages"         name="tabbedmenu.website.pages" />
         <menu-item forward="memberPermissions" name="tabbedmenu.website.members" />
-        <menu-item forward="inviteMember"      name="tabbedmenu.website.inviteMember" />
-        <menu-item forward="maintenance"       name="tabbedmenu.website.maintenance" />
+        <menu-item forward="pingSetup"         name="tabbedmenu.weblog.pingSetup" 
+                                               disabledProperty="pings.disablePingUsage" />
+        <menu-item forward="customPingTargets" name="tabbedmenu.weblog.customPingTargets" 
+                                               disabledProperty="pings.disallowCustomTargets" />
     </menu>
 
     <menu name="tabbedmenu.admin" roles="admin">

Modified: incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksForm.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksForm.jsp?rev=226354&r1=226353&r2=226354&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksForm.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksForm.jsp Fri Jul 29 05:08:14 2005
@@ -1,4 +1,5 @@
 <%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<% pageContext.setAttribute("leftPage","/bookmarks/BookmarksSidebar.jsp"); %>
 
 <%-- JavaScript for bookmarks table --%> 
 <script type="text/javascript">
@@ -43,32 +44,36 @@
 
 <%-- Folder path --%>
 
-<p>
-<b><fmt:message key="bookmarksForm.path" /></b>:
-
-<c:if test="${empty folderPath}">
-   /
-   <roller:link page="/editor/bookmarks.do">
-       <roller:linkparam id="method" value="selectFolder" />
-       <fmt:message key="bookmarksForm.root" />
-   </roller:link>
-</c:if>
-
-<c:if test="${!(empty folderPath)}">
-    <c:forEach var="folder" items="${folderPath}">
-        /
-        <roller:link page="/editor/bookmarks.do">
-            <roller:linkparam id="method" value="selectFolder" />
-            <roller:linkparam 
-                id="<%= RollerRequest.FOLDERID_KEY %>" 
-                name="folder" property="id" />
-            <c:out value="${folder.name}" />
-        </roller:link>
-    </c:forEach>
-    <br />
-</c:if>
-</p>
-
+<p>
+<b><fmt:message key="bookmarksForm.path" /></b>:
+
+<c:if test="${empty folderPath}">
+   /
+   <roller:link page="/editor/bookmarks.do">
+       <roller:linkparam id="method" value="selectFolder" />
+       <fmt:message key="bookmarksForm.root" />
+   </roller:link>
+</c:if>
+</p>
+
+<p>
+<c:if test="${!(empty folderPath)}">
+    <c:forEach var="folder" items="${folderPath}">
+        /
+        <roller:link page="/editor/bookmarks.do">
+            <roller:linkparam id="method" value="selectFolder" />
+            <roller:linkparam 
+                id="<%= RollerRequest.FOLDERID_KEY %>" 
+                name="folder" property="id" />
+            <c:out value="${folder.name}" />
+        </roller:link>
+    </c:forEach>
+    <br />
+</c:if>
+</p>
+
+<br />
+
 <%-- Form is a table of folders followed by bookmarks, each with checkbox --%>
 
 <html:form action="/editor/bookmarks" method="post">
@@ -76,26 +81,6 @@
 <html:hidden property="folderId" /> 
 
 <p>
-<%-- Add Bookmark link --%>
-<img src='<c:url value="/images/BookmarkNew16.png"/>' border="0"alt="icon" />
-<roller:link page="/editor/bookmarkEdit.do">
-    <roller:linkparam id="<%= RollerRequest.FOLDERID_KEY %>"
-        name="folder" property="id" />
-    <fmt:message key="bookmarksForm.addBookmark" />
-</roller:link>
-
-&nbsp;|&nbsp;
-
-<%-- Add Folder link --%>
-<img src='<c:url value="/images/FolderNew16.png"/>' border="0"alt="icon" />
-<roller:link page="/editor/folderEdit.do">
-    <roller:linkparam id="<%= RollerRequest.PARENTID_KEY %>"
-         name="folder" property="id" />
-    <fmt:message key="bookmarksForm.addFolder" />
-</roller:link>
-</p>
-
-<p>
 <%-- Select-all button --%>
 <input type="button" value="<fmt:message key='bookmarksForm.checkAll' />" 
    onclick="setChecked(1)" /></input>
@@ -107,9 +92,18 @@
 <%-- Delete-selected button --%>
 <input type="button" value="<fmt:message key='bookmarksForm.delete' />" 
    onclick="onDelete()"/></input>
-</td>
-</p>
-
+
+<%-- Move-selected button --%>
+<input type="button" value="<fmt:message key='bookmarksForm.move' />"   
+   onclick="onMove()"/></input>
+
+<%-- Move-to combo-box --%>
+<html:select property="moveToFolderId" size="1">
+    <html:options collection="allFolders" 
+        property="id" labelProperty="path"/>
+</html:select>
+</p>
+
 <table class="rollertable">
 
     <tr class="rHeaderTr">
@@ -205,18 +199,6 @@
     </c:forEach>
 
 </table>
-
-<p>
-<%-- Move-selected button --%>
-<input type="button" value="<fmt:message key='bookmarksForm.move' />"   
-   onclick="onMove()"/></input>
-
-<%-- Move-to combo-box --%>
-<html:select property="moveToFolderId" size="1">
-    <html:options collection="allFolders" 
-        property="id" labelProperty="path"/>
-</html:select>
-</p>
 
 </html:form>
 

Modified: incubator/roller/branches/roller_2.0/web/local-banner.jspf
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/local-banner.jspf?rev=226354&r1=226353&r2=226354&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/local-banner.jspf (original)
+++ incubator/roller/branches/roller_2.0/web/local-banner.jspf Fri Jul 29 05:08:14 2005
@@ -1,10 +1,6 @@
 
-        <br />
-        <center><img src="images/roller-logo.png" /></center>
+<h1><%= RollerRuntimeConfig.getProperty("site.name") %></h1>
 
-        <h1>
-           <%= RollerRuntimeConfig.getProperty("site.name") %>
-        </h1>
-        <p class="websiteDescription">
-           <%= RollerRuntimeConfig.getProperty("site.description") %>
-        </p>
+<p class="websiteDescription">
+<%= RollerRuntimeConfig.getProperty("site.description") %>
+</p>

Added: incubator/roller/branches/roller_2.0/web/main-sidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/main-sidebar.jsp?rev=226354&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/main-sidebar.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/main-sidebar.jsp Fri Jul 29 05:08:14 2005
@@ -0,0 +1,79 @@
+<%@ include file="/taglibs.jsp" %>
+
+<table class="sidebarBox">
+
+    <tr>
+       <td class="sidebarBox">
+          <div class="menu-tr"><div class="menu-tl">
+             <fmt:message key="mainPage.searchWeblogs" />
+          </div></div>
+       </td>
+    </tr>
+    
+    <tr>
+        <td>
+        
+        <form id="searchForm" method="get"
+            action="<c:out value="${baseURL}" />/search"
+            style="margin: 0; padding: 0" onsubmit="return validateSearch(this)">
+            <input type="text" id="q" name="q" size="20"
+                maxlength="255" value="<c:out value="${param.q}" />" />
+            <input type="submit" value="<fmt:message key="mainPage.searchButton" />" />
+        </form>
+        <script type="text/javascript"> 
+            <!--
+            function validateSearch(form) {
+                if (form.q.value == "") {
+                    alert("Please enter a search term to continue.");
+                    form.q.focus();
+                    return false;
+                }
+                return true;
+            } 
+            --!>
+        </script>
+        
+        </td>
+    </tr>
+    
+</table>
+
+<br />
+
+<table class="sidebarBox">
+
+    <tr>
+       <td class="sidebarBox">
+          <div class="menu-tr"><div class="menu-tl">
+             <fmt:message key="mainPage.hotWeblogs" />
+          </div></div>
+       </td>
+    </tr>  
+      
+    <tr>
+        <td>
+        
+	      <c:if test="${not empty popularWebsites}"> <%-- to prevent invalid XHTML --%>
+	        <ul style="list-style-type:none; padding-left:2px; margin: 0px">
+	        <c:forEach var="site" items="${popularWebsites}">
+	           <li style="list-style-type:none; padding-left:2px; margin: 0px">
+	               <a href='<c:out value="${baseURL}" />/page/<c:out value="${site.userName}" />'
+	                  title='<c:out value="${site.userName}" />' >
+	                  <str:truncateNicely lower="45" 
+	                    upper="45" ><c:out 
+	                    value="${site.websiteName}" /></str:truncateNicely></a>:
+	               <c:out value="${site.hits}" /> <fmt:message key="mainPage.hits" />
+	           </li>
+	        </c:forEach>
+	        </ul>
+	      </c:if>
+          
+        </td>
+    </tr>
+    
+</table>
+    
+<br />
+
+    
+    
\ No newline at end of file

Modified: incubator/roller/branches/roller_2.0/web/main.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/main.jsp?rev=226354&r1=226353&r2=226354&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/main.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/main.jsp Fri Jul 29 05:08:14 2005
@@ -1,19 +1,17 @@
-<%@ 
+<%@ 
 page import="org.roller.presentation.MainPageAction" %><%@ 
-page import="java.util.Locale" %><%@ 
+page import="java.util.Locale" %><%
+pageContext.setAttribute("leftPage","main-sidebar.jsp");
+%><%@ 
 include file="/taglibs.jsp" %><%@ 
-include file="/theme/header.jsp" %>
-<table>
-<tr><%
+include file="/theme/header.jsp" %><%
 request.setAttribute("pinnedPosts",
 	((MainPageAction.MainPageData)request.getAttribute("data")).getWeblogEntriesPinnedToMain(5));
 request.setAttribute("recentPosts",
 	((MainPageAction.MainPageData)request.getAttribute("data")).getRecentWeblogEntries(45));
 request.setAttribute("popularWebsites",
 	((MainPageAction.MainPageData)request.getAttribute("data")).getPopularWebsites(65));
-%>
-<td width="70%">
-
+%>
     <div class="bannerBox">
     <%@ include file="local-banner.jspf" %>
     </div>
@@ -90,59 +88,6 @@
 
          </div>
     </c:forEach>
-
-</td>
-<td width="30%" valign="top">
-
-    <div class="entryTitleBox"><fmt:message key="mainPage.searchWeblogs" /></div>
-
-    <div class="entryBox">
-        <form id="searchForm" method="get"
-            action="<c:out value="${baseURL}" />/search"
-            style="margin: 0; padding: 0" onsubmit="return validateSearch(this)">
-            <input type="text" id="q" name="q" size="20"
-                maxlength="255" value="<c:out value="${param.q}" />" />
-            <input type="submit" value="<fmt:message key="mainPage.searchButton" />" />
-        </form>
-        <script type="text/javascript">
-            function validateSearch(form) {
-                if (form.q.value == "") {
-                    alert("Please enter a search term to continue.");
-                    form.q.focus();
-                    return false;
-                }
-                return true;
-            }
-    </script>
-    </div>
-
-    <div class="entryTitleBox"><fmt:message key="mainPage.hotWeblogs" /></div>
-
-    <div class="entryBox">
-      <span class="hotBlogs">
-      <c:if test="${not empty popularWebsites}"> <%-- to prevent invalid XHTML --%>
-        <ul style="list-style-type:none; padding-left:2px; margin: 0px">
-        <c:forEach var="site" items="${popularWebsites}">
-           <li style="list-style-type:none; padding-left:2px; margin: 0px">
-               <a href='<c:out value="${baseURL}" />/page/<c:out value="${site.userName}" />'
-                  title='<c:out value="${site.userName}" />' >
-                  <str:truncateNicely lower="45" 
-				  	upper="45" ><c:out 
-					value="${site.websiteName}" /></str:truncateNicely></a>:
-               <c:out value="${site.hits}" /> <fmt:message key="mainPage.hits" />
-           </li>
-        </c:forEach>
-        </ul>
-      </c:if>
-      </span>
-    </div>
-
-</td>
-
-</tr>
-</table>
-
-<br />
 
 <%@ include file="/theme/footer.jsp" %>
 

Modified: incubator/roller/branches/roller_2.0/web/taglibs.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/taglibs.jsp?rev=226354&r1=226353&r2=226354&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/taglibs.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/taglibs.jsp Fri Jul 29 05:08:14 2005
@@ -9,9 +9,11 @@
 page import="org.roller.model.Roller" %><%@ 
 page import="org.roller.model.RollerFactory" %><%@ 
 page import="org.roller.pojos.UserData" %><%@ 
+page import="org.roller.pojos.WebsiteData" %><%@ 
 page import="org.roller.pojos.RollerConfigData" %><%@ 
 page import="org.roller.presentation.RollerContext" %><%@ 
 page import="org.roller.presentation.RollerSession" %><%@ 
+page import="org.roller.config.RollerConfig" %><%@ 
 page import="org.roller.presentation.RollerRequest" %><%@ 
 page import="org.roller.config.RollerRuntimeConfig" %><%@ 
 page import="org.roller.config.RollerConfig" %><%@ 

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=226354&r1=226353&r2=226354&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/layout.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/layout.css Fri Jul 29 05:08:14 2005
@@ -1,17 +1,77 @@
+/* ======================================================================
+layout.css: CSS styles for layout of Roller editor/admin UI
+Uses blue robot layout - http://bluerobot.com/web/layouts/layout2.html
+====================================================================== */
+
+#banner {
+    margin:0px 0px 10px 0px;
+    padding:17px 0px 0px 20px;
+    /* For IE5/Win's benefit height = [correct height] + [top padding] + [top and bottom border widths] */
+    height:33px; /* 14px + 17px + 2px = 33px */
+    border-style:solid;
+    border-color:black;
+    border-width:1px 0px; /* top and bottom borders: 1px; left and right borders: 0px */
+    line-height:11px;
+    background-color:#eee;
+
+/* Here is the ugly brilliant hack that protects IE5/Win from its own stupidity. 
+Thanks to Tantek Celik for the hack and to Eric Costello for publicizing it. 
+IE5/Win incorrectly parses the "\"}"" value, prematurely closing the style 
+declaration. The incorrect IE5/Win value is above, while the correct value is 
+below. See http://glish.com/css/hacks.asp for details. */
+    voice-family: "\"}\"";
+    voice-family:inherit;
+    height:14px; /* the correct height */
+    }
+/* I've heard this called the "be nice to Opera 5" rule. Basically, it feeds correct 
+length values to user agents that exhibit the parsing error exploited above yet get 
+the CSS box model right and understand the CSS2 parent-child selector. ALWAYS include
+a "be nice to Opera 5" rule every time you use the Tantek Celik hack (above). */
+body>#banner {height:14px;}
+
+#centercontent {
+    margin:0px 210px 50px 10px;
+    padding:10px;
+    }
+
+#rightcontent {
+    position:absolute;
+    top:50px;
+    right:20px;
+    width:185px;
+    padding:5px;
+    line-height:17px;
+/* Again, the ugly brilliant hack. */
+    voice-family: "\"}\"";
+    voice-family:inherit;
+    width:185px;
+    }
+/* Again, "be nice to Opera 5". */
+body>#Menu {width:150px;}
+
+div#loginTable {
+    margin: 20px;
+    border: 1px solid #C0C0C0;
+    color: inherit;
+    padding: 10px 5px 0px 5px;
+    width: 350px;
+}
+
+/*
 div#header {
-    border-top: 1px solid white; /* for some reason, this fixes safari */
-    background: white repeat-x url(images/header-grey.png);
+    border-top: 1px solid white;
+    background: white;
 }
 
 div#content {
-    margin: 0 0 0 136px;
+    margin: 0 0 0 0px;
     padding: 10px;
     padding-top: 0;
 }
 
-div#left { 
+div#sidebar { 
     position: absolute;
-    left: 0px;
+    right: 0px;
     width: 136px;
     padding: 10px;
 }
@@ -31,14 +91,8 @@
     margin-top: 30px;
     padding: 5px 0px 10px 5px;
     text-align: left;
-}
+}
 
-div#loginTable {
-    margin: 20px;
-    border: 1px solid #C0C0C0;
-    color: inherit;
-    padding: 10px 5px 0px 5px;
-    width: 350px;
-}
+*/
 
 

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=226354&r1=226353&r2=226354&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/menu.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/menu.css Fri Jul 29 05:08:14 2005
@@ -1,105 +1,63 @@
-.rNavigationBar {
-    float: right;
-    padding: 0px 0px 0 0;
-}
-
-.tmTabTable {
-    height: 26px;
-    padding-left: 10px;
-    padding-right: 10px;
-    margin-top: 0px;
-}
-
-.tmItemTable {
-    height: 25px;
-    width: 100%;
-    color: #FFFFFF;
-}
-
-.tmTabTable td {
-    vertical-align: middle;
-}
-
-.tmItemCell {
-    background-image: url(images/tabitem.png);
-    color: #FFFFFF;
-    vertical-align: middle;
-}
-
-.tmItemCell a {
-    background-color: transparent;
-    color: #FFFFFF;
-    text-decoration: underline;
-}
-
-.tmItemCell a:visited {
-    background-color: transparent;
-    color: #FFFFFF;
-}
-
-.tmItemLeft {
-    background-image: url(images/tabitem-left.png);
-    width: 9px;
-}
-
-.tmItemLinkSelected {
-    font-weight: bold;
-    text-decoration: none;
-}
-
-.tmItemRight {
-    background-image: url(images/tabitem-right.png); 
-    width: 9px;
-}
-
-.tmMenu {
-    background-image: url(images/tabmenu-unsel.png);
-    padding-left: 7px;
-    font-size:medium;
-}
-
-.tmMenu a:hover {
-    color: white;
-    font-size:medium;
-}
-
-.tmMenu a:visited {
-    background-color: transparent;
-    color: #4031a8;
-    font-size:medium;
-}
-
-.tmSelectedMenu {
-    background-image: url(images/tabmenu.png);
-    font-weight: bold;
-    padding-left: 5px;
-    padding-right: 5px;
-    font-size:medium;
-}
-
-.tmSelectedMenu a, .tmSelectedMenu a:visited {
-    background-color: transparent;
-    color: #FFFFFF;
-    text-decoration: none;
-}
-
-.tmSelectedSepLeft {
-    background-image: url(images/tabmenu-left.png);
-    width: 12px;
-}
-
-.tmSelectedSepRight {
-    background-image: url(images/tabmenu-right.png);
-    width: 12px;
-}
-
-.tmSepLeft {
-    background-image: url(images/tabmenu-left-unsel.png);
-    width: 12px;
-}
-
-.tmSepRight {
-    background-image: url(images/tabmenu-right-unsel.png);
-    width: 12px;
-}
-
+
+.menuTabTable {
+   height: 25px;
+}
+td.menuTabSeparator {
+    width: 10px;
+}  
+td.menuTabSelected {
+    padding: 0px; margin: 0px;
+    background-color: #CCCC99;
+    /* background-image: url(images/menutab-sel.png);
+    background-repeat: no-repeat; */
+}
+td.menuTabUnselected {
+    padding: 0px; margin: 0px;
+    background-color: #AAAA77;
+    /* background-image: url(images/menutab-unsel.png);
+    background-repeat: no-repeat; */
+}
+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;
+}
+
+
+
+.menuItemTable {
+    width: 100%;
+    height: 25px;
+    background-color: #CCCC99;
+    /* background-image: url(images/menubar.png);
+    background-repeat: repeat-x; */
+}
+.menuItem {
+    padding: 0px 5px 0px 5px; /* TRBL */
+ }
+.menuItemTable a:link, .menuTabTable a:link {
+    color: black;
+    text-decoration: none;
+    font-weight: bold;
+}
+.menuItemTable a:visited, .menuTabTable a:visited {
+    color: black;
+    text-decoration: none;
+    font-weight: bold;
+}
+.menuItemTable a:hover, .menuTabTable a:hover {
+    color: black;
+    text-decoration: underline;
+    font-weight: bold;
+}
+.menuItemTable a:active, .menuTabTable a:active {
+    color: black;
+    text-decoration: none;
+    font-weight: bold;
+}
+

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=226354&r1=226353&r2=226354&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/roller.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/roller.css Fri Jul 29 05:08:14 2005
@@ -1,13 +1,46 @@
-
-body {
-    background: white repeat-y url(images/leftbar-blue.png);
+/* ======================================================================
+roller.css: CSS styles for Roller editor/admin UI
+====================================================================== */
+
+/* ----------------------------------------------------------------------
+Editor look and feel styles
+---------------------------------------------------------------------- */
+
+#banner {
+    background-color: #CCCC99;
+}
+    
+td.sidebarBox {
+    height:25px;
+    padding: 0px; margin: 0px;
+    background-color: #CCCC99;
+}
+
+table.sidebarBox {
+    width:100%;
+}
+
+/* ----------------------------------------------------------------------
+General styles
+---------------------------------------------------------------------- */
+
+body {
+    height:100%;
+    background: white;
     margin: 0;
     padding: 0;
-    font:small Verdana,Arial,Sans-serif;
-    color:#333;
-    font:x-small/1.5em Verdana, Arial, Helvetica, sans-serif;
-    font-size: 69%;
-}
+    font:small Verdana,Arial,Sans-serif;
+    color:black;
+    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:x-small/1.5em Verdana, Arial, Helvetica, sans-serif;
+    font-size: 69%;
+}
 
 p {
     background: transparent;
@@ -16,7 +49,7 @@
 
 h1 {
     background: transparent;
-    color: #4031a8;
+    color: #A0A060;
     letter-spacing: 0.2em;
     font-size: x-large;
     font-weight: bold;
@@ -24,7 +57,7 @@
 
 h2 {
     background: transparent;
-    color: #4031a8;
+    color: #A0A060;
     letter-spacing: 0.2em;
     font-size: large;
     font-weight: bold;
@@ -32,7 +65,7 @@
 
 h3 {
     background: transparent;
-    color: #4031a8;
+    color: #A0A060;
     letter-spacing: 0.2em;
     font-weight: bold;
 }
@@ -54,22 +87,26 @@
 }
 
 a:link {
-    background: transparent;
-    color: #4031a8;
+    background: transparent;
+    font-weight: bold;
+    color: #A0A060;
     text-decoration: underline;
 }
 
 a:visited {
     background: transparent;
-    color: #4031a8;
+    font-weight: bold;
+    color: #A0A060;
     text-decoration: underline;
 }
 
 a:hover {
+    font-weight: bold;
     text-decoration: none;
 }
 
 a:active {
+    font-weight: bold;
     text-decoration: underline overline;
 }
 
@@ -80,16 +117,17 @@
 .details {
    font-size: small;
    color: grey;
-}
-
-/* ----------------------------------------------------- */
-/* Main page */
+}
 
+/* ----------------------------------------------------------------------
+Main page styles
+---------------------------------------------------------------------- */
+
 div.entryTitleBox {
    padding: 3px;
    margin: 3px;
    border: 1px #c0c0c0 solid;
-   background: #4031a8;
+   background: #CCCC99;
    color: white;
    font-size: medium;
 }
@@ -123,10 +161,6 @@
    color: grey;
 }
 
-.bannerBox {
-   text-align: center;
-}
-
 p.websiteDescription {
    text-style: italics;
 }
@@ -135,23 +169,21 @@
    font-size: small;
    color: grey;
    text-align: center;
-}
+}
 
-/* ----------------------------------------------------- */
-/* Tables */
+/* ----------------------------------------------------------------------
+Table styles 
+---------------------------------------------------------------------- */
 
 table.rollertable {
     border-collapse: collapse;
     margin: 5px; 
-    width: 98%;
+    width: 90%;
 }
 
 table.rollertable th, table.rollertable thead th {
     border: 1px solid #ccc;
-    background: #4031a8;
-    color: white;
-    font-weight: bolder;
-    font-size: large;
+    background: #CCCC99;
 }
 
 table.rollertable thead th {
@@ -201,8 +233,9 @@
     padding-right: 5px;
 }
 
-/* ----------------------------------------------------- */
-/* Calendar */
+/* ----------------------------------------------------------------------
+Calendar styles
+---------------------------------------------------------------------- */
 
 div.archiveCalendar {
     position: absolute; 
@@ -255,8 +288,9 @@
 	text-align: center;
 }
 
-/* ----------------------------------------------------- */
-/* Errors and status messages */
+/* ----------------------------------------------------------------------
+Error and status message styles
+---------------------------------------------------------------------- */
 
 .statusMsg {
     background: #CCFFCC;
@@ -309,7 +343,7 @@
 
 div.output {
     background-color: #e0e0e0;
-    border: 1px solid #a0a0a0;
+    border: 1px solid #CCCC99;
     color: #000000;
     font-size: 0.9em;
     font-weight: normal;
@@ -319,8 +353,9 @@
     vertical-align: bottom;
 }
 
-/* ----------------------------------------------------- */
-/* Misc styles */
+/* ----------------------------------------------------------------------
+Misc styles 
+---------------------------------------------------------------------- */
 
 div.NN4 {
     display: none;
@@ -374,7 +409,9 @@
     margin: 2px;
 }
 
-/* form layout */
+/* ----------------------------------------------------------------------
+form layout styles
+---------------------------------------------------------------------- */
 
 div.row { 
    padding:2px; 
@@ -388,7 +425,7 @@
 label.formrow {
    float:left;
    text-align: right;
-   width:25%;
+   width:20%;
    padding-right: 1em;
 }
 
@@ -411,7 +448,9 @@
    font-weight:bold;
 }
 
-/* weblog editor styles */
+/* ----------------------------------------------------------------------
+weblog editor styles 
+---------------------------------------------------------------------- */
 
 div.previewEntry {
    border: 1px solid gray;
@@ -424,7 +463,7 @@
 
 div.centerTitle {
     border: 1px solid #ccc;
-    background: #5454d1;
+    background: #CCCC99;
     color: black;
     font-weight: bolder;
     font-size: large;
@@ -432,16 +471,16 @@
 }
 
 div.control {
-    width:85%; 
-    background:#f0f0f0;
+    width:95%; 
+    background:#CCCC99;
     padding:4px;  
     margin:5px; 
 }
 
 div.controlToggle {
-    width:85%; 
+    width:95%; 
     color:black;
-    background:#f0f0f0;
+    background:#CCCC99;
     padding:4px;  
     margin:5px;  
     border-top: 1px solid #c0c0c0;

Modified: incubator/roller/branches/roller_2.0/web/theme/scripts/roller.js
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/scripts/roller.js?rev=226354&r1=226353&r2=226354&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/scripts/roller.js (original)
+++ incubator/roller/branches/roller_2.0/web/theme/scripts/roller.js Fri Jul 29 05:08:14 2005
@@ -136,12 +136,12 @@
         toggle = document.getElementById(toggleId);
     	if (target.style.display == "none") {
     		target.style.display = "";  
-    		toggle.style.background = "#e7e7ff";  
+    		toggle.style.background = "#CCCC99";  
             expanded = true;  
                   
     	} else {
     		target.style.display = "none";
-    		toggle.style.background = "#f0f0f0";  
+    		toggle.style.background = "#CCCC99";  
             expanded = false;
     	}
         togglePlusMinus("i" + targetId);

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=226354&r1=226353&r2=226354&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/status.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/status.jsp Fri Jul 29 05:08:14 2005
@@ -1,17 +1,43 @@
 <%@ include file="/taglibs.jsp" %>
+<%
+RollerSession rollerSession = RollerSession.getRollerSession(request);
+UserData user = rollerSession.getAuthenticatedUser();
+WebsiteData website = rollerSession.getCurrentWebsite();
+boolean allowNewUsers = RollerConfig.getBooleanProperty("configForm.allowNewUsers");
+%>
+
+<table class="sidebarBox">
+    <tr>
+       <td class="sidebarBox">
+          <div class="menu-tr"><div class="menu-tl">
+             <fmt:message key="mainPage.status" />
+          </div></div>
+       </td>
+    </tr>
+	<tr>
+		<td>
+			<% if (user != null) { %>
+			    <fmt:message key="mainPage.loggedInAs" />:<br />
+                 [<b><%= user.getUserName() %></b>].<br />
+                 <% if (website != null) { %>
+                    <fmt:message key="mainPage.currentWebsite" />:<br />
+                    [<b><%= website.getHandle() %></b>]<br />
+                 <% } %> 
+                 <br />
+			    <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>
+                 <br /><br />
+			    <html:link forward="registerUser"><fmt:message key="navigationBar.register"/></html:link>
+            <% } else { %>
+			    <html:link forward="login-redirect"><fmt:message key="navigationBar.login"/></html:link>
+            <% } %>
+
+		</td>
+	</tr>
+</table>
+
+<br />
+
+
 
-<logic:present name="loggedIn" scope="request" >
-    <fmt:message key="mainPage.loggedInAs" /> [<bean:write name="userName"/>].<br /><br />
-    <html:link forward="logout-redirect"><fmt:message key="navigationBar.logout"/></html:link>
-</logic:present>
-
-<logic:present name="allowNewUsers" scope="request" >
-    <html:link forward="login-redirect"><fmt:message key="navigationBar.login"/></html:link><br /><br />
-    <html:link forward="registerUser"><fmt:message key="navigationBar.register"/></html:link>
-</logic:present>
-
-<logic:notPresent name="loggedIn">
-    <logic:notPresent name="allowNewUsers">
-    <html:link forward="login-redirect"><fmt:message key="navigationBar.login"/></html:link>
-    </logic:notPresent>
-</logic:notPresent>

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=226354&r1=226353&r2=226354&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/CategoriesForm.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/CategoriesForm.jsp Fri Jul 29 05:08:14 2005
@@ -1,4 +1,5 @@
 <%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<% pageContext.setAttribute("leftPage","/weblog/CategoriesSidebar.jsp"); %>
 
 <%-- JavaScript for categories table --%> 
 <script type="text/javascript">
@@ -59,7 +60,9 @@
     </c:forEach>
     <br />
 </c:if>
-</p>
+</p>
+
+<br />
 
 <%-- Form is a table of categories each with checkbox --%>
 
@@ -68,16 +71,6 @@
 <html:hidden property="parentId" /> 
 
 <p>
-<%-- Add Category link --%>
-<img src='<c:url value="/images/FolderNew16.png"/>' border="0"alt="icon" />
-<roller:link page="/editor/categoryEdit.do">
-    <roller:linkparam id="<%= RollerRequest.PARENTID_KEY %>"
-         name="category" property="id" />
-    <fmt:message key="categoriesForm.addCategory" />
-</roller:link>
-</p>
-
-<p>
 <%-- Select-all button --%>
 <input type="button" value="<fmt:message key='categoriesForm.checkAll' />" 
    onclick="setChecked(1)" /></input>
@@ -163,7 +156,7 @@
     </c:forEach>
 
 </table>
-
+
 </html:form>
 
 <%@ include file="/theme/footer.jsp" %>

Added: 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=226354&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/CategoriesSidebar.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/weblog/CategoriesSidebar.jsp Fri Jul 29 05:08:14 2005
@@ -0,0 +1,26 @@
+<%@ include file="/taglibs.jsp" %>
+
+<table class="sidebarBox" >
+    <tr>
+       <td class="sidebarBox">
+          <div class="menu-tr"><div class="menu-tl">
+             <fmt:message key="mainPage.actions" />
+          </div></div>
+       </td>
+    </tr>    
+    <tr>
+        <td>
+			<p>
+			<%-- Add Category link --%>
+			<img src='<c:url value="/images/FolderNew16.png"/>' border="0"alt="icon" />
+			<roller:link page="/editor/categoryEdit.do">
+			    <roller:linkparam id="<%= RollerRequest.PARENTID_KEY %>"
+			         name="category" property="id" />
+			    <fmt:message key="categoriesForm.addCategory" />
+			</roller:link>
+			</p>
+        </td>
+    </tr>
+</table>
+
+<br />

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=226354&r1=226353&r2=226354&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp Fri Jul 29 05:08:14 2005
@@ -170,6 +170,7 @@
    <%-- the button box --%>
 
    <br />
+   <br />
    <div class="control">
 
         <%-- save draft and post buttons: only in edit and preview mode --%>

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=226354&r1=226353&r2=226354&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp Fri Jul 29 05:08:14 2005
@@ -5,50 +5,68 @@
 WeblogEntryPageModel model = (WeblogEntryPageModel)request.getAttribute("model");
 %>
 
-<div style="font-size: x-small;">
+<table class="sidebarBox" >
+    <tr>
+       <td class="sidebarBox">
+          <div class="menu-tr"><div class="menu-tl">
+             <fmt:message key="weblogEdit.draftEntries" />
+          </div></div>
+       </td>
+    </tr>    
+    <tr>
+        <td>
+			<c:if test="${empty model.recentDraftEntries}">
+			   <fmt:message key="application.none" />
+			</c:if>
+			<c:forEach var="post" items="${model.recentDraftEntries}">
+			    <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"/>' align="absmiddle" border="0" alt="icon" title="Edit" />
+			           <str:truncateNicely lower="23" upper="27">
+			              <c:out value="${post.title}" />
+			           </str:truncateNicely>
+			    </roller:link>
+			    <br />
+			</c:forEach>
+        </td>
+    </tr>
+</table>
 
-<span class="leftTitle">
-    <fmt:message key="weblogEdit.draftEntries" />
-</span>
-<br />
-<c:if test="${empty model.recentDraftEntries}">
-   <fmt:message key="application.none" />
-</c:if>
-<c:forEach var="post" items="${model.recentDraftEntries}">
-    <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"/>' align="absmiddle" border="0" alt="icon" title="Edit" />
-           <str:truncateNicely lower="23" upper="27">
-              <c:out value="${post.title}" />
-           </str:truncateNicely>
-    </roller:link>
-    <br />
-</c:forEach>
-<br />
 <br />
 
-<span class="leftTitle">
-   <fmt:message key="weblogEdit.publishedEntries" />
-</span>
+<table class="sidebarBox">
+    <tr>
+       <td class="sidebarBox">
+          <div class="menu-tr"><div class="menu-tl">
+             <fmt:message key="weblogEdit.publishedEntries" />
+          </div></div>
+       </td>
+    </tr>    
+    <tr>
+        <td>
+			<c:if test="${empty model.recentPublishedEntries}">
+			   <fmt:message key="application.none" />
+			</c:if>
+			<c:forEach var="post" items="${model.recentPublishedEntries}">
+			    <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"/>' align="absmiddle" border="0" alt="icon" title="Edit" />
+			           <str:truncateNicely lower="23" upper="27">
+			              <c:out value="${post.title}" />
+			           </str:truncateNicely>
+			    </roller:link>
+			    <br />
+			</c:forEach>
+        </td>
+    </tr>
+</table>
+
 <br />
-<c:if test="${empty model.recentPublishedEntries}">
-   <fmt:message key="application.none" />
-</c:if>
-<c:forEach var="post" items="${model.recentPublishedEntries}">
-    <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"/>' align="absmiddle" border="0" alt="icon" title="Edit" />
-           <str:truncateNicely lower="23" upper="27">
-              <c:out value="${post.title}" />
-           </str:truncateNicely>
-    </roller:link>
-    <br />
-</c:forEach>
 
-</div>
+

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=226354&r1=226353&r2=226354&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogQuery.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogQuery.jsp Fri Jul 29 05:08:14 2005
@@ -5,115 +5,71 @@
 %>
 
 <h1><fmt:message key="weblogEntryQuery.title" /></h1>
-
 <roller:StatusMessage/>
 
+<p><fmt:message key="weblogEntryQuery.description" /></p>
+
 <html:form action="/editor/weblogQuery" method="post" focus="title">
 
   <%-- ========================================================= --%>
   <%-- filter by category --%>
   
-    <div id="categoryControlToggle" class="controlToggle">
-      <span id="icategoryControl">+</span>  
-      <a href="#" class="controlToggle" 
-        onclick="javascript:toggleControl('categoryControlToggle','categoryControl')">
-         <fmt:message key="weblogEntryQuery.filterByCategory" />
-      </a>
-    </div>
-    <div id="categoryControl" class="control" style="display:none">
-
-            <label for="categoryId">
-                <fmt:message key="weblogEntryQuery.label.category" />
-            </label>
-            
-            <html:select property="categoryId" size="1" tabindex="4">
-                <html:option key="weblogEntryQuery.label.any" value="" />
-                <html:optionsCollection name="model" property="categories" value="id" label="path"  />
-            </html:select>
-            
-     </div>
-     
+    <div class="formrow">
+        <label for="categoryId" class="formrow">
+            <fmt:message key="weblogEntryQuery.label.category" /></label>          
+        <html:select property="categoryId" size="1" tabindex="4">
+            <html:option key="weblogEntryQuery.label.any" value="" />
+            <html:optionsCollection name="model" property="categories" value="id" label="path"  />
+        </html:select>
+    </div>
+  
   <%-- ========================================================= --%>
   <%-- filter by date --%>
   
-    <div id="dateControlToggle" class="controlToggle">
-      <span id="idateControl">+</span>  
-      <a href="#" class="controlToggle" onclick="javascript:toggleControl('dateControlToggle','dateControl')">
-        <fmt:message key="weblogEntryQuery.filterByPublishTime" />
-      </a>
+    <div class="formrow">
+        <label for="startDateString" class="formrow">
+           <fmt:message key="weblogEntryQuery.label.startDate" />:
+        </label>
+        <roller:Date property="startDateString" dateFormat='<%= model.getShortDateFormat() %>' />
     </div>
-    <div id="dateControl" class="control" style="display:none">
-  
-            <label for="startDateString">
-               <fmt:message key="weblogEntryQuery.label.startDate" />:
-            </label>
-            <roller:Date property="startDateString" dateFormat='<%= model.getShortDateFormat() %>' />
-
-            <label for="endDateString">
-               <fmt:message key="weblogEntryQuery.label.endDate" />:
-            </label>
-            <roller:Date property="endDateString" dateFormat='<%= model.getShortDateFormat() %>' />
-        
+
+    <div class="formrow">
+        <label for="endDateString" class="formrow">
+           <fmt:message key="weblogEntryQuery.label.endDate" />:
+        </label>
+        <roller:Date property="endDateString" dateFormat='<%= model.getShortDateFormat() %>' />
     </div>
 
   <%-- ========================================================= --%>
   <%-- filter by status --%>
-  
-    <div id="statusControlToggle" class="controlToggle">
-      <span id="istatusControl">+</span>  
-      <a href="#" class="controlToggle" 
-        onclick="javascript:toggleControl('statusControlToggle','statusControl')">
-         <fmt:message key="weblogEntryQuery.filterByStatus" />
-      </a>
-    </div>
-    <div id="statusControl" class="control" style="display:none">
-
-            <label for="status">
-                <fmt:message key="weblogEntryQuery.label.status" />:
-            </label>
-            
-            <html:radio property="status" value="ALL">
-                <fmt:message key="weblogEntryQuery.label.allEntries" /></html:radio>
-
-            <html:radio property="status" value="DRAFT_ONLY">
-                <fmt:message key="weblogEntryQuery.label.draftOnly" /></html:radio>
-
-            <html:radio property="status" value="PUBLISHED_ONLY" >
-                <fmt:message key="weblogEntryQuery.label.publishedOnly" /></html:radio>
-        
+
+    <div class="formrow">
+        <label for="status" class="formrow">
+            <fmt:message key="weblogEntryQuery.label.status" />:
+        </label>        
+        <html:radio property="status" value="ALL">
+            <fmt:message key="weblogEntryQuery.label.allEntries" /></html:radio> 
+        <html:radio property="status" value="DRAFT_ONLY">
+            <fmt:message key="weblogEntryQuery.label.draftOnly" /></html:radio>
+        <html:radio property="status" value="PUBLISHED_ONLY" >
+            <fmt:message key="weblogEntryQuery.label.publishedOnly" /></html:radio>
     </div>
 
   <%-- ========================================================= --%>
   <%-- limit number of results --%>
   
-    <div id="maxControlToggle" class="controlToggle">
-      <span id="imaxControl">+</span>  
-      <a href="#" class="controlToggle" onclick="javascript:toggleControl('maxControlToggle','maxControl')">
-        <fmt:message key="weblogEntryQuery.limitResultsReturned" />
-      </a>
-    </div>
-    <div id="maxControl" class="control" style="display:none">
-
-            <label for="maxEntries">
-                <fmt:message key="weblogEntryQuery.label.maxEntries" />
-            </label>
-            
-            <html:select property="maxEntries" size="1" tabindex="4">
-                <html:option value="25" />
-                <html:option value="50" />
-                <html:option value="75" />
-                <html:option value="100" />
-            </html:select>
-
+    <div class="formrow">
+        <label for="maxEntries" class="formrow">
+            <fmt:message key="weblogEntryQuery.label.maxEntries" />
+        </label>
+        <html:select property="maxEntries" size="1" tabindex="4">
+            <html:option value="25" />
+            <html:option value="50" />
+            <html:option value="75" />
+            <html:option value="100" />
+        </html:select>
     </div>
-
-  <script type="text/javascript">
-  <!--
-  toggleControl('categoryControlToggle','categoryControl');
-  toggleControl('dateControlToggle','dateControl');
-  -->
-  </script>
-
+    
   <%-- ========================================================= --%>
   <%-- search button --%>
   
@@ -127,10 +83,10 @@
 
 </html:form>
 
+<h1><fmt:message key="weblogEntryQuery.section.searchResults" /></h1>
+
 <table class="rollertable">
-   <tr>
-      <th class="rollertable"><fmt:message key="weblogEdit.entryCol" /></th>
-   <tr>
+
    <c:forEach var="post" items="${model.recentWeblogEntries}">
       <tr>
          <td class="rollertable_entry" width="100%" >

Modified: incubator/roller/branches/roller_2.0/web/weblog/editor-text.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/editor-text.jsp?rev=226354&r1=226353&r2=226354&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/editor-text.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/editor-text.jsp Fri Jul 29 05:08:14 2005
@@ -22,7 +22,7 @@
             -->
         </script>
 
-<html:textarea property="text" cols="75" rows="20" style="width: 100%" tabindex="2"/>
+<html:textarea property="text" cols="75" rows="20" style="width: 95%" tabindex="2"/>
 
         <script type="text/javascript">
             <!--

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=226354&r1=226353&r2=226354&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/referers.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/referers.jsp Fri Jul 29 05:08:14 2005
@@ -30,9 +30,11 @@
 <br />
 <input type="submit" value='<fmt:message key="referers.deleteSelected" />' /></input>
 </html:form>
+
+<br />
 
 <%-- Form allows reset of day hits --%>
-<h2><fmt:message key="referers.hitCounters" /></h2>
+<h1><fmt:message key="referers.hitCounters" /></h1>
 <p><fmt:message key="referers.hits" />: <c:out value="${pageHits}"/></p>
 <html:form action="/editor/referers" method="post">
     <input type="hidden" name="method" value="reset" />

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=226354&r1=226353&r2=226354&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/InviteMember.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/InviteMember.jsp Fri Jul 29 05:08:14 2005
@@ -12,7 +12,7 @@
     </div>    
     
     <div class="formrow">
-       <label for="userName" class="formrow" /><fmt:message key="inviteMember.userName" /></label>
+       <label for="userName" class="formrow" /><fmt:message key="inviteMember.permissions" /></label>
        <input type="radio" name="permissionsMask" value="3"  />
        <fmt:message key="inviteMember.administrator" />
        <input type="radio" name="permissionsMask" value="1" checked />

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=226354&r1=226353&r2=226354&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/MemberPermissions.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/MemberPermissions.jsp Fri Jul 29 05:08:14 2005
@@ -1,4 +1,5 @@
 <%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<% pageContext.setAttribute("leftPage","/website/MemberPermissionsSidebar.jsp"); %>
 
 <h1><fmt:message key="memberPermissions.title" /></h1>
 

Added: incubator/roller/branches/roller_2.0/web/website/MemberPermissionsSidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/MemberPermissionsSidebar.jsp?rev=226354&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/MemberPermissionsSidebar.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/website/MemberPermissionsSidebar.jsp Fri Jul 29 05:08:14 2005
@@ -0,0 +1,22 @@
+<%@ include file="/taglibs.jsp" %>
+
+<table class="sidebarBox" >
+    <tr>
+       <td class="sidebarBox">
+          <div class="menu-tr"><div class="menu-tl">
+             <fmt:message key="mainPage.actions" />
+          </div></div>
+       </td>
+    </tr>    
+    <tr>
+        <td>
+             <p>
+                <roller:link page="/editor/inviteMember.do">
+                    <fmt:message key="memberPermissions.inviteMember" />
+                </roller:link>
+			</p>
+        </td>
+    </tr>
+</table>
+
+<br />

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=226354&r1=226353&r2=226354&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp Fri Jul 29 05:08:14 2005
@@ -1,4 +1,5 @@
 <%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<% pageContext.setAttribute("leftPage","/website/YourWebsitesSidebar.jsp"); %>
 
 <script type="text/javascript">
 <!--
@@ -67,29 +68,25 @@
                <fmt:message key="yourWebsites.permissions" />
            </th>
            <th class="rollertable" width="20%">
-               <fmt:message key="yourWebsites.select" />
-           </th>
-           <th class="rollertable" width="20%">
                <fmt:message key="yourWebsites.resign" />
            </th>
         </tr>
         <c:forEach var="perms" items="${model.permissions}">
             <roller:row oddStyleClass="rollertable_odd" evenStyleClass="rollertable_even">  
                <td class="rollertable">
-                   <c:out value="${perms.website.name}" />
+                   <a href='javascript:selectWebsite("<c:out value='${perms.website.id}'/>")'>
+                       <c:out value="${perms.website.name}" />
+                   </a>
                </td>
                <td class="rollertable">
                    <c:out value="${perms.website.description}" />
                </td>
-               <td class="rollertable">
-                   <c:out value="${perms.permissionMask}" />
-               </td>
-               <td class="rollertable">
-                   <a href='javascript:selectWebsite("<c:out value='${perms.website.id}'/>")'>
-                       <fmt:message key="yourWebsites.select" />
-                   </a>
+               <td class="rollertable" align="center">
+                   <c:if test="${perms.permissionMask == 0}" >LIMITED</c:if>
+                   <c:if test="${perms.permissionMask == 1}" >AUTHOR</c:if>
+                   <c:if test="${perms.permissionMask == 3}" >ADMIN</c:if>
                </td>
-               <td class="rollertable">
+               <td class="rollertable" align="center">
                    <a href='javascript:resignWebsite("<c:out value='${perms.website.id}'/>","<c:out value="${perms.website.handle}" />")'>
                        <fmt:message key="yourWebsites.resign" />
                    </a>

Added: 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=226354&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp Fri Jul 29 05:08:14 2005
@@ -0,0 +1,22 @@
+<%@ include file="/taglibs.jsp" %>
+
+<table class="sidebarBox" >
+    <tr>
+       <td class="sidebarBox">
+          <div class="menu-tr"><div class="menu-tl">
+             <fmt:message key="mainPage.actions" />
+          </div></div>
+       </td>
+    </tr>    
+    <tr>
+        <td>
+             <p>
+                <roller:link page="/editor/createWebsite.do">
+                    <fmt:message key="yourWebsites.createWebsite" />
+                </roller:link>
+			</p>
+        </td>
+    </tr>
+</table>
+
+<br />

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=226354&r1=226353&r2=226354&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 Fri Jul 29 05:08:14 2005
@@ -2,7 +2,8 @@
 
 <roller:StatusMessage/>
 
-<h1><fmt:message key="websiteSettings.title" /></h1>
+<h1><fmt:message key="websiteSettings.title" /></h1>
+
 <html:form action="/editor/website" method="post">
     <html:hidden property="method" value="update"/></input>
 
@@ -11,13 +12,14 @@
     <html:hidden property="locale"/></input>
     <html:hidden property="timeZone"/></input>
     <html:hidden property="editorTheme"/></input>
-    <html:hidden property="isEnabled"/></input>
+    <html:hidden property="isEnabled"/></input>
+    <html:hidden property="defaultCategoryId"/></input>
 
 <table>
 
     <tr>
-        <td class="propname" width="30%"><fmt:message key="websiteSettings.websiteTitle" />
-        <td><html:text property="name" size="60"/></input></td>
+        <td class="propname"><fmt:message key="websiteSettings.websiteTitle" />
+        <td><html:text property="name" size="40"/></input></td>
     </tr>
 
     <tr>
@@ -35,25 +37,11 @@
         </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 class="propname"><fmt:message key="websiteSettings.defaultCategory" /></td>
-        <td>
-            <html:select property="defaultCategoryId" size="1">
-                <html:options collection="categories"
-                    property="id" labelProperty="path" />
-            </html:select>
-        </td>
-    </tr>
-
+    <tr>
+        <td><h2><fmt:message key="websiteSettings.commentSettings" /></h2></td>
+        <td></td>
+    </tr>
+
     <tr>
         <td class="propname"><fmt:message key="websiteSettings.allowComments" /></td>
         <td><html:checkbox property="allowComments" /></input></td>
@@ -71,10 +59,10 @@
         <td><html:text size="50" property="emailFromAddress" /></input></td>
     </tr>
 
-    <tr>
-        <td><h2><fmt:message key="websiteSettings.formatting" /></h2></td>
-        <td></td>
-    </tr>
+    <tr>
+        <td><h2><fmt:message key="websiteSettings.formatting" /></h2></td>
+        <td></td>
+    </tr>
 <% } %>
 
 <% if (org.roller.presentation.velocity.ContextLoader.hasPlugins()) { %>
@@ -96,11 +84,25 @@
     <html:hidden property="defaultPlugins" />
 <% } %>
 
-    <tr>
-        <td><h2><fmt:message key="websiteSettings.bloggerApi" /></h2></td>
-        <td></td>
-    </tr>
-
+    <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>
@@ -123,7 +125,7 @@
 
     <tr>
         <td class="propname"><fmt:message key="websiteSettings.ignoreUrls" /></td>
-        <td><html:textarea property="ignoreWords" rows="7" cols="60"/></td>
+        <td><html:textarea property="ignoreWords" rows="7" cols="40"/></td>
     </tr>
     <tr>
         <td>&nbsp;</td>

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=226354&r1=226353&r2=226354&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 Fri Jul 29 05:08:14 2005
@@ -4,8 +4,10 @@
 
 <h1><fmt:message key="uploadFiles.title" /></h1>
 <roller:FileUpload />
+
+<br />
 
-<h2><fmt:message key="uploadFiles.manageFiles" /></h2>
+<h1><fmt:message key="uploadFiles.manageFiles" /></h1>
 
 <html:form action="/editor/uploadFiles" method="post">
     <roller:FileManager />



Mime
View raw message