roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r1588757 [21/25] - in /roller/branches/rome2/app/src: main/java/org/apache/roller/ main/java/org/apache/roller/planet/business/ main/java/org/apache/roller/planet/business/fetcher/ main/java/org/apache/roller/planet/business/jpa/ main/java/...
Date Sun, 20 Apr 2014 13:39:01 GMT
Modified: roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml (original)
+++ roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml Sun Apr 20 13:38:51 2014
@@ -8,7 +8,6 @@ Each menu or menu item is governed by fo
        - admin:    superuser, administers server, etc.
        - login:    allowed to login and save profile
        - weblog:   is allowed to create and user weblogs
-       - comment:  allowed to comment on weblogs
        Use "any" to indicate that role is not required to view item
        
     2) weblogPerms: these are the weblog specific permissions required to view item
@@ -20,113 +19,106 @@ Each menu or menu item is governed by fo
     3) enable property: if true, show this menu
 
     4) disable property: if true, don't show this menu
+    
+    Note : Adding unnecessary authority checks will slow menu rendering
+    
 -->
 <menu-bar>
     
+    <!--  if we already have checked globalPerms="login" we should -->
+    <!--  not need to recheck on each tab item as they are the same -->
     <menu name="tabbedmenu.weblog" weblogPerms="edit_draft" globalPerms="login" >
         
+        <!-- globalPerms="login" -->
         <menu-item action="entryAdd" 
                    name="tabbedmenu.weblog.newEntry" 
-                   globalPerms="login"
                    weblogPerms="edit_draft" 
                    subactions="entryEdit,entryRemove" />
         
+        <!-- globalPerms="login" -->
         <menu-item action="entries" 
                    name="tabbedmenu.weblog.archives" 
-                   globalPerms="login"
                    weblogPerms="post" />
         
+        <!-- globalPerms="login" -->
         <menu-item action="comments" 
                    name="tabbedmenu.admin.commentManagement" 
-                   globalPerms="login"
                    weblogPerms="post" />
         
+        <!-- globalPerms="login" -->
         <menu-item action="categories"   
                    name="tabbedmenu.weblog.categories" 
-                   globalPerms="login"
                    weblogPerms="post"
                    subactions="categoryAdd,categoryEdit,categoryRemove" />
         
+        <!-- globalPerms="login" -->
         <menu-item action="bookmarks"    
                    name="tabbedmenu.bookmarks.allFolders" 
-                   globalPerms="login"
                    weblogPerms="admin"
                    subactions="bookmarkAdd,bookmarkEdit,folderAdd,folderEdit,bookmarksImport" />
 
+        <!-- globalPerms="login" -->
         <menu-item action="mediaFileView"
                    name="tabbedmenu.weblog.mediaFiles"
-                   globalPerms="login"
                    weblogPerms="post"
                    subactions="mediaFileAdd,mediaFileHierarchicalView,mediaFileSearch" />
 
+        <!-- globalPerms="login" -->
         <menu-item action="weblogExport"
                    enabledProperty="weblog.export.enabled"
                    name="tabbedmenu.weblog.export"
-                   globalPerms="login"
                    weblogPerms="admin"
                    subactions="exportEntries,exportResources"/>
 
+        <!-- globalPerms="login" -->
          <menu-item action="referrers"
-                   name="tabbedmenu.weblog.referers" 
-                   globalPerms="login"
+                   name="tabbedmenu.weblog.referers"
                    weblogPerms="admin"
                    enabledProperty="referrers.processing.enabled" />
     </menu>
     
-    
+    <!--  if we already have checked weblogPerms="admin" globalPerms="login" we should -->
+    <!--  not need to recheck on each tab item as they are the same -->
     <menu name="tabbedmenu.design" weblogPerms="admin" globalPerms="login" enabledProperty="themes.customtheme.allowed">
         
-        <menu-item action="themeEdit"         
-                   name="tabbedmenu.website.themes" 
-                   globalPerms="login"
-                   weblogPerms="admin" />
-        
-        <menu-item action="stylesheetEdit"         
-                   name="tabbedmenu.design.stylesheet" 
-                   globalPerms="login"
-                   weblogPerms="admin" />
-                   
-        <menu-item action="templates"         
+        <!-- globalPerms="login" weblogPerms="admin" -->
+        <menu-item action="themeEdit"
+                   name="tabbedmenu.website.themes" />
+        
+        <!-- globalPerms="login" weblogPerms="admin" -->
+        <menu-item action="stylesheetEdit"
+                   name="tabbedmenu.design.stylesheet" />
+        
+        <!-- globalPerms="login" weblogPerms="admin" -->
+        <menu-item action="templates"
                    name="tabbedmenu.website.pages" 
-                   globalPerms="login"
-                   weblogPerms="admin" 
                    subactions="templateAdd,templateEdit,templateRemove,templatesRemove" />
-                   
     </menu>
     
     
-    <menu name="tabbedmenu.website" weblogPerms="admin">
+    <!--  if we already have checked weblogPerms="admin" globalPerms="login" we should -->
+    <!--  not need to recheck on each tab item as they are the same -->
+    <menu name="tabbedmenu.website" weblogPerms="admin" globalPerms="login">
         
-        <menu-item action="weblogConfig"       
+        <!-- globalPerms="login" weblogPerms="admin" -->
+        <menu-item action="weblogConfig"
                    name="tabbedmenu.website.settings" 
-                   globalPerms="login"
-                   weblogPerms="admin" 
                    subactions="weblogRemove" />
         
+        <!-- globalPerms="login" weblogPerms="admin" -->
         <menu-item action="members" 
                    name="tabbedmenu.website.members" 
-                   globalPerms="login"
-                   weblogPerms="admin"
                    subactions="invite" 
                    enabledProperty="groupblogging.enabled"/>
         
-        <menu-item action="pings"         
+        <!-- globalPerms="login" weblogPerms="admin" -->
+        <menu-item action="pings"
                    name="tabbedmenu.weblog.pingSetup" 
-                   globalPerms="login"
-                   weblogPerms="admin" 
                    disabledProperty="pings.disablePingUsage" />
         
-        <menu-item action="customPingTargets" 
-                   name="tabbedmenu.weblog.customPingTargets" 
-                   globalPerms="login"
-                   weblogPerms="admin" 
-                   subactions="customPingTargetAdd,customPingTargetEdit"
-                   disabledProperty="pings.disallowCustomTargets" />        
-        
-        <menu-item action="maintenance"      
-                   name="tabbedmenu.website.maintenance" 
-                   globalPerms="login"
-                   weblogPerms="admin" />
+        <!-- globalPerms="login" weblogPerms="admin" -->
+        <menu-item action="maintenance"
+                   name="tabbedmenu.website.maintenance" />
     </menu>
     
 </menu-bar>

Modified: roller/branches/rome2/app/src/main/resources/sql/310-to-400-migration.vm
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/sql/310-to-400-migration.vm?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/sql/310-to-400-migration.vm (original)
+++ roller/branches/rome2/app/src/main/resources/sql/310-to-400-migration.vm Sun Apr 20 13:38:51 2014
@@ -154,8 +154,6 @@ create index raggs_sid_idx on rag_group_
 -- remove no-longer-used needed tables
 
 -- remove old rollerconfig table which has been deprecated since 1.2
--- NOTE: since this breaks the pre-1.2 -> 4.0+ direct upgrade path then
--- maybe we want to attempt to fix that by doing that upgrade via sql?
 #dropTableIfExists('rollerconfig')
 
 -- remove old id column of group subscription table

Modified: roller/branches/rome2/app/src/main/resources/sql/400-to-500-migration.vm
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/sql/400-to-500-migration.vm?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/sql/400-to-500-migration.vm (original)
+++ roller/branches/rome2/app/src/main/resources/sql/400-to-500-migration.vm Sun Apr 20 13:38:51 2014
@@ -39,7 +39,7 @@ insert into roller_permission (id,userna
       from rolleruser as u, website as w, roller_user_permissions as p
       where p.user_id = u.id and p.website_id = w.id and permission_mask = 3;
 
--- User management can now be exernalized, so no more relations with user table
+-- User management can now be externalized, so no more relations with user table
 
 #dropNotNullFromColumn("userrole" "userid" "varchar(48)")
 

Modified: roller/branches/rome2/app/src/main/resources/sql/500-to-510-migration.vm
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/sql/500-to-510-migration.vm?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/sql/500-to-510-migration.vm (original)
+++ roller/branches/rome2/app/src/main/resources/sql/500-to-510-migration.vm Sun Apr 20 13:38:51 2014
@@ -23,3 +23,23 @@ create table rol_templatecode (
 
 #addColumnNull("webpage" "type"  "varchar(16)")
 #addColumnNull("weblogentry" "search_description"  "varchar(255)")
+
+-- Removal of subcategories means no more path and parentid columns
+delete from weblogcategory where name = 'root' and parentid is null;
+#dropColumn("weblogcategory" 'parentid')
+#dropColumn("weblogcategory" 'path')
+
+-- Allow users to order their weblog categories (zero-based)
+#addColumnNotNull("weblogcategory" "position" "integer" "0")
+
+-- Removal of custom ping targets
+delete from pingtarget where websiteid is not null;
+#dropIndex("pt_websiteid_fk" "pingtarget")
+#dropColumn("pingtarget", "websiteid")
+
+-- Removal of bookmark subfolders and renaming of default folder to 'default'
+update folder set name = 'default' where name = 'root' and parentid is null;
+#dropColumn("folder" 'parentid')
+#dropColumn("folder" 'path')
+#dropColumn("folder" "description")
+#dropColumn("bookmark" "weight")

Modified: roller/branches/rome2/app/src/main/resources/sql/createdb.vm
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/sql/createdb.vm?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/sql/createdb.vm (original)
+++ roller/branches/rome2/app/src/main/resources/sql/createdb.vm Sun Apr 20 13:38:51 2014
@@ -162,24 +162,9 @@ create table rol_templatecode (
 create table folder (
     id               varchar(48) not null primary key,
     name             varchar(255) not null,
-    description      varchar(255),
-    websiteid        varchar(48) not null,
-    parentid         varchar(48),
-    path             varchar(255) 
+    websiteid        varchar(48) not null
 );
 create index fo_websiteid_idx on folder( websiteid );
-create index fo_parentid_idx on folder( parentid );
-create index fo_path_idx on folder( path );
-
-create table folderassoc (
-    id               varchar(48) not null primary key,
-    folderid         varchar(48) not null,
-    ancestorid       varchar(40),
-    relation         varchar(20) not null
-);
-create index fa_folderid_idx on folderassoc( folderid );
-create index fa_ancestorid_idx on folderassoc( ancestorid );
-create index fa_relation_idx on folderassoc( relation );
 
 create table bookmark (
     id               varchar(48) not null primary key,
@@ -187,7 +172,6 @@ create table bookmark (
     name             varchar(255) not null,
     description      varchar(255),
     url              varchar(255) not null,
-    weight           integer default 0 not null,
     priority         integer default 100 not null,
     image            varchar(255),
     feedurl          varchar(255)
@@ -195,27 +179,14 @@ create table bookmark (
 create index bm_folderid_idx on bookmark( folderid );
 
 create table weblogcategory (
-    id               varchar(48)  not null primary key,
+    id               varchar(48) not null primary key,
     name             varchar(255) not null,
     description      varchar(255),
     websiteid        varchar(48) not null,
     image            varchar(255),
-    parentid         varchar(48),
-    path             varchar(255)
+    position         integer default 0 not null
 );
 create index wc_websiteid_idx on weblogcategory( websiteid );
-create index ws_parentid_idx on weblogcategory( parentid );
-create index ws_path_idx on weblogcategory( path );
-
-create table weblogcategoryassoc (
-    id               varchar(48) not null primary key,
-    categoryid       varchar(48) not null,
-    ancestorid       varchar(40),
-    relation         varchar(20) not null
-);
-create index wca_categoryid_idx on weblogcategoryassoc( categoryid );
-create index wca_ancestorid_idx on weblogcategoryassoc( ancestorid );
-create index wca_relation_idx on weblogcategoryassoc( relation );
 
 create table weblogentry (
     id              varchar(48)  not null primary key,
@@ -308,19 +279,16 @@ create index co_status_idx on roller_com
 -- Ping Feature Tables
 -- name: short descriptive name of the ping target
 -- pingurl: URL to receive the ping
--- websiteid:  if not null, this is a custom target defined by the associated website
 -- conditioncode:
 -- lastsuccess:
 create table pingtarget (
     id           varchar(48) not null primary key,
     name         varchar(255) not null,
     pingurl      varchar(255) not null,
-    websiteid    varchar(48),
     conditioncode    integer default 0 not null,
     lastsuccess  $db.TIMESTAMP_SQL_TYPE,
     autoenabled  $db.BOOLEAN_SQL_TYPE_FALSE not null
 );
-create index pt_websiteid_idx on pingtarget( websiteid );
 
 -- auto ping configurations
 -- websiteid:  fk reference to website for which this auto ping configuration applies
@@ -333,16 +301,6 @@ create table autoping (
 create index ap_websiteid_idx on autoping( websiteid );
 create index ap_pingtid_idx on autoping( pingtargetid );
 
--- autopingid: fk reference to ping configuration
--- categoryid: fk reference to category
-create table pingcategory (
-    id            varchar(48) not null primary key,
-    autopingid  varchar(48) not null, 
-    categoryid    varchar(48) not null 
-);
-create index pc_autopingid_idx on pingcategory( autopingid );
-create index pc_categoryid_idx on pingcategory( categoryid );
-
 -- entrytime: timestamp of original entry onto the ping queue
 -- pingtargetid: weak fk reference to ping target (not constrained)
 -- websiteid: weak fk reference to website originating the ping (not constrained)
@@ -384,40 +342,6 @@ create index ref_datestr_idx on referer(
 create index ref_refpermlnk_idx on referer( refpermalink$!db.INDEXSIZE );
 create index ref_duplicate_idx on referer( duplicate );
 
--- Configuration options for Roller, should only ever be one row
--- Deprecated in 1.2: configuration now stored in roller_properties table
-create table rollerconfig (
-    id              varchar(48) not null primary key,
-    sitedescription varchar(255),
-    sitename        varchar(255),
-    emailaddress    varchar(255),
-    absoluteurl     varchar(255),
-    adminusers      varchar(255),
-    encryptpasswords $db.BOOLEAN_SQL_TYPE_TRUE not null,
-    algorithm       varchar(10),
-    newuserallowed  $db.BOOLEAN_SQL_TYPE_FALSE not null,
-    editorpages     varchar(255),
-    userthemes      varchar(255) not null,
-    indexdir        varchar(255),
-    memdebug        $db.BOOLEAN_SQL_TYPE_FALSE not null,
-    autoformatcomments $db.BOOLEAN_SQL_TYPE_FALSE not null,
-    escapecommenthtml $db.BOOLEAN_SQL_TYPE_TRUE not null,
-    emailcomments   $db.BOOLEAN_SQL_TYPE_FALSE not null,
-    enableaggregator $db.BOOLEAN_SQL_TYPE_FALSE not null,
-    enablelinkback  $db.BOOLEAN_SQL_TYPE_FALSE not null,
-    rsscachetime    integer default 3000 not null,
-    rssusecache     $db.BOOLEAN_SQL_TYPE_TRUE not null,
-    uploadallow     varchar(255),
-    uploadforbid    varchar(255),
-    uploadenabled   $db.BOOLEAN_SQL_TYPE_TRUE not null,
-    uploaddir       varchar(255) not null,
-    uploadpath      varchar(255) not null,
-    uploadmaxdirmb  decimal(5,2) default 4.0 not null,
-    uploadmaxfilemb decimal(5,2) default 1.5 not null,
-    dbversion       varchar(10),
-    refspamwords    $db.TEXT_SQL_TYPE
-);
-
 create table roller_properties (
     name     varchar(255) not null primary key,
     value    $db.TEXT_SQL_TYPE
@@ -624,9 +548,6 @@ alter table referer add constraint ref_w
 alter table folder add constraint fo_websiteid_fk
     foreign key ( websiteid ) references website( id ) $!db.ADDL_FK_PARAMS ;
 
--- alter table folder add constraint fo_parentid_fk
---     foreign key ( parentid ) references folder( id );
-
 alter table bookmark add constraint bm_folderid_fk
     foreign key ( folderid ) references folder( id ) $!db.ADDL_FK_PARAMS ;
 
@@ -649,10 +570,7 @@ alter table roller_mediafiledir add cons
 alter table newsfeed add constraint nf_websiteid_fk
     foreign key ( websiteid ) references website( id ) $!db.ADDL_FK_PARAMS ;
 
--- pingtarget, autoping, pingcategory
-
-alter table pingtarget add constraint pt_websiteid_fk
-    foreign key (websiteid) references website(id) $!db.ADDL_FK_PARAMS ;
+-- autoping
 
 alter table autoping add constraint ap_websiteid_fk
     foreign key (websiteid) references website(id) $!db.ADDL_FK_PARAMS ;
@@ -660,12 +578,6 @@ alter table autoping add constraint ap_w
 alter table autoping add constraint ap_pingtargetid_fk
     foreign key (pingtargetid) references pingtarget(id) $!db.ADDL_FK_PARAMS ;
 
-alter table pingcategory add constraint pc_autopingid_fk
-    foreign key (autopingid) references autoping(id) $!db.ADDL_FK_PARAMS ;
-
-alter table pingcategory add constraint pc_categoryid_fk
-    foreign key (categoryid) references weblogcategory(id) $!db.ADDL_FK_PARAMS ;
-
 
 -- THE FOLLOWING CONSTRAINTS CAN NOT BE SUPPORTED FOR IMPORTING new-user.xml
 -- alter table website add constraint website_defaultpageid_fk foreign key ( defaultpageid ) references webpage ( id );
@@ -677,4 +589,3 @@ alter table pingcategory add constraint 
 
 create index oc_username_idx  on roller_oauthconsumer( username$!db.INDEXSIZE );
 create index oc_consumerkey_idx  on roller_oauthconsumer( consumerkey$!db.INDEXSIZE );
-

Modified: roller/branches/rome2/app/src/main/resources/sql/droptables.sql
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/sql/droptables.sql?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/sql/droptables.sql (original)
+++ roller/branches/rome2/app/src/main/resources/sql/droptables.sql Sun Apr 20 13:38:51 2014
@@ -25,20 +25,17 @@ drop table rag_properties;
 -- non-associated tables
 drop table newsfeed;
 drop table usercookie;
-drop table rollerconfig;
 drop table roller_properties;
 drop table roller_audit_log;
 drop table roller_tasklock;
 
 -- supplemental services tables
 drop table pingqueueentry;
-drop table pingcategory;
 drop table autoping;
 drop table pingtarget;
 drop table referer;
 drop table bookmark;
 drop table folder;
-drop table folderassoc;
 drop table roller_userattribute;
 drop table roller_mediafiletag;
 drop table roller_mediafile;
@@ -52,7 +49,6 @@ drop table roller_weblogentrytag;
 drop table roller_weblogentrytagagg;
 drop table entryattribute;
 drop table weblogentry;
-drop table weblogcategoryassoc;
 drop table weblogcategory;
 drop table webpage;
 drop table rol_weblogtheme;

Modified: roller/branches/rome2/app/src/main/resources/sql/macros.vm
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/sql/macros.vm?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/sql/macros.vm (original)
+++ roller/branches/rome2/app/src/main/resources/sql/macros.vm Sun Apr 20 13:38:51 2014
@@ -92,6 +92,8 @@ Macro to account for lack of comparable 
 #macro(dropIndex $indexName $tableName)
 #if ($db.DBTYPE == "DERBY" || $db.DBTYPE == 'POSTGRESQL')
 drop index $indexName;
+#elseif ($db.DBTYPE == "MYSQL")
+alter table $tableName drop foreign key $indexName;
 #else
 drop index $indexName on $tableName;
 #end

Modified: roller/branches/rome2/app/src/main/resources/struts.properties
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/struts.properties?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/struts.properties (original)
+++ roller/branches/rome2/app/src/main/resources/struts.properties Sun Apr 20 13:38:51 2014
@@ -28,3 +28,8 @@ struts.custom.i18n.resources=Application
 
 # If you want to allow uploads over 1 billion bytes, then set this higher:
 struts.multipart.maxSize=1000000000
+
+# By default, Errors, Field errors and Message aren't copied during chaining
+# to copy Action Errors
+struts.xwork.chaining.copyErrors=true
+struts.xwork.chaining.copyMessages=true

Modified: roller/branches/rome2/app/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/resources/struts.xml?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/resources/struts.xml (original)
+++ roller/branches/rome2/app/src/main/resources/struts.xml Sun Apr 20 13:38:51 2014
@@ -27,20 +27,22 @@
                  default stack -->
             <interceptor-stack name="rollerStack">
                 <interceptor-ref name="exception"/>
-                <interceptor-ref name="alias"/>
+                <!-- <interceptor-ref name="alias"/> -->
                 <interceptor-ref name="servletConfig"/>
-                <interceptor-ref name="prepare"/>
+                <!-- <interceptor-ref name="prepare"/> -->
                 <interceptor-ref name="i18n"/>
                 <interceptor-ref name="chain"/>
-                <interceptor-ref name="debugging"/>
-                <interceptor-ref name="profiling"/>
-                <interceptor-ref name="scopedModelDriven"/>
-                <interceptor-ref name="modelDriven"/>
+                <!-- <interceptor-ref name="debugging"/> -->
+                <!-- <interceptor-ref name="profiling"/> -->
+                <!-- <interceptor-ref name="scopedModelDriven"/> -->
+                <!-- <interceptor-ref name="modelDriven"/> -->
                 <interceptor-ref name="fileUpload"/>
                 <interceptor-ref name="checkbox"/>
-                <interceptor-ref name="staticParams"/>
+                <interceptor-ref name="multiselect"/>
+                <!-- <interceptor-ref name="staticParams"/> -->
+                <interceptor-ref name="actionMappingParams"/>
                 <interceptor-ref name="params">
-                  <param name="excludeParams">dojo\..*</param>
+                    <param name="excludeParams">^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*</param>
                 </interceptor-ref>
                 <interceptor-ref name="conversionError"/>
                 
@@ -290,6 +292,10 @@
                 class="org.apache.roller.weblogger.ui.struts2.editor.EntryRemove">
             <result name="input" type="tiles">.EntryRemove</result>
             <result name="error" type="chain">menu</result>
+            <result name="cancel" type="redirectAction">
+                <param name="actionName">entries</param>
+                <param name="weblog">${weblog}</param>
+            </result>
             <result name="success" type="chain">entryAdd</result>
         </action>
 
@@ -332,17 +338,29 @@
                 class="org.apache.roller.weblogger.ui.struts2.editor.CategoryAdd">
             <result name="input" type="tiles">.CategoryAdd</result>
             <result name="success" type="chain">categories</result>
+            <result name="cancel" type="redirectAction">
+                <param name="actionName">categories</param>
+                <param name="weblog">${weblog}</param>
+            </result>
             <result name="error" type="chain">categories</result>
         </action>
         
         <action name="categoryEdit!*" method="{1}"
                 class="org.apache.roller.weblogger.ui.struts2.editor.CategoryEdit">
             <result name="input" type="tiles">.CategoryEdit</result>
+            <result name="cancel" type="redirectAction">
+                <param name="actionName">categories</param>
+                <param name="weblog">${weblog}</param>
+            </result>
         </action>
         
         <action name="categoryRemove!*" method="{1}"
                 class="org.apache.roller.weblogger.ui.struts2.editor.CategoryRemove">
             <result name="input" type="tiles">.CategoryRemove</result>
+            <result name="cancel" type="redirectAction">
+                <param name="actionName">categories</param>
+                <param name="weblog">${weblog}</param>
+            </result>
             <result name="success" type="chain">categories</result>
         </action>
         
@@ -355,12 +373,24 @@
                 class="org.apache.roller.weblogger.ui.struts2.editor.BookmarkAdd">
             <result name="input" type="tiles">.BookmarkAdd</result>
             <result name="success" type="chain">bookmarks</result>
+            <result name="cancel" type="redirectAction">
+                <param name="actionName">bookmarks</param>
+                <param name="weblog">${weblog}</param>
+                <param name="folderId">${folderId}</param>
+                <param name="suppressEmptyParameters">true</param>
+            </result>
             <result name="error" type="chain">bookmarks</result>
         </action>
         
         <action name="bookmarkEdit!*" method="{1}"
                 class="org.apache.roller.weblogger.ui.struts2.editor.BookmarkEdit">
             <result name="input" type="tiles">.BookmarkEdit</result>
+            <result name="cancel" type="redirectAction">
+                <param name="actionName">bookmarks</param>
+                <param name="weblog">${weblog}</param>
+                <param name="folderId">${folderId}</param>
+                <param name="suppressEmptyParameters">true</param>
+            </result>
             <result name="error" type="chain">bookmarks</result>
         </action>
         
@@ -374,12 +404,24 @@
                 class="org.apache.roller.weblogger.ui.struts2.editor.FolderAdd">
             <result name="input" type="tiles">.FolderAdd</result>
             <result name="success" type="chain">bookmarks</result>
+            <result name="cancel" type="redirectAction">
+                <param name="actionName">bookmarks</param>
+                <param name="weblog">${weblog}</param>
+                <param name="folderId">${folderId}</param>
+                <param name="suppressEmptyParameters">true</param>
+            </result>
             <result name="error" type="chain">bookmarks</result>
         </action>
         
         <action name="folderEdit!*" method="{1}"
                 class="org.apache.roller.weblogger.ui.struts2.editor.FolderEdit">
             <result name="input" type="tiles">.FolderEdit</result>
+            <result name="cancel" type="redirectAction">
+                <param name="actionName">bookmarks</param>
+                <param name="weblog">${weblog}</param>
+                <param name="folderId">${folderId}</param>
+                <param name="suppressEmptyParameters">true</param>
+            </result>
             <result name="error" type="chain">bookmarks</result>
         </action>
         
@@ -440,6 +482,10 @@
         <action name="templateRemove!*" method="{1}"
                 class="org.apache.roller.weblogger.ui.struts2.editor.TemplateRemove">
             <result name="confirm" type="tiles">.TemplateRemove</result>
+            <result name="cancel" type="redirectAction">
+                <param name="actionName">templates</param>
+                <param name="weblog">${weblog}</param>
+            </result>
             <result name="success" type="chain">templates</result>
         </action>
         
@@ -450,9 +496,7 @@
             <result name="success" type="chain">templates</result>
             <result name="cancel" type="redirectAction">
                 <param name="actionName">templates</param>
-                <param name="parse">true</param>
                 <param name="weblog">${weblog}</param>
-                <param name="suppressEmptyParameters">true</param>
             </result>
             <result name="error" type="chain">templates</result>
         </action>
@@ -467,6 +511,10 @@
             <result name="input" type="tiles">.MembersInvite</result>
             <result name="disabled" type="tiles">.disabled</result>
             <result name="success" type="chain">members</result>
+            <result name="cancel" type="redirectAction">
+                <param name="actionName">members</param>
+                <param name="weblog">${weblog}</param>
+            </result>
         </action>
 
         <action name="memberResign!*" method="{1}"
@@ -480,25 +528,7 @@
                 class="org.apache.roller.weblogger.ui.struts2.editor.Pings">
             <result name="list" type="tiles">.Pings</result>
         </action>
-        
-        <action name="customPingTargets!*" method="{1}"
-                class="org.apache.roller.weblogger.ui.struts2.editor.CustomPingTargets">
-            <result name="list" type="tiles">.CustomPingTargets</result>
-            <result name="confirm" type="tiles">.CustomPingTargetConfirm</result>
-        </action>
-        
-        <action name="customPingTargetAdd!*" method="{1}"
-                class="org.apache.roller.weblogger.ui.struts2.editor.CustomPingTargetAdd">
-            <result name="input" type="tiles">.CustomPingTargetAdd</result>
-            <result name="success" type="chain">customPingTargets</result>
-        </action>
-        
-        <action name="customPingTargetEdit!*" method="{1}"
-                class="org.apache.roller.weblogger.ui.struts2.editor.CustomPingTargetEdit">
-            <result name="input" type="tiles">.CustomPingTargetEdit</result>
-            <result name="error" type="chain">customPingTargets</result>
-        </action>
-        
+
         <action name="maintenance!*" method="{1}"
                 class="org.apache.roller.weblogger.ui.struts2.editor.Maintenance">
             <result name="success" type="tiles">.Maintenance</result>

Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargets.jsp
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargets.jsp?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargets.jsp (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargets.jsp Sun Apr 20 13:38:51 2014
@@ -51,10 +51,10 @@
     <!-- TODO: Use icons here -->
     <td class="rollertable" align="center" >
         <s:if test="#pingTarget.autoEnabled">
-            <span style="{color: #00aa00; font-weight: bold;}"><s:text name="pingTarget.enabled"/></span>&nbsp;
+            <span style="color: #00aa00; font-weight: bold;"><s:text name="pingTarget.enabled"/></span>&nbsp;
         </s:if>
         <s:else>
-            <span style="{color: #aaaaaa; font-weight: bold;}"><s:text name="pingTarget.disabled"/></span>&nbsp;
+            <span style="color: #aaaaaa; font-weight: bold;"><s:text name="pingTarget.disabled"/></span>&nbsp;
         </s:else>
     </td>
     

Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp Sun Apr 20 13:38:51 2014
@@ -17,6 +17,11 @@
 --%>
 <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
 
+<script type="text/javascript" src="<s:url value="/roller-ui/scripts/jquery-1.11.0.min.js" />"></script>
+<%-- Below two needed only if using popup date picker --%>
+<link rel="stylesheet" type="text/css" media="all" href='<s:url value="/roller-ui/theme/sunny/jquery.ui.all.css"/>' />
+<script type="text/javascript" src='<s:url value="/roller-ui/scripts/jquery-ui.custom.min.js"/>'></script>
+
 <div class="sidebarFade">
     <div class="menu-tr">
         <div class="menu-tl">
@@ -41,37 +46,33 @@
     <div class="sideformrow">
         <label for="startDateString" class="sideformrow"><s:text name="commentManagement.startDate" />:</label>
             <script type="text/javascript" >
-            <!--
-            if (document.layers) { // Netscape 4 hack
-                var calStart = new CalendarPopup();
-            } else {
-                var calStart = new CalendarPopup("datetagdiv");
-                document.write(calStart.getStyles());
-            }
-            // -->
+            $(function() {
+                $( "#comments_bean_startDateString" ).datepicker({
+                    showOn: "button",
+                    buttonImage: "/roller/images/calendar.png",
+                    buttonImageOnly: true,
+                    changeMonth: true,
+                    changeYear: true
+                });
+            });
             </script>
-            <s:textfield name="bean.startDateString" size="12" />
-            <a href="#" id="anchorCalStart" name="anchorCalStart"
-               onclick="calStart.select(document.getElementById('comments_bean_startDateString'),'anchorCalStart','MM/dd/yy'); return false">
-            <img src='<s:url value="/images/calendar.png"/>' class="calIcon" alt="Calendar" /></a>
+            <s:textfield name="bean.startDateString" size="12" readonly="true"/>
     </div>
         
     <div class="sideformrow">
         <label for="endDateString" class="sideformrow"><s:text name="commentManagement.endDate" />:</label>
             <script type="text/javascript" >
-            <!--
-            if (document.layers) { // Netscape 4 hack
-                var calEnd = new CalendarPopup();
-            } else {
-                var calEnd = new CalendarPopup("datetagdiv");
-                document.write(calEnd.getStyles());
-            }
-            // -->
+            $(function() {
+                $( "#comments_bean_endDateString" ).datepicker({
+                    showOn: "button",
+                    buttonImage: "/roller/images/calendar.png",
+                    buttonImageOnly: true,
+                    changeMonth: true,
+                    changeYear: true
+                });
+            });
             </script>
-            <s:textfield name="bean.endDateString" size="12" />
-            <a href="#" id="anchorCalEnd" name="anchorCalEnd"
-               onclick="calEnd.select(document.getElementById('comments_bean_endDateString'),'anchorCalEnd','MM/dd/yy'); return false">
-            <img src='<s:url value="/images/calendar.png"/>' class="calIcon" alt="Calendar" /></a>
+            <s:textfield name="bean.endDateString" size="12" readonly="true"/>
     </div>
     <br />
     <br />

Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp Sun Apr 20 13:38:51 2014
@@ -85,9 +85,8 @@ function confirmSubDelete(subUrl) {
         </td>
         
         <td class="rollertable">
-            <str:left count="100" >
-                <s:property value="#sub.feedURL" />
-            </str:left>
+            <s:set name="feedURL" value="#sub.feedURL" />
+            ${fn:substring(feedURL, 0, 100)}
         </td>
         
         <td class="rollertable">

Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/core/Register.jsp
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/core/Register.jsp?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/core/Register.jsp (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/core/Register.jsp Sun Apr 20 13:38:51 2014
@@ -32,7 +32,7 @@
         </td>
     </tr>
         
-    <s:if test="fromSso">
+    <s:if test="fromSSO">
         <tr>
             <td class="label"><label for="userName" /><s:text name="userSettings.username" /></label></td>
             <td class="field"><strong><s:property value="bean.userName" /></strong></td>
@@ -65,7 +65,7 @@
         <td class="description"><s:text name="userRegister.tip.email" /></td>
     </tr>
 
-    <s:if test="!fromSso">
+    <s:if test="!fromSSO">
         <tr>
             <td colspan="3">
                 <h2><s:text name="userRegister.heading.authentication" /></h2>
@@ -158,40 +158,45 @@
 function onChange() {
     var disabled = true;
     var openIdConfig    = '<s:property value="openIdConfiguration" />';
-    var ssoEnabled      = <s:property value="fromSso" />;
-    var passwordText    = document.register['bean.passwordText'].value;
-    var passwordConfirm = document.register['bean.passwordConfirm'].value;
-    var userName        = document.register['bean.userName'].value;
+    var ssoEnabled      = <s:property value="fromSSO" />;
     var emailAddress    = document.register['bean.emailAddress'].value;
-    var openIdUrl       = "";
+    var userName = passwordText = passwordConfirm = openIdUrl = "";
+
+    if (ssoEnabled) {
+        userName = '<s:property value="bean.userName" />';
+    } else {
+        userName = document.register['bean.userName'].value;
+    }
+
+    if (ssoEnabled == false && openIdConfig != 'only') {
+        passwordText    = document.register['bean.passwordText'].value;
+        passwordConfirm = document.register['bean.passwordConfirm'].value;
+    }
     if (openIdConfig != 'disabled') {
         openIdUrl = document.register['bean.openIdUrl'].value;
     }
-    
+
     if (ssoEnabled) {
         if (emailAddress) disabled = false;
-
     } else if (openIdConfig == 'disabled') {
         if (emailAddress && userName && passwordText && passwordConfirm) disabled = false;
-        
     } else if (openIdConfig == 'only') {
         if (emailAddress && openIdUrl) disabled = false;
-        
     } else if (openIdConfig == 'hybrid') {
         if (emailAddress && ((passwordText && passwordConfirm) || (openIdUrl)) ) disabled = false;
     }
 
-    if ((passwordText || passwordConfirm) && !(passwordText == passwordConfirm)) {
-        document.getElementById('readytip').innerHTML = '<s:text name="userRegister.error.mismatchedPasswords" />';
-        disabled = true;
-    } else if (disabled) {
-        document.getElementById('readytip').innerHTML = '<s:text name="userRegister.tip.ready" />'
-    } else {
-        document.getElementById('readytip').innerHTML = '<s:text name="userRegister.success.ready" />'
+    if (!ssoEnabled) {
+        if ((passwordText || passwordConfirm) && !(passwordText == passwordConfirm)) {
+            document.getElementById('readytip').innerHTML = '<s:text name="userRegister.error.mismatchedPasswords" />';
+            disabled = true;
+        } else if (disabled) {
+            document.getElementById('readytip').innerHTML = '<s:text name="userRegister.tip.ready" />'
+        } else {
+            document.getElementById('readytip').innerHTML = '<s:text name="userRegister.success.ready" />'
+        }
     }
     document.getElementById('submit').disabled = disabled;
 }
 document.getElementById('submit').disabled = true;
 </script>
-
-

Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkAdd.jsp Sun Apr 20 13:38:51 2014
@@ -19,13 +19,14 @@
 
 <p class="subtitle">
     <s:text name="bookmarkForm.add.subtitle" >
-        <s:param value="folder.path" />
+        <s:param value="folder.name" />
     </s:text>
 </p>
 
 <s:form action="bookmarkAdd!save">
     <s:hidden name="salt" />
     <s:hidden name="weblog" />
+    <s:hidden name="folder.name" />
     <s:hidden name="folderId" />
     
     <table>
@@ -41,35 +42,25 @@
         </tr>
         
         <tr>
-            <td><s:text name="bookmarkForm.url" /></td>                
+            <td><s:text name="bookmarkForm.url" /></td>
             <td><s:textfield name="bean.url" maxlength="255" size="70" /></td>
         </tr>
         
         <tr>
-            <td><s:text name="bookmarkForm.rssUrl" /></td>         
+            <td><s:text name="bookmarkForm.rssUrl" /></td>
             <td><s:textfield name="bean.feedUrl" maxlength="255" size="70" /></td>
         </tr>
         
         <tr>
-            <td><s:text name="bookmarkForm.image" /></td>          
+            <td><s:text name="bookmarkForm.image" /></td>
             <td><s:textfield name="bean.image" maxlength="255" size="70" /></td>
         </tr>
         
-        <tr>
-            <td><s:text name="bookmarkForm.priority" /></td>         
-            <td><s:textfield name="bean.priority" maxlength="255" size="5" /></td>
-        </tr>
-        
-        <tr>
-            <td><s:text name="bookmarkForm.weight" /></td>          
-            <td><s:textfield name="bean.weight" maxlength="255" size="5" /></td>
-        </tr>
-        
     </table>
     
     <p>
         <s:submit value="%{getText('bookmarkForm.save')}" />
-        <s:submit value="%{getText('bookmarkForm.cancel')}" action="bookmarks" />
+        <s:submit value="%{getText('bookmarkForm.cancel')}" action="bookmarkAdd!cancel" />
     </p>
     
 </s:form>

Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp Sun Apr 20 13:38:51 2014
@@ -19,7 +19,7 @@
 
 <p class="subtitle">
     <s:text name="bookmarkForm.edit.subtitle" >
-        <s:param value="bookmark.folder.path" />
+        <s:param value="bookmark.folder.name" />
     </s:text>
 </p>
 
@@ -27,9 +27,7 @@
 	<s:hidden name="salt" />
     <s:hidden name="weblog" />
     <s:hidden name="bean.id" />
-    
-    <%-- if we cancel then we need this attribute --%>
-    <s:hidden name="folderId" value="%{bookmark.folder.id}" />
+    <s:hidden name="folderId" />
     
     <table>
         
@@ -44,35 +42,25 @@
         </tr>
         
         <tr>
-            <td><s:text name="bookmarkForm.url" /></td>                
+            <td><s:text name="bookmarkForm.url" /></td>
             <td><s:textfield name="bean.url" maxlength="255" size="70" /></td>
         </tr>
         
         <tr>
-            <td><s:text name="bookmarkForm.rssUrl" /></td>         
+            <td><s:text name="bookmarkForm.rssUrl" /></td>
             <td><s:textfield name="bean.feedUrl" maxlength="255" size="70" /></td>
         </tr>
         
         <tr>
-            <td><s:text name="bookmarkForm.image" /></td>          
+            <td><s:text name="bookmarkForm.image" /></td>
             <td><s:textfield name="bean.image" maxlength="255" size="70" /></td>
         </tr>
         
-        <tr>
-            <td><s:text name="bookmarkForm.priority" /></td>         
-            <td><s:textfield name="bean.priority" maxlength="255" size="5" /></td>
-        </tr>
-        
-        <tr>
-            <td><s:text name="bookmarkForm.weight" /></td>          
-            <td><s:textfield name="bean.weight" maxlength="255" size="5" /></td>
-        </tr>
-        
     </table>
     
     <p>
         <s:submit value="%{getText('bookmarkForm.save')}" />
-        <s:submit value="%{getText('bookmarkForm.cancel')}" action="bookmarks" />
+        <s:submit value="%{getText('bookmarkForm.cancel')}" action="bookmarkAdd!cancel" />
     </p>
     
 </s:form>

Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp Sun Apr 20 13:38:51 2014
@@ -17,29 +17,38 @@
 --%>
 <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
 
-<%-- JavaScript for bookmarks table --%> 
+<%-- JavaScript for bookmarks table --%>
 <script type="text/javascript">
 // <!-- 
 function onDelete() 
 {
     if ( confirm("<s:text name='bookmarksForm.delete.confirm' />") ) 
     {
-        document.bookmarks.method.value = "deleteSelected";
         document.bookmarks.submit();
     }
- }
-function onMove() 
+}
+
+function onDeleteFolder()
+{
+    if ( confirm("<s:text name='bookmarksForm.deleteFolder.confirm' />") )
+    {
+        document.bookmarks.action='<s:url action="bookmarks!deleteFolder" />';
+        document.bookmarks.submit();
+    }
+}
+
+function onMove()
 {
     if ( confirm("<s:text name='bookmarksForm.move.confirm' />") ) 
     {
-        document.bookmarks.method.value = "moveSelected";
+        document.bookmarks.action='<s:url action="bookmarks!move" />';
         document.bookmarks.submit();
     }
 }
 // -->
 </script>
 
-<s:if test="folderPath.isEmpty">
+<s:if test="folder.name == 'default'">
     <p class="subtitle">
         <s:text name="bookmarksForm.subtitle" >
             <s:param value="weblog" />
@@ -49,94 +58,48 @@ function onMove() 
         <s:text name="bookmarksForm.rootPrompt" />
     </p>
 </s:if>
-
 <s:else>
     <p class="subtitle">
-    <s:text name="bookmarksForm.path" />: /
-    <s:iterator id="pathItem" value="folderPath">
-        <s:url id="pathUrl" action="bookmarks">
-            <s:param name="weblog" value="%{actionWeblog.handle}" />
-            <s:param name="folderId" value="#pathItem.id" />
-        </s:url>
-        <s:a href="%{pathUrl}"><s:property value="#pathItem.name" /></s:a> / 
-    </s:iterator>
-    <p>
-    <p><s:text name="bookmarksForm.folderPrompt" /></p>
+    <s:text name="bookmarksForm.path" />: <s:text name="%{folder.name}" />
+    <s:url id="editUrl" action="folderEdit">
+        <s:param name="weblog" value="%{actionWeblog.handle}" />
+        <s:param name="bean.id" value="%{folder.id}" />
+        <s:param name="folderId" value="%{folder.id}" suppressEmptyParameters="true" />
+    </s:url>
+    <s:a href="%{editUrl}"><img src='<s:url value="/images/page_white_edit.png"/>' border="0" alt="icon" /
+        title="<s:text name='bookmarksForm.folder.edit.tip' />" /></s:a>
 </s:else>
 
-
 <%-- Form is a table of folders followed by bookmarks, each with checkbox --%>
 <s:form action="bookmarks!delete">
 	<s:hidden name="salt" />
     <s:hidden name="weblog" />
     <s:hidden name="folderId" /> 
     
-    <s:if test="!allFolders.isEmpty && ( folder.folders.size > 0 || folder.bookmarks.size > 0)">
-        
-        <%-- Move-selected button --%>
-        <s:submit type="button" action="bookmarks!move" key="bookmarksForm.move" onclick="onMove();return false;" />
-        
-        <%-- Move-to combo-box --%>
-        <s:select name="targetFolderId" list="allFolders" listKey="id" listValue="path" />
-        
+    <s:if test="!allFolders.isEmpty">
+
+        <%-- View button --%>
+        <s:submit type="button" action="bookmarks!view" key="bookmarksForm.viewFolder" />
+
+        <%-- Folder to View combo-box --%>
+        <s:select name="viewFolderId" list="allFolders" listKey="id" listValue="name" />
+
         <br /><br />
-        
+
     </s:if>
     <table class="rollertable">
-    
+
         <tr class="rHeaderTr">
-            <th class="rollertable" width="5%"><input name="control" type="checkbox" onclick="toggleFunctionAll(this.checked);"/></th>
-            <th class="rollertable" width="5%">&nbsp;</th>
-            <th class="rollertable" width="30%"><s:text name="bookmarksForm.name" /></th>
-            <th class="rollertable" width="45%"><s:text name="bookmarksForm.description" /></th>
-            <th class="rollertable" width="5%"><s:text name="bookmarksForm.priority" /></th>
+            <th class="rollertable" width="5%"><input name="control" type="checkbox" onclick="toggleFunctionAll(this.checked);"
+                title="<s:text name="bookmarksForm.selectAllLabel"/>"/></th>
+            <th class="rollertable" width="25%"><s:text name="bookmarksForm.name" /></th>
+            <th class="rollertable" width="25%"><s:text name="bookmarksForm.url" /></th>
+            <th class="rollertable" width="35%"><s:text name="bookmarksForm.feedurl" /></th>
             <th class="rollertable" width="5%"><s:text name="bookmarksForm.edit" /></th>
             <th class="rollertable" width="5%"><s:text name="bookmarksForm.visitLink" /></th>
         </tr>
         
-        <s:if test="folder.folders.size > 0 || folder.bookmarks.size > 0">
-        
-        <%-- Folders --%>
-        <s:iterator id="folder" value="folder.folders" status="rowstatus">
-            <s:if test="#rowstatus.odd == true">
-                <tr class="rollertable_odd">
-            </s:if>
-            <s:else>
-                <tr class="rollertable_even">
-            </s:else>
-                
-                <td class="rollertable center" style="vertical-align:middle">
-                    <input type="checkbox" name="selectedFolders" value="<s:property value="#folder.id"/>" />
-                </td>
-                
-                <td class="rollertable" align="center"><img src='<s:url value="/images/folder.png"/>' alt="icon" /></td>
-                
-                <td class="rollertable">
-                    <s:url id="folderUrl" action="bookmarks">
-                        <s:param name="weblog" value="%{actionWeblog.handle}" />
-                        <s:param name="folderId" value="#folder.id" />
-                    </s:url>
-                    <s:a href="%{folderUrl}"><str:truncateNicely lower="15" upper="20" ><s:property value="#folder.name" /></str:truncateNicely></s:a>
-                </td>
-                
-                <td class="rollertable">
-                    <str:truncateNicely lower="30" upper="35" ><s:property value="#folder.description" /></str:truncateNicely>
-                </td>
-                
-                <td class="rollertable"></td>
-                
-                <td class="rollertable" align="center">
-                    <s:url id="editUrl" action="folderEdit">
-                        <s:param name="weblog" value="%{actionWeblog.handle}" />
-                        <s:param name="bean.id" value="#folder.id" />
-                    </s:url>
-                    <s:a href="%{editUrl}"><img src='<s:url value="/images/page_white_edit.png"/>' border="0" alt="icon" /></s:a>
-                </td>
-                
-                <td class="rollertable">&nbsp;</td>
-                
-            </tr>
-        </s:iterator>
+        <s:if test="folder.bookmarks.size > 0">
         
         <%-- Bookmarks --%>
         <s:iterator id="bookmark" value="folder.bookmarks" status="rowstatus">
@@ -148,27 +111,28 @@ function onMove() 
             </s:else>
                 
                 <td class="rollertable center" style="vertical-align:middle">
-                    <input type="checkbox" name="selectedBookmarks" value="<s:property value="#bookmark.id"/>" />
+                    <input type="checkbox" name="selectedBookmarks"
+                    title="<s:text name="bookmarksForm.selectOneLabel"><s:param value="#bookmark.name"/></s:text>"
+                    value="<s:property value="#bookmark.id"/>" />
                 </td>
                 
-                <td class="rollertable" align="center"><img src='<s:url value="/images/link.png"/>' alt="icon" /></td>
-                
                 <td class="rollertable">
-                    <str:truncateNicely lower="15" upper="20" ><s:property value="#bookmark.name" /></str:truncateNicely>
+                    <str:truncateNicely lower="25" upper="30" ><s:property value="#bookmark.name" /></str:truncateNicely>
                 </td>
                 
                 <td class="rollertable">
-                    <str:truncateNicely lower="30" upper="35" ><s:property value="#bookmark.description" /></str:truncateNicely>
+                    <str:truncateNicely lower="40" upper="50" ><s:property value="#bookmark.url" /></str:truncateNicely>
                 </td>
                 
                 <td class="rollertable">
-                    &nbsp;<s:property value="#bookmark.priority" />
+                    <str:truncateNicely lower="60" upper="70" ><s:property value="#bookmark.feedUrl" /></str:truncateNicely>
                 </td>
-                
+
                 <td class="rollertable" align="center">
                     <s:url id="editUrl" action="bookmarkEdit">
                         <s:param name="weblog" value="%{actionWeblog.handle}" />
                         <s:param name="bean.id" value="#bookmark.id" />
+                        <s:param name="folderId" value="%{folderId}" suppressEmptyParameters="true" />
                     </s:url>
                     <s:a href="%{editUrl}"><img src='<s:url value="/images/page_white_edit.png"/>' border="0" alt="icon" 
                              title="<s:text name='bookmarksForm.edit.tip' />" /></s:a>
@@ -177,8 +141,7 @@ function onMove() 
                 <td class="rollertable" align="center">
                     <s:if test="#bookmark.url != null" >
                         <a href="<s:property value="#bookmark.url" />">
-                            <img src='<s:url value="/images/world_go.png"/>' border="0" alt="icon" 
-                                 title="<s:text name='bookmarksForm.visitLink.tip' />" />
+                            <img src='<s:url value="/images/world_go.png"/>' border="0" alt="icon" title="<s:text name='bookmarksForm.visitLink.tip' />" />
                         </a>
                     </s:if>
                 </td>
@@ -194,11 +157,23 @@ function onMove() 
         </s:else>
     </table>
     
-    <s:if test="folder.folders.size > 0 || folder.bookmarks.size > 0">
-        <div class="control">
-            <%-- Delete-selected button --%>
-            <input type="button" value="<s:text name="bookmarksForm.delete"/>" onclick="onDelete()" /> 
-        </div>
-    </s:if>
+    <div class="control">
+        <s:if test="folder.bookmarks.size > 0">
+                <%-- Delete-selected button --%>
+                <input type="button" value="<s:text name="bookmarksForm.delete"/>" onclick="onDelete();return false;" />
+        </s:if>
+
+        <s:if test="!allFolders.isEmpty && folder.bookmarks.size > 0">
+            <%-- Move-selected button --%>
+            <s:submit value="%{getText('bookmarksForm.move')}" action="bookmarks!move" onclick="onMove();return false;" />
+
+            <%-- Move-to combo-box --%>
+            <s:select name="targetFolderId" list="allFolders" listKey="id" listValue="name" />
+        </s:if>
+
+        <s:if test="folder.name != 'default'">
+            <s:submit value="%{getText('bookmarksForm.deleteFolder')}" action="bookmarks!deleteFolder" onclick="onDeleteFolder();return false;"/>
+        </s:if>
+    </div>
 
 </s:form>

Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksImport.jsp
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksImport.jsp?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksImport.jsp (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksImport.jsp Sun Apr 20 13:38:51 2014
@@ -34,4 +34,5 @@
     <br />
     <br />
     <s:submit value="%{getText('bookmarksImport.import')}" />
+    <s:submit value="%{getText('bookmarksImport.cancel')}" action="bookmarks" />
 </s:form>

Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp Sun Apr 20 13:38:51 2014
@@ -41,23 +41,19 @@
                     <img src='<s:url value="/images/folder_add.png"/>' border="0"alt="icon" />
                     <s:url id="addFolder" action="folderAdd">
                         <s:param name="weblog" value="%{actionWeblog.handle}" />
-                        <s:param name="folderId" value="%{folder.id}" />
                     </s:url>
                     <s:a href="%{addFolder}"><s:text name="bookmarksForm.addFolder" /></s:a>
                 </p>
                 
-                <s:if test="folderPath.isEmpty">            
-                    <%-- Import bookmarks --%>
-                    <p>
-                        <img src='<s:url value="/images/link_add.png"/>' border="0"alt="icon" />
-                        <s:url id="importBookmarks" action="bookmarksImport">
-                            <s:param name="weblog" value="%{actionWeblog.handle}" />
-                            <s:param name="folderId" />
-                        </s:url>
-                        <s:a href="%{importBookmarks}"><s:text name="bookmarksForm.importBookmarks" /></s:a>
-                    </p>                
-                </s:if>
-                
+                <%-- Import bookmarks --%>
+                <p>
+                    <img src='<s:url value="/images/link_add.png"/>' border="0"alt="icon" />
+                    <s:url id="importBookmarks" action="bookmarksImport">
+                        <s:param name="weblog" value="%{actionWeblog.handle}" />
+                    </s:url>
+                    <s:a href="%{importBookmarks}"><s:text name="bookmarksForm.importBookmarks" /></s:a>
+                </p>
+
                 <br />
                 <br />
             </div>

Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp Sun Apr 20 13:38:51 2014
@@ -31,30 +31,14 @@ function onMove()
 //-->
 </script>
 
-<s:if test="categoryPath.isEmpty">
-    <p class="subtitle">
-        <s:text name="categoriesForm.subtitle" >
-            <s:param value="weblog" />
-        </s:text>
-    </p>  
-    <p class="pagetip">
-        <s:text name="categoriesForm.rootPrompt" />
-    </p>
-</s:if>
-
-<s:else>
-    <p class="subtitle">
-    <s:text name="categoriesForm.path" />: /
-    <s:iterator id="pathItem" value="categoryPath">
-        <s:url id="pathUrl" action="categories">
-            <s:param name="weblog" value="%{actionWeblog.handle}" />
-            <s:param name="categoryId" value="#pathItem.id" />
-        </s:url>
-        <s:a href="%{pathUrl}"><s:property value="#pathItem.name" /></s:a> / 
-    </s:iterator>
-    <p>
-    <p><s:text name="categoriesForm.categoryPrompt" /></p>
-</s:else>
+<p class="subtitle">
+    <s:text name="categoriesForm.subtitle" >
+        <s:param value="weblog" />
+    </s:text>
+</p>
+<p class="pagetip">
+    <s:text name="categoriesForm.rootPrompt" />
+</p>
 
 
 <%-- Form is a table of categories each with checkbox --%>
@@ -62,34 +46,20 @@ function onMove()
 	<s:hidden name="salt" />
     <s:hidden name="weblog" />
     <s:hidden name="categoryId" /> 
-    
-    <s:if test="!allCategories.isEmpty">
-    
-        <%-- Move-selected button --%>
-        <s:submit value="%{getText('categoriesForm.move')}" onclick="onMove();return false;" />
-    
-        <%-- Move-to combo-box --%>
-        <s:select name="targetCategoryId" list="allCategories" listKey="id" listValue="path" />
-    
-        <br /><br />
-    
-    </s:if>
-    
+
     <table class="rollertable">
         
         <tr class="rollertable">
-            <th class="rollertable" width="5%"><input type="checkbox" name="control" onclick="toggleFunctionAll(this.checked);"/></th>
-            <th class="rollertable" width="5%">&nbsp;</th>
-            <th class="rollertable" width="30%"><s:text name="categoriesForm.name" /></th>
+            <th class="rollertable" width="35%"><s:text name="categoriesForm.name" /></th>
             <th class="rollertable" width="45%"><s:text name="categoriesForm.description" /></th>
-            <th class="rollertable" width="5%"><s:text name="categoriesForm.edit" /></th>
-            <th class="rollertable" width="5%"><s:text name="categoriesForm.remove" /></th>
+            <th class="rollertable" width="10%"><s:text name="categoriesForm.edit" /></th>
+            <th class="rollertable" width="10%"><s:text name="categoriesForm.remove" /></th>
         </tr>
         
         <s:if test="AllCategories != null && !AllCategories.isEmpty">
         
         <%-- Categories --%>
-        <s:iterator id="category" value="category.weblogCategories" status="rowstatus">
+        <s:iterator id="category" value="AllCategories" status="rowstatus">
             <s:if test="#rowstatus.odd == true">
                 <tr class="rollertable_odd">
             </s:if>
@@ -97,18 +67,8 @@ function onMove()
                 <tr class="rollertable_even">
             </s:else>
             
-                <td class="rollertable center" style="vertical-align:middle">
-                    <input type="checkbox" name="selectedCategories" value="<s:property value="#category.id"/>" />
-                </td>
-                
-                <td class="rollertable" align="center"><img src='<s:url value="/images/folder.png"/>' alt="icon" /></td>
-                
                 <td class="rollertable">
-                    <s:url id="categoryUrl" action="categories">
-                        <s:param name="weblog" value="%{actionWeblog.handle}" />
-                        <s:param name="categoryId" value="#category.id" />
-                    </s:url>
-                    <s:a href="%{categoryUrl}"><str:truncateNicely lower="15" upper="20" ><s:property value="#category.name" /></str:truncateNicely></s:a>
+                    <str:truncateNicely lower="15" upper="20" ><s:property value="#category.name" /></str:truncateNicely>
                 </td>
                 
                 <td class="rollertable">
@@ -124,7 +84,7 @@ function onMove()
                 </td>
                 
                 <td class="rollertable" align="center">
-                    <s:if test="!categoryPath.isEmpty || category.weblogCategories.size() > 1">
+                    <s:if test="AllCategories.size() > 1">
                         <s:url id="removeUrl" action="categoryRemove">
                             <s:param name="weblog" value="%{actionWeblog.handle}" />
                             <s:param name="removeId" value="#category.id" />

Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp Sun Apr 20 13:38:51 2014
@@ -30,7 +30,6 @@
                     <img src='<s:url value="/images/folder_add.png"/>' border="0"alt="icon" />
                     <s:url id="addCategory" action="categoryAdd">
                         <s:param name="weblog" value="%{actionWeblog.handle}" />
-                        <s:param name="categoryId" value="%{category.id}" />
                     </s:url>
                     <s:a href="%{addCategory}"><s:text name="categoriesForm.addCategory" /></s:a>
                 </p>
@@ -40,4 +39,4 @@
             
         </div>
     </div>
-</div>			
+</div>

Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CategoryAdd.jsp Sun Apr 20 13:38:51 2014
@@ -21,14 +21,9 @@
     <s:text name="categoryForm.add.subtitle" />
 </p>
 
-<p>
-    <b><s:text name="categoriesForm.path" /></b>:<s:property value="category.path" />
-</p>
-
 <s:form action="categoryAdd!save">
 	<s:hidden name="salt" />
     <s:hidden name="weblog" />
-    <s:hidden name="categoryId" />
     
     <table>
         
@@ -51,7 +46,7 @@
     
     <p>
         <s:submit value="%{getText('categoryForm.save')}" />
-        <s:submit value="%{getText('categoryForm.cancel')}" action="categories" />
+        <s:submit value="%{getText('categoryForm.cancel')}" action="categoryAdd!cancel" />
     </p>
     
 </s:form>

Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp Sun Apr 20 13:38:51 2014
@@ -21,18 +21,11 @@
     <s:text name="categoryForm.edit.subtitle" />
 </p>
 
-<p>
-    <b><s:text name="categoriesForm.path" /></b>:<s:property value="category.path" />
-</p>
-
 <s:form action="categoryEdit!save">
-	<s:hidden name="salt" />
+    <s:hidden name="salt" />
     <s:hidden name="weblog" />
     <s:hidden name="bean.id" />
-    
-    <%-- if we cancel then we need this attribute --%>
-    <s:hidden name="categoryId" value="%{category.parent.id}" />
-    
+
     <table>
         
         <tr>
@@ -54,7 +47,7 @@
     
     <p>
         <s:submit value="%{getText('categoryForm.save')}" />
-        <s:submit value="%{getText('categoryForm.cancel')}" action="categories" />
+        <s:submit value="%{getText('categoryForm.cancel')}" action="categoryEdit!cancel" />
     </p>
     
 </s:form>

Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CategoryRemove.jsp
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CategoryRemove.jsp?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CategoryRemove.jsp (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CategoryRemove.jsp Sun Apr 20 13:38:51 2014
@@ -26,10 +26,7 @@
 	<s:hidden name="salt" />
     <s:hidden name="weblog" />
     <s:hidden name="removeId" />
-    
-    <%-- if we cancel then we need this attribute --%>
-    <s:hidden name="categoryId" value="%{category.parent.id}" />
-    
+
     <s:if test="category.inUse" >
         <br />
         <span class="warning">
@@ -37,7 +34,7 @@
         </span>
         <p><s:text name="categoryDeleteOK.youMustMoveEntries" /><p>
             <s:text name="categoryDeleteOK.moveToWhere" />
-            <s:select name="targetCategoryId" list="allCategories" listKey="id" listValue="path" />
+            <s:select name="targetCategoryId" list="allCategories" listKey="id" listValue="name" />
         </p>
     </s:if>
     <s:else>
@@ -49,6 +46,6 @@
     </p>
     
     <s:submit value="%{getText('application.yes')}" />&nbsp;
-    <s:submit value="%{getText('application.no')}" action="categories" />
+    <s:submit value="%{getText('application.no')}" action="categoryRemove!cancel" />
     
 </s:form>

Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp Sun Apr 20 13:38:51 2014
@@ -17,7 +17,7 @@
 --%>
 <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-<script type="text/javascript" src="<s:url value="/roller-ui/scripts/jquery-1.4.2.min.js" />"></script>
+<script type="text/javascript" src="<s:url value="/roller-ui/scripts/jquery-1.11.0.min.js" />"></script>
 
 <script type="text/javascript">
     <!--

Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp Sun Apr 20 13:38:51 2014
@@ -17,6 +17,11 @@
 --%>
 <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
 
+<script type="text/javascript" src="<s:url value="/roller-ui/scripts/jquery-1.11.0.min.js" />"></script>
+<%-- Below two needed only if using popup date picker --%>
+<link rel="stylesheet" type="text/css" media="all" href='<s:url value="/roller-ui/theme/sunny/jquery.ui.all.css"/>' />
+<script type="text/javascript" src='<s:url value="/roller-ui/scripts/jquery-ui.custom.min.js"/>'></script>
+
 <div class="sidebarFade">
     <div class="menu-tr">
         <div class="menu-tl">
@@ -42,37 +47,33 @@
     <div class="sideformrow">
         <label for="startDateString" class="sideformrow"><s:text name="commentManagement.startDate" />:</label>
             <script type="text/javascript" >
-            <!--
-            if (document.layers) { // Netscape 4 hack
-                var calStart = new CalendarPopup();
-            } else {
-                var calStart = new CalendarPopup("datetagdiv");
-                document.write(calStart.getStyles());
-            }
-            // -->
+            $(function() {
+                $( "#commentsQuery_bean_startDateString" ).datepicker({
+                    showOn: "button",
+                    buttonImage: "/roller/images/calendar.png",
+                    buttonImageOnly: true,
+                    changeMonth: true,
+                    changeYear: true
+                });
+            });
             </script>
-            <s:textfield name="bean.startDateString" size="12" />
-            <a href="#" id="anchorCalStart" name="anchorCalStart"
-               onclick="calStart.select(document.getElementById('commentsQuery_bean_startDateString'),'anchorCalStart','MM/dd/yy'); return false">
-            <img src='<s:url value="/images/calendar.png"/>' class="calIcon" alt="Calendar" /></a>
+            <s:textfield name="bean.startDateString" size="12" readonly="true"/>
     </div>
         
     <div class="sideformrow">
         <label for="endDateString" class="sideformrow"><s:text name="commentManagement.endDate" />:</label>
             <script type="text/javascript" >
-            <!--
-            if (document.layers) { // Netscape 4 hack
-                var calEnd = new CalendarPopup();
-            } else {
-                var calEnd = new CalendarPopup("datetagdiv");
-                document.write(calEnd.getStyles());
-            }
-            // -->
+            $(function() {
+                $( "#commentsQuery_bean_endDateString" ).datepicker({
+                    showOn: "button",
+                    buttonImage: "/roller/images/calendar.png",
+                    buttonImageOnly: true,
+                    changeMonth: true,
+                    changeYear: true
+                });
+            });
             </script>
-            <s:textfield name="bean.endDateString" size="12" />
-            <a href="#" id="anchorCalEnd" name="anchorCalEnd"
-               onclick="calEnd.select(document.getElementById('commentsQuery_bean_endDateString'),'anchorCalEnd','MM/dd/yy'); return false">
-            <img src='<s:url value="/images/calendar.png"/>' class="calIcon" alt="Calendar" /></a>
+            <s:textfield name="bean.endDateString" size="12" readonly="true"/>
     </div>
     <br />
     <br />

Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp Sun Apr 20 13:38:51 2014
@@ -17,6 +17,11 @@
 --%>
 <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
 
+<script type="text/javascript" src="<s:url value="/roller-ui/scripts/jquery-1.11.0.min.js" />"></script>
+<%-- Below two needed only if using popup date picker --%>
+<link rel="stylesheet" type="text/css" media="all" href='<s:url value="/roller-ui/theme/sunny/jquery.ui.all.css"/>' />
+<script type="text/javascript" src='<s:url value="/roller-ui/scripts/jquery-ui.custom.min.js"/>'></script>
+
 <div class="sidebarFade">
     <div class="menu-tr">
         <div class="menu-tl">
@@ -40,7 +45,7 @@
                     <div class="sideformrow">
                         <label for="categoryId" class="sideformrow">
                         <s:text name="weblogEntryQuery.label.category" /></label>
-                        <s:select name="bean.categoryPath" list="categories" listKey="path" listValue="name" size="1" />
+                        <s:select name="bean.categoryName" list="categories" listKey="path" listValue="name" size="1" />
                     </div>
                     <br />
                     <br />
@@ -73,37 +78,33 @@
                     <div class="sideformrow">
                         <label for="startDateString" class="sideformrow"><s:text name="weblogEntryQuery.label.startDate" />:</label>
                         <script type="text/javascript" >
-                        <!--
-                        if (document.layers) { // Netscape 4 hack
-                            var calStart = new CalendarPopup();
-                        } else {
-                            var calStart = new CalendarPopup("datetagdiv");
-                            document.write(calStart.getStyles());
-                        }
-                        // -->
+                        $(function() {
+                            $( "#entries_bean_startDateString" ).datepicker({
+                                showOn: "button",
+                                buttonImage: "/roller/images/calendar.png",
+                                buttonImageOnly: true,
+                                changeMonth: true,
+                                changeYear: true
+                            });
+                        });
                         </script>
-                        <s:textfield name="bean.startDateString" size="12" />
-                        <a href="#" id="anchorCalStart" name="anchorCalStart"
-                           onclick="calStart.select(document.getElementById('entries_bean_startDateString'),'anchorCalStart','MM/dd/yy'); return false">
-                        <img src='<s:url value="/images/calendar.png"/>' class="calIcon" alt="Calendar" /></a>
+                        <s:textfield name="bean.startDateString" size="12" readonly="true"/>
                     </div>
 
                     <div class="sideformrow">
                         <label for="endDateString" class="sideformrow"><s:text name="weblogEntryQuery.label.endDate" />:</label>
                         <script type="text/javascript" >
-                        <!--
-                        if (document.layers) { // Netscape 4 hack
-                            var calEnd = new CalendarPopup();
-                        } else {
-                            var calEnd = new CalendarPopup("datetagdiv");
-                            document.write(calEnd.getStyles());
-                        }
-                        // -->
+                        $(function() {
+                            $( "#entries_bean_endDateString" ).datepicker({
+                                showOn: "button",
+                                buttonImage: "/roller/images/calendar.png",
+                                buttonImageOnly: true,
+                                changeMonth: true,
+                                changeYear: true
+                            });
+                        });
                         </script>
-                        <s:textfield name="bean.endDateString" size="12" />
-                        <a href="#" id="anchorCalEnd" name="anchorCalEnd"
-                           onclick="calEnd.select(document.getElementById('entries_bean_endDateString'),'anchorCalEnd','MM/dd/yy'); return false">
-                        <img src='<s:url value="/images/calendar.png"/>' class="calIcon" alt="Calendar" /></a>
+                        <s:textfield name="bean.endDateString" size="12" readonly="true"/>
                     </div>
                     <br />
                     <br />

Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp Sun Apr 20 13:38:51 2014
@@ -26,7 +26,11 @@
 <script type="text/javascript" src="<s:url value='/roller-ui/yui/menu/menu-min.js'/>"></script>
 <script type="text/javascript" src="<s:url value='/roller-ui/yui/dragdrop/dragdrop-min.js' />"></script>
 
-<script type="text/javascript" src="<s:url value="/roller-ui/scripts/jquery-1.4.2.min.js" />"></script>
+<script type="text/javascript" src="<s:url value="/roller-ui/scripts/jquery-1.11.0.min.js" />"></script>
+<%-- Below two needed only if using popup date picker --%>
+<link rel="stylesheet" type="text/css" media="all" href='<s:url value="/roller-ui/theme/sunny/jquery.ui.all.css"/>' />
+<script type="text/javascript" src='<s:url value="/roller-ui/scripts/jquery-ui.custom.min.js"/>'></script>
+
 <!-- Combo-handled YUI JS files: TODO add to roller-ui/yui or remove??
 <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/combo?2.8.0r4/build/autocomplete/assets/skins/sam/autocomplete.css">
 <script type="text/javascript" src="http://yui.yahooapis.com/combo?2.8.0r4/build/animation/animation-min.js&2.8.0r4/build/connection/connection-min.js&2.8.0r4/build/datasource/datasource-min.js&2.8.0r4/build/autocomplete/autocomplete-min.js"></script>
@@ -159,19 +163,17 @@
             <s:select name="bean.seconds" list="secondsList" />
             &nbsp;&nbsp;
             <script type="text/javascript" >
-            <!--
-            if (document.layers) { // Netscape 4 hack
-                var cal = new CalendarPopup();
-            } else {
-                var cal = new CalendarPopup("datetagdiv");
-                document.write(cal.getStyles());
-            }
-            // -->
+            $(function() {
+                $( "#entry_bean_dateString" ).datepicker({
+                    showOn: "button",
+                    buttonImage: "/roller/images/calendar.png",
+                    buttonImageOnly: true,
+                    changeMonth: true,
+                    changeYear: true
+                });
+            });
             </script>
-            <s:textfield name="bean.dateString" size="12" />
-            <a href="#" id="anchorCal" name="anchorCal"
-               onclick="cal.select(document.getElementById('entry_bean_dateString'),'anchorCal','MM/dd/yy'); return false">
-            <img src='<s:url value="/images/calendar.png"/>' class="calIcon" alt="Calendar" /></a>
+            <s:textfield name="bean.dateString" size="12" readonly="true"/>
             <s:property value="actionWeblog.timeZone" />
         </div>
         <br />
@@ -225,14 +227,14 @@
 
 <script type="text/javascript">
 //Get cookie to determine state of control
-if (getCookie('control-miscControl') != null) {
-    if(getCookie('control-miscControl') == 'true'){
+if (getCookie('control_miscControl') != null) {
+    if(getCookie('control_miscControl') == 'true'){
         toggle('miscControl');
         togglePlusMinus('imiscControl');
     }
 }
-if (getCookie('control-pluginControl') != null) {
-    if(getCookie('control-pluginControl') == 'true'){
+if (getCookie('control_pluginControl') != null) {
+    if(getCookie('control_pluginControl') == 'true'){
         toggle('pluginControl');
         togglePlusMinus('ipluginControl');
     }

Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp Sun Apr 20 13:38:51 2014
@@ -26,7 +26,11 @@
 <script type="text/javascript" src="<s:url value='/roller-ui/yui/menu/menu-min.js'/>"></script>
 <script type="text/javascript" src="<s:url value='/roller-ui/yui/dragdrop/dragdrop-min.js' />"></script>
 
-<script type="text/javascript" src="<s:url value="/roller-ui/scripts/jquery-1.4.2.min.js" />"></script>
+<script type="text/javascript" src="<s:url value="/roller-ui/scripts/jquery-1.11.0.min.js" />"></script>
+<%-- Below two needed only if using popup date picker --%>
+<link rel="stylesheet" type="text/css" media="all" href='<s:url value="/roller-ui/theme/sunny/jquery.ui.all.css"/>' />
+<script type="text/javascript" src='<s:url value="/roller-ui/scripts/jquery-ui.custom.min.js"/>'></script>
+
 <!-- Combo-handled YUI JS files: TODO add to roller-ui/yui or remove??
 <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/combo?2.8.0r4/build/autocomplete/assets/skins/sam/autocomplete.css"> 
 <script type="text/javascript" src="http://yui.yahooapis.com/combo?2.8.0r4/build/animation/animation-min.js&2.8.0r4/build/connection/connection-min.js&2.8.0r4/build/datasource/datasource-min.js&2.8.0r4/build/autocomplete/autocomplete-min.js"></script>
@@ -217,19 +221,17 @@ function fullPreviewMode() {
             <s:select name="bean.seconds" list="secondsList" />
             &nbsp;&nbsp;
             <script type="text/javascript" >
-            <!--
-            if (document.layers) { // Netscape 4 hack
-                var cal = new CalendarPopup();
-            } else {
-                var cal = new CalendarPopup("datetagdiv");
-                document.write(cal.getStyles());
-            }
-            // -->
+            $(function() {
+                $( "#entry_bean_dateString" ).datepicker({
+                    showOn: "button",
+                    buttonImage: "/roller/images/calendar.png",
+                    buttonImageOnly: true,
+                    changeMonth: true,
+                    changeYear: true
+                });
+            });
             </script>
-            <s:textfield name="bean.dateString" size="12" />
-            <a href="#" id="anchorCal" name="anchorCal"
-               onclick="cal.select(document.getElementById('entry_bean_dateString'),'anchorCal','MM/dd/yy'); return false">
-            <img src='<s:url value="/images/calendar.png"/>' class="calIcon" alt="Calendar" /></a>
+            <s:textfield name="bean.dateString" size="12" readonly="true"/>
             <s:property value="actionWeblog.timeZone" />
         </div>   
         <br />
@@ -312,14 +314,14 @@ function fullPreviewMode() {
 
 <script type="text/javascript">
 //Get cookie to determine state of control
-if (getCookie('control-miscControl') != null) {
-    if(getCookie('control-miscControl') == 'true'){
+if (getCookie('control_miscControl') != null) {
+    if(getCookie('control_miscControl') == 'true'){
         toggle('miscControl');
         togglePlusMinus('imiscControl');
     }
 }
-if (getCookie('control-pluginControl') != null) {
-    if(getCookie('control-pluginControl') == 'true'){
+if (getCookie('control_pluginControl') != null) {
+    if(getCookie('control_pluginControl') == 'true'){
         toggle('pluginControl');
         togglePlusMinus('ipluginControl');
     }

Modified: roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp?rev=1588757&r1=1588756&r2=1588757&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp (original)
+++ roller/branches/rome2/app/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp Sun Apr 20 13:38:51 2014
@@ -41,8 +41,7 @@
     <s:form action="entryEdit">
 		<s:hidden name="salt" />
         <s:hidden name="weblog" />
-        <s:hidden name="bean.id" value="%{removeId}" />
-        <s:submit value="%{getText('weblogEntryRemove.no')}" />
+        <s:submit value="%{getText('weblogEntryRemove.no')}" action="entryRemove!cancel" />
     </s:form>
 </td>
 </tr>



Mime
View raw message