roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r543893 [3/4] - in /roller/branches/roller_guice/apps: planet/nbproject/ weblogger/ weblogger/nbproject/ weblogger/src/java/org/apache/roller/weblogger/ weblogger/src/java/org/apache/roller/weblogger/business/ weblogger/src/java/org/apache/...
Date Sun, 03 Jun 2007 14:00:41 GMT
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java Sun Jun  3 07:00:36 2007
@@ -50,7 +50,6 @@
 import org.apache.roller.weblogger.util.DateUtil;
 import org.apache.roller.weblogger.util.RegexUtil;
 import org.apache.roller.weblogger.util.URLUtilities;
-import org.apache.struts.util.RequestUtils;
 
 /**
  * Load Velocity Context with Roller objects, values, and custom plugins.
@@ -414,7 +413,7 @@
         ctx.put("uploadPath", ContextLoader.figureResourcePath());
         
         try {
-            URL absUrl = RequestUtils.absoluteURL(request, "/");
+            URL absUrl = new URL(RollerRuntimeConfig.getAbsoluteContextURL());
             ctx.put("host", absUrl.getHost());
         } catch (MalformedURLException e) {
             throw new RollerException(e);

Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java Sun Jun  3 07:00:36 2007
@@ -18,7 +18,6 @@
 
 package org.apache.roller.weblogger.ui.rendering.velocity.deprecated;
 
-import java.net.MalformedURLException;
 import java.util.Date;
 import java.util.Hashtable;
 import java.util.Iterator;
@@ -30,22 +29,19 @@
 import javax.servlet.jsp.PageContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.struts.util.RequestUtils;
 import org.apache.roller.RollerException;
 import org.apache.roller.weblogger.business.WeblogEntryPlugin;
 import org.apache.roller.weblogger.business.PluginManager;
 import org.apache.roller.weblogger.business.Roller;
 import org.apache.roller.weblogger.business.RollerFactory;
+import org.apache.roller.weblogger.config.RollerRuntimeConfig;
 import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
 import org.apache.roller.weblogger.pojos.Weblog;
 import org.apache.roller.weblogger.pojos.wrapper.RefererDataWrapper;
 import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper;
-import org.apache.roller.weblogger.ui.core.RequestConstants;
 import org.apache.roller.weblogger.ui.core.RollerSession;
 import org.apache.roller.weblogger.ui.core.tags.calendar.CalendarModel;
 import org.apache.roller.weblogger.ui.core.tags.calendar.CalendarTag;
-import org.apache.roller.weblogger.ui.core.tags.menu.EditorNavigationBarTag;
-import org.apache.roller.weblogger.ui.core.tags.menu.MenuTag;
 import org.apache.roller.weblogger.ui.core.tags.calendar.BigWeblogCalendarModel;
 import org.apache.roller.weblogger.ui.core.tags.calendar.WeblogCalendarModel;
 import org.apache.roller.weblogger.ui.rendering.util.WeblogPageRequest;
@@ -133,35 +129,9 @@
     
     
     public String getToggleLinkbackDisplayHTML(RefererDataWrapper referer) {
-        String ret = "";
-        String link = null;
-        try {
-            RollerSession rollerSession =
-                    RollerSession.getRollerSession(mRequest);
-            if (mWebsite != null
-                    && rollerSession.isUserAuthorizedToAdmin(mWebsite)) {
-                Hashtable params = new Hashtable();
-                params.put( RequestConstants.REFERRER_ID, referer.getId());
-                params.put( RequestConstants.WEBLOG, mWebsite.getHandle());
-                link = RequestUtils.computeURL( mPageContext,
-                        "toggleLinkback", null, null, null, params,null,false);
-                
-                StringBuffer sb = new StringBuffer();
-                sb.append("[<a href=\"");
-                sb.append(link);
-                if ( referer.getVisible().booleanValue() ) {
-                    sb.append("\">Visible</a>] ");
-                } else {
-                    sb.append("\">Hidden</a>] ");
-                }
-                ret = sb.toString();
-            }
-        } catch (Exception e) {
-            // should never happen, but if it does:
-            mLogger.error("ERROR creating toggle-linkback URL",e);
-        }
-        
-        return ret;
+        // NOTE: this was EOLed as part of Roller 4.0 since we no longer
+        // have an action for toggling linkback display
+        return "";
     }
     
     
@@ -200,15 +170,9 @@
      * @return String HTML for navbar.
      */
     public String showEditorNavBar(boolean vertical) {
-        EditorNavigationBarTag editorTag = new EditorNavigationBarTag();
-        editorTag.setPageContext(mPageContext);
-        if ( vertical ) {
-            editorTag.setView("templates/navbar/navbar-vertical.vm");
-        } else {
-            editorTag.setView("templates/navbar/navbar-horizontal.vm");
-        }
-        editorTag.setModel("editor-menu.xml");
-        return editorTag.emit();
+        // this method has been EOLd starting in Roller 4.0
+        // this same functionality can be obtained via the #showAuthorMenu() macro
+        return null;
     }
     
     
@@ -219,11 +183,9 @@
      * @return String HTML for menu.
      */
     public String showMenu(String model, String template) {
-        MenuTag menuTag = new MenuTag();
-        menuTag.setPageContext(mPageContext);
-        menuTag.setModel(model);
-        menuTag.setView(template);
-        return menuTag.emit();
+        // this method has been EOLd starting in Roller 4.0
+        // this same functionality can be obtained via the #showAuthorMenu() macro
+        return null;
     }
     
     //------------------------------------------------- WeblogCalendar methods
@@ -302,35 +264,25 @@
      */
     public String strutsUrlHelper1( boolean useIds, boolean isAction,
             String path, String val1, String val2, Hashtable params) {
-        if (useIds) {
-            if (mFolder != null) {
-                params.put(RequestConstants.FOLDER_ID,
-                        mFolder.getId());
-            }
-            if (mWebsite != null) {
-                params.put(RequestConstants.WEBLOG, mWebsite.getHandle());
-            }
-        }
         
-        if (OldStringUtils.isNotEmpty(val1) && !val1.equals("null")) {
-            params.clear();
-            params.put("weblog", val1);
-        }
+        // NOTE: this method is now official defunct since Roller 4.0
+        // when we EOLed struts1 and had no real equivalent for this
         
-        String returnUrl = "";
-        try {
-            if (isAction) {
-                returnUrl = RequestUtils.computeURL( mPageContext,
-                        path, null, null, null, params, null, false);
-            } else {
-                returnUrl = RequestUtils.computeURL( mPageContext,
-                        null, path, null, null, params, null, false);
-            }
-        } catch (MalformedURLException mue) {
-            mLogger.warn("RollerRequest.strutsUrlHelper exception: ", mue);
-            returnUrl = "<span class=\"error\">ERROR generating link</span>";
+        if(path == null) {
+            return null;
+        } else if("weblogCreate".equals(path)) {
+            // a little hacky, but hopefully nobody is really using this anymore
+            return RollerRuntimeConfig.getRelativeContextURL()+"/roller-ui/authoring/entryAdd.rol?weblog="+val1;
+        } else if("editWebsite".equals(path)) {
+            // a little hacky, but hopefully nobody is really using this anymore
+            return RollerRuntimeConfig.getRelativeContextURL()+"/roller-ui/authoring/weblogConfig.rol?weblog="+val1;
+        } else if("logout-redirect".equals(path)) {
+            return URLUtilities.getLogoutURL(false);
+        } else if("login-redirect".equals(path)) {
+            return URLUtilities.getLoginURL(false);
+        } else {
+            return "<span class=\"error\">ERROR generating link</span>";
         }
-        return returnUrl;
     }
     
     

Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java Sun Jun  3 07:00:36 2007
@@ -121,13 +121,8 @@
     }
     
     
-    public String cancel() {
-        return "cancel";
-    }
-    
-    
     // TODO: replace with struts2 validation
-    protected void myValidate() {
+    private void myValidate() {
         
         String allowed = RollerConfig.getProperty("username.allowedChars");
         if(allowed == null || allowed.trim().length() == 0) {

Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUserBean.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUserBean.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUserBean.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUserBean.java Sun Jun  3 07:00:36 2007
@@ -30,6 +30,7 @@
     private String id = null;
     private String userName = null;
     private String password = null;
+    private String screenName = null;
     private String fullName = null;
     private String emailAddress = null;
     private String locale = null;
@@ -63,7 +64,15 @@
     public void setPassword(String password) {
         this.password = password;
     }
+    
+    public String getScreenName() {
+        return screenName;
+    }
 
+    public void setScreenName(String screenName) {
+        this.screenName = screenName;
+    }
+    
     public String getFullName() {
         return fullName;
     }
@@ -123,6 +132,7 @@
     
     public void copyTo(User dataHolder, Locale locale) {
         
+        dataHolder.setScreenName(this.screenName);
         dataHolder.setFullName(this.fullName);
         dataHolder.setEmailAddress(this.emailAddress);
         dataHolder.setLocale(this.locale);
@@ -137,6 +147,7 @@
         this.id = dataHolder.getId();
         this.userName = dataHolder.getUserName();
         this.password = dataHolder.getPassword();
+        this.screenName = dataHolder.getScreenName();
         this.fullName = dataHolder.getFullName();
         this.emailAddress = dataHolder.getEmailAddress();
         this.locale = dataHolder.getLocale();

Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java Sun Jun  3 07:00:36 2007
@@ -157,11 +157,6 @@
     }
     
     
-    public String cancel() {
-        return "cancel";
-    }
-    
-    
     // TODO: replace with struts2 validation
     private void myValidate() {
         

Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java Sun Jun  3 07:00:36 2007
@@ -87,12 +87,6 @@
     }
     
     
-    @SkipValidation
-    public String cancel() {
-        return "cancel";
-    }
-    
-    
     public String save() {
         
         User user = getAuthenticatedUser();

Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java Sun Jun  3 07:00:36 2007
@@ -67,12 +67,6 @@
     }
     
     
-    @SkipValidation
-    public String cancel() {
-        return "cancel";
-    }
-    
-    
     public String save() {
         
         myValidate();

Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java Sun Jun  3 07:00:36 2007
@@ -106,12 +106,6 @@
     }
     
     
-    @SkipValidation
-    public String cancel() {
-        return "cancel";
-    }
-    
-    
     public String save() {
         
         if(!RollerRuntimeConfig.getBooleanProperty("users.registration.enabled")) {

Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java Sun Jun  3 07:00:36 2007
@@ -26,6 +26,7 @@
 import org.apache.roller.RollerException;
 import org.apache.roller.weblogger.business.RollerFactory;
 import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.pojos.WeblogCategory;
 import org.apache.roller.weblogger.pojos.WeblogPermission;
 import org.apache.roller.weblogger.pojos.WeblogEntry;
 import org.apache.roller.weblogger.ui.struts2.util.KeyValueObject;
@@ -112,6 +113,22 @@
         }
         
         return LIST;
+    }
+    
+    
+    public List<WeblogCategory> getCategories() {
+        // make list of categories with first option being being a transient
+        // category just meant to represent the default option of any category
+        List<WeblogCategory> cats = new ArrayList();
+        
+        WeblogCategory tmpCat = new WeblogCategory();
+        tmpCat.setName("Any");
+        tmpCat.setPath("");
+        cats.add(tmpCat);
+        
+        cats.addAll(getActionWeblog().getWeblogCategories());
+        
+        return cats;
     }
     
     

Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java Sun Jun  3 07:00:36 2007
@@ -22,21 +22,21 @@
 import java.util.Arrays;
 import java.util.Date;
 import java.util.Iterator;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.weblogger.RollerPermissionsException;
 import org.apache.roller.weblogger.business.RollerFactory;
 import org.apache.roller.weblogger.business.WeblogManager;
 import org.apache.roller.weblogger.pojos.WeblogPermission;
 import org.apache.roller.weblogger.pojos.WeblogEntry;
 import org.apache.roller.weblogger.util.cache.CacheManager;
 import org.apache.roller.weblogger.util.MailUtil;
-import org.apache.commons.lang.StringUtils;
 import org.apache.roller.weblogger.util.RollerMessages;
 import org.apache.roller.weblogger.util.RollerMessages.RollerMessage;
 import org.apache.roller.weblogger.util.Trackback;
 import org.apache.roller.weblogger.util.TrackbackNotAllowedException;
+import org.apache.roller.weblogger.util.URLUtilities;
 import org.apache.struts2.interceptor.validation.SkipValidation;
 
 
@@ -256,7 +256,7 @@
     
     
     public String getPreviewURL() {
-        return getEntry().getPermalink();
+        return URLUtilities.getPreviewWeblogEntryURL(getEntry().getAnchor(), getActionWeblog(), null, true);
     }
     
     

Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java Sun Jun  3 07:00:36 2007
@@ -18,6 +18,7 @@
 
 package org.apache.roller.weblogger.ui.struts2.editor;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -76,10 +77,17 @@
         
         List<WeblogPermission> permissions = getActionWeblog().getPermissions();
         
+        // we have to copy the permissions list so that when we remove permissions
+        // below we don't get ConcurrentModificationExceptions
+        List<WeblogPermission> permsList = new ArrayList();
+        for( WeblogPermission perm : permissions ) {
+            permsList.add(perm);
+        }
+        
         int removed = 0;
         int changed = 0;
         try {
-            for( WeblogPermission perms : permissions ) {
+            for( WeblogPermission perms : permsList ) {
                 
                 String sval = getParameter("perm-" + perms.getId());
                 if (sval != null) {

Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java Sun Jun  3 07:00:36 2007
@@ -149,11 +149,6 @@
     }
     
     
-    public String cancel() {
-        return "cancel";
-    }
-    
-    
     private void myValidate() {
         
         // if name changed make sure there isn't a conflict

Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java Sun Jun  3 07:00:36 2007
@@ -20,7 +20,9 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
@@ -45,6 +47,10 @@
     // list of template action types user is allowed to create
     private List availableActions = Collections.EMPTY_LIST;
     
+    // name and action of new template if we are adding a template
+    private String newTmplName = null;
+    private String newTmplAction = null;
+    
     
     public Templates() {
         this.actionName = "templates";
@@ -53,7 +59,6 @@
     }
     
     
-    // must be a weblog admin to use this action
     public short requiredWeblogPermissions() {
         return WeblogPermission.ADMIN;
     }
@@ -97,6 +102,90 @@
     }
     
     
+    /**
+     * Save a new template.
+     */
+    public String add() {
+        
+        // validation
+        myValidate();
+        
+        if(!hasActionErrors()) try {
+            
+            WeblogTemplate newTemplate = new WeblogTemplate();
+            newTemplate.setWebsite(getActionWeblog());
+            newTemplate.setAction(getNewTmplAction());
+            newTemplate.setName(getNewTmplName());
+            newTemplate.setDescription(newTemplate.getName());
+            newTemplate.setContents(getText("pageForm.newTemplateContent"));
+            newTemplate.setHidden(false);
+            newTemplate.setNavbar(false);
+            newTemplate.setLastModified( new Date() );
+            
+            // all templates start out as velocity templates
+            newTemplate.setTemplateLanguage("velocity");
+            
+            // for now, all templates just use _decorator
+            if(!"_decorator".equals(newTemplate.getName())) {
+                newTemplate.setDecoratorName("_decorator");
+            }
+            
+            // save the new Template
+            UserManager mgr = RollerFactory.getRoller().getUserManager();
+            mgr.savePage( newTemplate );
+            
+            // if this person happened to create a Weblog template from
+            // scratch then make sure and set the defaultPageId
+            if(WeblogTemplate.DEFAULT_PAGE.equals(newTemplate.getName())) {
+                getActionWeblog().setDefaultPageId(newTemplate.getId());
+                mgr.saveWebsite(getActionWeblog());
+            }
+            
+            // flush results to db
+            RollerFactory.getRoller().flush();
+            
+            // reset form fields
+            setNewTmplName(null);
+            setNewTmplAction(null);
+            
+        } catch (RollerException ex) {
+            log.error("Error adding new template for weblog - "+getActionWeblog().getHandle(), ex);
+            // TODO: i18n
+            addError("Error adding new template");
+        }
+        
+        return execute();
+    }
+    
+    
+    // validation when adding a new template
+    private void myValidate() {
+        
+        // make sure name is non-null and within proper size
+        if(StringUtils.isEmpty(getNewTmplName())) {
+            addError("TemplateEdit.error.nameNull");
+        } else if(getNewTmplName().length() > 255) {
+            addError("TemplateEdit.error.nameSize");
+        }
+        
+        // make sure action is a valid
+        if(StringUtils.isEmpty(getNewTmplAction())) {
+            addError("TemplateEdit.error.actionNull");
+        }
+        
+        // check if template by that name already exists
+        try {
+            UserManager umgr = RollerFactory.getRoller().getUserManager();
+            WeblogTemplate existingPage = umgr.getPageByName(getActionWeblog(), getNewTmplName());
+            if(existingPage != null) {
+                addError("pagesForm.error.alreadyExists", getNewTmplName());
+            }
+        } catch (RollerException ex) {
+            log.error("Error checking for existing template", ex);
+        }
+    }
+    
+    
     public List getTemplates() {
         return templates;
     }
@@ -111,6 +200,22 @@
 
     public void setAvailableActions(List availableActions) {
         this.availableActions = availableActions;
+    }
+    
+    public String getNewTmplName() {
+        return newTmplName;
+    }
+
+    public void setNewTmplName(String newTmplName) {
+        this.newTmplName = newTmplName;
+    }
+
+    public String getNewTmplAction() {
+        return newTmplAction;
+    }
+
+    public void setNewTmplAction(String newTmplAction) {
+        this.newTmplAction = newTmplAction;
     }
     
 }

Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java Sun Jun  3 07:00:36 2007
@@ -71,7 +71,7 @@
             CacheManager.invalidate(getActionWeblog());
             
             // TODO: i18n
-            addMessage("Successfully removed weblog ["+getActionWeblog().getName()+"]");
+            addMessage("Successfully removed weblog - "+getActionWeblog().getName());
             
             return SUCCESS;
             
@@ -82,6 +82,7 @@
         }
         
         return "confirm";
+        
     }
     
 }

Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/UIActionInterceptor.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/UIActionInterceptor.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/UIActionInterceptor.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/UIActionInterceptor.java Sun Jun  3 07:00:36 2007
@@ -28,7 +28,6 @@
 import org.apache.roller.weblogger.business.RollerFactory;
 import org.apache.roller.weblogger.business.UserManager;
 import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.ui.core.RequestConstants;
 import org.apache.roller.weblogger.ui.core.RollerSession;
 import org.apache.struts2.StrutsStatics;
 

Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/UIActionPrepareInterceptor.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/UIActionPrepareInterceptor.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/UIActionPrepareInterceptor.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/UIActionPrepareInterceptor.java Sun Jun  3 07:00:36 2007
@@ -21,16 +21,8 @@
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
-import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.business.RollerFactory;
-import org.apache.roller.weblogger.business.UserManager;
-import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.ui.core.RequestConstants;
-import org.apache.roller.weblogger.ui.core.RollerSession;
-import org.apache.struts2.StrutsStatics;
 
 
 /**

Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/UISecurityInterceptor.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/UISecurityInterceptor.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/UISecurityInterceptor.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/UISecurityInterceptor.java Sun Jun  3 07:00:36 2007
@@ -20,15 +20,10 @@
 
 import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
-import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.business.RollerFactory;
-import org.apache.roller.weblogger.business.UserManager;
 import org.apache.roller.weblogger.pojos.User;
 import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.ui.core.RequestConstants;
-import org.apache.roller.weblogger.ui.core.RollerSession;
 
 
 /**

Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/URLUtilities.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/URLUtilities.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/URLUtilities.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/URLUtilities.java Sun Jun  3 07:00:36 2007
@@ -416,13 +416,44 @@
             url.append(RollerRuntimeConfig.getRelativeContextURL());
         }
         
-        url.append("/roller-ui/logout-redirect.rol");
+        url.append("/roller-ui/logout.rol");
         
         return url.toString();
     }
     
     
     /**
+     * Get a url to a UI action in a given namespace, optionally specifying
+     * a weblogHandle parameter if that is needed by the action.
+     */
+    public static final String getActionURL(String action,
+                                            String namespace,
+                                            String weblogHandle,
+                                            boolean absolute) {
+        
+        StringBuffer url = new StringBuffer();
+        
+        if(absolute) {
+            url.append(RollerRuntimeConfig.getAbsoluteContextURL());
+        } else {
+            url.append(RollerRuntimeConfig.getRelativeContextURL());
+        }
+        
+        url.append(namespace);
+        url.append("/").append(action).append(".rol");
+        
+        if(weblogHandle != null) {
+            Map params = new HashMap();
+            params.put("weblog", weblogHandle);
+            
+            return url.toString() + getQueryString(params);
+        } else {
+            return url.toString();
+        }
+    }
+    
+    
+    /**
      * Get a url to add a new weblog entry.
      */
     public static final String getEntryAddURL(String weblogHandle,
@@ -484,7 +515,7 @@
             url.append(RollerRuntimeConfig.getRelativeContextURL());
         }
         
-        url.append("/roller-ui/admin/weblogConfig.rol");
+        url.append("/roller-ui/authoring/weblogConfig.rol");
         
         Map params = new HashMap();
         params.put("weblog", weblogHandle);

Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties Sun Jun  3 07:00:36 2007
@@ -1291,22 +1291,39 @@
 
 themeEditor.title=Weblog Theme
 themeEditor.subtitle=Select theme for weblog <span>{0}</span>
-themeEditor.tip=You can select a new theme for this weblog. BEWARE: if you \
-have customized your current theme by editing the templates that define it, \
-then switching to a new theme may destroy your customizations.
+
+themeEditor.sharedTheme=Shared Theme
+themeEditor.sharedThemeDescription=This option is for users who don't \
+want to fuss with designing their weblog on their own and prefer the \
+easier option of using a predefined theme.
+
+themeEditor.customTheme=Custom Theme
+themeEditor.customThemeDescription=This option is for the creative \
+bloggers who want to be able to create a blog design of their own.  \
+Beware though, managing a blog design of your own takes a bit of effort.
+
+themeEditor.yourCurrentTheme=Your current theme is
 themeEditor.selectTheme=Select a new theme to preview
 themeEditor.youMayCustomize=If you like you may customize a personal copy of \
 this theme.
-themeEditor.yourCurrentTheme=Your current theme is
-themeEditor.preview=Preview
-themeEditor.yourThemeIsShownBelow=Your current theme is shown below.
-themeEditor.themeBelowIsCalled=The theme shown below is called:
-themeEditor.savePrompt=Would you like to save this as your new theme?
-themeEditor.saveWarning=NOTE: this may destroy any customizations you made to the \
-Page Templates of your previous theme.
+
+themeEditor.previewLink=See how your blog will look with this theme.
+themeEditor.previewDescription=How can you know if this is really the \
+theme for you until you see it on your blog right?  Click the link above \
+to launch a full page preview of how your blog will look with the selected theme.
+
+themeEditor.customStylesheetLink=Modify the styling of your selected theme.
+themeEditor.customStylesheetDescription=If you are happy with your theme \
+but want to make a few styling choices of your own such as choosing \
+different fonts, colors, etc, then try making your own stylesheet or \
+borrow one from someoone else using your theme.
+
+themeEditor.import=I want to copy the templates from the selected theme into my weblog.
+themeEditor.importWarning=WARNING: this operation may overwrite some of your \
+existing templates.
+
 themeEditor.save=Save
-themeEditor.cancel=Cancel
-themeEditor.customize=Customize
+
 
 # ---------------------------------------------------------------------- Uploads
 
@@ -1718,7 +1735,9 @@
 
 websiteSettings.generalSettings=General Settings
 websiteSettings.websiteTitle=Title
-websiteSettings.websiteDescription=Description
+websiteSettings.websiteDescription=Tagline
+websiteSettings.icon=Icon
+websiteSettings.about=About your blog
 websiteSettings.emailAddress=Email address of weblog owner
 websiteSettings.editor=Weblog editor page to be used
 websiteSettings.entryDisplayCount=Number of entries to display on weblog

Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/META-INF/tlds/roller.tld
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/META-INF/tlds/roller.tld?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/META-INF/tlds/roller.tld (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/META-INF/tlds/roller.tld Sun Jun  3 07:00:36 2007
@@ -18,27 +18,6 @@
 
    <tag>
 
-      <name>Menu</name>
-      <tag-class>org.apache.roller.weblogger.ui.core.tags.menu.MenuTag</tag-class>
-
-      <attribute>
-         <name>id</name>
-
-      </attribute>
-      <attribute>
-         <name>view</name>
-         <required>true</required>
-
-      </attribute>
-      <attribute>
-         <name>model</name>
-         <required>true</required>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <name>Date</name>
       <tag-class>org.apache.roller.weblogger.ui.core.tags.DateTag</tag-class>
 
@@ -92,27 +71,6 @@
       </attribute>
       <attribute>
          <name>classSuffix</name>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
-      <name>EditorNavigationBar</name>
-      <tag-class>org.apache.roller.weblogger.ui.core.tags.menu.EditorNavigationBarTag</tag-class>
-
-      <attribute>
-         <name>id</name>
-
-      </attribute>
-      <attribute>
-         <name>view</name>
-         <required>true</required>
-
-      </attribute>
-      <attribute>
-         <name>model</name>
-         <required>true</required>
 
       </attribute>
 

Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/roller.properties
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/roller.properties?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/roller.properties (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/roller.properties Sun Jun  3 07:00:36 2007
@@ -265,15 +265,13 @@
 # URL patterns that require HTTPS
 schemeenforcement.https.urls=/roller_j_security_check,\
 /roller-ui/login-redirect.jsp,\
-/roller-ui/login.do,\
-/roller-ui/user.do,\
-/roller-ui/yourProfile.do,\
-/roller-ui/admin/user.do,\
+/roller-ui/login.rol,\
+/roller-ui/register.rol,/roller-ui/register!save.rol,\
+/roller-ui/profile.rol,/roller-ui/profile!save.rol,\
+/roller-ui/admin/userAdmin.rol,\
+/roller-ui/admin/createUser.rol,/roller-ui/admin/createUser!save.rol,\
 /roller-ui/authoring/userdata,\
-/roller-ui/login,\
-/roller-ui/register,\
-/roller-ui/profile,\
-/roller-ui/login-redirect
+/roller-ui/authoring/membersInvite.rol,/roller-ui/authoring/membersInvite!save.rol
 
 # Password security settings
 passwds.encryption.enabled=false

Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/struts.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/struts.xml?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/struts.xml (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/struts.xml Sun Jun  3 07:00:36 2007
@@ -110,7 +110,6 @@
         <action name="register!*" method="{1}"
                 class="org.apache.roller.weblogger.ui.struts2.core.Register">
             <result name="input" type="tiles">.Register</result>
-            <result name="cancel" type="redirect">/</result>
             <result name="success" type="tiles">.Welcome</result>
         </action>
         
@@ -124,7 +123,6 @@
         <action name="createWeblog!*" method="{1}"
                 class="org.apache.roller.weblogger.ui.struts2.core.CreateWeblog">
             <result name="input" type="tiles">.CreateWeblog</result>
-            <result name="cancel" type="redirect-action">menu</result>
             <result name="success" type="chain">menu</result>
         </action>
         
@@ -152,13 +150,11 @@
         <action name="createUser!*" method="{1}"
                 class="org.apache.roller.weblogger.ui.struts2.admin.CreateUser">
             <result name="input" type="tiles">.CreateUser</result>
-            <result name="cancel" type="redirect-action">userAdmin</result>
         </action>
         
         <action name="modifyUser!*" method="{1}"
                 class="org.apache.roller.weblogger.ui.struts2.admin.ModifyUser">
             <result name="input" type="tiles">.ModifyUser</result>
-            <result name="cancel" type="redirect-action">userAdmin</result>
         </action>
         
         <action name="globalCommentManagement!*" method="{1}"
@@ -190,22 +186,20 @@
         </action>
         
         
-        <!--
         <action name="planetConfig!*" method="{1}"
-                class="org.apache.roller.weblogger.planet.ui.struts2.admin.PlanetConfigAction">
-            <result name="planetConfig.page">.PlanetConfig</result>
+                class="org.apache.roller.weblogger.planet.ui.PlanetConfig">
+            <result name="input" type="tiles">.PlanetConfig</result>
         </action>
         
         <action name="planetSubscriptions!*" method="{1}"
-                class="org.apache.roller.weblogger.planet.ui.struts2.admin.PlanetSubscriptionsAction">
-            <result name="planetSubscriptions.page">.PlanetSubscriptions</result>
+                class="org.apache.roller.weblogger.planet.ui.PlanetSubscriptions">
+            <result name="list" type="tiles">.PlanetSubscriptions</result>
         </action>
         
         <action name="planetGroups!*" method="{1}"
-                class="org.apache.roller.weblogger.planet.ui.struts2.admin.PlanetGroupsAction">
-            <result name="planetGroups.page">.PlanetGroups</result>
+                class="org.apache.roller.weblogger.planet.ui.PlanetGroups">
+            <result name="list" type="tiles">.PlanetGroups</result>
         </action>
-        -->
     </package>
     
     
@@ -340,16 +334,10 @@
             <result name="list" type="tiles">.Templates</result>
         </action>
         
-        <action name="templateAdd!*" method="{1}"
-                class="org.apache.roller.weblogger.ui.struts2.editor.TemplateAdd">
-            <result name="success" type="chain">templates</result>
-        </action>
-        
         <action name="templateEdit!*" method="{1}"
                 class="org.apache.roller.weblogger.ui.struts2.editor.TemplateEdit">
             <result name="list" type="chain">templates</result>
             <result name="input" type="tiles">.TemplateEdit</result>
-            <result name="cancel" type="redirect-action">templates</result>
         </action>
         
         <action name="templateRemove!*" method="{1}"

Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/CommonPingTargets.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/CommonPingTargets.jsp?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/CommonPingTargets.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/CommonPingTargets.jsp Sun Jun  3 07:00:36 2007
@@ -97,9 +97,9 @@
 
 </table>
 
-<br />
-
-<div class="control">
-    <s:url id="addPing" action="commonPingTargetAdd" />
-    <s:a href="%{addPing}">Add Ping Target</s:a>
+<div style="padding: 4px; font-weight: bold;">
+    <s:url id="addPing" action="customPingTargetAdd">
+        <s:param name="weblog" value="actionWeblog.handle" />
+    </s:url>
+    <img src='<s:url value="/images/add.png"/>' border="0"alt="icon" /><s:a href="%{addPing}">Add Ping Target</s:a>
 </div>

Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/CreateUser.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/CreateUser.jsp?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/CreateUser.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/CreateUser.jsp Sun Jun  3 07:00:36 2007
@@ -23,12 +23,6 @@
     
     <table class="formtable">
         <tr>
-            <td class="label"><label for="fullName" /><s:text name="userSettings.fullname" /></label></td>
-            <td class="field"><s:textfield name="bean.fullName" size="30" maxlength="30" /></td>
-            <td class="description"><s:text name="userAdmin.tip.fullName" /></td>
-        </tr>
-        
-        <tr>
             <td class="label"><label for="userName" /><s:text name="userSettings.username" /></label></td>
             <td class="field"><s:textfield name="bean.userName" size="30" maxlength="30" /></td>
             <td class="description"><s:text name="userAdmin.tip.userName" /></td>
@@ -41,6 +35,18 @@
         </tr>
         
         <tr>
+            <td class="label"><label for="screenName" /><s:text name="userSettings.screenname" /></label></td>
+            <td class="field"><s:textfield name="bean.screenName" size="30" maxlength="30" /></td>
+            <td class="description"><s:text name="userAdmin.tip.screenName" /></td>
+        </tr>
+        
+        <tr>
+            <td class="label"><label for="fullName" /><s:text name="userSettings.fullname" /></label></td>
+            <td class="field"><s:textfield name="bean.fullName" size="30" maxlength="30" /></td>
+            <td class="description"><s:text name="userAdmin.tip.fullName" /></td>
+        </tr>
+        
+        <tr>
             <td class="label"><label for="emailAddress" /><s:text name="userSettings.email" /></label></td>
             <td class="field"><s:textfield name="bean.emailAddress" size="40" maxlength="40" /></td>
             <td class="description"><s:text name="userAdmin.tip.email" /></td>
@@ -85,7 +91,7 @@
     
     <div class="control">
         <s:submit key="userAdmin.save" />
-        <s:submit key="application.cancel" action="createUser!cancel" />
+        <input type="button" value="<s:text name="application.cancel"/>" onclick="window.location='<s:url action="userAdmin"/>'" />
     </div>
     
 </s:form>

Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/ModifyUser.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/ModifyUser.jsp?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/ModifyUser.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/ModifyUser.jsp Sun Jun  3 07:00:36 2007
@@ -24,12 +24,6 @@
     
     <table class="formtable">
         <tr>
-            <td class="label"><label for="fullName" /><s:text name="userSettings.fullname" /></label></td>
-            <td class="field"><s:textfield name="bean.fullName" size="30" maxlength="30" /></td>
-            <td class="description"><s:text name="userAdmin.tip.fullName" /></td>
-        </tr>
-        
-        <tr>
             <td class="label"><label for="userName" /><s:text name="userSettings.username" /></label></td>
             <td class="field"><s:textfield name="bean.userName" size="30" maxlength="30" readonly="true" cssStyle="background: #e5e5e5" /></td>
             <td class="description"><s:text name="userAdmin.tip.userName" /></td>
@@ -42,6 +36,18 @@
         </tr>
         
         <tr>
+            <td class="label"><label for="screenName" /><s:text name="userSettings.screenname" /></label></td>
+            <td class="field"><s:textfield name="bean.screenName" size="30" maxlength="30" /></td>
+            <td class="description"><s:text name="userAdmin.tip.screenName" /></td>
+        </tr>
+        
+        <tr>
+            <td class="label"><label for="fullName" /><s:text name="userSettings.fullname" /></label></td>
+            <td class="field"><s:textfield name="bean.fullName" size="30" maxlength="30" /></td>
+            <td class="description"><s:text name="userAdmin.tip.fullName" /></td>
+        </tr>
+        
+        <tr>
             <td class="label"><label for="emailAddress" /><s:text name="userSettings.email" /></label></td>
             <td class="field"><s:textfield name="bean.emailAddress" size="40" maxlength="40" /></td>
             <td class="description"><s:text name="userAdmin.tip.email" /></td>
@@ -135,7 +141,7 @@
     
     <div class="control">
         <s:submit key="userAdmin.save" />
-        <s:submit key="application.cancel" action="modifyUser!cancel" />
+        <input type="button" value="<s:text name="application.cancel"/>" onclick="window.location='<s:url action="userAdmin"/>'" />
     </div>
     
 </s:form>

Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/core/CreateWeblog.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/core/CreateWeblog.jsp?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/core/CreateWeblog.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/core/CreateWeblog.jsp Sun Jun  3 07:00:36 2007
@@ -20,7 +20,7 @@
 <script type="text/javascript">
 <!--
 function previewImage(theme) {
-    document.preview.src="<s:property value="siteURL" />/themes/" + theme + "/sm-theme-" + theme + ".png";
+    document.preview.src="<s:property value="siteURL" />/roller-ui/authoring/previewtheme?theme="+theme;
 }
 function handlePreview(handle) {
     previewSpan = document.getElementById("handlePreview");
@@ -113,7 +113,7 @@
 <br />
    
 <s:submit key="createWebsite.button.save" />
-<s:submit key="createWebsite.button.cancel" action="createWeblog!cancel" />
+<input type="button" value="<s:text name="createWebsite.button.cancel"/>" onclick="window.location='<s:url action="menu"/>'" />
     
 </s:form>
 

Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/core/Profile.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/core/Profile.jsp?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/core/Profile.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/core/Profile.jsp Sun Jun  3 07:00:36 2007
@@ -20,69 +20,68 @@
 <p class="subtitle"><s:text name="yourProfile.description" /></p>
 
 <s:form action="profile!save">
-    <s:hidden name="bean.userName" />
     
-<table class="formtable">
-
-<tr>
-    <td class="label"><label for="userName" /><s:text name="userSettings.username" /></label></td>
-    <td class="field"><span class="fixedAttr"><s:property value="bean.userName"/></span></td>
-    <td class="description"><s:text name="yourProfile.tip.userName" /></td>
-</tr>
-
-<tr>
-    <td class="label"><label for="passwordText" /><s:text name="userSettings.password" /></label></td>
-    <td class="field">
-        <s:password name="bean.passwordText" size="20" maxlength="20" />
-    </td>
-    <td class="description"><s:text name="userRegister.tip.password" /></td>
-</tr>
-
-<tr>
-    <td class="label"><label for="passwordConfirm" /><s:text name="userSettings.passwordConfirm" /></label></td>
-    <td class="field"><s:password name="bean.passwordConfirm" size="20" maxlength="20" /></td>
-    <td class="description"><s:text name="userRegister.tip.passwordConfirm" /></td>
-</tr>
-
-<tr>
-    <td class="label"><label for="screenName" /><s:text name="userSettings.screenname" /></label></td>
-    <td class="field"><s:textfield name="bean.screenName" size="30" maxlength="30" /></td>
-    <td class="description"><s:text name="userRegister.tip.screenName" /></td>
-</tr>
-
-<tr>
-    <td class="label"><label for="fullName" /><s:text name="userSettings.fullname" /></label></td>
-    <td class="field"><s:textfield name="bean.fullName" size="30" maxlength="30" /></td>
-    <td class="description"><s:text name="userRegister.tip.fullName" /></td>
-</tr>
+    <table class="formtable">
+        
+        <tr>
+            <td class="label"><label for="userName" /><s:text name="userSettings.username" /></label></td>
+            <td class="field"><s:textfield name="bean.userName" size="30" maxlength="30" readonly="true" cssStyle="background: #e5e5e5" /></td>
+            <td class="description"><s:text name="yourProfile.tip.userName" /></td>
+        </tr>
+        
+        <tr>
+            <td class="label"><label for="passwordText" /><s:text name="userSettings.password" /></label></td>
+            <td class="field">
+                <s:password name="bean.passwordText" size="20" maxlength="20" />
+            </td>
+            <td class="description"><s:text name="userRegister.tip.password" /></td>
+        </tr>
+        
+        <tr>
+            <td class="label"><label for="passwordConfirm" /><s:text name="userSettings.passwordConfirm" /></label></td>
+            <td class="field"><s:password name="bean.passwordConfirm" size="20" maxlength="20" /></td>
+            <td class="description"><s:text name="userRegister.tip.passwordConfirm" /></td>
+        </tr>
+        
+        <tr>
+            <td class="label"><label for="screenName" /><s:text name="userSettings.screenname" /></label></td>
+            <td class="field"><s:textfield name="bean.screenName" size="30" maxlength="30" /></td>
+            <td class="description"><s:text name="userRegister.tip.screenName" /></td>
+        </tr>
+        
+        <tr>
+            <td class="label"><label for="fullName" /><s:text name="userSettings.fullname" /></label></td>
+            <td class="field"><s:textfield name="bean.fullName" size="30" maxlength="30" /></td>
+            <td class="description"><s:text name="userRegister.tip.fullName" /></td>
+        </tr>
+        
+        <tr>
+            <td class="label"><label for="emailAddress" /><s:text name="userSettings.email" /></label></td>
+            <td class="field"><s:textfield name="bean.emailAddress" size="40" maxlength="40" /></td>
+            <td class="description"><s:text name="userRegister.tip.email" /></td>
+        </tr>
+        
+        <tr>
+            <td class="label"><label for="locale" /><s:text name="userSettings.locale" /></label></td>
+            <td class="field">
+                <s:select name="bean.locale" size="1" list="localesList" listValue="displayName" />
+            </td>
+            <td class="description"><s:text name="userRegister.tip.locale" /></td>
+        </tr>
+        
+        <tr>
+            <td class="label"><label for="timeZone" /><s:text name="userSettings.timeZone" /></label></td>
+            <td class="field">
+                <s:select name="bean.timeZone" size="1" list="timeZonesList" />
+            </td>
+            <td class="description"><s:text name="userRegister.tip.timeZone" /></td>
+        </tr>
+        
+    </table>
     
-<tr>
-    <td class="label"><label for="emailAddress" /><s:text name="userSettings.email" /></label></td>
-    <td class="field"><s:textfield name="bean.emailAddress" size="40" maxlength="40" /></td>
-    <td class="description"><s:text name="userRegister.tip.email" /></td>
-</tr>
-
-<tr>
-    <td class="label"><label for="locale" /><s:text name="userSettings.locale" /></label></td>
-    <td class="field">
-       <s:select name="bean.locale" size="1" list="localesList" listValue="displayName" />
-    </td>
-    <td class="description"><s:text name="userRegister.tip.locale" /></td>
-</tr>
+    <br />
     
-<tr>
-    <td class="label"><label for="timeZone" /><s:text name="userSettings.timeZone" /></label></td>
-    <td class="field">
-       <s:select name="bean.timeZone" size="1" list="timeZonesList" />
-    </td>
-    <td class="description"><s:text name="userRegister.tip.timeZone" /></td>
-</tr>
+    <s:submit key="userSettings.button.save" />
+    <input type="button" value="<s:text name="userSettings.button.cancel"/>" onclick="window.location='<s:url action="menu"/>'" />
     
-</table>
-
-<br />
-
-<s:submit key="userSettings.button.save" />
-<s:submit key="userSettings.button.cancel" action="profile!cancel" />
-
 </s:form>

Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/core/Register.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/core/Register.jsp?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/core/Register.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/core/Register.jsp Sun Jun  3 07:00:36 2007
@@ -94,6 +94,6 @@
 <br />
 
 <s:submit key="userRegister.button.save" />
-<s:submit key="userSettings.button.cancel" action="register!cancel" />
+<input type="button" value="<s:text name="userSettings.button.cancel"/>" onclick="window.location='<s:url value="/"/>'" />
     
 </s:form>

Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/Comments.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/Comments.jsp?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/Comments.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/Comments.jsp Sun Jun  3 07:00:36 2007
@@ -73,10 +73,12 @@
 </script>
 
 <p class="subtitle">
-    <s:text name="commentManagement.subtitle" />
+    <s:text name="commentManagement.website.subtitle">
+        <s:param value="%{actionWeblog.handle}"/>
+    </s:text>
 </p>
 
-<p class="pagetip"><s:text name="commentManagement.globalTip" /></p>
+<p class="pagetip"><s:text name="commentManagement.tip" /></p>
 
 <s:if test="comments.isEmpty">
     <s:text name="commentManagement.noCommentsFound" />

Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/CommentsSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/CommentsSidebar.jsp?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/CommentsSidebar.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/CommentsSidebar.jsp Sun Jun  3 07:00:36 2007
@@ -33,7 +33,7 @@
     
     <div class="sideformrow">
         <label for="searchString" class="sideformrow"><s:text name="commentManagement.searchString" />:</label>   
-        <s:textfield name="bean.searchString" />
+        <s:textfield name="bean.searchString" size="15" />
     </div>
     <br />
     <br />

Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/CustomPingTargets.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/CustomPingTargets.jsp?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/CustomPingTargets.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/CustomPingTargets.jsp Sun Jun  3 07:00:36 2007
@@ -18,9 +18,9 @@
 <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
 
 <p class="subtitle">
-   <s:text name="customPingTargets.subtitle" >
-       <s:param value="actionWeblog.handle" />
-   </s:text>
+    <s:text name="customPingTargets.subtitle" >
+        <s:param value="actionWeblog.handle" />
+    </s:text>
 </p>  
 
 <s:if test="getProp('pings.disallowCustomTargets')">
@@ -84,12 +84,10 @@
 
 </table>
 
-<br />
-
-<div class="control">
+<div style="padding: 4px; font-weight: bold;">
     <s:url id="addPing" action="customPingTargetAdd">
         <s:param name="weblog" value="actionWeblog.handle" />
     </s:url>
-    <s:a href="%{addPing}">Add Ping Target</s:a>
+    <img src='<s:url value="/images/add.png"/>' border="0"alt="icon" /><s:a href="%{addPing}">Add Ping Target</s:a>
 </div>
 </s:else>

Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/EntriesSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/EntriesSidebar.jsp?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/EntriesSidebar.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/EntriesSidebar.jsp Sun Jun  3 07:00:36 2007
@@ -39,7 +39,7 @@
                     <div class="sideformrow">
                         <label for="categoryId" class="sideformrow">
                         <s:text name="weblogEntryQuery.label.category" /></label>          
-                        <s:select name="bean.categoryPath" list="actionWeblog.weblogCategories" listKey="path" listValue="path" size="1" />
+                        <s:select name="bean.categoryPath" list="categories" listKey="path" listValue="name" size="1" />
                     </div>
                     <br />
                     <br />

Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp Sun Jun  3 07:00:36 2007
@@ -205,13 +205,13 @@
     <br>
     <div class="control">
         <s:if test="userAnAuthor">
-            <s:submit key="weblogEdit.post" onclick="document.getElementById('entryAdd_bean_status').value='PUBLISHED';"/>
+            <s:submit key="weblogEdit.post" onclick="document.getElementById('entry_bean_status').value='PUBLISHED';"/>
         </s:if>
         <s:else>
-            <s:submit key="weblogEdit.submitForReview" onclick="document.getElementById('entryAdd_bean_status').value='PENDING';"/>
+            <s:submit key="weblogEdit.submitForReview" onclick="document.getElementById('entry_bean_status').value='PENDING';"/>
         </s:else>
         
-        <s:submit key="weblogEdit.save" onclick="document.getElementById('entryAdd_bean_status').value='DRAFT';" />
+        <s:submit key="weblogEdit.save" onclick="document.getElementById('entry_bean_status').value='DRAFT';" />
         
         <s:url id="removeUrl" action="entryRemove">
             <s:param name="weblog" value="actionWeblog.handle" />

Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/TemplateEdit.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/TemplateEdit.jsp?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/TemplateEdit.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/TemplateEdit.jsp Sun Jun  3 07:00:36 2007
@@ -43,8 +43,7 @@
             <td class="label"><s:text name="pageForm.name" />&nbsp;</td>
             <td class="field">
                 <s:if test="template.required">
-                    <span class="fixedAttr"><s:property value="bean.name"/></span>
-                    <s:hidden name="bean.name" />
+                    <s:textfield name="bean.name" size="50" readonly="true" cssStyle="background: #e5e5e5" />
                 </s:if>
                 <s:else>
                     <s:textfield name="bean.name" size="50"/>
@@ -84,13 +83,7 @@
             <tr>
                 <td class="label" valign="top"><s:text name="pageForm.link" />&nbsp;</td>
                 <td class="field">
-                    <s:if test="template.required">
-                        <span class="fixedAttr"><s:property value="bean.link"/></span>
-                        <s:hidden name="bean.link" />
-                    </s:if>
-                    <s:else>
-                        <s:textfield name="bean.link" size="50" onkeyup="updatePageURLDisplay()" />
-                    </s:else>
+                    <s:textfield name="bean.link" size="50" onkeyup="updatePageURLDisplay()" />
                     <br />
                     <s:property value="actionWeblog.absoluteURL" />/page/<span id="linkPreview" style="color:red"><s:property value="bean.link" /></span>
                     <s:if test="template.link != null">[<a id="launchLink" onClick="launchPage()"><s:text name="pageForm.launch" /></a>]</s:if>
@@ -103,8 +96,7 @@
             <td class="label" valign="top" style="padding-top: 4px"><s:text name="pageForm.description" />&nbsp;</td>
             <td class="field">
                 <s:if test="template.required">
-                    <span class="fixedAttr"><s:property value="bean.description"/></span>
-                    <s:hidden name="bean.description" />
+                    <s:textarea name="bean.description" cols="50" rows="2" readonly="true" cssStyle="background: #e5e5e5" />
                 </s:if>
                 <s:else>
                     <s:textarea name="bean.description" cols="50" rows="2" />
@@ -143,8 +135,8 @@
     <table style="width:100%">
         <tr>
             <td>
-                <s:submit key="pageForm.save" /></input>
-                <s:submit key="application.done" action="templates" /></input>
+                <s:submit key="pageForm.save" />
+                <input type="button" value="<s:text name="application.done"/>" onclick="window.location='<s:url action="templates"><s:param name="weblog" value="%{weblog}"/></s:url>'" />
             </td>
             <td align="right">
                 <!-- Add buttons to make this textarea taller or shorter -->

Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/TemplatesSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/TemplatesSidebar.jsp?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/TemplatesSidebar.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/TemplatesSidebar.jsp Sun Jun  3 07:00:36 2007
@@ -25,18 +25,18 @@
                 <h3><s:text name="pagesForm.addNewPage" /></h3>
                 <hr size="1" noshade="noshade" />
                 
-                <s:form action="templateAdd!save">
+                <s:form action="templates!add">
                     <s:hidden name="weblog" />
                     
-                    <table cellpadding="0" cellspacing="0">
+                    <table cellpadding="0" cellspacing="6">
                         <tr>
-                            <td><s:text name="pagesForm.name"/>:</td>
+                            <td><s:text name="pagesForm.name"/></td>
                             <td><s:textfield name="newTmplName" /></td>
                         </tr>
                         
                         <s:if test="!availableActions.isEmpty" >
                             <tr>
-                                <td><s:text name="pagesForm.action"/>:</td>
+                                <td><s:text name="pagesForm.action"/></td>
                                 <td>
                                     <s:select name="newTmplAction" size="1" list="availableActions" />
                                 </td>

Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEdit.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEdit.jsp?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEdit.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEdit.jsp Sun Jun  3 07:00:36 2007
@@ -20,7 +20,7 @@
 <script type="text/javascript">
 <!--
 function previewImage(element, theme) {
-    element.src="<s:property value="siteURL" />/themes/" + theme + "/sm-theme-" + theme + ".png";
+    element.src="<s:property value="siteURL" />/roller-ui/authoring/previewtheme?theme="+theme;
 }
 
 function fullPreview(selector) {
@@ -75,14 +75,14 @@
         <tr>
             <td width="50%">
                 <div id="sharedChooser" class="chooser">
-                    <h2><input id="sharedRadio" type="radio" name="themeType" value="shared" <s:if test="!customTheme">checked="true"</s:if> onchange="updateThemeChooser(this)" />&nbsp;Shared Theme</h2>
-                    This option is for users who don't want to fuss with designing their weblog on their own and prefer the easier option of using a predefined theme.
+                    <h2><input id="sharedRadio" type="radio" name="themeType" value="shared" <s:if test="!customTheme">checked="true"</s:if> onchange="updateThemeChooser(this)" />&nbsp;<s:text name="themeEditor.sharedTheme" /></h2>
+                    <s:text name="themeEditor.sharedThemeDescription" />
                 </div>
             </td>
             <td width="50%">
                 <div id="customChooser" class="chooser">
-                    <h2><input id="customRadio" type="radio" name="themeType" value="custom" <s:if test="customTheme">checked="true"</s:if> onchange="updateThemeChooser(this)" />&nbsp;Custom Theme</h2>
-                    This option is for the creative bloggers who want to be able to create a blog design of their own.  Beware though, managing a blog design of your own takes a bit of effort.
+                    <h2><input id="customRadio" type="radio" name="themeType" value="custom" <s:if test="customTheme">checked="true"</s:if> onchange="updateThemeChooser(this)" />&nbsp;<s:text name="themeEditor.customTheme" /></h2>
+                    <s:text name="themeEditor.customThemeDescription" />
                 </div>
             </td>
         </tr>
@@ -107,16 +107,17 @@
             </script>
         </p>
         <p>
-            &raquo; <a href="#" onclick="fullPreview(document.getElementById('sharedSelector'))">See how your blog will look with this theme.</a><br/>
-            How can you know if this is really the theme for you until you see it on your blog right?  Click the link above to launch a full page preview of how your blog will look with the selected theme.
+            &raquo; <a href="#" onclick="fullPreview(document.getElementById('sharedSelector'))"><s:text name="themeEditor.previewLink" /></a><br/>
+            <s:text name="themeEditor.previewDescription" />
         </p>
-        <s:if test="actionWeblog.theme.customStylesheet != null">
+        
+        <s:if test="!customTheme && actionWeblog.theme.customStylesheet != null">
             <p>
                 <s:url action="stylesheetEdit" id="stylesheetEdit" >
                     <s:param name="weblog" value="%{actionWeblog.handle}" />
                 </s:url>
-                &raquo; <s:a href="%{stylesheetEdit}">Modify the styling of your selected theme.</s:a><br/>
-                If you are happy with your theme but want to make a few styling choices of your own such as choosing different fonts, colors, etc, then try making your own stylesheet or borrow one from someoone else using your theme.
+                &raquo; <s:a href="%{stylesheetEdit}"><s:text name="themeEditor.customStylesheetLink" /></s:a><br/>
+                <s:text name="themeEditor.customStylesheetDescription" />
             </p>
         </s:if>
         <p><s:submit key="themeEditor.save" /></p>
@@ -124,8 +125,8 @@
     
     <div id="customOptioner" class="optioner" style="display:none;">
         <p>
-            <s:checkbox name="importTheme" />I want to copy the templates from the selected theme into my weblog.<br/>
-            <span class="warning">WARNING: this operation may overwrite some of your existing templates.</span>
+            <s:checkbox name="importTheme" /><s:text name="themeEditor.import" /><br/>
+            <span class="warning"><s:text name="themeEditor.importWarning" /></span>
         </p>
         <p>
             <s:select id="customSelector" name="importThemeId" list="themes" listKey="id" listValue="name" size="1" onchange="previewImage(document.getElementById('customPreviewImg'), this[selectedIndex].value)"/>
@@ -138,8 +139,8 @@
             </script>
         </p>
         <p>
-            &raquo; <a href="#" onclick="fullPreview(document.getElementById('customSelector'))">See how your blog will look with this theme.</a><br/>
-            How can you know if this is really the theme for you until you see it on your blog right?  Click the link above to launch a full page preview of how your blog will look with the selected theme.
+            &raquo; <a href="#" onclick="fullPreview(document.getElementById('customSelector'))"><s:text name="themeEditor.previewLink" /></a><br/>
+            <s:text name="themeEditor.previewDescription" />
         </p>
         <p><s:submit key="themeEditor.save" /></p>
     </div>
@@ -154,4 +155,4 @@
     <s:else>
         updateThemeChooser(document.getElementById('sharedRadio'));
     </s:else>
-</script>
\ No newline at end of file
+</script>

Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/WeblogConfig.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/WeblogConfig.jsp?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/WeblogConfig.jsp (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/WeblogConfig.jsp Sun Jun  3 07:00:36 2007
@@ -44,13 +44,13 @@
 
     <tr>
         <td class="label"><s:text name="websiteSettings.websiteDescription" /></td>
-        <td class="field"><s:textfield name="bean.description" /></td>
+        <td class="field"><s:textfield name="bean.description" size="40"/></td>
         <td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td>
     </tr>
     
     <tr>
         <td class="label"><s:text name="websiteSettings.icon" /></td>
-        <td class="field"><s:textfield name="bean.icon" /></td>
+        <td class="field"><s:textfield name="bean.icon" size="40"/></td>
         <td class="description"><%-- <s:text name="websiteSettings.tip." /> --%></td>
     </tr>
     

Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/security.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/security.xml?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/security.xml (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/security.xml Sun Jun  3 07:00:36 2007
@@ -43,17 +43,13 @@
          <property name="objectDefinitionSource">
             <value>
                 PATTERN_TYPE_APACHE_ANT
-                /roller-ui/login-redirect.jsp=admin,editor
-                /roller-ui/yourProfile**=admin,editor
-                /roller-ui/createWebsite**=admin,editor
-                /roller-ui/yourWebsites**=admin,editor
-                /roller-ui/authoring/**=admin,editor
-                /roller-ui/admin/**=admin
-                /rewrite-status*=admin
-                /roller-ui/login-redirect=admin,editor
+                /roller-ui/login-redirect**=admin,editor
                 /roller-ui/profile**=admin,editor
                 /roller-ui/createWeblog**=admin,editor
                 /roller-ui/menu**=admin,editor
+                /roller-ui/authoring/**=admin,editor
+                /roller-ui/admin/**=admin
+                /rewrite-status*=admin
             </value>
                 <!-- Add this to above list for LDAP/SSO configuration -->
                 <!-- /roller-ui/user.do*=register -->

Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/tiles.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/tiles.xml?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/tiles.xml (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/tiles.xml Sun Jun  3 07:00:36 2007
@@ -151,12 +151,12 @@
         <put name="content" value="/WEB-INF/jsps/admin/CacheInfo.jsp" />
     </definition>
     
-    <definition name=".PlanetSubscriptions" extends=".tiles-tabbedpage" >
-        <put name="content" value="/WEB-INF/jsps/admin/PlanetSubscriptions.jsp" />
-    </definition>
-    
     <definition name=".PlanetConfig" extends=".tiles-tabbedpage" >
         <put name="content" value="/WEB-INF/jsps/admin/PlanetConfig.jsp" />
+    </definition>
+    
+    <definition name=".PlanetSubscriptions" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/admin/PlanetSubscriptions.jsp" />
     </definition>
     
     <definition name=".PlanetGroups" extends=".tiles-tabbedpage" >

Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/deprecated/navbar.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/deprecated/navbar.vm?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/deprecated/navbar.vm (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/deprecated/navbar.vm Sun Jun  3 07:00:36 2007
@@ -9,7 +9,26 @@
  * @param $template Name of Velocity template to display menu.
  *#
 #macro( showMenu $model $template )
-    $pageHelper.showMenu($model, $template)
+
+    ## NOTE: technically this method allowed users access to use things that
+    ## weren't part of Roller, but in 4.0 we are removing this very old menu
+    ## building code and so there is no way to guarantee backwards comapatability
+    ## in the cases where someone made their own menus
+
+    #if( $model == 'editor-menu.xml' )
+        #if( $template == 'templates/navbar/navbar-horizontal.vm' )
+            #showAuthorMenu( false )
+        #else
+            #showAuthorMenu( true )
+        #end
+    #elseif( $model == 'admin-menu.xml' )
+        #if( $template == 'templates/navbar/navbar-horizontal.vm' )
+            #showAdminMenu( false )
+        #else
+            #showAdminMenu( true )
+        #end
+    #end
+
 #end
 
 #**
@@ -17,14 +36,16 @@
  * @param vertical True if bar is to be displayed vertically.
  *#
 #macro( showEditorNavBar $vertical )
-    $pageHelper.showEditorNavBar($vertical)
+    ## just call new 3.0 version of this macro
+    #showAuthorMenu( $vertical )
 #end
 
 #**
  * Show Editor navbar using CSS friendly template.
  *#
 #macro( showEditorMenu )
-    $pageHelper.showMenu("editor-menu.xml", "templates/navbar/navbar-css.vm")
+    ## just call new 3.0 version of this macro
+    #showAuthorMenu( true )
 #end
 
 #**

Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/feeds.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/feeds.vm?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/feeds.vm (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/feeds.vm Sun Jun  3 07:00:36 2007
@@ -30,7 +30,7 @@
     <entry>
         <id>$entry.permalink</id>
         <title type="html">$utils.escapeXML($entry.title)</title>
-        <author><name>$entry.creator.fullName</name></author>
+        <author><name>$entry.creator.screenName</name></author>
         <link rel="alternate" type="text/html" href="$entry.permalink"/>
         <published>$utils.formatIso8601Date($entry.pubTime)</published>
         <updated>$utils.formatIso8601Date($entry.updateTime)</updated> 
@@ -59,7 +59,7 @@
   <item>
     <guid isPermaLink="true">$entry.permalink</guid>
     <title>$utils.escapeXML($utils.removeHTML($entry.title))</title>
-    <dc:creator>$utils.escapeXML($entry.creator.fullName)</dc:creator>
+    <dc:creator>$utils.escapeXML($entry.creator.screenName)</dc:creator>
     <link>$entry.permalink</link>
     #if( $entry.link && !$entry.link.trim().equals("") )
     <source url="$utils.escapeXML($entry.link)">$utils.escapeXML($entry.link)</source>

Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/site-comments-atom.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/site-comments-atom.vm?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/site-comments-atom.vm (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/site-comments-atom.vm Sun Jun  3 07:00:36 2007
@@ -16,22 +16,19 @@
   directory of this distribution.
 
 *#<?xml version="1.0" encoding='utf-8'?>
-#if($config.feedStyle)
-<?xml-stylesheet type="text/xsl" href="$url.absoluteSite/roller-ui/styles/atom.xsl" media="screen"?>
-#end
+#if($config.feedStyle)<?xml-stylesheet type="text/xsl" href="$url.absoluteSite/roller-ui/styles/atom.xsl" media="screen"?>#end
 #set($pager = $site.getCommentsPager(-1, $config.feedSize) )
-#set($comments = $pager.items )
 <feed xmlns="http://www.w3.org/2005/Atom">
     <title type="html">$utils.escapeXML($config.siteName) (Comments)</title>
     <id>$url.feed.comments.atom</id>
     <link rel="alternate" type="text/html" href="$url.home" />
     <id>$url.feed.comments.atom($model.categoryPath, $model.excerpts)</id>
     <link rel="self" type="application/atom+xml" href="$url.feed.comments.atom($model.categoryPath, $model.excerpts)" />
-#if($config.feedHistoryEnabled)
-#showFeedHistory($pager)
-#end    
+    #if($config.feedHistoryEnabled)
+        #showFeedHistory($pager)
+    #end    
     <updated>$utils.formatIso8601Date($model.weblog.lastModified)</updated>
     <generator uri="http://rollerweblogger.org" version="$config.rollerVersion ($config.rollerBuildTimestamp:$config.rollerBuildUser)">Apache Roller (incubating)</generator>
-#showCommentsAtom10($comments)
+    #showCommentsAtom10($pager.items)
 </feed>
 

Modified: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/site-entries-atom.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/site-entries-atom.vm?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/site-entries-atom.vm (original)
+++ roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/site-entries-atom.vm Sun Jun  3 07:00:36 2007
@@ -16,29 +16,26 @@
   directory of this distribution.
 
 *#<?xml version="1.0" encoding='utf-8'?>
-#if($config.feedStyle)
-<?xml-stylesheet type="text/xsl" href="$url.absoluteSite/roller-ui/styles/atom.xsl" media="screen"?>
-#end
+#if($config.feedStyle)<?xml-stylesheet type="text/xsl" href="$url.absoluteSite/roller-ui/styles/atom.xsl" media="screen"?>#end
 #set($pager = $site.getWeblogEntriesPager(-1, $config.feedSize))
-#set($entries = $pager.items)
 <feed xmlns="http://www.w3.org/2005/Atom">
     <title type="html">$utils.escapeXML($config.siteName)</title>
     <subtitle type="html">$utils.escapeXML($config.siteDescription)</subtitle>
     <id>$url.absoluteSite</id>
     <link rel="alternate" type="text/html" href="$url.absoluteSite" />
-#if($model.tags)
-    <link rel="self" type="application/atom+xml" href="$url.feed.entries.atomByTags($model.tags, $model.excerpts)" />
-#elseif($model.categoryPath)
-    <link rel="self" type="application/atom+xml" href="$url.feed.entries.atom($model.categoryPath, $model.excerpts)" />
-#else
-    <link rel="self" type="application/atom+xml" href="$url.feed.entries.atom" />
-#end
-#if($config.feedHistoryEnabled)
-#showFeedHistory($pager)
-#end  
+    #if($model.tags)
+        <link rel="self" type="application/atom+xml" href="$url.feed.entries.atomByTags($model.tags, $model.excerpts)" />
+    #elseif($model.categoryPath)
+        <link rel="self" type="application/atom+xml" href="$url.feed.entries.atom($model.categoryPath, $model.excerpts)" />
+    #else
+        <link rel="self" type="application/atom+xml" href="$url.feed.entries.atom" />
+    #end
+    #if($config.feedHistoryEnabled)
+        #showFeedHistory($pager)
+    #end  
     <updated>$utils.formatIso8601Date($model.weblog.lastModified)</updated>
     <generator uri="http://rollerweblogger.org" version="$config.rollerVersion ($config.rollerBuildTimestamp:$config.rollerBuildUser)">Apache Roller (incubating)</generator>
-#showEntriesAtom10($entries)
+    #showEntriesAtom10($pager.items)
 </feed>
 
 



Mime
View raw message