roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r231067 - in /incubator/roller/branches/roller_2.0: nbproject/ src/org/roller/business/hibernate/ src/org/roller/pojos/ src/org/roller/presentation/bookmarks/actions/ src/org/roller/presentation/velocity/ src/org/roller/presentation/weblog/...
Date Tue, 09 Aug 2005 17:32:36 GMT
Author: snoopdave
Date: Tue Aug  9 10:31:44 2005
New Revision: 231067

URL: http://svn.apache.org/viewcvs?rev=231067&view=rev
Log:
More post-merge fixes.

Modified:
    incubator/roller/branches/roller_2.0/nbproject/project.xml
    incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/HibernateRefererManagerImpl.java
    incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/HibernateUserManagerImpl.java
    incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/HibernateWeblogManagerImpl.java
    incubator/roller/branches/roller_2.0/src/org/roller/pojos/UserData.java
    incubator/roller/branches/roller_2.0/src/org/roller/pojos/WeblogEntryData.java
    incubator/roller/branches/roller_2.0/src/org/roller/pojos/WebsiteData.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarkEditAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderSaveAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/ImportBookmarksFormAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageHelper.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogQueryAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/xmlrpc/BaseAPIHandler.java
    incubator/roller/branches/roller_2.0/tests/org/roller/RollerTestBase.java
    incubator/roller/branches/roller_2.0/tests/org/roller/business/UserManagerTest.java
    incubator/roller/branches/roller_2.0/tests/org/roller/presentation/xmlrpc/RollerXmlRpcServerTest.java
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml
    incubator/roller/branches/roller_2.0/web/WEB-INF/editor-menu.xml
    incubator/roller/branches/roller_2.0/web/planet/PlanetConfig.jsp
    incubator/roller/branches/roller_2.0/web/theme/status.jsp
    incubator/roller/branches/roller_2.0/web/weblog/WeblogQuery.jsp
    incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp
    incubator/roller/branches/roller_2.0/web/website/edit-website.jsp
    incubator/roller/branches/roller_2.0/web/website/rollerProperties.jsp

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

Modified: incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/HibernateRefererManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/HibernateRefererManagerImpl.java?rev=231067&r1=231066&r2=231067&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/HibernateRefererManagerImpl.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/HibernateRefererManagerImpl.java Tue Aug  9 10:31:44 2005
@@ -292,7 +292,7 @@
             results = session.find(
                "select sum(h.dayHits),sum(h.totalHits) from h in class " +
                "org.roller.pojos.RefererData " +
-               "where h.website.isEnabled=? and h.website.id=? ",
+               "where h.website.enabled=? and h.website.id=? ",
                args, types);
         }
         catch (HibernateException e)

Modified: incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/HibernateUserManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/HibernateUserManagerImpl.java?rev=231067&r1=231066&r2=231067&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/HibernateUserManagerImpl.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/HibernateUserManagerImpl.java Tue Aug  9 10:31:44 2005
@@ -77,7 +77,7 @@
             }
             if (enabled != null)
             {
-                criteria.add(Expression.eq("isEnabled", enabled));
+                criteria.add(Expression.eq("enabled", enabled));
             }
             return criteria.list();
         }
@@ -104,7 +104,7 @@
             }
             if (enabled != null)
             {
-                criteria.add(Expression.eq("isEnabled", enabled));
+                criteria.add(Expression.eq("enabled", enabled));
             }
             return criteria.list();
         }
@@ -160,7 +160,7 @@
                 criteria.add(
                    Expression.conjunction()
                        .add(new EqExpression("handle", handle, true))
-                       .add(Expression.eq("isEnabled", enabled)));
+                       .add(Expression.eq("enabled", enabled)));
             }
             else
             {
@@ -192,7 +192,7 @@
                 criteria.add(
                    Expression.conjunction()
                        .add(new EqExpression("userName", userName, true))
-                       .add(Expression.eq("isEnabled", enabled)));
+                       .add(Expression.eq("enabled", enabled)));
             }
             else
             {
@@ -365,7 +365,7 @@
         Criteria criteria = session.createCriteria(UserData.class);            
         if (enabled != null)
         {
-            criteria.add(Expression.eq("isEnabled", enabled));
+            criteria.add(Expression.eq("enabled", enabled));
         }
         try
         {
@@ -596,7 +596,7 @@
         List results = new ArrayList();
         if (enabled != null)
         {
-            criteria.add(Expression.eq("isEnabled", Boolean.TRUE));
+            criteria.add(Expression.eq("enabled", Boolean.TRUE));
         }
         if (startsWith != null) 
         {

Modified: incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/HibernateWeblogManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/HibernateWeblogManagerImpl.java?rev=231067&r1=231066&r2=231067&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/HibernateWeblogManagerImpl.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/HibernateWeblogManagerImpl.java Tue Aug  9 10:31:44 2005
@@ -257,7 +257,7 @@
             else 
             {
                 criteria.createAlias("website","w");
-                criteria.add(Expression.eq("w.isEnabled", Boolean.TRUE));
+                criteria.add(Expression.eq("w.enabled", Boolean.TRUE));
             }
     
             if (startDate != null)

Modified: incubator/roller/branches/roller_2.0/src/org/roller/pojos/UserData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/pojos/UserData.java?rev=231067&r1=231066&r2=231067&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/pojos/UserData.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/pojos/UserData.java Tue Aug  9 10:31:44 2005
@@ -39,15 +39,15 @@
    
    static final long serialVersionUID = -6354583200913127874L;
 
-   protected String id;
-   protected String userName;
-   protected String password;
-   protected String fullName;
-   protected String emailAddress;
-   protected Date dateCreated;
+   protected String  id;
+   protected String  userName;
+   protected String  password;
+   protected String  fullName;
+   protected String  emailAddress;
+   protected Date    dateCreated;
    protected String  locale;
    protected String  timeZone;
-   protected Boolean isEnabled = Boolean.TRUE;
+   protected Boolean enabled = Boolean.TRUE;
    
    private Set roles = new TreeSet();
    private List permissions = new ArrayList();
@@ -71,7 +71,7 @@
          this.dateCreated = (Date)dateCreated.clone();
          this.locale = locale;
          this.timeZone = timeZone;
-         this.isEnabled = isEnabled;
+         this.enabled = enabled;
 	}
 
 	public UserData( UserData otherData )
@@ -104,15 +104,15 @@
      * @ejb:persistent-field
      * @hibernate.property column="isenabled" non-null="true" unique="false"
      */
-    public Boolean getIsEnabled()
+    public Boolean getEnabled()
     {
-        return this.isEnabled;
+        return this.enabled;
     }
     
     /** @ejb:persistent-field */ 
-    public void setIsEnabled(Boolean isEnabled)
+    public void setEnabled(Boolean enabled)
     {
-        this.isEnabled = isEnabled;
+        this.enabled = enabled;
     }
     
     /** Id of the User.

Modified: incubator/roller/branches/roller_2.0/src/org/roller/pojos/WeblogEntryData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/pojos/WeblogEntryData.java?rev=231067&r1=231066&r2=231067&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/pojos/WeblogEntryData.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/pojos/WeblogEntryData.java Tue Aug  9 10:31:44 2005
@@ -215,6 +215,7 @@
     }
     
     /** 
+     * @roller.wrapPojoMethod type="simple"
      * @ejb:persistent-field 
      * @hibernate.property column="title" non-null="true" unique="false"
      */

Modified: incubator/roller/branches/roller_2.0/src/org/roller/pojos/WebsiteData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/pojos/WebsiteData.java?rev=231067&r1=231066&r2=231067&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/pojos/WebsiteData.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/pojos/WebsiteData.java Tue Aug  9 10:31:44 2005
@@ -59,7 +59,7 @@
     protected String  locale;
     protected String  timeZone;
     protected String  mDefaultPlugins;
-    protected Boolean isEnabled;
+    protected Boolean enabled;
     protected Date dateCreated;
        
     // Associated objects
@@ -88,7 +88,7 @@
                        final Boolean  allowComments,
                        final Boolean  emailComments,
                        final String   emailFromAddress,
-                       final Boolean  isEnabled,
+                       final Boolean  enabled,
                        final String   emailAddress,
                        final Date     dateCreated)
     {
@@ -107,7 +107,7 @@
         this.allowComments = allowComments;
         this.emailComments = emailComments;
         this.emailFromAddress = emailFromAddress;
-        this.isEnabled = isEnabled;
+        this.enabled = enabled;
         this.emailAddress = emailAddress;
         this.dateCreated = dateCreated;
     }
@@ -728,15 +728,15 @@
      * @ejb:persistent-field
      * @hibernate.property column="isenabled" non-null="true" unique="false"
      */
-    public Boolean getIsEnabled()
+    public Boolean getEnabled()
     {
-        return this.isEnabled;
+        return this.enabled;
     }
     
     /** @ejb:persistent-field */ 
-    public void setIsEnabled(Boolean isEnabled)
+    public void setEnabled(Boolean enabled)
     {
-        this.isEnabled = isEnabled;
+        this.enabled = enabled;
     }
 
     public String toString()
@@ -871,7 +871,7 @@
         this.locale = other.locale;
         this.timeZone = other.timeZone;
         this.mDefaultPlugins = other.mDefaultPlugins;
-        this.isEnabled = other.isEnabled;
+        this.enabled = other.enabled;
         this.dateCreated = dateCreated;
     }
     

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarkEditAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarkEditAction.java?rev=231067&r1=231066&r2=231067&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarkEditAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarkEditAction.java Tue Aug  9 10:31:44 2005
@@ -18,6 +18,7 @@
 import org.roller.pojos.FolderData;
 import org.roller.pojos.WebsiteData;
 import org.roller.presentation.RollerRequest;
+import org.roller.presentation.RollerSession;
 import org.roller.presentation.bookmarks.formbeans.BookmarkFormEx;
 
 /**
@@ -36,7 +37,8 @@
         throws Exception
     {
         RollerRequest rreq = RollerRequest.getRollerRequest(request);
-        WebsiteData wd = rreq.getWebsite();
+        RollerSession rses = RollerSession.getRollerSession(request);
+        WebsiteData wd = rses.getCurrentWebsite();
         BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
         BookmarkFormEx form = (BookmarkFormEx)actionForm;
         

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderSaveAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderSaveAction.java?rev=231067&r1=231066&r2=231067&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderSaveAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderSaveAction.java Tue Aug  9 10:31:44 2005
@@ -19,6 +19,7 @@
 import org.roller.pojos.FolderData;
 import org.roller.pojos.WebsiteData;
 import org.roller.presentation.RollerRequest;
+import org.roller.presentation.RollerSession;
 import org.roller.presentation.bookmarks.formbeans.FolderFormEx;
 
 /**
@@ -40,7 +41,8 @@
         ActionForward forward = mapping.findForward("Bookmarks");
         FolderFormEx form = (FolderFormEx)actionForm;
         RollerRequest rreq = RollerRequest.getRollerRequest(request);
-        WebsiteData wd = rreq.getWebsite();
+        RollerSession rses = RollerSession.getRollerSession(request);
+        WebsiteData wd = rses.getCurrentWebsite();
         BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
         
         FolderData fd = null;

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/ImportBookmarksFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/ImportBookmarksFormAction.java?rev=231067&r1=231066&r2=231067&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/ImportBookmarksFormAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/ImportBookmarksFormAction.java Tue Aug  9 10:31:44 2005
@@ -25,6 +25,7 @@
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import org.roller.presentation.RollerSession;
 
 /////////////////////////////////////////////////////////////////////////////
 /**
@@ -106,8 +107,11 @@
                         RollerRequest rreq = 
                             RollerRequest.getRollerRequest(request);
                         BookmarkManager bm = 
-                            RollerFactory.getRoller().getBookmarkManager();    
-                        bm.importBookmarks(rreq.getWebsite(), folderName, data);
+                            RollerFactory.getRoller().getBookmarkManager();
+                        RollerSession rses = 
+                            RollerSession.getRollerSession(request);
+                        bm.importBookmarks(
+                            rses.getCurrentWebsite(), folderName, data);
                         
                         RollerFactory.getRoller().commit();
                     }

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageHelper.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageHelper.java?rev=231067&r1=231066&r2=231067&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageHelper.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageHelper.java Tue Aug  9 10:31:44 2005
@@ -70,15 +70,14 @@
         if (rreq != null) 
         {
             mPageContext = rreq.getPageContext();
-            WebsiteData website = null;
             if ( rreq.getRequest().getAttribute(RollerRequest.OWNING_WEBSITE) != null)
             {
-                website = (WebsiteData)
+                mWebsite = (WebsiteData)
                     rreq.getRequest().getAttribute(RollerRequest.OWNING_WEBSITE);
             }
             else if ( rreq.getWebsite() != null )
             {
-                website = rreq.getWebsite();
+                mWebsite = rreq.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=231067&r1=231066&r2=231067&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 Tue Aug  9 10:31:44 2005
@@ -47,6 +47,8 @@
         RollerRequest rreq = RollerRequest.getRollerRequest(request);
         WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
         
+        String status= form.getStatus().equals("ALL") ? null : form.getStatus();
+        
         request.setAttribute("model", new WeblogQueryPageModel(
            request, 
            response, 
@@ -55,7 +57,7 @@
            form.getCategoryId(),
            form.getStartDateString(),
            form.getEndDateString(),
-           form.getStatus(),
+           status,
            form.getMaxEntries())); 
         
         return mapping.findForward("weblogQuery.page");

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java?rev=231067&r1=231066&r2=231067&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java Tue Aug  9 10:31:44 2005
@@ -1,13 +1,10 @@
 package org.roller.presentation.website.actions;
 
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
-
-import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -22,13 +19,14 @@
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.actions.DispatchAction;
 import org.roller.RollerException;
+import org.roller.model.Roller;
 import org.roller.model.RollerFactory;
+import org.roller.model.ThemeManager;
 import org.roller.model.UserManager;
 import org.roller.pojos.UserData;
 import org.roller.pojos.WebsiteData;
 import org.roller.presentation.BasePageModel;
 import org.roller.presentation.RollerContext;
-import org.roller.presentation.RollerRequest;
 import org.roller.presentation.RollerSession;
 import org.roller.presentation.website.formbeans.CreateWebsiteForm;
 
@@ -65,7 +63,7 @@
             ActionForm          actionForm,
             HttpServletRequest  request,
             HttpServletResponse response)
-            throws IOException, ServletException
+            throws Exception
     {
         CreateWebsiteForm form = (CreateWebsiteForm)actionForm;
         form.setLocale( Locale.getDefault().toString() );
@@ -145,11 +143,14 @@
         private String rssURL = null;
         private WebsiteData website = null;
         public CreateWebsitePageModel(HttpServletRequest request,
-                HttpServletResponse response, ActionMapping mapping, WebsiteData wd)
+            HttpServletResponse response, ActionMapping mapping, WebsiteData wd)
+            throws RollerException
         {
             super(request, response, mapping);
             RollerContext rollerContext = RollerContext.getRollerContext(request);
-            // ROLLER_2.0: fix this: themes = Arrays.asList(rollerContext.getThemeNames());
+            Roller roller = RollerFactory.getRoller();
+            ThemeManager themeMgr = roller.getThemeManager();
+            themes = themeMgr.getEnabledThemesList();
             if (wd != null) 
             {
                 contextURL = rollerContext.getAbsoluteContextUrl(request);

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java?rev=231067&r1=231066&r2=231067&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java Tue Aug  9 10:31:44 2005
@@ -131,7 +131,7 @@
             form.copyTo(ud, request.getLocale()); // doesn't copy password
             ud.setId(null);
             ud.setDateCreated(new java.util.Date());
-            ud.setIsEnabled(Boolean.TRUE);
+            ud.setEnabled(Boolean.TRUE);
 
             // If user set both password and passwordConfirm then reset password
             if (    !StringUtils.isEmpty(form.getPasswordText()) 

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=231067&r1=231066&r2=231067&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 Tue Aug  9 10:31:44 2005
@@ -65,7 +65,7 @@
                 WeblogTemplateForm form = (WeblogTemplateForm)actionForm;
                 WeblogTemplate data = new WeblogTemplate();
                 form.copyTo(data, request.getLocale());
-                WebsiteData hd = rreq.getWebsite();
+                WebsiteData hd = rses.getCurrentWebsite();
 
                 data.setWebsite( hd );
                 data.setLastModified( new java.util.Date() );
@@ -186,18 +186,18 @@
             if ( rses.isUserAuthorizedToAdmin() )
             {
                 WeblogTemplateForm form = (WeblogTemplateForm)actionForm;
-                WeblogTemplate data = new WeblogTemplate();
-                form.copyTo(data, request.getLocale());
-
                 UserManager mgr = RollerFactory.getRoller().getUserManager();
-                mgr.removePageSafely( data.getId() );
+                
+                // fetch template to be deleted (we'll need its website)
+                WeblogTemplate template = mgr.retrievePage(form.getId());
+                
+                mgr.removePageSafely(template.getId());
                 RollerFactory.getRoller().commit();
 
                 UserData user = rses.getAuthenticatedUser();
-                PageCacheFilter.removeFromCache( request, data.getWebsite() );
+                PageCacheFilter.removeFromCache(request, template.getWebsite());
                     
                 addModelObjects(rreq);
-
                 actionForm.reset(mapping,request);
             }
             else

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=231067&r1=231066&r2=231067&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 Tue Aug  9 10:31:44 2005
@@ -146,8 +146,8 @@
                     WebsiteData wd = umgr.retrieveWebsite(form.getId());
                     wd.save(); // should throw if save not permitted
 
-                    // ensure isEnabled can't be changed
-                    form.setIsEnabled(wd.getIsEnabled());
+                    // ensure getEnabled can't be changed
+                    form.setEnabled(wd.getEnabled());
                     form.copyTo(wd, request.getLocale());
                                         
                     wd.save();

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/xmlrpc/BaseAPIHandler.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/xmlrpc/BaseAPIHandler.java?rev=231067&r1=231066&r2=231067&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/xmlrpc/BaseAPIHandler.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/xmlrpc/BaseAPIHandler.java Tue Aug  9 10:31:44 2005
@@ -94,8 +94,8 @@
             user = userMgr.getUser(username);
             
             enabled = website.getEnableBloggerApi().booleanValue() 
-                   && website.getIsEnabled().booleanValue() 
-                      && user.getIsEnabled().booleanValue();
+                   && website.getEnabled().booleanValue() 
+                      && user.getEnabled().booleanValue();
             if (enabled)
             {    
                 // are passwords encrypted?
@@ -156,7 +156,7 @@
             UserManager userMgr = RollerFactory.getRoller().getUserManager();
             user = userMgr.getUser(username);
             
-            enabled = user.getIsEnabled().booleanValue();
+            enabled = user.getEnabled().booleanValue();
             if (enabled)
             {    
                 // are passwords encrypted?

Modified: incubator/roller/branches/roller_2.0/tests/org/roller/RollerTestBase.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/tests/org/roller/RollerTestBase.java?rev=231067&r1=231066&r2=231067&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/tests/org/roller/RollerTestBase.java (original)
+++ incubator/roller/branches/roller_2.0/tests/org/roller/RollerTestBase.java Tue Aug  9 10:31:44 2005
@@ -171,7 +171,7 @@
                 "Test User #"+i,      // fullName
                 "test"+i+"@test.com"  // emailAddress
                 );
-            ud.setIsEnabled(new Boolean(i%2 == 0)); // half of users are disabled
+            ud.setEnabled(new Boolean(i%2 == 0)); // half of users are disabled
             WebsiteData website = (WebsiteData)umgr.getWebsites(ud, null).get(0);
             mWebsitesCreated.add(website);
             mUsersCreated.add(ud);

Modified: incubator/roller/branches/roller_2.0/tests/org/roller/business/UserManagerTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/tests/org/roller/business/UserManagerTest.java?rev=231067&r1=231066&r2=231067&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/tests/org/roller/business/UserManagerTest.java (original)
+++ incubator/roller/branches/roller_2.0/tests/org/roller/business/UserManagerTest.java Tue Aug  9 10:31:44 2005
@@ -75,18 +75,18 @@
                                  "password",
                                  "EnabledUser",
                                  "enabledUser@example.com");
-        enabledUser.setIsEnabled(Boolean.TRUE);
+        enabledUser.setEnabled(Boolean.TRUE);
         enabledSite = ((WebsiteData)umgr.getWebsites(enabledUser, null).get(0));
-        enabledSite.setIsEnabled(Boolean.TRUE);       
+        enabledSite.setEnabled(Boolean.TRUE);       
 
         disabledUser = createUser(disabledUserName,
                                  "password",
                                  "DisabledUser",
                                  "disabledUser@example.com");
                 
-        disabledUser.setIsEnabled(Boolean.FALSE);
+        disabledUser.setEnabled(Boolean.FALSE);
         disabledSite = ((WebsiteData)umgr.getWebsites(disabledUser, null).get(0));
-        disabledSite.setIsEnabled(Boolean.FALSE);  
+        disabledSite.setEnabled(Boolean.FALSE);  
 
         getRoller().commit();
     }

Modified: incubator/roller/branches/roller_2.0/tests/org/roller/presentation/xmlrpc/RollerXmlRpcServerTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/tests/org/roller/presentation/xmlrpc/RollerXmlRpcServerTest.java?rev=231067&r1=231066&r2=231067&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/tests/org/roller/presentation/xmlrpc/RollerXmlRpcServerTest.java (original)
+++ incubator/roller/branches/roller_2.0/tests/org/roller/presentation/xmlrpc/RollerXmlRpcServerTest.java Tue Aug  9 10:31:44 2005
@@ -48,7 +48,7 @@
     {
         ArrayList params = new ArrayList();
         params.add("roller"); // appkey
-        params.add("roller"); // blogid
+        params.add("testuser0"); // blogid
         params.add("testuser0"); // userid
         params.add("password"); // password
         params.add(new Integer(5)); // numposts

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=231067&r1=231066&r2=231067&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 Tue Aug  9 10:31:44 2005
@@ -139,6 +139,7 @@
 configForm.searchIndexDir=Search Index Directory<br />(use ${user.home} for \
 system property)
 configForm.suspendPingProcessing=Suspend all ping processing?
+configForm.emailNotification=Email notification?
 
 configForm.userSettings=User Settings
 configForm.allowNewUsers=Allow New Users?
@@ -148,7 +149,7 @@
 configForm.editorPages=Editor Pages
 configForm.autoformatComments=Autoformat Comments?
 configForm.escapeCommentHtml=Escape Comment HTML?
-configForm.emailComments=Email Comments?
+configForm.emailComments=Email notification of comments?
 
 configForm.fileUploadSettings=File Upload Settings
 configForm.enableFileUploads=Enable File Uploads?
@@ -683,6 +684,7 @@
 
 planetConfig.pageTitle=Planet Configuration
 planetConfig.prompt=Configure Planet Roller
+planetConfig.description=Description
 planetConfig.title=Title
 planetConfig.adminEmail=Admin E-mail
 planetConfig.cacheDir=Cache Directory
@@ -708,13 +710,12 @@
 planetConfig.error.badProxyPort=Proxy port is invalid
 
 planetConfig.tip.title=Title to be used in newsfeed header
+planetConfig.tip.description=Description to be used in newsfeed header
 planetConfig.tip.adminEmail=E-mail address to be used in newsfeed header
 planetConfig.tip.cacheDir=Directory where newsfeed data will be cached
 planetConfig.tip.siteUrl=URL to be used in newsfeed header
 planetConfig.tip.proxyHost=URL of proxy host (if required)
 planetConfig.tip.proxyPort=Port of proxy host (if required)
-
-
 
 planetSubscriptions.pageTitle=Planet Subscriptions
 planetSubscriptions.prompt.add=Add a subscription

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=231067&r1=231066&r2=231067&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 Tue Aug  9 10:31:44 2005
@@ -29,29 +29,33 @@
    
       <property-def  name="site.name"  key="configForm.siteName">
          <type>string</type>
-	 <default-value>Roller Site</default-value>
+         <default-value>Roller Site</default-value>
       </property-def>
       <property-def  name="site.description"  key="configForm.siteDescription">
          <type>string</type>
-	 <default-value>Roller Site</default-value>
+         <default-value>Roller Site</default-value>
       </property-def>
       <property-def  name="site.adminemail"  key="configForm.siteAdminEmail">
          <type>string</type>
-	 <default-value></default-value>
+         <default-value></default-value>
       </property-def>
       <property-def  name="site.absoluteurl"  key="configForm.absoluteUrl">
          <type>string</type>
-	 <default-value></default-value>
+         <default-value></default-value>
       </property-def>
       <property-def name="site.linkbacks.enabled" key="configForm.enableLinkback">
          <type>boolean</type>
-	 <default-value>false</default-value>
+         <default-value>false</default-value>
       </property-def>
       <property-def name="pings.suspendPingProcessing" key="configForm.suspendPingProcessing">
          <type>boolean</type>
-	 <default-value>false</default-value>
+         <default-value>false</default-value>
       </property-def>
-      
+      <property-def  name="site.emailnotify"  key="configForm.emailNotification">
+         <type>boolean</type>
+         <!-- defaults to false because we don't distribute mail jars -->
+         <default-value>false</default-value>
+      </property-def>      
    </display-group >
 
    <!-- User Settings Group -->
@@ -59,25 +63,26 @@
    
       <property-def  name="users.registration.enabled"  key="configForm.allowNewUsers">
          <type>boolean</type>
-	 <default-value>true</default-value>
+         <default-value>true</default-value>
       </property-def>
       <property-def  name="users.editor.pages"  key="configForm.editorPages">
          <type>text</type>
-	 <default-value>editor-ekit.jsp,editor-text.jsp,editor-dhtml.jsp,editor-text-js.jsp,editor-wiki-js.jsp,editor-rte.jsp</default-value>
+         <default-value>editor-ekit.jsp,editor-text.jsp,editor-dhtml.jsp,editor-text-js.jsp,editor-wiki-js.jsp,editor-rte.jsp</default-value>
          <rows>3</rows>
          <cols>40</cols>
       </property-def>
       <property-def  name="users.comments.autoformat"  key="configForm.autoformatComments">
          <type>boolean</type>
-	 <default-value>true</default-value>
+         <default-value>true</default-value>
       </property-def>
       <property-def  name="users.comments.escapehtml"  key="configForm.escapeCommentHtml">
          <type>boolean</type>
-	 <default-value>false</default-value>
+         <default-value>false</default-value>
       </property-def>
       <property-def  name="users.comments.emailnotify"  key="configForm.emailComments">
          <type>boolean</type>
-	 <default-value>true</default-value>
+         <!-- defaults to false because we don't distribute mail jars -->
+         <default-value>false</default-value> 
       </property-def>
 
    </display-group >
@@ -87,23 +92,23 @@
    
       <property-def  name="uploads.enabled"  key="configForm.enableFileUploads">
          <type>boolean</type>
-	 <default-value>true</default-value>
+         <default-value>true</default-value>
       </property-def>
       <property-def  name="uploads.types.allowed"  key="configForm.allowedExtensions">
          <type>string</type>
-	 <default-value>jpg,jpeg,gif,png</default-value>
+         <default-value>jpg,jpeg,gif,png</default-value>
       </property-def>
       <property-def  name="uploads.types.forbid"  key="configForm.forbiddenExtensions">
          <type>string</type>
-	 <default-value></default-value>
+         <default-value></default-value>
       </property-def>
       <property-def  name="uploads.file.maxsize"  key="configForm.maxFileSize">
          <type>string</type>
-	 <default-value>1.00</default-value>
+         <default-value>1.00</default-value>
       </property-def>
       <property-def  name="uploads.dir.maxsize"  key="configForm.maxDirSize">
          <type>string</type>
-	 <default-value>4.00</default-value>
+         <default-value>4.00</default-value>
       </property-def>
 
    </display-group >
@@ -112,11 +117,11 @@
    
       <property-def  name="users.themes.path"  key="configForm.newUserThemes">
          <type>string</type>
-	 <default-value>/themes</default-value>
+         <default-value>/themes</default-value>
       </property-def>
       <property-def  name="themes.customtheme.allowed"  key="configForm.allowCustomTheme">
          <type>boolean</type>
-	 <default-value>true</default-value>
+         <default-value>true</default-value>
       </property-def>
       
    </display-group>
@@ -137,7 +142,7 @@
    
       <property-def  name="spam.referers.ignorewords"  key="websiteSettings.ignoreUrls">
          <type>text</type>
-	 <default-value></default-value>
+         <default-value></default-value>
          <rows>7</rows>
          <cols>40</cols>
       </property-def>

Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/editor-menu.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/editor-menu.xml?rev=231067&r1=231066&r2=231067&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/editor-menu.xml (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/editor-menu.xml Tue Aug  9 10:31:44 2005
@@ -22,12 +22,11 @@
 <menu-bar>
 
     <menu name="tabbedmenu.main" roles="any" perms="any">
+        <menu-item forward="main"         name="tabbedmenu.main"    
+                                          perms="any" roles="any" />
         <menu-item forward="planet"       name="tabbedmenu.planet" 
                                           perms="any" roles="any" 
                                           enabledProperty="planet.aggregator.enabled" />
-        <menu-item forward="main"         name="tabbedmenu.main"    
-                                          perms="any" roles="any" 
-                                          disabledProperty="planet.aggregator.enabled" />
         <menu-item forward="yourProfile"  name="tabbedmenu.website.user"
                                           perms="any"
                                           roles="editor,admin" />

Modified: incubator/roller/branches/roller_2.0/web/planet/PlanetConfig.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/planet/PlanetConfig.jsp?rev=231067&r1=231066&r2=231067&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/planet/PlanetConfig.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/planet/PlanetConfig.jsp Tue Aug  9 10:31:44 2005
@@ -35,7 +35,7 @@
            <fmt:message key="planetConfig.description" />
         </label>
         <html:text property="description" size="40" maxlength="255" />
-        <img src="../images/help.jpeg" alt="help" 
+        <img src="../images/Help16.gif" alt="help" 
            title='<fmt:message key="planetConfig.tip.description" />' />
     </div>
     
@@ -84,7 +84,10 @@
            title='<fmt:message key="planetConfig.tip.proxyPort" />' />
     </div>
     
-    <input type="submit" value='<fmt:message key="planetConfig.button.post" />' />
+    <br />
+    <div class="control">
+        <input type="submit" value='<fmt:message key="planetConfig.button.post" />' />
+    </div>
     
     <br />      
     <br />      
@@ -97,7 +100,7 @@
 
     <input type="button" name="sync"
        value='<fmt:message key="planetConfig.button.syncWebsites" />'
-       onclick="syncWebsites()" />  
+       onclick="syncWebsites()" /> 
 
 </html:form>
 

Modified: incubator/roller/branches/roller_2.0/web/theme/status.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/status.jsp?rev=231067&r1=231066&r2=231067&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/status.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/status.jsp Tue Aug  9 10:31:44 2005
@@ -1,8 +1,10 @@
 <%@ 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");
 %>
 <br />
@@ -22,7 +24,7 @@
                  [<b><%= user.getUserName() %></b>].<br />
                  <% if (website != null) { %>
                     <fmt:message key="mainPage.currentWebsite" />:<br />
-                    [<b><%= website.getHandle() %></b>]<br />
+                    [<b><a href='<%= absURL + "/page/" + website.getHandle() %>'><%= website.getHandle() %></a></b>]<br />
                  <% } %> 
                 <fmt:message key="navigationBar.youMay" />&nbsp;
 			    <html:link forward="logout-redirect"><fmt:message key="navigationBar.logout"/></html:link>

Modified: incubator/roller/branches/roller_2.0/web/weblog/WeblogQuery.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/WeblogQuery.jsp?rev=231067&r1=231066&r2=231067&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogQuery.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogQuery.jsp Tue Aug  9 10:31:44 2005
@@ -49,9 +49,9 @@
         </label>        
         <html:radio property="status" value="ALL">
             <fmt:message key="weblogEntryQuery.label.allEntries" /></html:radio> 
-        <html:radio property="status" value="DRAFT_ONLY">
+        <html:radio property="status" value="DRAFT">
             <fmt:message key="weblogEntryQuery.label.draftOnly" /></html:radio>
-        <html:radio property="status" value="PUBLISHED_ONLY" >
+        <html:radio property="status" value="PUBLISHED" >
             <fmt:message key="weblogEntryQuery.label.publishedOnly" /></html:radio>
     </div>
 

Modified: incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp?rev=231067&r1=231066&r2=231067&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp Tue Aug  9 10:31:44 2005
@@ -9,7 +9,7 @@
     <html:hidden property="method" value="save"/></input>
     <html:hidden property="id"/></input>
     <html:hidden property="userName" /></input>
-    <html:hidden property="isEnabled" /></input>
+    <html:hidden property="enabled" /></input>
     
     <div class="formrow">
        <label for="fullName" class="formrow" /><fmt:message key="userSettings.fullname" /></label>

Modified: incubator/roller/branches/roller_2.0/web/website/edit-website.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/edit-website.jsp?rev=231067&r1=231066&r2=231067&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/edit-website.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/edit-website.jsp Tue Aug  9 10:31:44 2005
@@ -13,7 +13,7 @@
     <html:hidden property="handle"/></input>
     <html:hidden property="timeZone"/></input>
     <html:hidden property="editorTheme"/></input>
-    <html:hidden property="isEnabled"/></input>
+    <html:hidden property="enabled"/></input>
     <html:hidden property="defaultCategoryId"/></input>
 
 <table>

Modified: incubator/roller/branches/roller_2.0/web/website/rollerProperties.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/rollerProperties.jsp?rev=231067&r1=231066&r2=231067&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/rollerProperties.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/rollerProperties.jsp Tue Aug  9 10:31:44 2005
@@ -73,15 +73,12 @@
         </tr>
         
     </x:forEach>
-        
-        <tr>
-            <td class="buttonBox" colspan="2">
-                <input class="buttonBox" type="submit" value="<fmt:message key="configForm.save"/>"/>
-            </td>
-        </tr>
 
     </table>
-
+    
+            <div class="control">
+                <input class="buttonBox" type="submit" value="<fmt:message key="configForm.save"/>"/>
+            </div>
 <form>
 
 



Mime
View raw message