roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r239735 [1/2] - in /incubator/roller/branches/roller_2.0: metadata/xdoclet/ nbproject/ src/org/roller/presentation/ src/org/roller/presentation/bookmarks/actions/ src/org/roller/presentation/planet/ src/org/roller/presentation/weblog/action...
Date Wed, 24 Aug 2005 19:18:27 GMT
Author: snoopdave
Date: Wed Aug 24 12:16:58 2005
New Revision: 239735

URL: http://svn.apache.org/viewcvs?rev=239735&view=rev
Log:
Changes to allow page title to be known outside of content, plus some UI polishing

Added:
    incubator/roller/branches/roller_2.0/web/theme/adminsidebar.jsp
    incubator/roller/branches/roller_2.0/web/theme/banner.jsp
    incubator/roller/branches/roller_2.0/web/theme/editorsidebar.jsp
    incubator/roller/branches/roller_2.0/web/theme/head.jsp
    incubator/roller/branches/roller_2.0/web/theme/sidebar.jsp
    incubator/roller/branches/roller_2.0/web/theme/styles.jsp
    incubator/roller/branches/roller_2.0/web/theme/sun/
    incubator/roller/branches/roller_2.0/web/theme/sun/bsclogo.png   (with props)
    incubator/roller/branches/roller_2.0/web/theme/sun/colors.css
    incubator/roller/branches/roller_2.0/web/theme/sun/menutab-sel.png   (with props)
    incubator/roller/branches/roller_2.0/web/theme/sun/menutab-unsel.png   (with props)
    incubator/roller/branches/roller_2.0/web/theme/sun/two-banner.png   (with props)
    incubator/roller/branches/roller_2.0/web/theme/sun/two-sidebarfade.png   (with props)
    incubator/roller/branches/roller_2.0/web/theme/sun/two-togglegrey.png   (with props)
Removed:
    incubator/roller/branches/roller_2.0/web/theme/header.jsp
    incubator/roller/branches/roller_2.0/web/theme/status.jsp
    incubator/roller/branches/roller_2.0/web/theme/tiles-adminsidebar.jsp
    incubator/roller/branches/roller_2.0/web/theme/tiles-editorsidebar.jsp
    incubator/roller/branches/roller_2.0/web/theme/tiles-footer.jsp
    incubator/roller/branches/roller_2.0/web/theme/tiles-head.jsp
    incubator/roller/branches/roller_2.0/web/theme/tiles-sidebar.jsp
Modified:
    incubator/roller/branches/roller_2.0/metadata/xdoclet/error-pages.xml
    incubator/roller/branches/roller_2.0/nbproject/project.xml
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/BasePageModel.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetConfigAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetGroupsAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/BasePingTargetsAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoriesAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CustomPingTargetsAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ExportEntriesAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/PingSetupAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ReferersAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryPageModel.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogQueryPageModel.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CommonPingTargetsAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MemberPermissionsAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/RollerPropertiesAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/ThemeEditorAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UploadFileFormAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserAdminAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourProfileAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourWebsitesAction.java
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
    incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml
    incubator/roller/branches/roller_2.0/web/bookmarks/BookmarkForm.jsp
    incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksForm.jsp
    incubator/roller/branches/roller_2.0/web/bookmarks/FolderForm.jsp
    incubator/roller/branches/roller_2.0/web/bookmarks/import.jsp
    incubator/roller/branches/roller_2.0/web/error.jsp
    incubator/roller/branches/roller_2.0/web/login.jsp
    incubator/roller/branches/roller_2.0/web/main.jsp
    incubator/roller/branches/roller_2.0/web/planet.jsp
    incubator/roller/branches/roller_2.0/web/planet/PlanetConfig.jsp
    incubator/roller/branches/roller_2.0/web/planet/PlanetGroups.jsp
    incubator/roller/branches/roller_2.0/web/planet/PlanetSubscriptions.jsp
    incubator/roller/branches/roller_2.0/web/theme/blue/colors.css
    incubator/roller/branches/roller_2.0/web/theme/footer.jsp
    incubator/roller/branches/roller_2.0/web/theme/layout.css
    incubator/roller/branches/roller_2.0/web/theme/roller.css
    incubator/roller/branches/roller_2.0/web/theme/tan/colors.css
    incubator/roller/branches/roller_2.0/web/theme/tiles-adminpage.jsp
    incubator/roller/branches/roller_2.0/web/theme/tiles-editorpage.jsp
    incubator/roller/branches/roller_2.0/web/theme/tiles-frontpage.jsp
    incubator/roller/branches/roller_2.0/web/theme/tiles-mainmenupage.jsp
    incubator/roller/branches/roller_2.0/web/theme/tiles-simplepage.jsp
    incubator/roller/branches/roller_2.0/web/weblog/CategoriesForm.jsp
    incubator/roller/branches/roller_2.0/web/weblog/CategoryDeleteOK.jsp
    incubator/roller/branches/roller_2.0/web/weblog/CategoryForm.jsp
    incubator/roller/branches/roller_2.0/web/weblog/CustomPingTargetDeleteOK.jsp
    incubator/roller/branches/roller_2.0/web/weblog/CustomPingTargetEdit.jsp
    incubator/roller/branches/roller_2.0/web/weblog/CustomPingTargets.jsp
    incubator/roller/branches/roller_2.0/web/weblog/PingResult.jsp
    incubator/roller/branches/roller_2.0/web/weblog/Pings.jsp
    incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp
    incubator/roller/branches/roller_2.0/web/weblog/WeblogEntryRemove.jsp
    incubator/roller/branches/roller_2.0/web/weblog/WeblogQuery.jsp
    incubator/roller/branches/roller_2.0/web/weblog/bake-weblog.jsp
    incubator/roller/branches/roller_2.0/web/weblog/export-entries.jsp
    incubator/roller/branches/roller_2.0/web/weblog/import-entries.jsp
    incubator/roller/branches/roller_2.0/web/weblog/referers.jsp
    incubator/roller/branches/roller_2.0/web/weblog/spellcheck-entry.jsp
    incubator/roller/branches/roller_2.0/web/website/CommonPingTargetDeleteOK.jsp
    incubator/roller/branches/roller_2.0/web/website/CommonPingTargetEdit.jsp
    incubator/roller/branches/roller_2.0/web/website/CommonPingTargets.jsp
    incubator/roller/branches/roller_2.0/web/website/CreateWebsite.jsp
    incubator/roller/branches/roller_2.0/web/website/InviteMember.jsp
    incubator/roller/branches/roller_2.0/web/website/InviteMemberDone.jsp
    incubator/roller/branches/roller_2.0/web/website/Maintenance.jsp
    incubator/roller/branches/roller_2.0/web/website/MemberPermissions.jsp
    incubator/roller/branches/roller_2.0/web/website/UserAdmin.jsp
    incubator/roller/branches/roller_2.0/web/website/UserNew.jsp
    incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp
    incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp
    incubator/roller/branches/roller_2.0/web/website/edit-page.jsp
    incubator/roller/branches/roller_2.0/web/website/edit-pages-sidebar.jsp
    incubator/roller/branches/roller_2.0/web/website/edit-pages.jsp
    incubator/roller/branches/roller_2.0/web/website/edit-website.jsp
    incubator/roller/branches/roller_2.0/web/website/remove-page.jsp
    incubator/roller/branches/roller_2.0/web/website/rollerProperties.jsp
    incubator/roller/branches/roller_2.0/web/website/theme-editor.jsp
    incubator/roller/branches/roller_2.0/web/website/upload-file.jsp
    incubator/roller/branches/roller_2.0/web/website/welcome.jsp

Modified: incubator/roller/branches/roller_2.0/metadata/xdoclet/error-pages.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/metadata/xdoclet/error-pages.xml?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/metadata/xdoclet/error-pages.xml (original)
+++ incubator/roller/branches/roller_2.0/metadata/xdoclet/error-pages.xml Wed Aug 24 12:16:58 2005
@@ -18,5 +18,3 @@
     <error-code>400</error-code>
     <location>/login-redirect.jsp</location>
 </error-page>
-
-

Modified: incubator/roller/branches/roller_2.0/nbproject/project.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/nbproject/project.xml?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/nbproject/project.xml (original)
+++ incubator/roller/branches/roller_2.0/nbproject/project.xml Wed Aug 24 12:16:58 2005
@@ -43,6 +43,11 @@
                     <type>java</type>
                     <location>build/generated/src.business</location>
                 </source-folder>
+                <source-folder>
+                    <label>contrib/plugins/src</label>
+                    <type>java</type>
+                    <location>contrib/plugins/src</location>
+                </source-folder>
             </folders>
             <ide-actions>
                 <action name="build">
@@ -114,6 +119,10 @@
                         <label>build/generated/src.business</label>
                         <location>build/generated/src.business</location>
                     </source-folder>
+                    <source-folder style="packages">
+                        <label>contrib/plugins/src</label>
+                        <location>contrib/plugins/src</location>
+                    </source-folder>
                     <source-file>
                         <location>build.xml</location>
                     </source-file>
@@ -135,6 +144,7 @@
                 <package-root>build/generated/src.presentation</package-root>
                 <package-root>sandbox/standalone/src</package-root>
                 <package-root>tests</package-root>
+                <package-root>contrib/plugins/src</package-root>
                 <classpath mode="compile">tools/hibernate-2.1/lib/jdom.jar:tools/buildtime/junit-3.8.1.jar:tools/lib/activation.jar:tools/lib/commons-betwixt-1.0-beta-1.jar:tools/lib/commons-codec-1.1.jar:tools/lib/commons-httpclient-2.0.2.jar:tools/lib/concurrent-1.3.2.jar:tools/lib/ekitapplet.jar:tools/lib/jazzy-core.jar:tools/lib/log4j-1.2.4.jar:tools/lib/lucene-1.4.3.jar:tools/lib/mail.jar:tools/lib/mm.mysql-2.0.14-bin.jar:tools/lib/rome-0.6.jar:tools/lib/rome-fetcher-0.6.jar:tools/lib/taglibs-string.jar:tools/lib/velocity-1.4.jar:tools/lib/velocity-dep-1.4.jar:tools/lib/velocity-tools-1.1.jar:tools/lib/xmlrpc-1.2-b1.jar:tools/struts-1.2.4/lib/antlr.jar:tools/struts-1.2.4/lib/commons-beanutils.jar:tools/struts-1.2.4/lib/commons-collections.jar:tools/struts-1.2.4/lib/commons-digester.jar:tools/struts-1.2.4/lib/commons-fileupload.jar:tools/struts-1.2.4/lib/commons-lang-2.0.jar:tools/struts-1.2.4/lib/commons-logging.jar:tools/struts-1.2.4/lib/commons-validator.jar:tools/struts-1.2.4/lib/jakarta-oro.jar:tools/struts-1.2.4/lib/struts-el.jar:tools/struts-1.2.4/lib/struts.jar:tools/hibernate-2.1/hibernate2.jar:tools/hibernate-2.1/lib/c3p0-0.8.4.5.jar:tools/hibernate-2.1/lib/cglib-full-2.0.1.jar:tools/hibernate-2.1/lib/dom4j-1.4.jar:tools/hibernate-2.1/lib/ehcache-0.7.jar:tools/hibernate-2.1/lib/jta.jar:tools/hibernate-2.1/lib/odmg-3.0.jar:tools/hibernate-2.1/lib/proxool-0.8.3.jar:tools/hibernate-2.1/lib/xalan-2.4.0.jar:tools/buildtime/tomcat-4.1.24/servlet-api.jar:tools/buildtime/tomcat-4.1.24/jasper-runtime.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:tools/buildtime/mockrunner-0.35/lib/nekohtml.jar:tools/standard-1.0.3/lib/jaxen-full.jar:tools/standard-1.0.3/lib/jstl.jar:tools/standard-1.0.3/lib/standard.jar</classpath>
                 <source-level>1.4</source-level>
             </compilation-unit>

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/BasePageModel.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/BasePageModel.java?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/BasePageModel.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/BasePageModel.java Wed Aug 24 12:16:58 2005
@@ -6,12 +6,12 @@
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.List;
+import java.util.ResourceBundle;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.struts.action.ActionMapping;
-import org.roller.RollerException;
 import org.roller.presentation.util.StrutsUtil;
 
 /**
@@ -20,11 +20,16 @@
  */
 public class BasePageModel
 {
+    protected static ResourceBundle bundle = 
+        ResourceBundle.getBundle("ApplicationResources");  
+    
+    private String titleKey = null;
     private HttpServletRequest request = null;
     private HttpServletResponse response = null;
     private ActionMapping mapping = null;
     
     public BasePageModel(
+            String titleKey,
             HttpServletRequest request,
             HttpServletResponse response,
             ActionMapping mapping)
@@ -32,10 +37,16 @@
         this.request = request;
         this.response = response;
         this.mapping = mapping;
+        this.titleKey = titleKey;
         request.setAttribute("locales", StrutsUtil.getLocaleBeans());        
         request.setAttribute("timeZones", StrutsUtil.getTimeZoneBeans());        
     }
 
+    public String getTitle() 
+    {
+        return bundle.getString(titleKey);
+    }
+    
     public String getBaseURL()
     {
         RollerContext rctx = RollerContext.getRollerContext(request);

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java Wed Aug 24 12:16:58 2005
@@ -3,13 +3,17 @@
  */
 package org.roller.presentation.bookmarks.actions;
 
+import java.text.MessageFormat;
 import java.util.Comparator;
 import java.util.Iterator;
+import java.util.List;
 import java.util.LinkedList;
+import java.util.Set;
 import java.util.TreeSet;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.lang.StringUtils;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -220,76 +224,10 @@
         ActionMapping mapping, BookmarksForm form)
         throws RollerException
     {
-        RollerRequest rreq = RollerRequest.getRollerRequest(request);
-        //WebsiteData wd = rreq.getWebsite();
-        RollerSession rollerSession = RollerSession.getRollerSession(request);
-        WebsiteData wd = rollerSession.getCurrentWebsite();
-        BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
-
-        TreeSet allFolders = new TreeSet(new FolderPathComparator());
-
-        BasePageModel pageModel = new BasePageModel(request, response, mapping);
-        request.setAttribute("model",pageModel);
-        
-        // Find folderid wherever it may be
-        String folderId = (String)request.getAttribute(RollerRequest.FOLDERID_KEY);
-        if (null == folderId)
-        {
-            folderId = request.getParameter(RollerRequest.FOLDERID_KEY);
-        }
-        if (null == folderId)
-        {
-            folderId = form.getFolderId();
-        }
-
-        FolderData folder = null;
-        if (null == folderId || folderId.equals("null"))
-        {
-            folder = bmgr.getRootFolder(wd);
-        }
-        else
-        {
-            folder = bmgr.retrieveFolder(folderId);
-        }
-        form.setFolderId(folder.getId());
-
-        request.setAttribute("folder", folder);
-        request.setAttribute("folders", folder.getFolders());
-        request.setAttribute("bookmarks", folder.getBookmarks());
-
-        if (null != folder.getParent())
-        {
-            LinkedList folderPath = new LinkedList();
-            folderPath.add(0, folder);
-            FolderData parent = folder.getParent();
-            while (parent != null)
-            {
-                folderPath.add(0, parent);
-                parent = parent.getParent();
-            }
-            request.setAttribute("folderPath", folderPath);
-
-            request.setAttribute(
-                RollerRequest.PARENTID_KEY, folder.getParent().getId());
-        }
-
-        // Build list of all folders, except for current one, sorted by path.
-        Iterator iter = bmgr.getAllFolders(wd).iterator();
 
-        // Build list of only children
-        //Iterator iter = folder.getFolders().iterator();
-
-        //int max = 20, count = 0;
-        while (iter.hasNext()) // && count < max)
-        {
-            //count++;
-            FolderData fd = (FolderData) iter.next();
-            if (!fd.getId().equals(folderId))
-            {
-                allFolders.add(fd);
-            }
-        }
-        request.setAttribute("allFolders", allFolders);
+        BookmarksPageModel pageModel = 
+                new BookmarksPageModel(request, response, mapping, form);
+        request.setAttribute("model", pageModel);
     }
 
     private static final class FolderPathComparator implements Comparator
@@ -308,5 +246,114 @@
             }
             return res;
         }
+    }
+    
+    public class BookmarksPageModel extends BasePageModel
+    {
+        private List folderPath = null;
+        private TreeSet allFolders = null;
+        private FolderData folder = null;   
+        
+        public BookmarksPageModel(
+                HttpServletRequest request,
+                HttpServletResponse response,
+                ActionMapping mapping,
+                BookmarksForm form) throws RollerException
+        {
+            super("",  request, response, mapping);
+            
+            RollerRequest rreq = RollerRequest.getRollerRequest(request);
+            //WebsiteData wd = rreq.getWebsite();
+            RollerSession rollerSession = RollerSession.getRollerSession(request);
+            WebsiteData wd = rollerSession.getCurrentWebsite();
+            BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
+
+            allFolders = new TreeSet(new FolderPathComparator());
+
+            // Find folderid wherever it may be
+            String folderId = (
+                    String)request.getAttribute(RollerRequest.FOLDERID_KEY);
+            if (null == folderId)
+            {
+                folderId = request.getParameter(RollerRequest.FOLDERID_KEY);
+            }
+            if (null == folderId)
+            {
+                folderId = form.getFolderId();
+            }
+
+            if (null == folderId || folderId.equals("null"))
+            {
+                folder = bmgr.getRootFolder(wd);
+            }
+            else
+            {
+                folder = bmgr.retrieveFolder(folderId);
+            }
+            form.setFolderId(folder.getId());
+
+            if (null != folder.getParent())
+            {
+                folderPath = new LinkedList();
+                folderPath.add(0, folder);
+                FolderData parent = folder.getParent();
+                while (parent != null)
+                {
+                    folderPath.add(0, parent);
+                    parent = parent.getParent();
+                }
+                request.setAttribute(
+                    RollerRequest.PARENTID_KEY, folder.getParent().getId());
+            }
+
+            // Build list of all folders, except for current one, sorted by path.
+            Iterator iter = bmgr.getAllFolders(wd).iterator();
+
+            // Build list of only children
+            //Iterator iter = folder.getFolders().iterator();
+
+            //int max = 20, count = 0;
+            while (iter.hasNext()) // && count < max)
+            {
+                //count++;
+                FolderData fd = (FolderData) iter.next();
+                if (!fd.getId().equals(folderId))
+                {
+                    allFolders.add(fd);
+                }
+            }
+            
+            // for Struts tags
+            request.setAttribute("allFolders", allFolders);            
+            request.setAttribute("folder", folder);
+        }
+        
+        public String getTitle()
+        {
+            if (folderPath == null || folderPath.isEmpty()) 
+            {
+                return bundle.getString("bookmarksForm.rootTitle");
+            }
+            else 
+            {
+                return MessageFormat.format(
+                    bundle.getString("bookmarksForm.folderTitle"),
+                    new String[] {folder.getName()});
+            }
+        }
+        public List getFolderPath() 
+        {
+            return folderPath;
+        }
+        public Set getAllFolders() 
+        {
+            return allFolders;
+        }
+        public FolderData getFolder()
+        {
+            return folder;
+        }
+                
+
     }
 }

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetConfigAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetConfigAction.java?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetConfigAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetConfigAction.java Wed Aug 24 12:16:58 2005
@@ -69,8 +69,8 @@
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
             if (RollerSession.getRollerSession(request).isAdminUser())
             {
-                BasePageModel pageModel = 
-                        new BasePageModel(request, response, mapping);
+                BasePageModel pageModel = new BasePageModel(
+                    "planetConfig.pageTitle", request, response, mapping);
                 request.setAttribute("model",pageModel);                
                 Roller roller = RollerFactory.getRoller();
                 PlanetManager planet = roller.getPlanetManager();
@@ -112,8 +112,8 @@
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
             if (RollerSession.getRollerSession(request).isAdminUser())
             {
-                BasePageModel pageModel = 
-                        new BasePageModel(request, response, mapping);
+                BasePageModel pageModel = new BasePageModel(
+                    "planetConfig.pageTitle", request, response, mapping);
                 request.setAttribute("model",pageModel);                
                 Roller roller = RollerFactory.getRoller();
                 PlanetManager planet = roller.getPlanetManager();
@@ -169,8 +169,8 @@
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
             if (RollerSession.getRollerSession(request).isAdminUser())
             {
-                BasePageModel pageModel = 
-                        new BasePageModel(request, response, mapping);
+                BasePageModel pageModel = new BasePageModel(
+                    "planetConfig.pageTitle", request, response, mapping);
                 request.setAttribute("model",pageModel);                
                 Roller roller = RollerFactory.getRoller();
                 RefreshEntriesTask task = new RefreshEntriesTask();
@@ -206,8 +206,8 @@
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
             if (RollerSession.getRollerSession(request).isAdminUser())
             {
-                BasePageModel pageModel = 
-                        new BasePageModel(request, response, mapping);
+                BasePageModel pageModel = new BasePageModel(
+                    "planetConfig.pageTitle", request, response, mapping);
                 request.setAttribute("model",pageModel);                
                 Roller roller = (Roller)RollerFactory.getRoller();
                 SyncWebsitesTask task = new SyncWebsitesTask();

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetGroupsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetGroupsAction.java?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetGroupsAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetGroupsAction.java Wed Aug 24 12:16:58 2005
@@ -266,7 +266,7 @@
             HttpServletResponse response,
             ActionMapping mapping) throws RollerException
         {
-            super(request, response, mapping);
+            super("planetGroups.pagetitle", request, response, mapping);
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
             Roller roller = RollerFactory.getRoller();
             PlanetManager planet = roller.getPlanetManager();            

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java Wed Aug 24 12:16:58 2005
@@ -16,6 +16,7 @@
 package org.roller.presentation.planet;
 
 import java.io.IOException;
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -95,7 +96,7 @@
                 form.setGroupHandle(groupHandle);
                 request.setAttribute("model", 
                     new SubscriptionsPageModel(
-                            targetGroup, request, response, mapping));
+                            targetGroup, request, response, mapping, form));
             }
             else
             {
@@ -134,7 +135,7 @@
                 form.setGroupHandle(groupHandle);
                 request.setAttribute("model", 
                     new SubscriptionsPageModel(
-                            targetGroup, request, response, mapping));
+                            targetGroup, request, response, mapping, form));
             }
             else
             {
@@ -185,7 +186,7 @@
                     form.setGroupHandle(groupHandle);
                     request.setAttribute("model", 
                         new SubscriptionsPageModel(
-                                targetGroup, request, response, mapping));
+                                targetGroup, request, response, mapping, form));
                     
                     ActionMessages messages = new ActionMessages();
                     messages.add(null, 
@@ -264,7 +265,7 @@
             }
             request.setAttribute("model", 
                 new SubscriptionsPageModel(
-                        targetGroup, request, response, mapping));
+                        targetGroup, request, response, mapping, form));
         }
         catch (RollerException e)
         {
@@ -350,13 +351,17 @@
     {
         private List subscriptions = null;
         private boolean unconfigured = false;
+        private PlanetSubscriptionFormEx form = null;
+        
         public SubscriptionsPageModel(
                 PlanetGroupData group,
                 HttpServletRequest request,
                 HttpServletResponse response,
-                ActionMapping mapping) throws RollerException
+                ActionMapping mapping, 
+                PlanetSubscriptionFormEx form) throws RollerException
         {
-            super(request, response, mapping);
+            super("dummy", request, response, mapping);
+            this.form = form;
             if (group != null) 
             {
                 Set subsSet = group.getSubscriptions();
@@ -367,10 +372,26 @@
                 unconfigured = true;
             }
         }
+       
+        public String getTitle()
+        {
+            if (!form.getGroupHandle().equals("external")) 
+            {
+                return MessageFormat.format(
+                    bundle.getString("planetSubscriptions.titleGroup"), 
+                    new String[] {form.getGroupHandle()});
+            }
+            else 
+            {
+                return bundle.getString("planetSubscriptions.title");
+            }
+        }
+        
         public List getSubscriptions()
         {
             return subscriptions;
         }
+        
         public boolean isUnconfigured()
         {
             return unconfigured;

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/BasePingTargetsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/BasePingTargetsAction.java?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/BasePingTargetsAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/BasePingTargetsAction.java Wed Aug 24 12:16:58 2005
@@ -31,9 +31,10 @@
 
 
 /**
- * Base class for both common and custom ping target operations.  The methods here apply to
- * creating, editing and removing ping targets.  Operations for maintaining automatic ping
- * configurations are handled by {@link PingSetupAction}.
+ * Base class for both common and custom ping target operations.  The methods 
+ * here apply to creating, editing and removing ping targets.  Operations for 
+ * maintaining automatic ping configurations are handled by 
+ * {@link PingSetupAction}.
  */
 public abstract class BasePingTargetsAction extends DispatchAction
 {
@@ -42,6 +43,10 @@
     protected static final String PING_TARGET_EDIT_PAGE = "pingTargetEdit.page";
     protected static final String PING_TARGET_DELETE_PAGE = "pingTargetDeleteOK.page";
     protected static final String ACCESS_DENIED_PAGE = "access-denied";
+    
+    public abstract String getPingTargetsTitle();
+    public abstract String getPingTargetEditTitle();
+    public abstract String getPingTargetDeleteOKTitle();    
 
     public BasePingTargetsAction() {
 
@@ -84,7 +89,8 @@
         RollerRequest rreq = RollerRequest.getRollerRequest(req);
         try
         {
-            BasePageModel pageModel = new BasePageModel(req, res, mapping);
+            BasePageModel pageModel = 
+                new BasePageModel(getPingTargetsTitle(), req, res, mapping);
             req.setAttribute("model",pageModel);            
             if (!hasRequiredRights(rreq))
             {
@@ -122,7 +128,8 @@
         PingTargetForm pingTargetForm = (PingTargetForm) form;
         try
         {
-            BasePageModel pageModel = new BasePageModel(req, res, mapping);
+            BasePageModel pageModel = 
+                new BasePageModel(getPingTargetEditTitle(), req, res, mapping);
             req.setAttribute("model",pageModel);            
             if (!hasRequiredRights(rreq))
             {
@@ -186,7 +193,8 @@
                                 HttpServletRequest req, HttpServletResponse res)
         throws Exception
     {
-        BasePageModel pageModel = new BasePageModel(req, res, mapping);
+        BasePageModel pageModel = 
+            new BasePageModel(getPingTargetEditTitle(), req, res, mapping);
         req.setAttribute("model",pageModel);            
         return mapping.findForward(PING_TARGET_EDIT_PAGE);
     }
@@ -209,7 +217,8 @@
         RollerRequest rreq = RollerRequest.getRollerRequest(req);
         try
         {
-            BasePageModel pageModel = new BasePageModel(req, res, mapping);
+            BasePageModel pageModel = 
+                new BasePageModel(getPingTargetEditTitle(), req, res, mapping);
             req.setAttribute("model",pageModel);            
             if (!hasRequiredRights(rreq))
             {
@@ -244,7 +253,8 @@
         RollerRequest rreq = RollerRequest.getRollerRequest(req);
         try
         {
-            BasePageModel pageModel = new BasePageModel(req, res, mapping);
+            BasePageModel pageModel = new BasePageModel(
+                    getPingTargetDeleteOKTitle(), req, res, mapping);
             req.setAttribute("model",pageModel);            
             if (!hasRequiredRights(rreq))
             {

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoriesAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoriesAction.java?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoriesAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoriesAction.java Wed Aug 24 12:16:58 2005
@@ -3,13 +3,17 @@
  */
 package org.roller.presentation.weblog.actions;
 
+import java.text.MessageFormat;
 import java.util.Comparator;
 import java.util.Iterator;
+import java.util.List;
 import java.util.LinkedList;
+import java.util.Set;
 import java.util.TreeSet;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.lang.StringUtils;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -160,76 +164,116 @@
         ActionMapping mapping, CategoriesForm form) 
         throws RollerException
     {
-        RollerRequest rreq = RollerRequest.getRollerRequest(request);
-        WebsiteData wd = RollerSession.getRollerSession(request).getCurrentWebsite();
-        WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
-        
-        TreeSet allCategories = new TreeSet(new CategoryPathComparator());
-        
-        BasePageModel pageModel = new BasePageModel(request, response, mapping);
+        CategoriesPageModel pageModel = 
+            new CategoriesPageModel(request, response, mapping, form);
         request.setAttribute("model",pageModel);
-        
-        // Find catid wherever it may be
-        String catId = (String)request.getAttribute(RollerRequest.WEBLOGCATEGORYID_KEY);
-        if (null == catId) 
-        {
-            catId = request.getParameter(RollerRequest.WEBLOGCATEGORYID_KEY);
-        }  
-        if (null == catId)
-        {
-            catId = form.getId();     
-        }
-       
-        WeblogCategoryData cat = null;
-        if (null == catId || catId.equals("null"))
-        {
-            cat = wmgr.getRootWeblogCategory(wd);
-        }
-        else 
-        {
-            cat = wmgr.retrieveWeblogCategory(catId);            
+    }
+
+    private static final class CategoryPathComparator implements Comparator
+    {
+        public int compare(Object o1, Object o2) {
+            WeblogCategoryData f1 = (WeblogCategoryData)o1; 
+            WeblogCategoryData f2 = (WeblogCategoryData)o2; 
+            return f1.getPath().compareTo(f2.getPath());
         }
-        form.setId(cat.getId());
+    }
+    
+    
+    public class CategoriesPageModel extends BasePageModel
+    {
+        private CategoriesForm form = null;
+        private WeblogCategoryData cat = null;
+        private TreeSet allCategories = null;
+        private List catPath = null;
         
-        request.setAttribute("category", cat);
-        request.setAttribute("categories", cat.getWeblogCategories());
+        public WeblogCategoryData getCategory() { return cat; }
+        public Set getAllCategories() { return allCategories; }
+        public List getCategoryPath() { return catPath; }
         
-        if (null != cat.getParent())
+        public CategoriesPageModel(
+                HttpServletRequest request,
+                HttpServletResponse response,
+                ActionMapping mapping,
+                CategoriesForm form) throws RollerException
         {
-            LinkedList catPath = new LinkedList();
-            catPath.add(0, cat);
-            WeblogCategoryData parent = cat.getParent();
-            while (parent != null) 
+            super("dummy",  request, response, mapping);
+            this.form = form;
+            
+            RollerRequest rreq = RollerRequest.getRollerRequest(request);
+            WebsiteData wd = 
+                RollerSession.getRollerSession(request).getCurrentWebsite();
+            WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+
+            allCategories = new TreeSet(new CategoryPathComparator());
+
+            // Find catid wherever it may be
+            String catId = (String)
+                request.getAttribute(RollerRequest.WEBLOGCATEGORYID_KEY);
+            if (null == catId) 
+            {
+                catId = request.getParameter(RollerRequest.WEBLOGCATEGORYID_KEY);
+            }  
+            if (null == catId)
             {
-                catPath.add(0, parent);
-                parent = parent.getParent();   
+                catId = form.getId();     
             }
-            request.setAttribute("categoryPath", catPath);
-            
-            request.setAttribute(
-                RollerRequest.PARENTID_KEY, cat.getParent().getId());
-        }
-    
-        // Build collection of all Categories, except for current one, 
-        // sorted by path.
-        Iterator iter = wmgr.getWeblogCategories(wd).iterator();
-        while (iter.hasNext())
-        {
-            WeblogCategoryData cd = (WeblogCategoryData) iter.next();
-            if (!cd.getId().equals(catId))
+
+            cat = null;
+            if (null == catId || catId.equals("null"))
             {
-                allCategories.add(cd);
+                cat = wmgr.getRootWeblogCategory(wd);
             }
-        }
-        request.setAttribute("allCategories", allCategories);
-    }
+            else 
+            {
+                cat = wmgr.retrieveWeblogCategory(catId);            
+            }
+            form.setId(cat.getId());
 
-    private static final class CategoryPathComparator implements Comparator
-    {
-        public int compare(Object o1, Object o2) {
-            WeblogCategoryData f1 = (WeblogCategoryData)o1; 
-            WeblogCategoryData f2 = (WeblogCategoryData)o2; 
-            return f1.getPath().compareTo(f2.getPath());
+            //request.setAttribute("categories", cat.getWeblogCategories());
+
+            if (null != cat.getParent())
+            {
+                catPath = new LinkedList();
+                catPath.add(0, cat);
+                WeblogCategoryData parent = cat.getParent();
+                while (parent != null) 
+                {
+                    catPath.add(0, parent);
+                    parent = parent.getParent();   
+                }
+                //request.setAttribute("categoryPath", catPath);
+
+                request.setAttribute(
+                    RollerRequest.PARENTID_KEY, cat.getParent().getId());
+            }
+
+            // Build collection of all Categories, except for current one, 
+            // sorted by path.
+            Iterator iter = wmgr.getWeblogCategories(wd).iterator();
+            while (iter.hasNext())
+            {
+                WeblogCategoryData cd = (WeblogCategoryData) iter.next();
+                if (!cd.getId().equals(catId))
+                {
+                    allCategories.add(cd);
+                }
+            }
+            // For Struts tags
+            request.setAttribute("allCategories", allCategories);
+            request.setAttribute("category", cat);
+        }        
+        public String getTitle()
+        {
+            if (catPath == null || catPath.isEmpty()) 
+            {
+                return bundle.getString("categoriesForm.rootTitle");
+            }
+            else 
+            {
+                return MessageFormat.format(
+                        bundle.getString("categoriesForm.parent"),
+                        new String[] {cat.getName()});
+            }
         }
     }
 }

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CustomPingTargetsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CustomPingTargetsAction.java?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CustomPingTargetsAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CustomPingTargetsAction.java Wed Aug 24 12:16:58 2005
@@ -43,7 +43,19 @@
     private static Log mLogger =
         LogFactory.getFactory().getInstance(CustomPingTargetsAction.class);
 
-
+    public String getPingTargetsTitle() 
+    {
+        return "customPingTargets.customPingTargets";    
+    }
+    public String getPingTargetEditTitle()
+    {
+        return "pingTarget.pingTarget";    
+    }
+    public String getPingTargetDeleteOKTitle() 
+    {
+        return "pingTarget.confirmRemoveTitle";    
+    }
+    
     public CustomPingTargetsAction() {
         super();
     }

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ExportEntriesAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ExportEntriesAction.java?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ExportEntriesAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ExportEntriesAction.java Wed Aug 24 12:16:58 2005
@@ -95,7 +95,7 @@
             else
             {
                 request.setAttribute("model",
-                    new BasePageModel(request, response, mapping));
+                    new BasePageModel("", request, response, mapping));
             }
         }
         catch (Exception e)
@@ -133,7 +133,7 @@
             if ( rollerSession.isUserAuthorizedToAdmin() )
             {               
                 request.setAttribute("model",
-                                     new BasePageModel(request, response, mapping));
+                        new BasePageModel("", request, response, mapping));
                 
                 Locale locale = Locale.getDefault();//rreq.getWebsite().getLocaleInstance();
                 final DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, locale);

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/PingSetupAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/PingSetupAction.java?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/PingSetupAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/PingSetupAction.java Wed Aug 24 12:16:58 2005
@@ -97,7 +97,8 @@
                 return mapping.findForward("access-denied");
             }
 
-            BasePageModel pageModel = new BasePageModel(req, res, mapping);
+            BasePageModel pageModel = 
+                    new BasePageModel("pings.title", req, res, mapping);
             req.setAttribute("model",pageModel);
         
             List commonPingTargets = pingTargetMgr.getCommonPingTargets();

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ReferersAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ReferersAction.java?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ReferersAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ReferersAction.java Wed Aug 24 12:16:58 2005
@@ -62,7 +62,8 @@
         {
             if ( rollerSession.isUserAuthorizedToAuthor() )
             {   
-                BasePageModel pageModel = new BasePageModel(req, res, mapping);
+                BasePageModel pageModel = new BasePageModel(
+                        "referers.todaysReferers", req, res, mapping);
                 req.setAttribute("model", pageModel);
                 req.setAttribute("pageHits",
                     new Integer(refmgr.getDayHits(RollerSession.getRollerSession(req).getCurrentWebsite())));

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryPageModel.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryPageModel.java?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryPageModel.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryPageModel.java Wed Aug 24 12:16:58 2005
@@ -82,7 +82,7 @@
             WeblogEntryFormEx form,
             PageMode mode) throws RollerException
     {
-        super(request, response, mapping);
+        super("dummy", request, response, mapping);
         this.rollerRequest = RollerRequest.getRollerRequest(request);  
         this.form = form;
         this.mode = mode;
@@ -94,6 +94,15 @@
             WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
             comments = wmgr.getComments(form.getId(), false);
         }
+    }
+    
+    public String getTitle() 
+    {
+        if (StringUtils.isEmpty(form.getId()))
+        {
+            return bundle.getString("weblogEdit.title.newEntry");
+        }
+        return bundle.getString("weblogEdit.title.editEntry");
     }
 
     public String getBaseURL()

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogQueryPageModel.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogQueryPageModel.java?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogQueryPageModel.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogQueryPageModel.java Wed Aug 24 12:16:58 2005
@@ -49,7 +49,7 @@
             String status,
             Integer maxEntries) throws RollerException
     {
-        super(request, response, mapping);
+        super("weblogEntryQuery.title", request, response, mapping);
         rollerRequest = RollerRequest.getRollerRequest(request);
         this.request = request;
         

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CommonPingTargetsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CommonPingTargetsAction.java?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CommonPingTargetsAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CommonPingTargetsAction.java Wed Aug 24 12:16:58 2005
@@ -38,6 +38,19 @@
         return mLogger;
     }
 
+    public String getPingTargetsTitle() 
+    {
+        return "commonPingTargets.commonPingTargets";    
+    }
+    public String getPingTargetEditTitle()
+    {
+        return "pingTarget.pingTarget";    
+    }
+    public String getPingTargetDeleteOKTitle() 
+    {
+        return "pingTarget.confirmRemoveTitle";    
+    }
+    
     /*
      * Get the ping targets for the view.  Here we return the common ping targets for the
      * entire site.

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java Wed Aug 24 12:16:58 2005
@@ -180,7 +180,7 @@
             HttpServletResponse response, ActionMapping mapping, WebsiteData wd)
             throws RollerException
         {
-            super(request, response, mapping);
+            super("createWebsite.title", request, response, mapping);
             RollerContext rollerContext = RollerContext.getRollerContext(request);
             Roller roller = RollerFactory.getRoller();
             ThemeManager themeMgr = roller.getThemeManager();

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MemberPermissionsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MemberPermissionsAction.java?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MemberPermissionsAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MemberPermissionsAction.java Wed Aug 24 12:16:58 2005
@@ -148,7 +148,7 @@
         public MemberPermissionsPageModel(HttpServletRequest request,
           HttpServletResponse response, ActionMapping mapping) throws RollerException
         {
-            super(request, response, mapping);
+            super("memberPermissions.title", request, response, mapping);
             Roller roller = RollerFactory.getRoller();
             RollerSession rollerSession = RollerSession.getRollerSession(request);
             WebsiteData website = rollerSession.getCurrentWebsite();

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/RollerPropertiesAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/RollerPropertiesAction.java?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/RollerPropertiesAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/RollerPropertiesAction.java Wed Aug 24 12:16:58 2005
@@ -76,8 +76,8 @@
         
         ActionForward forward = mapping.findForward("rollerProperties.page");
         try {
-            BasePageModel pageModel = 
-                    new BasePageModel(request, response, mapping);
+            BasePageModel pageModel = new BasePageModel(
+                    "configForm.title", request, response, mapping);
             request.setAttribute("model",pageModel);                
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
             RollerSession rollerSession = RollerSession.getRollerSession(request);
@@ -114,8 +114,8 @@
         try {
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
             RollerSession rollerSession = RollerSession.getRollerSession(request);
-            BasePageModel pageModel = 
-                    new BasePageModel(request, response, mapping);
+            BasePageModel pageModel = new BasePageModel(
+                    "configForm.title", request, response, mapping);
             request.setAttribute("model",pageModel);                
             if (rollerSession.isAdminUser()) {
             

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/ThemeEditorAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/ThemeEditorAction.java?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/ThemeEditorAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/ThemeEditorAction.java Wed Aug 24 12:16:58 2005
@@ -83,8 +83,8 @@
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
             if ( rses.isUserAuthorizedToAdmin() ) {
                 
-                BasePageModel pageModel = 
-                        new BasePageModel(request, response, mapping);
+                BasePageModel pageModel = new BasePageModel(
+                        "themeEditor.title", request, response, mapping);
                 request.setAttribute("model",pageModel);          
                     
                 // get users current theme and our themes list
@@ -145,8 +145,8 @@
                 ThemeManager themeMgr = roller.getThemeManager();
                 
                     
-                BasePageModel pageModel = 
-                        new BasePageModel(request, response, mapping);
+                BasePageModel pageModel = new BasePageModel(
+                        "themeEditor.title", request, response, mapping);
                 request.setAttribute("model",pageModel);          
                     
                 String username = rses.getAuthenticatedUser().getUserName();
@@ -224,8 +224,8 @@
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
             if ( rses.isUserAuthorizedToAdmin() ) {
                 
-                BasePageModel pageModel = 
-                        new BasePageModel(request, response, mapping);
+                BasePageModel pageModel = new BasePageModel(
+                        "themeEditor.title", request, response, mapping);
                 request.setAttribute("model",pageModel);          
                     
                 String newTheme = null;
@@ -318,8 +318,8 @@
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
             if ( rses.isUserAuthorizedToAdmin() ) {
                 
-                BasePageModel pageModel = 
-                        new BasePageModel(request, response, mapping);
+                BasePageModel pageModel = new BasePageModel(
+                        "themeEditor.title", request, response, mapping);
                 request.setAttribute("model",pageModel);          
                     
                 // copy down current theme to weblog templates

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UploadFileFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UploadFileFormAction.java?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UploadFileFormAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UploadFileFormAction.java Wed Aug 24 12:16:58 2005
@@ -56,7 +56,8 @@
         RollerRequest rreq = null;
         ActionForward fwd = mapping.findForward("uploadFiles.page");
         WebsiteData website = null;
-        BasePageModel pageModel = new BasePageModel(request, response, mapping);
+        BasePageModel pageModel = 
+            new BasePageModel("uploadFiles.title", request, response, mapping);
         request.setAttribute("model", pageModel);
         RollerMessages msgs = new RollerMessages();
         try
@@ -165,7 +166,8 @@
         UploadFileForm theForm = (UploadFileForm)actionForm;
         ActionForward fwd = mapping.findForward("uploadFiles.page");
         RollerRequest rreq = RollerRequest.getRollerRequest(request);
-        BasePageModel pageModel = new BasePageModel(request, response, mapping);
+        BasePageModel pageModel = 
+            new BasePageModel("uploadFiles.title", request, response, mapping);
         request.setAttribute("model", pageModel);
         try
         {
@@ -210,7 +212,8 @@
         {
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
             RollerSession rollerSession = RollerSession.getRollerSession(request);
-            BasePageModel pageModel = new BasePageModel(request, response, mapping);
+            BasePageModel pageModel = 
+             new BasePageModel("uploadFiles.title", request, response, mapping);
             request.setAttribute("model", pageModel);
             if ( !rollerSession.isUserAuthorizedToAuthor() )
             {

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserAdminAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserAdminAction.java?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserAdminAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserAdminAction.java Wed Aug 24 12:16:58 2005
@@ -2,6 +2,7 @@
 package org.roller.presentation.website.actions;
 
 import java.io.IOException;
+import java.text.MessageFormat;
 import java.util.List;
 
 import javax.servlet.ServletException;
@@ -62,9 +63,9 @@
             RollerSession rollerSession = RollerSession.getRollerSession(request);
             if (rollerSession.isAdminUser() )
             {
-                 request.setAttribute(
-                    "model", new BasePageModel(request, response, mapping));
                 UserAdminForm userForm = (UserAdminForm)actionForm;
+                request.setAttribute("model", 
+                  new UserAdminPageModel(request, response, mapping, userForm));
                 UserManager mgr = RollerFactory.getRoller().getUserManager();                
                 if (userForm != null && userForm.getUserName() != null)
                 {
@@ -287,5 +288,28 @@
 		return edit(mapping, actionForm, request, response);
 	}
 
+    public class UserAdminPageModel extends BasePageModel 
+    {
+        private UserAdminForm userAdminForm = null;
+        public UserAdminPageModel(
+            HttpServletRequest request,
+            HttpServletResponse response,
+            ActionMapping mapping,
+            UserAdminForm form)
+        {
+            super("dummy", request, response, mapping);
+            userAdminForm = form;
+        }
+        public String getTitle() 
+        {
+            if (StringUtils.isEmpty(userAdminForm.getUserName())) 
+            {
+                return bundle.getString("userAdmin.title.searchUser");
+            }
+            return MessageFormat.format(
+                    bundle.getString("userAdmin.title.editUser"), 
+                    new String[] { userAdminForm.getUserName() } );
+        }
+    }
 }
 

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java Wed Aug 24 12:16:58 2005
@@ -89,8 +89,8 @@
             userForm.setTimeZone( TimeZone.getDefault().getID() );
             userForm.setPasswordText(null);
             userForm.setPasswordConfirm(null);            
-            request.setAttribute(
-                "model", new BasePageModel(request, response, mapping));
+            request.setAttribute("model", new BasePageModel(
+                    "newUser.addNewUser", request, response, mapping));
         }
         catch (Exception e)
         {

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java Wed Aug 24 12:16:58 2005
@@ -59,6 +59,8 @@
         ActionForward forward = mapping.findForward("editPages.page");
         try
         {
+            request.setAttribute("model", new BasePageModel(
+                "pagesForm.title", request, response, mapping));   
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
             RollerSession rses = RollerSession.getRollerSession(request);
             if ( rses.isUserAuthorizedToAdmin() )
@@ -115,6 +117,8 @@
         ActionForward forward = mapping.findForward("editPage.page");
         try
         {
+            request.setAttribute("model", new BasePageModel(
+                "pageForm.title", request, response, mapping));   
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
             RollerSession rses = RollerSession.getRollerSession(request);
             if ( rses.isUserAuthorizedToAdmin() )
@@ -154,6 +158,8 @@
         {
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
             RollerSession rses = RollerSession.getRollerSession(request);
+            request.setAttribute("model", new BasePageModel(
+                "pagesForm.title", request, response, mapping));            
             if ( rses.isUserAuthorizedToAdmin() )
             {
                 addModelObjects(request, response, mapping);
@@ -180,6 +186,8 @@
         throws IOException, ServletException
     {
         ActionForward forward = mapping.findForward("editPages");
+        request.setAttribute("model", new BasePageModel(
+            "pagesForm.title", request, response, mapping));
         try
         {
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
@@ -230,6 +238,8 @@
         throws IOException, ServletException
     {
         ActionForward forward = mapping.findForward("removePage.page");
+        request.setAttribute("model", new BasePageModel(
+            "editPages.title.removeOK", request, response, mapping));
         try
         {
             RollerSession rses = RollerSession.getRollerSession(request);
@@ -269,6 +279,8 @@
         {
             RollerSession rses = RollerSession.getRollerSession(request);
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
+            request.setAttribute("model", new BasePageModel(
+                "pageForm.title", request, response, mapping));
             if ( rses.isUserAuthorizedToAdmin() )
             {
                 WeblogTemplateForm form = (WeblogTemplateForm)actionForm;
@@ -357,6 +369,8 @@
         HttpServletResponse response)
         throws IOException, ServletException
     {
+        request.setAttribute("model", new BasePageModel(
+                "pagesForm.title", request, response, mapping));
         return (mapping.findForward("editPages"));
     }
     
@@ -369,10 +383,6 @@
     {             
         UserManager mgr = RollerFactory.getRoller().getUserManager();        
         RollerSession rses = RollerSession.getRollerSession(request);
-
-        BasePageModel pageModel = 
-            new BasePageModel(request, response, mapping);
-        request.setAttribute("model",pageModel); 
                 
         UserData user = rses.getAuthenticatedUser();
         request.setAttribute("user",user);

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java Wed Aug 24 12:16:58 2005
@@ -105,7 +105,8 @@
                 request.setAttribute("editorPagesList", epages);
                 
                     
-                BasePageModel pageModel = new BasePageModel(request, response, mapping);
+                BasePageModel pageModel = new BasePageModel(
+                    "websiteSettings.title", request, response, mapping);
                 request.setAttribute("model",pageModel);   
                     
                 rses.setCurrentWebsite(website);
@@ -177,7 +178,8 @@
                         org.apache.commons.lang.StringUtils.deleteWhitespace(editorPages), ","));
                     request.setAttribute("editorPagesList", epages);   
                     
-                    BasePageModel pageModel = new BasePageModel(request, response, mapping);
+                    BasePageModel pageModel = new BasePageModel(
+                        "websiteSettings.title", request, response, mapping);
                     request.setAttribute("model",pageModel);                
                 /*
                 }

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourProfileAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourProfileAction.java?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourProfileAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourProfileAction.java Wed Aug 24 12:16:58 2005
@@ -1,8 +1,6 @@
 package org.roller.presentation.website.actions;
 
 import java.io.IOException;
-import java.util.Locale;
-import java.util.TimeZone;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -21,7 +19,6 @@
 import org.roller.model.UserManager;
 import org.roller.pojos.UserData;
 import org.roller.presentation.BasePageModel;
-import org.roller.presentation.RollerRequest;
 import org.roller.presentation.RollerSession;
 import org.roller.presentation.website.formbeans.UserFormEx;
 import org.roller.util.StringUtils;
@@ -81,8 +78,8 @@
             form.setPasswordConfirm(null);
             form.setLocale(ud.getLocale());
             form.setTimeZone(ud.getTimeZone());
-            request.setAttribute(
-                    "model", new BasePageModel(request, response, mapping));
+            request.setAttribute("model", new BasePageModel(
+                "yourProfile.title", request, response, mapping));
         }
         catch (Exception e)
         {
@@ -153,8 +150,8 @@
                 
                 RollerFactory.getRoller().commit();
 
-                request.setAttribute(
-                        "model", new BasePageModel(request, response, mapping));
+                request.setAttribute("model", new BasePageModel(
+                        "yourProfile.title", request, response, mapping));
                 
                 //msgs.add(null, new ActionMessage("yourProfile.saved"));
                 saveMessages(request, msgs);

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourWebsitesAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourWebsitesAction.java?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourWebsitesAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourWebsitesAction.java Wed Aug 24 12:16:58 2005
@@ -214,10 +214,11 @@
         private boolean groupBloggingEnabled = false;
         private List permissions = new ArrayList();
         private List pendings = new ArrayList();
+        
         public YourWebsitesPageModel(HttpServletRequest request,
           HttpServletResponse response, ActionMapping mapping) throws RollerException
         {
-            super(request, response, mapping);
+            super("yourWebsites.title", request, response, mapping);
             Roller roller = RollerFactory.getRoller();
             RollerSession rollerSession = RollerSession.getRollerSession(request);
             UserData user = rollerSession.getAuthenticatedUser();
@@ -259,5 +260,6 @@
         public void setPlanetAggregatorEnabled(boolean planetAggregatorEnabled) {
             this.planetAggregatorEnabled = planetAggregatorEnabled;
         }
+    
     }
 }

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=239735&r1=239734&r2=239735&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 Wed Aug 24 12:16:58 2005
@@ -23,6 +23,8 @@
 
 bookmarksForm.root=root
 bookmarksForm.rootTitle=Bookmarks
+bookmarksForm.folderTitle=Bookmark Folder [{0}]
+
 bookmarksForm.rootPrompt=\
 This is your top-level bookmarks folder. \
 The bookmarks you keep here will appear in the blogroll section of your blog \
@@ -42,9 +44,9 @@
 bookmarksForm.checkNone=Select None
 bookmarksForm.delete=Delete selected
 bookmarksForm.description=Description
+bookmarksForm.folder=Bookmark Folder
 bookmarksForm.edit=Edit
 bookmarksForm.edit.tip=Click to edit this folder or bookmark
-bookmarksForm.folder=Bookmark Folder
 bookmarksForm.move=Move selected
 bookmarksForm.name=Name
 bookmarksForm.path=Path
@@ -629,25 +631,27 @@
 pagesForm.edit=Edit
 pagesForm.remove=Remove
 pagesForm.required=(required)
-pagesForm.hiddenNote=NOTE: Pages with names that start with '_' are hidden. \
+pagesForm.hiddenNote=NOTE: Template with names that start with '_' are hidden. \
 They will not be shown in the navigation bar.
-pagesForm.addNewPage=Add a new page
-pagesForm.addNewPage.success=New page <strong>{0}</strong> added successfully.
+pagesForm.addNewPage=Add a new template
+pagesForm.addNewPage.success=New template <strong>{0}</strong> added successfully.
 pagesForm.add=Add
-pagesForm.emptyPage=Empty page...
-pagesForm.themesReminder=<b>Reminder:</b> You are currently using the {0} shared theme, so some page edits may not effect how your blog looks.
+pagesForm.emptyPage=Empty template...
+pagesForm.themesReminder=<b>Reminder:</b> You are currently using the {0} shared theme, so some template edits may not effect how your blog looks.
+editPages.title.removeOK=Confirm remove of template
 
 pageCache.flushed=Page cache has been successfully flushed.
 
 # -------------------------------------------------------------------- Page edit
 
-pageForm.editPage=Edit Page
+pageForm.title=Edit Template
+pageForm.editPage=Edit Template
 pageForm.name=Name
 pageForm.link=Link
 pageForm.description=Description
 pageForm.template=Template
 pageForm.save=Save
-pageForm.save.success=Page updated successfully.
+pageForm.save.success=Template updated successfully.
 
 # ---------------------------------------------------- Ping Target Admin/Editing
 
@@ -776,6 +780,7 @@
 # ----------------------------------------------------- PlanetSubscriptions.jsp
 
 planetSubscriptions.title=Subscriptions
+planetSubscriptions.titleGroup=Subscriptions [{0}]
 
 planetSubscriptions.subtitle.add=\
 Managing newsfeed subscriptions in group [<b>{0}</b>].
@@ -1313,7 +1318,11 @@
 
 # ---------------------------------------------------------------- Your Weblogs
 
-yourWebsites.title=Manage Weblogs
+yourWebsites.title=Main Menu
+yourWebsites.subtitle=Welcome to Roller. Use this main menu page to\
+manage your weblogs, your user profile and (if you have admin permissions) \
+administer the blog server.
+
 yourWebsites.actions=Actions
 
 yourWebsites.title.welcomeNoBlog=Welcome to Roller
@@ -1321,7 +1330,8 @@
 yourWebsites.prompt.welcomeNoBlog=Would you like to
 yourWebsites.createOne=create a weblog
 
-yourWebsites.prompt=Your existing weblogs. You may \
+yourWebsites.weblogs.title=Manage Weblogs
+yourWebsites.weblogs.prompt=Your existing weblogs. You may \
 add entries, manage templates, set configurations, etc.
 
 yourWebsites.existingWebsites=Your Existing Weblogs

Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml Wed Aug 24 12:16:58 2005
@@ -6,46 +6,46 @@
 
 <definition name=".tiles-frontpage" path="/theme/tiles-frontpage.jsp">
    <put name="content" value="${content}" />
-   <put name="sidebar" value="/theme/status.jsp" />
-   <put name="footer"  value="/theme/tiles-footer.jsp" />
-   <put name="head"    value="/theme/tiles-head.jsp" />
-   <put name="status"    value="/theme/status.jsp" />
+   <put name="banner"  value="/theme/banner.jsp" />
+   <put name="footer"  value="/theme/footer.jsp" />
+   <put name="head"    value="/theme/head.jsp" />
+   <put name="banner"  value="/theme/banner.jsp" />
 </definition>
 
 <definition name=".tiles-mainmenupage" path="/theme/tiles-mainmenupage.jsp">
-   <put name="content" value="${content}" />
-   <put name="status"  value="/theme/status.jsp" />
-   <put name="sidebar" value="/theme/tiles-sidebar.jsp" />
-   <put name="footer"  value="/theme/tiles-footer.jsp" />
-   <put name="head"    value="/theme/tiles-head.jsp" />
-   <put name="messages"        value="/theme/messages.jsp" />
+   <put name="content"  value="${content}" />
+   <put name="banner"   value="/theme/banner.jsp" />
+   <put name="sidebar"  value="/theme/sidebar.jsp" />
+   <put name="footer"   value="/theme/footer.jsp" />
+   <put name="head"     value="/theme/head.jsp" />
+   <put name="messages" value="/theme/messages.jsp" />
 </definition>
 
 <definition name=".tiles-editorpage" path="/theme/tiles-editorpage.jsp">
-   <put name="content"         value="${content}" />
-   <put name="status"          value="/theme/status.jsp" />
-   <put name="sidebar"         value="/theme/tiles-sidebar.jsp" />
-   <put name="default-sidebar" value="/theme/tiles-editorsidebar.jsp" />
-   <put name="footer"          value="/theme/tiles-footer.jsp" />
-   <put name="head"            value="/theme/tiles-head.jsp" />
-   <put name="messages"        value="/theme/messages.jsp" />
+   <put name="content"  value="${content}" />
+   <put name="banner"   value="/theme/banner.jsp" />
+   <put name="sidebar"  value="/theme/sidebar.jsp" />
+   <put name="footer"   value="/theme/footer.jsp" />
+   <put name="head"     value="/theme/head.jsp" />
+   <put name="messages" value="/theme/messages.jsp" />
+   <put name="styles"   value="/theme/styles.jsp" />
 </definition>
 
 <definition name=".tiles-adminpage" path="/theme/tiles-adminpage.jsp">
-   <put name="content"         value="${content}" />
-   <put name="status"          value="/theme/status.jsp" />
-   <put name="sidebar"         value="/theme/tiles-sidebar.jsp" />
-   <put name="default-sidebar" value="/theme/tiles-adminsidebar.jsp" />
-   <put name="footer"          value="/theme/tiles-footer.jsp" />
-   <put name="head"            value="/theme/tiles-head.jsp" />
-   <put name="messages"        value="/theme/messages.jsp" />
+   <put name="content"  value="${content}" />
+   <put name="banner"   value="/theme/banner.jsp" />
+   <put name="sidebar"  value="/theme/sidebar.jsp" />
+   <put name="footer"   value="/theme/footer.jsp" />
+   <put name="head"     value="/theme/head.jsp" />
+   <put name="messages" value="/theme/messages.jsp" />
+   <put name="styles"   value="/theme/styles.jsp" />
 </definition>
 
 <definition name=".tiles-simplepage" path="/theme/tiles-simplepage.jsp">
    <put name="content"  value="${content}" />
-   <put name="status"   value="/theme/status.jsp" />
-   <put name="footer"   value="/theme/tiles-footer.jsp" />
-   <put name="head"     value="/theme/tiles-head.jsp" />
+   <put name="banner"   value="/theme/banner.jsp" />
+   <put name="footer"   value="/theme/footer.jsp" />
+   <put name="head"     value="/theme/head.jsp" />
    <put name="messages" value="/theme/messages.jsp" />
 </definition>
 
@@ -105,22 +105,22 @@
     <put name="content" value="/website/upload-file.jsp" />
 </definition>
 
-<definition name=".WeblogEntryRemove" extends=".tiles-simplepage" >
+<definition name=".WeblogEntryRemove" extends=".tiles-adminpage" >
     <put name="content" value="/weblog/WeblogEntryRemove.jsp" />
 </definition>
-<definition name=".CategoryForm" extends=".tiles-simplepage" >
+<definition name=".CategoryForm" extends=".tiles-adminpage" >
     <put name="content" value="/weblog/CategoryForm.jsp" />
 </definition>
-<definition name=".CategoryDeleteOK" extends=".tiles-simplepage" >
+<definition name=".CategoryDeleteOK" extends=".tiles-adminpage" >
     <put name="content" value="/weblog/CategoryDeleteOK.jsp" />
 </definition>
-<definition name=".BookmarkForm" extends=".tiles-simplepage" >
+<definition name=".BookmarkForm" extends=".tiles-adminpage" >
     <put name="content" value="/bookmarks/BookmarkForm.jsp" />
 </definition>
-<definition name=".FolderForm" extends=".tiles-simplepage" >
+<definition name=".FolderForm" extends=".tiles-adminpage" >
     <put name="content" value="/bookmarks/FolderForm.jsp" />
 </definition>
-<definition name=".import" extends=".tiles-simplepage" >
+<definition name=".import" extends=".tiles-adminpage" >
     <put name="content" value="/bookmarks/import.jsp" />
 </definition>
 
@@ -150,22 +150,22 @@
     <put name="content" value="/weblog/Pings.jsp" />
 </definition>
 
-<definition name=".CustomPingTargetDeleteOK" extends=".tiles-simplepage" >
+<definition name=".CustomPingTargetDeleteOK" extends=".tiles-adminpage" >
     <put name="content" value="/weblog/CustomPingTargetDeleteOK.jsp" />
 </definition>
-<definition name=".CustomPingTargetEdit" extends=".tiles-simplepage" >
+<definition name=".CustomPingTargetEdit" extends=".tiles-adminpage" >
     <put name="content" value="/weblog/CustomPingTargetEdit.jsp" />
 </definition>
-<definition name=".InviteMember" extends=".tiles-simplepage" >
+<definition name=".InviteMember" extends=".tiles-adminpage" >
     <put name="content" value="/website/InviteMember.jsp" />
 </definition>
-<definition name=".InviteMemberDone" extends=".tiles-simplepage" >
+<definition name=".InviteMemberDone" extends=".tiles-adminpage" >
     <put name="content" value="/website/InviteMemberDone.jsp" />
 </definition>
-<definition name=".edit-page" extends=".tiles-simplepage"  >
+<definition name=".edit-page" extends=".tiles-adminpage"  >
     <put name="content" value="/website/edit-page.jsp" />
 </definition>
-<definition name=".remove-page" extends=".tiles-simplepage"  >
+<definition name=".remove-page" extends=".tiles-adminpage"  >
     <put name="content" value="/website/remove-page.jsp" />
 </definition>
 
@@ -182,14 +182,14 @@
     <put name="content" value="/website/CommonPingTargets.jsp" />
 </definition>
 
-<definition name=".CommonPingTargetDeleteOK" extends=".tiles-simplepage" >
+<definition name=".CommonPingTargetDeleteOK" extends=".tiles-adminpage" >
     <put name="content" value="/website/CommonPingTargetDeleteOK.jsp" />
 </definition>
-<definition name=".CommonPingTargetEdit" extends=".tiles-simplepage" >
+<definition name=".CommonPingTargetEdit" extends=".tiles-adminpage" >
     <put name="content" value="/website/CommonPingTargetEdit.jsp" />
 </definition>
 
-<definition name=".UserNew" extends=".tiles-simplepage" >
+<definition name=".UserNew" extends=".tiles-adminpage" >
     <put name="content" value="/website/UserNew.jsp" />
 </definition>
 

Modified: incubator/roller/branches/roller_2.0/web/bookmarks/BookmarkForm.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/bookmarks/BookmarkForm.jsp?rev=239735&r1=239734&r2=239735&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/bookmarks/BookmarkForm.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/bookmarks/BookmarkForm.jsp Wed Aug 24 12:16:58 2005
@@ -1,7 +1,6 @@
-<%@ include file="/taglibs.jsp" %><%@ include file="/theme/header.jsp" %>
+<%@ include file="/taglibs.jsp" %>
 
-<h3>
-<img src='<c:url value="/images/Bookmark24.png"/>' alt="bookmark" align="absmiddle" />
+<p class="subtitle">
 <c:if test="${state == 'add'}">
     <fmt:message key="bookmarkForm.addBookmark" />
 </c:if>
@@ -11,7 +10,7 @@
 <c:if test="${state == 'correct'}">
     <fmt:message key="bookmarkForm.correctBookmark" />
 </c:if>
-</h3>
+</p>
 
 <p>
 <b><fmt:message key="bookmarksForm.path" /></b>:
@@ -78,5 +77,3 @@
     </p>
 
 </html:form>
-
-<%@ include file="/theme/footer.jsp" %>
\ No newline at end of file



Mime
View raw message