roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r240407 [2/3] - in /incubator/roller/branches/roller_2.0: metadata/xdoclet/ src/org/roller/presentation/ src/org/roller/presentation/bookmarks/actions/ src/org/roller/presentation/filters/ src/org/roller/presentation/planet/ src/org/roller/...
Date Sat, 27 Aug 2005 11:47:37 GMT
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java Sat Aug 27 04:46:10 2005
@@ -98,13 +98,15 @@
         ActionForward forward = mapping.findForward("weblogEdit.page");
         try
         {
-            RollerSession rollerSession = 
-                RollerSession.getRollerSession(request);
-            if (rollerSession.isUserAuthorized())
+            RollerSession rses = RollerSession.getRollerSession(request);
+            RollerRequest rreq = RollerRequest.getRollerRequest(request);
+            if (rreq.getWebsite() != null 
+                    && rses.isUserAuthorized(rreq.getWebsite()))
             {
                 WeblogEntryFormEx form = (WeblogEntryFormEx)actionForm; 
                 form.initNew(request, response);
-                form.setCreatorId(rollerSession.getAuthenticatedUser().getId());
+                form.setCreatorId(rses.getAuthenticatedUser().getId());
+                form.setWebsiteId(rreq.getWebsite().getId()); 
                 
                 request.setAttribute("model",
                         new WeblogEntryPageModel(request, response, mapping,
@@ -139,21 +141,12 @@
         try
         {
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
-            RollerSession rollerSession = 
-                RollerSession.getRollerSession(request);
+            RollerSession rses = RollerSession.getRollerSession(request);
             WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
-            WeblogEntryData entry = rreq.getWeblogEntry();
-            
-            if (   rollerSession.getCurrentWebsite() == null
-                && entry.getWebsite().hasUserPermissions(
-                   rollerSession.getAuthenticatedUser(),PermissionsData.AUTHOR))
-            {
-                // user clicked on URL in email notification
-                rollerSession.setCurrentWebsite(entry.getWebsite());
-            }
+            WeblogEntryData entry = rreq.getWeblogEntry();           
                 
-            if (     rollerSession.isUserAuthorizedToAuthor() 
-                 || (rollerSession.isUserAuthorized() && entry.isDraft()))
+            if (rses.isUserAuthorizedToAuthor(entry.getWebsite()) 
+            || (rses.isUserAuthorized(entry.getWebsite()) && entry.isDraft()))
             {
                 WeblogEntryFormEx form = (WeblogEntryFormEx)actionForm;
                 if (entry == null && form.getId() != null)
@@ -223,12 +216,13 @@
         {
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
             RollerSession rollerSession = 
-                RollerSession.getRollerSession(request);
-            if ( rollerSession.isUserAuthorizedToAuthor() )
+              RollerSession.getRollerSession(request);
+            WeblogEntryPageModel pageModel = new WeblogEntryPageModel(
+              request, response, mapping, (WeblogEntryFormEx)actionForm, mode);
+            if (rollerSession.isUserAuthorizedToAuthor(
+                    pageModel.getWeblogEntry().getWebsite()))
             {
-                request.setAttribute("model",
-                   new WeblogEntryPageModel(request, response, mapping, 
-                           (WeblogEntryFormEx)actionForm, mode));
+                request.setAttribute("model", pageModel);                   
             }
             else
             {
@@ -264,18 +258,17 @@
             RollerSession      rses = RollerSession.getRollerSession(request);
             UserManager     userMgr = roller.getUserManager();
             WeblogManager weblogMgr = roller.getWeblogManager();
-            WebsiteData        site = rses.getCurrentWebsite();
-            WeblogEntryData   entry = null;
+            UserData           ud  = userMgr.retrieveUser(wf.getCreatorId());
+            WebsiteData       site = userMgr.retrieveWebsite(wf.getWebsiteId());
+            WeblogEntryData  entry = null;
             
-            if ( rses.isUserAuthorizedToAuthor() 
-                 || (rses.isUserAuthorized() 
+            if ( rses.isUserAuthorizedToAuthor(site) 
+                 || (rses.isUserAuthorized(site) 
                         && !wf.getStatus().equals(WeblogEntryData.PUBLISHED) ))
             {                             
                 if (wf.getId() == null || wf.getId().trim().length()==0) 
                 {
                     entry = new WeblogEntryData();  
-                    UserData ud = userMgr.retrieveUser(
-                            rses.getAuthenticatedUser().getId());
                     entry.setCreator(ud);
                     entry.setWebsite( site );
                 }
@@ -314,8 +307,8 @@
                 // Reindex entry, flush caches, etc.
                 reindexEntry(RollerFactory.getRoller(), entry);
                 mLogger.debug("Removing from cache");
-                PageCacheFilter.removeFromCache(request, 
-                   RollerSession.getRollerSession(request).getCurrentWebsite());
+                RollerRequest rreq = RollerRequest.getRollerRequest(request);
+                PageCacheFilter.removeFromCache(request, entry.getWebsite());
                 MainPageAction.flushMainPageCache();
 
                 // Clean up session objects we used
@@ -329,8 +322,8 @@
                                 (WeblogEntryFormEx)actionForm,
                                 WeblogEntryPageModel.EDIT_MODE));
                 
-                if (!rses.isUserAuthorizedToAuthor() && 
-                        rses.isUserAuthorized() && entry.isPending())
+                if (!rses.isUserAuthorizedToAuthor(site) && 
+                        rses.isUserAuthorized(site) && entry.isPending())
                 {
                     // implies that entry just changed to pending
                     notifyWebsiteAuthorsOfPendingEntry(request, entry);
@@ -553,10 +546,10 @@
             WeblogEntryFormEx wf = (WeblogEntryFormEx)actionForm;
             WeblogEntryData wd = 
                 roller.getWeblogManager().retrieveWeblogEntry(wf.getId());
-            RollerSession rollerSession = 
+            RollerSession rses = 
                 RollerSession.getRollerSession(request);
-            if (     rollerSession.isUserAuthorizedToAuthor() 
-                 || (rollerSession.isUserAuthorized() && wd.isDraft()) )
+            if (     rses.isUserAuthorizedToAuthor(wd.getWebsite()) 
+                 || (rses.isUserAuthorized(wd.getWebsite()) && wd.isDraft()) )
             {
                 wf.copyFrom(wd, request.getLocale());
                 if (wd == null || wd.getId() == null)
@@ -595,14 +588,14 @@
             WeblogManager mgr = RollerFactory.getRoller().getWeblogManager();
             WeblogEntryData wd = 
                 mgr.retrieveWeblogEntry(request.getParameter("id"));
-            RollerSession rollerSession = 
+            RollerSession rses = 
                 RollerSession.getRollerSession(request);
-            if (     rollerSession.isUserAuthorizedToAuthor() 
-                 || (rollerSession.isUserAuthorized() && wd.isDraft()) )
+            if (     rses.isUserAuthorizedToAuthor(wd.getWebsite()) 
+                 || (rses.isUserAuthorized(wd.getWebsite()) && wd.isDraft()) )
             {
                 // Flush the page cache
-                PageCacheFilter.removeFromCache(request, 
-                   RollerSession.getRollerSession(request).getCurrentWebsite());
+                PageCacheFilter.removeFromCache(
+                        request, wd.getWebsite());
 				// remove the index for it
                 wd.setStatus(WeblogEntryData.DRAFT);
 		        reindexEntry(RollerFactory.getRoller(), wd);
@@ -646,13 +639,14 @@
     {
         try
         {
-            RollerSession rollerSession = 
+            WeblogEntryFormEx wf = (WeblogEntryFormEx)actionForm;
+            UserManager umgr = RollerFactory.getRoller().getUserManager();
+            WebsiteData site = umgr.retrieveWebsite(wf.getWebsiteId());
+            RollerSession rses = 
                 RollerSession.getRollerSession(request);
-            RollerRequest rreq = RollerRequest.getRollerRequest(request);
-            if ( rollerSession.isUserAuthorizedToAuthor() )
+            if (rses.isUserAuthorizedToAuthor(site))
             {
                 HttpSession session = request.getSession(true);
-                WeblogEntryFormEx wf = (WeblogEntryFormEx)actionForm;
                 // misspelt words have been submitted
                 if (wf.getReplacementWords() != null &&
                     wf.getReplacementWords().length > 0)
@@ -706,13 +700,14 @@
         ActionForward forward = mapping.findForward("weblogEdit.page");
         try
         {
-            RollerSession rollerSession = 
+            WeblogEntryFormEx wf = (WeblogEntryFormEx)actionForm;
+            UserManager umgr = RollerFactory.getRoller().getUserManager();
+            WebsiteData site = umgr.retrieveWebsite(wf.getWebsiteId());
+            RollerSession rses = 
                 RollerSession.getRollerSession(request);
-            RollerRequest rreq = RollerRequest.getRollerRequest(request);
-            if ( rollerSession.isUserAuthorizedToAuthor() )
+            if ( rses.isUserAuthorizedToAuthor(site) )
             {
                 HttpSession session = request.getSession(true);
-                WeblogEntryFormEx wf = (WeblogEntryFormEx)actionForm;
                 
                 // we need to save any new entries before SpellChecking
                 if (wf.getId() == null) 
@@ -760,9 +755,9 @@
         RollerSession rollerSession = RollerSession.getRollerSession(request);
         try
         {
-            if ( rollerSession.isUserAuthorizedToAuthor() )
+            WeblogEntryData wd = rreq.getWeblogEntry();
+            if ( rollerSession.isUserAuthorizedToAuthor(wd.getWebsite()))
             {
-                WeblogEntryData wd = rreq.getWeblogEntry();
                 if (wd == null || wd.getId() == null)
                 {
                     throw new NullPointerException(
@@ -845,21 +840,21 @@
        WeblogEntryData entry = null;
        try
        {
-           RollerSession rollerSession= RollerSession.getRollerSession(request);
-           if (rollerSession.isUserAuthorizedToAuthor())
+           WeblogEntryFormEx form = (WeblogEntryFormEx)actionForm;
+           String entryid = form.getId();
+           if ( entryid == null )
            {
-               WeblogEntryFormEx form = (WeblogEntryFormEx)actionForm;
-               String entryid = form.getId();
-               if ( entryid == null )
-               {
-                   entryid = 
-                       request.getParameter(RollerRequest.WEBLOGENTRYID_KEY);
-               }
-
-               RollerContext rctx= RollerContext.getRollerContext(request);
-               WeblogManager wmgr= RollerFactory.getRoller().getWeblogManager();
-               entry = wmgr.retrieveWeblogEntry(entryid);
+               entryid = 
+                   request.getParameter(RollerRequest.WEBLOGENTRYID_KEY);
+           }
+
+           RollerContext rctx= RollerContext.getRollerContext(request);
+           WeblogManager wmgr= RollerFactory.getRoller().getWeblogManager();
+           entry = wmgr.retrieveWeblogEntry(entryid);
 
+           RollerSession rses = RollerSession.getRollerSession(request);
+           if (rses.isUserAuthorizedToAuthor(entry.getWebsite()))
+           {
                String title = entry.getTitle();
 
                // Run entry through registered PagePlugins

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=240407&r1=240406&r2=240407&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 Sat Aug 27 04:46:10 2005
@@ -121,7 +121,7 @@
         RollerSession rollerSession = RollerSession.getRollerSession(getRequest());
         return RollerFactory.getRoller().getWeblogManager()
             .getWeblogEntries(
-                rollerSession.getCurrentWebsite(), // userName
+                getWeblogEntry().getWebsite(), // userName
                 null,              // startDate
                 null,              // endDate
                 null,              // catName
@@ -140,7 +140,7 @@
         RollerSession rollerSession = RollerSession.getRollerSession(getRequest());
         return RollerFactory.getRoller().getWeblogManager()
             .getWeblogEntries(
-                rollerSession.getCurrentWebsite(), 
+                getWeblogEntry().getWebsite(), 
                 null,              // startDate
                 null,              // endDate
                 null,              // catName
@@ -159,7 +159,7 @@
         RollerSession rollerSession = RollerSession.getRollerSession(getRequest());
         return RollerFactory.getRoller().getWeblogManager()
             .getWeblogEntries(
-                rollerSession.getCurrentWebsite(), 
+                getWeblogEntry().getWebsite(), 
                 null,              // startDate
                 null,              // endDate
                 null,              // catName
@@ -202,7 +202,7 @@
         // Select editor page selected by user (simple text editor,
         // DHTML editor, Ekit Java applet, etc.
         RollerSession rollerSession = RollerSession.getRollerSession(getRequest());
-        String editorPage = rollerSession.getCurrentWebsite().getEditorPage();
+        String editorPage = weblogEntry.getWebsite().getEditorPage();
         if (StringUtils.isEmpty( editorPage ))
         {
             editorPage = "editor-text.jsp";
@@ -232,7 +232,7 @@
     {
         RollerSession rollerSession = RollerSession.getRollerSession(getRequest());
         return RollerFactory.getRoller().getWeblogManager()
-            .getWeblogCategories(rollerSession.getCurrentWebsite(), false);
+            .getWeblogCategories(weblogEntry.getWebsite(), false);
     }
 
     public List getComments() throws Exception
@@ -250,12 +250,11 @@
     {
         if (weblogEntry == null) 
         {
-            RollerSession rollerSession = RollerSession.getRollerSession(getRequest());
             weblogEntry = new WeblogEntryData();
-            weblogEntry.setWebsite(rollerSession.getCurrentWebsite());
+            weblogEntry.setWebsite(getWebsite());
             form.copyTo(weblogEntry, 
                     getRequest().getLocale(), getRequest().getParameterMap());
-            weblogEntry.setWebsite(rollerSession.getCurrentWebsite());
+            weblogEntry.setWebsite(weblogEntry.getWebsite());
         }
         return weblogEntry;
     }
@@ -361,4 +360,16 @@
     public void setWords(ArrayList words) {
         this.words = words;
     }
+
+    public boolean getUserAuthorized() throws RollerException
+    {
+        return getRollerSession().isUserAuthorized(getWeblogEntry().getWebsite());
+    }
+    
+    public boolean getUserAuthorizedToAuthor() throws RollerException
+    {
+        return getRollerSession().isUserAuthorizedToAuthor(getWeblogEntry().getWebsite());
+    }
+    
+    
 }

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogQueryAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogQueryAction.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogQueryAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogQueryAction.java Sat Aug 27 04:46:10 2005
@@ -53,7 +53,7 @@
            request, 
            response, 
            mapping,
-           RollerSession.getRollerSession(request).getCurrentWebsite(),
+           rreq.getWebsite(),
            form.getCategoryId(),
            form.getStartDateString(),
            form.getEndDateString(),

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=240407&r1=240406&r2=240407&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 Sat Aug 27 04:46:10 2005
@@ -116,9 +116,9 @@
 
     public List getCategories() throws Exception
     {
-        RollerSession rollerSession = RollerSession.getRollerSession(request);
+        RollerRequest rreq = RollerRequest.getRollerRequest(request);
         List categories = RollerFactory.getRoller().getWeblogManager()
-            .getWeblogCategories(rollerSession.getCurrentWebsite());
+            .getWeblogCategories(rreq.getWebsite());
         return categories;
     }
 

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/formbeans/WeblogEntryFormEx.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/formbeans/WeblogEntryFormEx.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/formbeans/WeblogEntryFormEx.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/formbeans/WeblogEntryFormEx.java Sat Aug 27 04:46:10 2005
@@ -34,6 +34,7 @@
 {
     private String mCategoryId = null;
     private String mCreatorId = null;
+    private String mWebsiteId = null;
     private Date mDate = new Date();    
     private String mDateString = null;        
     private Integer mHours = new Integer(0);
@@ -65,16 +66,16 @@
     {
         RollerRequest rreq = RollerRequest.getRollerRequest(request);
         RollerSession rses = RollerSession.getRollerSession(request); 
-        if (rses.getCurrentWebsite().getDefaultPlugins() != null)
+        if (rreq.getWebsite().getDefaultPlugins() != null)
         {
             setPluginsArray(StringUtils.split(
-                    rses.getCurrentWebsite().getDefaultPlugins(), ",") );
+                    rreq.getWebsite().getDefaultPlugins(), ",") );
         }
         status = WeblogEntryData.DRAFT;
         allowComments = Boolean.TRUE;
         updateTime = new Timestamp(new Date().getTime());
         pubTime = updateTime;
-        initPubTimeDateStrings(rses.getCurrentWebsite(), request.getLocale());        
+        initPubTimeDateStrings(rreq.getWebsite(), request.getLocale());        
     }
     
     /**
@@ -111,11 +112,7 @@
         if (getCategoryId() != null) 
         {
             entry.setCategoryId(getCategoryId());
-        }       
-        if (getCreatorId() != null) 
-        {
-            entry.setCreatorId(getCreatorId());
-        }       
+        }             
         if (getAllowComments() == null)
         {
             entry.setAllowComments(Boolean.FALSE);
@@ -156,7 +153,8 @@
     {
         super.copyFrom(entry, locale);
         mCategoryId = entry.getCategory().getId();
-        mCreatorId = entry.getCreator().getId();
+        mCreatorId = entry.getCreator().getId();       
+        mWebsiteId = entry.getWebsite().getId();
         
         initPubTimeDateStrings(entry.getWebsite(), locale);
         
@@ -412,6 +410,15 @@
     public void setCreatorId(String creatorId)
     {
         mCreatorId = creatorId;
+    }
+
+    public String getWebsiteId()
+    {
+        return mWebsiteId;
+    }
+    public void setWebsiteId(String websiteId)
+    {
+        mWebsiteId = websiteId;
     }
 
     /** Convenience method for checking status */

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=240407&r1=240406&r2=240407&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 Sat Aug 27 04:46:10 2005
@@ -80,6 +80,6 @@
     {
         // This mimics the check in other admin actions, but not sure why the latter is not sufficient.
         RollerSession rollerSession = RollerSession.getRollerSession(rreq.getRequest());
-        return rollerSession.isAdminUser();
+        return rollerSession.isGlobalAdminUser();
     }
 }

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/InviteMemberAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/InviteMemberAction.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/InviteMemberAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/InviteMemberAction.java Sat Aug 27 04:46:10 2005
@@ -3,9 +3,6 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
 import java.util.ResourceBundle;
 import javax.mail.MessagingException;
 import javax.mail.Session;
@@ -34,8 +31,9 @@
 import org.roller.pojos.PermissionsData;
 import org.roller.pojos.UserData;
 import org.roller.pojos.WebsiteData;
+import org.roller.presentation.BasePageModel;
 import org.roller.presentation.RollerContext;
-import org.roller.presentation.RollerSession;
+import org.roller.presentation.RollerRequest;
 import org.roller.presentation.website.formbeans.InviteMemberForm;
 import org.roller.util.MailUtil;
 
@@ -83,7 +81,9 @@
         HttpServletResponse response)
         throws IOException, ServletException
     {
-        ActionForward forward = mapping.findForward("inviteMember.page");
+        ActionForward forward = mapping.findForward("inviteMember.page");        
+        request.setAttribute("model", new BasePageModel(
+            "inviteMember.title", request, response, mapping));
         return forward; 
     }
     
@@ -100,6 +100,10 @@
         InviteMemberForm form = (InviteMemberForm)actionForm;
         UserManager umgr = RollerFactory.getRoller().getUserManager();
         UserData user = umgr.getUser(form.getUserName());
+        
+        request.setAttribute("model", new BasePageModel(
+            "inviteMember.title", request, response, mapping));
+
         if (user == null)
         {
             errors.add(ActionErrors.GLOBAL_ERROR, 
@@ -107,8 +111,8 @@
         }
         else 
         {
-            RollerSession rses = RollerSession.getRollerSession(request);
-            WebsiteData website = rses.getCurrentWebsite();
+            RollerRequest rreq = RollerRequest.getRollerRequest(request);
+            WebsiteData website = rreq.getWebsite();
             PermissionsData perms = umgr.getPermissions(website, user);
             if (perms != null && perms.isPending())
             {

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MaintenanceAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MaintenanceAction.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MaintenanceAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MaintenanceAction.java Sat Aug 27 04:46:10 2005
@@ -24,6 +24,7 @@
 import org.roller.model.IndexManager;
 import org.roller.model.RollerFactory;
 import org.roller.pojos.WebsiteData;
+import org.roller.presentation.RollerRequest;
 import org.roller.presentation.RollerSession;
 import org.roller.presentation.pagecache.PageCacheFilter;
 
@@ -71,11 +72,13 @@
 	{
 		try
 		{
-            RollerSession rollerSession = RollerSession.getRollerSession(request);
-			if (rollerSession.isUserAuthorizedToAdmin() )
+            RollerRequest rreq  = RollerRequest.getRollerRequest(request);
+            WebsiteData website = rreq.getWebsite();            
+            RollerSession rses = RollerSession.getRollerSession(request);
+			if (rses.isUserAuthorizedToAdmin(website) )
 			{
-				WebsiteData website = RollerSession.getRollerSession(request).getCurrentWebsite();
-				IndexManager manager = RollerFactory.getRoller().getIndexManager();
+				IndexManager manager = 
+                        RollerFactory.getRoller().getIndexManager();
 				manager.rebuildWebsiteIndex(website);
 				
                 ActionMessages messages = new ActionMessages();
@@ -109,10 +112,12 @@
     {
         try
         {
-            RollerSession rollerSession = RollerSession.getRollerSession(request);
-			if ( rollerSession.isUserAuthorizedToAdmin() )
+            RollerRequest rreq  = RollerRequest.getRollerRequest(request);
+            WebsiteData website = rreq.getWebsite();            
+            RollerSession rses = RollerSession.getRollerSession(request);
+			if ( rses.isUserAuthorizedToAdmin(website) )
 			{
-	            PageCacheFilter.removeFromCache(request, RollerSession.getRollerSession(request).getCurrentWebsite());
+	            PageCacheFilter.removeFromCache(request, website);
 
                  ActionMessages messages = new ActionMessages();
                  messages.add(null, new ActionMessage("maintenance.message.flushed"));

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=240407&r1=240406&r2=240407&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 Sat Aug 27 04:46:10 2005
@@ -24,6 +24,7 @@
 import org.roller.pojos.UserData;
 import org.roller.pojos.WebsiteData;
 import org.roller.presentation.BasePageModel;
+import org.roller.presentation.RollerRequest;
 import org.roller.presentation.RollerSession;
 
 /**
@@ -150,8 +151,9 @@
         {
             super("memberPermissions.title", request, response, mapping);
             Roller roller = RollerFactory.getRoller();
+            RollerRequest rreq = RollerRequest.getRollerRequest(request);
             RollerSession rollerSession = RollerSession.getRollerSession(request);
-            WebsiteData website = rollerSession.getCurrentWebsite();
+            WebsiteData website = rreq.getWebsite();
             permissions = roller.getUserManager().getAllPermissions(website);
         }
         public List getPermissions()

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=240407&r1=240406&r2=240407&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 Sat Aug 27 04:46:10 2005
@@ -81,7 +81,7 @@
             request.setAttribute("model",pageModel);                
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
             RollerSession rollerSession = RollerSession.getRollerSession(request);
-            if (rollerSession.isAdminUser() ) {
+            if (rollerSession.isGlobalAdminUser() ) {
                 
                 // just grab our properties map and put it in the request
                 Roller mRoller = RollerFactory.getRoller();
@@ -117,7 +117,7 @@
             BasePageModel pageModel = new BasePageModel(
                     "configForm.title", request, response, mapping);
             request.setAttribute("model",pageModel);                
-            if (rollerSession.isAdminUser()) {
+            if (rollerSession.isGlobalAdminUser()) {
             
                 // just grab our properties map and put it in the request
                 Roller mRoller = RollerFactory.getRoller();

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=240407&r1=240406&r2=240407&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 Sat Aug 27 04:46:10 2005
@@ -81,7 +81,8 @@
         try {
             RollerSession rses = RollerSession.getRollerSession(request);
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
-            if ( rses.isUserAuthorizedToAdmin() ) {
+            WebsiteData website = rreq.getWebsite();
+            if ( rses.isUserAuthorizedToAdmin(website) ) {
                 
                 BasePageModel pageModel = new BasePageModel(
                         "themeEditor.title", request, response, mapping);
@@ -92,7 +93,6 @@
                 ThemeManager themeMgr = roller.getThemeManager();
                 
                 String username = rses.getAuthenticatedUser().getUserName();
-                WebsiteData website = rses.getCurrentWebsite();
                 String currentTheme = website.getEditorTheme();
                 List themes = themeMgr.getEnabledThemesList();
                 
@@ -138,7 +138,8 @@
         try {
             RollerSession rses = RollerSession.getRollerSession(request);            
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
-            if ( rses.isUserAuthorizedToAdmin() ) {
+            WebsiteData website = rreq.getWebsite();
+            if ( rses.isUserAuthorizedToAdmin(website)) {
 
                 // get users current theme
                 Roller roller = RollerFactory.getRoller();
@@ -150,7 +151,6 @@
                 request.setAttribute("model",pageModel);          
                     
                 String username = rses.getAuthenticatedUser().getUserName();
-                WebsiteData website = rses.getCurrentWebsite();
                 String currentTheme = website.getEditorTheme();
                 List themes = themeMgr.getEnabledThemesList();
                 
@@ -222,7 +222,8 @@
         try {
             RollerSession rses = RollerSession.getRollerSession(request);
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
-            if ( rses.isUserAuthorizedToAdmin() ) {
+            WebsiteData website = rreq.getWebsite();
+            if ( rses.isUserAuthorizedToAdmin(website) ) {
                 
                 BasePageModel pageModel = new BasePageModel(
                         "themeEditor.title", request, response, mapping);
@@ -261,7 +262,6 @@
                     try {
                         Roller roller = RollerFactory.getRoller();
                         String username = rses.getAuthenticatedUser().getUserName();
-                        WebsiteData website = rses.getCurrentWebsite();
                         website.setEditorTheme(newTheme);
                         website.save();
                         
@@ -316,7 +316,8 @@
         try {
             RollerSession rses = RollerSession.getRollerSession(request);
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
-            if ( rses.isUserAuthorizedToAdmin() ) {
+            WebsiteData website = rreq.getWebsite();
+            if ( rses.isUserAuthorizedToAdmin(website) ) {
                 
                 BasePageModel pageModel = new BasePageModel(
                         "themeEditor.title", request, response, mapping);
@@ -327,7 +328,6 @@
                 ThemeManager themeMgr = roller.getThemeManager();
                 
                 String username = rses.getAuthenticatedUser().getUserName();
-                WebsiteData website = rses.getCurrentWebsite();
                 
                 try {
                     Theme usersTheme = themeMgr.getTheme(website.getEditorTheme());

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=240407&r1=240406&r2=240407&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 Sat Aug 27 04:46:10 2005
@@ -55,7 +55,7 @@
     {
         RollerRequest rreq = null;
         ActionForward fwd = mapping.findForward("uploadFiles.page");
-        WebsiteData website = null;
+        WebsiteData website = website = rreq.getWebsite();;
         BasePageModel pageModel = 
             new BasePageModel("uploadFiles.title", request, response, mapping);
         request.setAttribute("model", pageModel);
@@ -64,11 +64,11 @@
         {
             rreq = RollerRequest.getRollerRequest(request);
             RollerSession rollerSession = RollerSession.getRollerSession(request);
-            if ( !rollerSession.isUserAuthorizedToAuthor() )
+            
+            if ( !rollerSession.isUserAuthorizedToAuthor(website) )
             {
                 return mapping.findForward("access-denied");
             }
-            website = RollerSession.getRollerSession(request).getCurrentWebsite();
         }
         catch (Exception e)
         {
@@ -172,7 +172,7 @@
         try
         {
             FileManager fmgr = RollerFactory.getRoller().getFileManager();
-            WebsiteData website = RollerSession.getRollerSession(request).getCurrentWebsite();
+            WebsiteData website = rreq.getWebsite();
             String[] deleteFiles = theForm.getDeleteFiles();
             for (int i=0; i<deleteFiles.length; i++)
             {
@@ -215,7 +215,8 @@
             BasePageModel pageModel = 
              new BasePageModel("uploadFiles.title", request, response, mapping);
             request.setAttribute("model", pageModel);
-            if ( !rollerSession.isUserAuthorizedToAuthor() )
+            WebsiteData website = rreq.getWebsite();
+            if ( !rollerSession.isUserAuthorizedToAuthor(website) )
             {
                 return mapping.findForward("access-denied");
             }

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=240407&r1=240406&r2=240407&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 Sat Aug 27 04:46:10 2005
@@ -61,7 +61,7 @@
         {
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
             RollerSession rollerSession = RollerSession.getRollerSession(request);
-            if (rollerSession.isAdminUser() )
+            if (rollerSession.isGlobalAdminUser() )
             {
                 UserAdminForm userForm = (UserAdminForm)actionForm;
                 request.setAttribute("model", 
@@ -124,7 +124,7 @@
         {
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
             RollerSession rollerSession = RollerSession.getRollerSession(request);
-            if (rollerSession.isAdminUser() )
+            if (rollerSession.isGlobalAdminUser() )
             {
                 UserAdminForm userForm = (UserAdminForm)actionForm;
                 UserManager mgr = RollerFactory.getRoller().getUserManager();
@@ -201,7 +201,7 @@
     {
         // remove user's Entries from Lucene index
         IndexManager indexManager = RollerFactory.getRoller().getIndexManager();
-        WebsiteData website = RollerSession.getRollerSession(request).getCurrentWebsite();
+        WebsiteData website = rreq.getWebsite();
         indexManager.removeWebsiteIndex(website); 
         
         // delete user from database
@@ -268,7 +268,7 @@
 		{
 			RollerRequest rreq = RollerRequest.getRollerRequest(request);
              RollerSession rollerSession = RollerSession.getRollerSession(request);
-			if (rollerSession.isAdminUser() )
+			if (rollerSession.isGlobalAdminUser() )
 			{
 				UserAdminForm uaf = (UserAdminForm)actionForm;
 				

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=240407&r1=240406&r2=240407&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 Sat Aug 27 04:46:10 2005
@@ -63,14 +63,13 @@
                 "pagesForm.title", request, response, mapping));   
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
             RollerSession rses = RollerSession.getRollerSession(request);
-            if ( rses.isUserAuthorizedToAdmin() )
+            WebsiteData website = rreq.getWebsite();
+            if ( rses.isUserAuthorizedToAdmin(website) )
             {
                 WeblogTemplateForm form = (WeblogTemplateForm)actionForm;
                 WeblogTemplate data = new WeblogTemplate();
                 form.copyTo(data, request.getLocale());
-                WebsiteData hd = rses.getCurrentWebsite();
-
-                data.setWebsite( hd );
+                data.setWebsite( website );
                 data.setLastModified( new java.util.Date() );
                 data.setDescription("");
                 data.setContents("");
@@ -87,7 +86,7 @@
                 saveMessages(request, uiMessages);
                 
                 UserData user = rses.getAuthenticatedUser();
-                PageCacheFilter.removeFromCache( request, hd );
+                PageCacheFilter.removeFromCache( request, website );
                     
                 actionForm.reset(mapping,request);                
                 
@@ -121,7 +120,8 @@
                 "pageForm.title", request, response, mapping));   
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
             RollerSession rses = RollerSession.getRollerSession(request);
-            if ( rses.isUserAuthorizedToAdmin() )
+            WebsiteData website = rreq.getWebsite();
+            if ( rses.isUserAuthorizedToAdmin(website) )
             {
                 UserData ud = rses.getAuthenticatedUser();
                 WeblogTemplate pd = (WeblogTemplate) rreq.getPage();
@@ -160,7 +160,8 @@
             RollerSession rses = RollerSession.getRollerSession(request);
             request.setAttribute("model", new BasePageModel(
                 "pagesForm.title", request, response, mapping));            
-            if ( rses.isUserAuthorizedToAdmin() )
+            WebsiteData website = rreq.getWebsite();
+            if ( rses.isUserAuthorizedToAdmin(website) )
             {
                 addModelObjects(request, response, mapping);
             }
@@ -192,7 +193,8 @@
         {
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
             RollerSession rses = RollerSession.getRollerSession(request);
-            if ( rses.isUserAuthorizedToAdmin() )
+            WebsiteData website = rreq.getWebsite();
+            if ( rses.isUserAuthorizedToAdmin(website) )
             {
                 WeblogTemplateForm form = (WeblogTemplateForm)actionForm;
                 UserManager mgr = RollerFactory.getRoller().getUserManager();
@@ -244,7 +246,8 @@
         {
             RollerSession rses = RollerSession.getRollerSession(request);
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
-            if ( rses.isUserAuthorizedToAdmin() )
+            WebsiteData website = rreq.getWebsite();
+            if ( rses.isUserAuthorizedToAdmin(website) )
             {
                 WeblogTemplate cd = (WeblogTemplate) rreq.getPage();
                 WeblogTemplateForm pf = (WeblogTemplateForm)actionForm;
@@ -281,7 +284,8 @@
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
             request.setAttribute("model", new BasePageModel(
                 "pageForm.title", request, response, mapping));
-            if ( rses.isUserAuthorizedToAdmin() )
+            WebsiteData website = rreq.getWebsite();
+            if ( rses.isUserAuthorizedToAdmin(website) )
             {
                 WeblogTemplateForm form = (WeblogTemplateForm)actionForm;
                 UserManager mgr = RollerFactory.getRoller().getUserManager();
@@ -383,11 +387,12 @@
     {             
         UserManager mgr = RollerFactory.getRoller().getUserManager();        
         RollerSession rses = RollerSession.getRollerSession(request);
+        RollerRequest rreq = RollerRequest.getRollerRequest(request);
                 
         UserData user = rses.getAuthenticatedUser();
         request.setAttribute("user",user);
 
-        WebsiteData wd = rses.getCurrentWebsite();
+        WebsiteData wd = rreq.getWebsite();
         request.setAttribute("website", wd);
 
         List pages = mgr.getPages(wd);

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=240407&r1=240406&r2=240407&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 Sat Aug 27 04:46:10 2005
@@ -73,8 +73,9 @@
         try
         {
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
+            WebsiteData website = rreq.getWebsite();
             RollerSession rses = RollerSession.getRollerSession(request);
-            if (rses.isUserAuthorizedToAdmin())
+            if (rses.isUserAuthorizedToAdmin(website))
             {
                 Roller roller = RollerFactory.getRoller();
                 UserManager umgr = roller.getUserManager();
@@ -82,8 +83,6 @@
                 UserData ud = rses.getAuthenticatedUser();
                 request.setAttribute("user",ud);
 
-                WebsiteData website = 
-                    umgr.retrieveWebsite(rses.getCurrentWebsite().getId());
                 WebsiteFormEx wf = (WebsiteFormEx)actionForm;
                 wf.copyFrom(website, request.getLocale());
 
@@ -108,8 +107,6 @@
                 BasePageModel pageModel = new BasePageModel(
                     "websiteSettings.title", request, response, mapping);
                 request.setAttribute("model",pageModel);   
-                    
-                rses.setCurrentWebsite(website);
             }
             else
             {
@@ -137,19 +134,18 @@
         ActionForward forward = mapping.findForward("editWebsite");
         try
         {
-            RollerRequest rreq = RollerRequest.getRollerRequest(request);
+            WebsiteFormEx form = (WebsiteFormEx)actionForm;
             WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
             UserManager umgr = RollerFactory.getRoller().getUserManager();
+            WebsiteData wd = umgr.retrieveWebsite(form.getId());
             RollerSession rollerSession = RollerSession.getRollerSession(request);
-            if ( rollerSession.isUserAuthorizedToAdmin() )
+            if ( rollerSession.isUserAuthorizedToAdmin(wd))
             {
-                WebsiteFormEx form = (WebsiteFormEx)actionForm;
 
                 /* we don't need this check any longer -- Allen G
                 if(!form.getDefaultPageId().equals(form.getWeblogDayPageId()))
                 {
                 */               
-                    WebsiteData wd = umgr.retrieveWebsite(form.getId());
                     wd.save(); // should throw if save not permitted
 
                     // ensure getEnabled can't be changed

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=240407&r1=240406&r2=240407&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 Sat Aug 27 04:46:10 2005
@@ -65,62 +65,6 @@
         return forward;
     }
         
-    public ActionForward newEntry(
-            ActionMapping       mapping,
-            ActionForm          actionForm,
-            HttpServletRequest  request,
-            HttpServletResponse response)
-            throws Exception
-    {
-        selectWebsite(mapping, actionForm, request, response);
-        return mapping.findForward("weblogCreate");
-    }
-    
-    public ActionForward editEntries(
-            ActionMapping       mapping,
-            ActionForm          actionForm,
-            HttpServletRequest  request,
-            HttpServletResponse response)
-            throws Exception
-    {
-        selectWebsite(mapping, actionForm, request, response);
-        return mapping.findForward("weblogQuery");
-    }
-    
-    public ActionForward manageWeblog(
-            ActionMapping       mapping,
-            ActionForm          actionForm,
-            HttpServletRequest  request,
-            HttpServletResponse response)
-            throws Exception
-    {
-        selectWebsite(mapping, actionForm, request, response);
-        return mapping.findForward("editWebsite");
-    }
-    
-    public void selectWebsite(
-            ActionMapping       mapping,
-            ActionForm          actionForm,
-            HttpServletRequest  request,
-            HttpServletResponse response)
-            throws Exception
-    {
-        YourWebsitesForm form = (YourWebsitesForm)actionForm;
-        Roller roller = RollerFactory.getRoller();
-        WebsiteData selectedWebsite = 
-            roller.getUserManager().retrieveWebsite(form.getWebsiteId());
-        RollerSession rollerSession = RollerSession.getRollerSession(request);
-        UserData user = rollerSession.getAuthenticatedUser();
-        if (selectedWebsite.hasUserPermissions(user, PermissionsData.LIMITED))
-        {
-            rollerSession.setCurrentWebsite(selectedWebsite);
-            //ActionMessages msgs = new ActionMessages();
-            //msgs.add(null, new ActionMessage(
-                    //"yourWebsites.selected", selectedWebsite.getHandle()));
-            //saveMessages(request, msgs);
-        }        
-    }
-        
     public ActionForward accept(
             ActionMapping       mapping,
             ActionForm          actionForm,

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/tags/FileManagerTag.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/tags/FileManagerTag.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/tags/FileManagerTag.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/tags/FileManagerTag.java Sat Aug 27 04:46:10 2005
@@ -51,8 +51,7 @@
             HttpServletRequest request =
                 (HttpServletRequest)pageContext.getRequest();
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
-            //UserData user = RollerSession.getRollerSession(request).getAuthenticatedUser();
-            WebsiteData website = RollerSession.getRollerSession(request).getCurrentWebsite();
+            WebsiteData website = rreq.getWebsite();
 
             // for formatting the file size
             DecimalFormat format = (DecimalFormat) DecimalFormat.getInstance();
@@ -88,7 +87,7 @@
                     // to PRIMARY
                     java.text.Collator locCollator =
                         java.text.Collator.getInstance(
-                            RollerSession.getRollerSession(request).getCurrentWebsite().getLocaleInstance());
+                            rreq.getWebsite().getLocaleInstance());
                     locCollator.setStrength(Collator.PRIMARY);
                     java.util.Arrays.sort(files, locCollator);
 

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/tags/FileUploadTag.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/tags/FileUploadTag.java?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/tags/FileUploadTag.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/tags/FileUploadTag.java Sat Aug 27 04:46:10 2005
@@ -59,7 +59,7 @@
             HttpServletRequest request =
                 (HttpServletRequest)pageContext.getRequest();
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
-            WebsiteData website = RollerSession.getRollerSession(request).getCurrentWebsite();
+            WebsiteData website = rreq.getWebsite();
             
             String maxDir = RollerRuntimeConfig.getProperty("uploads.dir.maxsize");
             String maxFile = RollerRuntimeConfig.getProperty("uploads.file.maxsize");

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=240407&r1=240406&r2=240407&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 Sat Aug 27 04:46:10 2005
@@ -5,11 +5,17 @@
 
 # ------------------------------------------------------------- BookmarkForm.jsp
 
-bookmarkForm.addBookmark=Add a New Bookmark
+bookmarkForm.add.title=Add New Bookmark
+bookmarkForm.add.subtitle=Adding new bookmark in folder [{0}]
+
+bookmarkForm.edit.title=Edit Bookmark
+bookmarkForm.edit.subtitle=Editing bookmark in folder [{0}]
+
+bookmarkForm.correct.title=Correct Bookmark
+bookmarkForm.correct.subtitle=Correct fields and re-submit
+
 bookmarkForm.cancel=Cancel
-bookmarkForm.correctBookmark=Correct Bookmark Edits
 bookmarkForm.description=Description
-bookmarkForm.editBookmark=Edit Bookmark
 bookmarkForm.folder=Bookmark Folder
 bookmarkForm.image=Image URL
 bookmarkForm.name=Name
@@ -72,14 +78,21 @@
 
 # ------------------------------------------------------------- CategoryForm.jsp
 
+categoryForm.edit.title=Edit Category
+categoryForm.edit.subtitle=Editing category
+
+categoryForm.add.title=Add Category
+categoryForm.add.subtitle=Adding category
+
+categoryForm.correct.title=Correct Category
+categoryForm.correct.subtitle=Correcting category
+
 categoryForm.name=Name
 categoryForm.description=Description
 categoryForm.image=image
 categoryForm.save=Save
 categoryForm.cancel=Cancel
-categoryForm.editCategory=Edit Category
-categoryForm.addCategory=Add Category
-categoryForm.correctCategory=Correct Category
+
 
 # ----------------------------------------------------------- CategoriesForm.jsp
 
@@ -165,8 +178,9 @@
 roller.properties file).
 
 configForm.siteSettings=Site Settings
-configForm.siteName=Site Name (for main RSS feed)
-configForm.siteDescription=Site Description (for main RSS feed)
+configForm.siteName=Site Name (for main page and RSS feed)
+configForm.shortName=Short name (shown in site banner)
+configForm.siteDescription=Site Description (for main page and RSS feed)
 configForm.siteAdminEmail=Site Administrator's email address
 configForm.absoluteUrl=Absolute URL to site (if required)
 configForm.enableLinkback=Enable Linkback extraction?
@@ -389,13 +403,19 @@
 
 # --------------------------------------------------------------- FolderForm.jsp
 
+folderForm.add.title=Add Folder
+folderForm.add.subtitle=Adding new bookmark folder in folder [{0}]
+
+folderForm.edit.title=Edit Folder
+folderForm.edit.subtitle=Ediring bookmark folder in folder [{0}]
+
+folderForm.correct.title=Correct Folder
+folderForm.correct.subtitle=Correcting bookmark folder edits
+
 folderForm.name=Name
 folderForm.save=Save
 folderForm.cancel=Cancel
 folderForm.description=Description
-folderForm.addFolder=Add New Bookmark Folder
-folderForm.editFolder=Edit Bookmark Folder
-folderForm.correctFolder=Correct Bookmark Folder edits
 
 folderForm.save.exception=ERROR saving folder, perhaps name is not unique? \
 The error message is: {0}
@@ -540,8 +560,8 @@
 mainPage.actions=Actions
 mainPage.status=Status
 mainPage.weblog=Working in weblog
-mainPage.loggedInAs=Logged in as
-mainPage.currentWebsite=Editing weblog
+mainPage.loggedInAs=User: 
+mainPage.currentWebsite=Weblog: 
 mainPage.sidebarHelpTitle=What is this?
 mainPage.adminWarning=You have <b>Global Admin</b><br /> permission, use it wisely.
 
@@ -906,7 +926,7 @@
 tabbedmenu.user.websites=Your Weblogs
 tabbedmenu.createWebsite=Create Weblog
 
-tabbedmenu.weblog=Weblog
+tabbedmenu.weblog=Create &amp; Edit
 tabbedmenu.weblog.newEntry=New Entry
 tabbedmenu.weblog.archives=Edit Entries
 tabbedmenu.weblog.categories=Categories
@@ -915,7 +935,7 @@
 tabbedmenu.weblog.referers=Referers
 tabbedmenu.website.files=File Uploads
 
-tabbedmenu.website=Manage
+tabbedmenu.website=Preferences
 tabbedmenu.website.settings=Settings
 tabbedmenu.website.themes=Theme
 tabbedmenu.website.pages=Templates
@@ -1265,8 +1285,8 @@
 # ---------------------------------------------------------------------- Website 
 
 websiteSettings.title=Weblog Settings
-websiteSettings.subtitle=Managing website settings for website [<b>{0}</b>]
-websiteSettings.tip=Change website title, description, comment and referer \
+websiteSettings.subtitle=Managing weblog settings for weblog [<b>{0}</b>]
+websiteSettings.tip=Change weblog title, description, comment and referer \
 spam prevention settings.
 websiteSettings.websiteTitle=Title
 websiteSettings.websiteDescription=Description

Modified: 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-tabbed.vm?rev=240407&r1=240406&r2=240407&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-tabbed.vm Sat Aug 27 04:46:10 2005
@@ -4,7 +4,6 @@
 <tr>
   #foreach( $menu in $menuModel.getMenus() )
     #if( $menu.isPermitted( $req ) )
-        <td class="menuTabSeparator"></td>
 	    #if( $menu.isSelected( $req ) )
 	    <td class="menuTabSelected">
 	    #else
@@ -16,6 +15,7 @@
 	       </div>
 	    </div>
 	    </td>	    
+        <td class="menuTabSeparator"></td>
     #end
   #end
 </tr>

Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml Sat Aug 27 04:46:10 2005
@@ -31,6 +31,10 @@
          <type>string</type>
          <default-value>Roller Site</default-value>
       </property-def>
+      <property-def  name="site.shortName"  key="configForm.shortName">
+         <type>string</type>
+         <default-value>Front Page</default-value>
+      </property-def>
       <property-def  name="site.description"  key="configForm.siteDescription">
          <type>string</type>
          <default-value>Roller Site</default-value>

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=240407&r1=240406&r2=240407&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 Sat Aug 27 04:46:10 2005
@@ -5,55 +5,60 @@
 <tiles-definitions>
 
 <definition name=".tiles-frontpage" path="/theme/tiles-frontpage.jsp">
-   <put name="content" value="${content}" />
-   <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" />
+   <put name="banner"       value="/theme/banner.jsp" />
+   <put name="bannerStatus" value="/theme/bannerStatus.jsp" />
+   <put name="head"         value="/theme/head.jsp" />
+   <put name="styles"       value="/theme/css-sidebar-high.jsp" />
+   <put name="content"      value="${content}" />
+   <put name="sidebar"      value="/theme/empty.jsp" />
+   <put name="footer"       value="/theme/footer.jsp" />
 </definition>
 
 <definition name=".tiles-mainmenupage" path="/theme/tiles-mainmenupage.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="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="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" />
+   <put name="banner"       value="/theme/banner.jsp" />
+   <put name="bannerStatus" value="/theme/bannerStatus.jsp" />
+   <put name="head"         value="/theme/head.jsp" />
+   <put name="styles"       value="/theme/css-sidebar-high.jsp" />
+   <put name="messages"     value="/theme/messages.jsp" />
+   <put name="content"      value="${content}" />
+   <put name="sidebar"      value="/theme/empty.jsp" />
+   <put name="footer"       value="/theme/footer.jsp" />
+</definition>
+
+<definition name=".tiles-tabbedpage" path="/theme/tiles-tabbedpage.jsp">
+   <put name="bannerStatus" value="/theme/bannerStatus.jsp" />
+   <put name="head"         value="/theme/head.jsp" />
+   <put name="styles"       value="/theme/empty.jsp" />
+   <put name="menu"         value="${menu}" />
+   <put name="messages"     value="/theme/messages.jsp" />
+   <put name="content"      value="${content}" />
+   <put name="sidebar"      value="/theme/empty.jsp" />
+   <put name="footer"       value="/theme/footer.jsp" />
 </definition>
 
 <definition name=".tiles-simplepage" path="/theme/tiles-simplepage.jsp">
-   <put name="content"  value="${content}" />
-   <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" />
+   <put name="banner"       value="/theme/empty.jsp" />
+   <put name="bannerStatus" value="/theme/bannerStatus.jsp" />
+   <put name="head"         value="/theme/head.jsp" />
+   <put name="styles"       value="/theme/empty.jsp" />
+   <put name="messages"     value="/theme/messages.jsp" />
+   <put name="content"      value="${content}" />
+   <put name="footer"       value="/theme/footer.jsp" />
+</definition>
+
+<definition name=".tiles-editorpage" extends=".tiles-tabbedpage" >
+   <put name="menu" value="/theme/menu-editor.jsp" />
+</definition>
+
+<definition name=".tiles-adminpage" extends=".tiles-tabbedpage" >
+   <put name="menu" value="/theme/menu-admin.jsp" />
 </definition>
 
-    
 <definition name=".main" extends=".tiles-frontpage" >
     <put name="content" value="/main.jsp" />
     <put name="sidebar" value="/main-sidebar.jsp" />
 </definition>
+
 <definition name=".planet" extends=".tiles-frontpage" >
     <put name="content" value="/planet.jsp" />
 </definition>
@@ -64,6 +69,7 @@
 <definition name=".YourWebsites" extends=".tiles-mainmenupage" >
     <put name="content" value="/website/YourWebsites.jsp" />
     <put name="sidebar" value="/website/YourWebsitesSidebar.jsp" />
+    <put name="styles" value="/theme/css-sidebar-high.jsp" />
 </definition>
 
 <definition name=".YourProfile" extends=".tiles-simplepage" >
@@ -85,14 +91,17 @@
 <definition name=".WeblogEdit" extends=".tiles-editorpage" >
     <put name="content" value="/weblog/WeblogEdit.jsp" />
     <put name="sidebar" value="/weblog/WeblogEditSidebar.jsp" />
+    <put name="styles" value="/theme/css-sidebar-low.jsp" />
 </definition>
 <definition name=".WeblogQuery" extends=".tiles-editorpage" >
     <put name="content" value="/weblog/WeblogQuery.jsp" />
     <put name="sidebar" value="/weblog/WeblogQuerySidebar.jsp" />
+    <put name="styles" value="/theme/css-sidebar-low.jsp" />
 </definition>
 <definition name=".CategoriesForm" extends=".tiles-editorpage" >
     <put name="content" value="/weblog/CategoriesForm.jsp" />
     <put name="sidebar" value="/weblog/CategoriesSidebar.jsp" />
+    <put name="styles" value="/theme/css-sidebar-low.jsp" />
 </definition>
 <definition name=".referers" extends=".tiles-editorpage" >
     <put name="content" value="/weblog/referers.jsp" />
@@ -100,27 +109,28 @@
 <definition name=".BookmarksForm" extends=".tiles-editorpage" >
     <put name="content" value="/bookmarks/BookmarksForm.jsp" />
     <put name="sidebar" value="/bookmarks/BookmarksSidebar.jsp" />
+    <put name="styles" value="/theme/css-sidebar-low.jsp" />
 </definition>
 <definition name=".upload-file" extends=".tiles-editorpage" >
     <put name="content" value="/website/upload-file.jsp" />
 </definition>
 
-<definition name=".WeblogEntryRemove" extends=".tiles-adminpage" >
+<definition name=".WeblogEntryRemove" extends=".tiles-editorpage" >
     <put name="content" value="/weblog/WeblogEntryRemove.jsp" />
 </definition>
-<definition name=".CategoryForm" extends=".tiles-adminpage" >
+<definition name=".CategoryForm" extends=".tiles-editorpage" >
     <put name="content" value="/weblog/CategoryForm.jsp" />
 </definition>
-<definition name=".CategoryDeleteOK" extends=".tiles-adminpage" >
+<definition name=".CategoryDeleteOK" extends=".tiles-editorpage" >
     <put name="content" value="/weblog/CategoryDeleteOK.jsp" />
 </definition>
-<definition name=".BookmarkForm" extends=".tiles-adminpage" >
+<definition name=".BookmarkForm" extends=".tiles-editorpage" >
     <put name="content" value="/bookmarks/BookmarkForm.jsp" />
 </definition>
-<definition name=".FolderForm" extends=".tiles-adminpage" >
+<definition name=".FolderForm" extends=".tiles-editorpage" >
     <put name="content" value="/bookmarks/FolderForm.jsp" />
 </definition>
-<definition name=".import" extends=".tiles-adminpage" >
+<definition name=".import" extends=".tiles-editorpage" >
     <put name="content" value="/bookmarks/import.jsp" />
 </definition>
 
@@ -135,10 +145,12 @@
 <definition name=".edit-pages" extends=".tiles-editorpage"  >
     <put name="content" value="/website/edit-pages.jsp" />
     <put name="sidebar" value="/website/edit-pages-sidebar.jsp" />
+    <put name="styles" value="/theme/css-sidebar-low.jsp" />
 </definition>
 <definition name=".MemberPermissions" extends=".tiles-editorpage" >
     <put name="content" value="/website/MemberPermissions.jsp" />
     <put name="sidebar" value="/website/MemberPermissionsSidebar.jsp" />
+    <put name="styles" value="/theme/css-sidebar-low.jsp" />
 </definition>
 <definition name=".CustomPingTargets" extends=".tiles-editorpage" >
     <put name="content" value="/weblog/CustomPingTargets.jsp" />
@@ -150,22 +162,22 @@
     <put name="content" value="/weblog/Pings.jsp" />
 </definition>
 
-<definition name=".CustomPingTargetDeleteOK" extends=".tiles-adminpage" >
+<definition name=".CustomPingTargetDeleteOK" extends=".tiles-editorpage" >
     <put name="content" value="/weblog/CustomPingTargetDeleteOK.jsp" />
 </definition>
-<definition name=".CustomPingTargetEdit" extends=".tiles-adminpage" >
+<definition name=".CustomPingTargetEdit" extends=".tiles-editorpage" >
     <put name="content" value="/weblog/CustomPingTargetEdit.jsp" />
 </definition>
-<definition name=".InviteMember" extends=".tiles-adminpage" >
+<definition name=".InviteMember" extends=".tiles-editorpage" >
     <put name="content" value="/website/InviteMember.jsp" />
 </definition>
-<definition name=".InviteMemberDone" extends=".tiles-adminpage" >
+<definition name=".InviteMemberDone" extends=".tiles-editorpage" >
     <put name="content" value="/website/InviteMemberDone.jsp" />
 </definition>
-<definition name=".edit-page" extends=".tiles-adminpage"  >
+<definition name=".edit-page" extends=".tiles-editorpage"  >
     <put name="content" value="/website/edit-page.jsp" />
 </definition>
-<definition name=".remove-page" extends=".tiles-adminpage"  >
+<definition name=".remove-page" extends=".tiles-editorpage"  >
     <put name="content" value="/website/remove-page.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=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/bookmarks/BookmarkForm.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/bookmarks/BookmarkForm.jsp Sat Aug 27 04:46:10 2005
@@ -1,25 +1,33 @@
 <%@ include file="/taglibs.jsp" %>
 
+<c:if test="${!empty parentFolder.parent.path}">
+    <c:set var="folderName" value="${parentFolder.parent.path}" />
+</c:if>
+<c:if test="${empty parentFolder.parent.path}">
+    <c:set var="folderName" value="/" />
+</c:if>
+
 <p class="subtitle">
 <c:if test="${state == 'add'}">
-    <fmt:message key="bookmarkForm.addBookmark" />
+    <fmt:message key="bookmarkForm.add.subtitle" >
+        <fmt:param value="${folderName}" />
+    </fmt:message>
 </c:if>
 <c:if test="${state == 'edit'}">
-    <fmt:message key="bookmarkForm.editBookmark" />
+    <fmt:message key="bookmarkForm.edit.subtitle" >
+        <fmt:param value="${folderName}" />
+    </fmt:message>
 </c:if>
 <c:if test="${state == 'correct'}">
-    <fmt:message key="bookmarkForm.correctBookmark" />
+    <fmt:message key="bookmarkForm..correct.subtitle" >
+        <fmt:param value="${folderName}" />
+    </fmt:message>
 </c:if>
 </p>
 
 <p>
 <b><fmt:message key="bookmarksForm.path" /></b>:
-<c:if test="${!empty parentFolder.parent.path}">
-    <c:out value="${parentFolder.parent.path}" />
-</c:if>
-<c:if test="${empty parentFolder.parent.path}">
-    /
-</c:if>
+   <c:out value="${folderName}" />
 </p>
 
 <html:form action="/editor/bookmarkSave" method="post" focus="name">
@@ -72,7 +80,7 @@
     <p>
     <input type="submit" value="<fmt:message key='bookmarkForm.save'/>" />
     <input type="button" value="<fmt:message key='bookmarkForm.cancel' />" 
-        onclick="window.location = 'bookmarks.do?method=selectFolder&amp;folderid=<%=
+        onclick="window.location = 'bookmarks.do?method=selectFolder&amp;folderId=<%=
         request.getAttribute(RollerRequest.FOLDERID_KEY) %>'" />
     </p>
 

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

Modified: incubator/roller/branches/roller_2.0/web/bookmarks/FolderForm.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/bookmarks/FolderForm.jsp?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/bookmarks/FolderForm.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/bookmarks/FolderForm.jsp Sat Aug 27 04:46:10 2005
@@ -1,26 +1,27 @@
 <%@ include file="/taglibs.jsp" %>
 
-<h3>
-<img src='<c:url value="/images/Folder24.png" />' alt="folder" align="absmiddle" />
+<c:if test="${!empty parentFolder.parent.path}">
+    <c:set var="folderName" value="${parentFolder.parent.path}" />
+</c:if>
+<c:if test="${empty parentFolder.parent.path}">
+    <c:set var="folderName" value="/" />
+</c:if>
+
+<p class="subtitle">
 <c:if test="${state == 'add'}">
-    <fmt:message key="folderForm.addFolder" /></h3>
+    <fmt:message key="folderForm.add.subtitle" /></h3>
 </c:if>
 <c:if test="${state == 'edit'}">
-    <fmt:message key="folderForm.editFolder" />
+    <fmt:message key="folderForm.edit.subtitle" />
 </c:if>
 <c:if test="${state == 'correct'}">
-    <fmt:message key="folderForm.correctFolder" />
+    <fmt:message key="folderForm.correct.subtitle" />
 </c:if>
-</h3>
+</p>
 
 <p>
 <b><fmt:message key="bookmarksForm.path" /></b>:
-<c:if test="${!empty parentFolder.parent.path}">
-    <c:out value="${parentFolder.parent.path}" />
-</c:if>
-<c:if test="${empty parentFolder.parent.path}">
-    /
-</c:if>
+<c:out value="${folderName}" />
 </p>
 
 <html:form action="/editor/folderSave" method="post" focus="name">
@@ -47,7 +48,7 @@
     <p>
     <input type="submit" value="<fmt:message key='folderForm.save' />" />
     <input type="button" value="<fmt:message key='folderForm.cancel' />" 
-        onclick="window.location = 'bookmarks.do?method=selectFolder&amp;folderid=<%=
+        onclick="window.location = 'bookmarks.do?method=selectFolder&amp;folderId=<%=
         request.getAttribute(RollerRequest.PARENTID_KEY) %>'" />
     </p>
 

Modified: incubator/roller/branches/roller_2.0/web/error.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/error.jsp?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/error.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/error.jsp Sat Aug 27 04:46:10 2005
@@ -1,8 +1,10 @@
 <%@ include file="/taglibs.jsp" %>
 <tiles:insert page="/theme/tiles-simplepage.jsp">
-   <tiles:put name="content"  value="/errorBody.jsp" />
-   <tiles:put name="banner"   value="/theme/banner.jsp" />
-   <tiles:put name="footer"   value="/theme/footer.jsp" />
-   <tiles:put name="head"     value="/theme/head.jsp" />
-   <tiles:put name="messages" value="/theme/messages.jsp" />
+   <tiles:put name="banner"       value="/theme/banner.jsp" />
+   <tiles:put name="bannerStatus" value="/theme/bannerStatus.jsp" />
+   <tiles:put name="head"         value="/theme/head.jsp" />
+   <tiles:put name="styles"       value="/theme/css-banner.jsp" />
+   <tiles:put name="messages"     value="/theme/messages.jsp" />
+   <tiles:put name="content"      value="/errorBody.jsp" />
+   <tiles:put name="footer"       value="/theme/footer.jsp" />
 </tiles:insert>

Modified: incubator/roller/branches/roller_2.0/web/login-redirect.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/login-redirect.jsp?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/login-redirect.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/login-redirect.jsp Sat Aug 27 04:46:10 2005
@@ -1,29 +1,28 @@
 <%@ page language="java" errorPage="/error.jsp" contentType="text/html; charset=UTF-8" %><%@ 
 taglib uri="http://java.sun.com/jstl/core" prefix="c" %><%@ 
-taglib uri="http://www.rollerweblogger.org/tags" prefix="roller" %><%@ 
-page import="org.roller.model.*" %><%@
-page import="org.roller.pojos.*" %><%@
-page import="org.roller.config.RollerConfig" %><%@
-page import="org.roller.presentation.RollerSession" %><%@
+taglib uri="http://www.rollerweblogger.org/tags" prefix="roller" %><%@ 
+page import="org.roller.model.*" %><%@
+page import="org.roller.pojos.*" %><%@
+page import="org.roller.config.RollerConfig" %><%@
+page import="org.roller.presentation.RollerSession" %><%@
 page import="java.util.List" %>
 <% request.setAttribute("secure_login", RollerConfig.getProperty("securelogin.enabled")); %>
 <c:if test='${secure_login == "true"}' >
   <roller:secure mode="unsecured" />
 </c:if>
-<%
-Roller roller = RollerFactory.getRoller();
-RollerSession rollerSession = RollerSession.getRollerSession(request);
-UserData user = rollerSession.getAuthenticatedUser();
-List websites = roller.getUserManager().getWebsites(user, Boolean.TRUE);
-if (websites.size() == 1) {
-    WebsiteData website = (WebsiteData)websites.get(0);
-    website.hasUserPermissions(user, PermissionsData.LIMITED);
-    rollerSession.setCurrentWebsite(website);
-    response.sendRedirect(
-        "editor/weblog.do?method=create&rmk=tabbedmenu.weblog&rmik=tabbedmenu.weblog.newEntry");
-} else {
-    response.sendRedirect(
-       "editor/yourWebsites.do?method=edit&rmik=tabbedmenu.user.websites");
-}
+<%
+Roller roller = RollerFactory.getRoller();
+RollerSession rollerSession = RollerSession.getRollerSession(request);
+UserData user = rollerSession.getAuthenticatedUser();
+List websites = roller.getUserManager().getWebsites(user, Boolean.TRUE);
+if (websites.size() == 1) {
+    WebsiteData website = (WebsiteData)websites.get(0);
+    website.hasUserPermissions(user, PermissionsData.LIMITED);
+    response.sendRedirect(
+        "editor/weblog.do?method=create&rmk=tabbedmenu.weblog&rmik=tabbedmenu.weblog.newEntry&weblog="+website.getHandle());
+} else {
+    response.sendRedirect(
+       "editor/yourWebsites.do?method=edit&rmik=tabbedmenu.user.websites");
+}
 %>
 

Modified: incubator/roller/branches/roller_2.0/web/login.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/login.jsp?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/login.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/login.jsp Sat Aug 27 04:46:10 2005
@@ -1,8 +1,10 @@
 <%@ include file="/taglibs.jsp" %>
 <tiles:insert page="/theme/tiles-simplepage.jsp">
-   <tiles:put name="content"  value="/loginBody.jsp" />
-   <tiles:put name="banner"   value="/theme/banner.jsp" />
-   <tiles:put name="footer"   value="/theme/footer.jsp" />
-   <tiles:put name="head"     value="/theme/head.jsp" />
-   <tiles:put name="messages" value="/theme/messages.jsp" />
+   <tiles:put name="banner"       value="/theme/banner.jsp" />
+   <tiles:put name="bannerStatus" value="/theme/bannerStatus.jsp" />
+   <tiles:put name="head"         value="/theme/head.jsp" />
+   <tiles:put name="styles"       value="/theme/css-banner.jsp" />
+   <tiles:put name="messages"     value="/theme/messages.jsp" />
+   <tiles:put name="content"      value="/loginBody.jsp" />
+   <tiles:put name="footer"       value="/theme/footer.jsp" />
 </tiles:insert>

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

Added: incubator/roller/branches/roller_2.0/web/theme/bannerStatus.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/bannerStatus.jsp?rev=240407&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/bannerStatus.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/theme/bannerStatus.jsp Sat Aug 27 04:46:10 2005
@@ -0,0 +1,51 @@
+<%@ include file="/taglibs.jsp" %>
+<%
+RollerContext rctx = RollerContext.getRollerContext(request);
+RollerSession rollerSession = RollerSession.getRollerSession(request);
+RollerRequest rreq = RollerRequest.getRollerRequest(request);
+UserData user = rollerSession.getAuthenticatedUser();
+WebsiteData website = rreq.getWebsite();
+String absURL = rctx.getAbsoluteContextUrl(request);
+boolean allowNewUsers = RollerConfig.getBooleanProperty("users.registration.enabled");
+%>
+<div class="bannerStatusBox">
+    
+    <div class="bannerLeft">
+        <roller:link forward="main">
+            <%= RollerRuntimeConfig.getProperty("site.shortName") %>
+        </roller:link>
+    </div>
+
+    <div class="bannerRight">
+            
+        <% if (user != null) { %>
+            <fmt:message key="mainPage.loggedInAs" />
+             <b><%= user.getUserName() %></b>
+             |
+        <% } %>
+        
+        <c:if test="${!empty model.website}" >
+             <fmt:message key="mainPage.currentWebsite" />
+              <b><c:out value="${model.website.handle}" /></b>
+              |
+        </c:if>
+
+        <roller:link forward="yourWebsites">
+            <fmt:message key="mainPage.mainMenu" />
+        </roller:link>
+
+        <% if (user != null) { %>
+            | <html:link forward="logout-redirect"><fmt:message key="navigationBar.logout"/></html:link>
+        <% } else if (allowNewUsers) { %>
+            | <html:link forward="login-redirect"><fmt:message key="navigationBar.login"/></html:link>
+            | <html:link forward="registerUser"><fmt:message key="navigationBar.register"/></html:link>
+        <% } else { %>
+            | <html:link forward="login-redirect"><fmt:message key="navigationBar.login"/></html:link>
+        <% } %>
+
+    </div>
+    
+</div>
+
+
+

Modified: incubator/roller/branches/roller_2.0/web/theme/blue/colors.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/blue/colors.css?rev=240407&r1=240406&r2=240407&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/blue/colors.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/blue/colors.css Sat Aug 27 04:46:10 2005
@@ -1,5 +1,5 @@
 
-/* Customizable colors and images */
+/* BLUE : Customizable colors and images */
 
 /* ------------------------------------------------------------------------ */
 /* add colors and images to roller.css */
@@ -10,17 +10,17 @@
 .sidebarfade {
     background: url("two-sidebarfade.png") repeat-x top;
 }
-.statusBox {
+.bannerStatusBox {
     background: #00038a;
     color: white;
 }
-.statusBox a {
+.bannerStatusBox a {
     color: white;
 }
-.statusBox a:link {
+.bannerStatusBox a:link {
     color: white;
 }
-.statusBox a:visited {
+.bannerStatusBox a:visited {
     color: white;
 }
 h1 {

Added: incubator/roller/branches/roller_2.0/web/theme/css-banner.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/css-banner.jsp?rev=240407&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/css-banner.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/theme/css-banner.jsp Sat Aug 27 04:46:10 2005
@@ -0,0 +1,7 @@
+
+#banner {
+    height: 105px; 
+}
+
+
+

Added: incubator/roller/branches/roller_2.0/web/theme/css-sidebar-high.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/css-sidebar-high.jsp?rev=240407&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/css-sidebar-high.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/theme/css-sidebar-high.jsp Sat Aug 27 04:46:10 2005
@@ -0,0 +1,13 @@
+
+#centercontent {
+    margin: 15px 260px 0px 15px;
+}
+#rightcontent {
+    position: absolute;
+    top:   120px;
+    right:  15px;
+    width: 230px;
+}
+
+
+

Added: incubator/roller/branches/roller_2.0/web/theme/css-sidebar-low.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/css-sidebar-low.jsp?rev=240407&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/css-sidebar-low.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/theme/css-sidebar-low.jsp Sat Aug 27 04:46:10 2005
@@ -0,0 +1,13 @@
+
+#centercontent {
+    margin: 15px 260px 0px 15px;
+}
+#rightcontent {
+    position: absolute;
+    top:   140px;
+    right:  15px;
+    width: 230px;
+}
+
+
+

Added: incubator/roller/branches/roller_2.0/web/theme/empty.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/empty.jsp?rev=240407&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/empty.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/theme/empty.jsp Sat Aug 27 04:46:10 2005
@@ -0,0 +1,5 @@
+
+<%-- empty tile --%>
+
+
+



Mime
View raw message