You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/05/14 20:42:04 UTC

svn commit: r537945 [4/4] - in /roller/branches/roller_4.0_newbackend: ./ docs/examples/plugins/ docs/examples/plugins/pluginmodel/ docs/examples/plugins/pluginmodel/src/ docs/examples/plugins/pluginmodel/src/org/ docs/examples/plugins/pluginmodel/src/...

Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml (original)
+++ roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml Mon May 14 11:41:57 2007
@@ -57,8 +57,8 @@
          <default-value>Front Page</default-value>
       </property-def>
       <property-def  name="site.description"  key="configForm.siteDescription">
-         <type>string</type>
-	     <default-value>A default install of the Roller Weblogger open source blog server</default-value>
+         <type>text</type>
+	 <default-value>A default install of the Roller Weblogger open source blog server</default-value>
       </property-def>      
       <property-def  name="site.frontpage.weblog.handle"  key="configForm.frontpageWeblogHandle">
          <type>string</type>

Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/struts.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/struts.xml?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/struts.xml (original)
+++ roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/struts.xml Mon May 14 11:41:57 2007
@@ -17,10 +17,14 @@
                          class="org.apache.roller.ui.core.util.struts2.UIActionInterceptor" />
             <interceptor name="UISecurityInterceptor" 
                          class="org.apache.roller.ui.core.util.struts2.UISecurityInterceptor" />
+            <interceptor name="UIActionPrepareInterceptor" 
+                         class="org.apache.roller.ui.core.util.struts2.UIActionPrepareInterceptor" />
+                         
             <interceptor-stack name="rollerStack">
                 <interceptor-ref name="defaultStack"/>
                 <interceptor-ref name="UIActionInterceptor"/>
                 <interceptor-ref name="UISecurityInterceptor"/>
+                <interceptor-ref name="UIActionPrepareInterceptor"/>
             </interceptor-stack>
         </interceptors>
         
@@ -83,43 +87,60 @@
     
     
     <!-- Weblogger Admin UI (includes planet) -->
-    <!--
     <package name="weblogger-admin" namespace="/roller-ui/admin" extends="weblogger">
         
-        <action name="rollerConfig!*" method="{1}"
-                class="org.apache.roller.ui.admin.struts2.RollerPropertiesAction">
-            <result name="rollerProperties.page">.rollerProperties</result>
+        <action name="globalConfig!*" method="{1}"
+                class="org.apache.roller.ui.admin.struts2.GlobalConfig">
+            <result name="success" type="tiles">.GlobalConfig</result>
         </action>
         
-        <action name="user!*" method="{1}"
-                class="org.apache.roller.ui.admin.struts2.UserAdminAction">
-            <result name="adminUser.page">.UserAdmin</result>
+        <action name="userAdmin"
+                class="org.apache.roller.ui.admin.struts2.UserAdmin">
+            <result name="success" type="tiles">.UserAdmin</result>
         </action>
         
-        <action name="commentManagement!*" method="{1}"
-                class="org.apache.roller.ui.authoring.struts2.CommentManagementAction">
-            <result name="commentManagement.page">.CommentManagement</result>
-            <result name="commentManagementGlobal.page">.CommentManagementGlobal</result>
+        <action name="createUser!*" method="{1}"
+                class="org.apache.roller.ui.admin.struts2.CreateUser">
+            <result name="input" type="tiles">.CreateUser</result>
+            <result name="cancel" type="redirect-action">userAdmin</result>
         </action>
         
-        <action name="commentQuery!*" method="{1}"
-                class="org.apache.roller.ui.authoring.struts2.CommentManagementAction">
-            <result name="commentManagement.page">.CommentManagement</result>
-            <result name="commentManagementGlobal.page">.CommentManagementGlobal</result>
+        <action name="modifyUser!*" method="{1}"
+                class="org.apache.roller.ui.admin.struts2.ModifyUser">
+            <result name="input" type="tiles">.ModifyUser</result>
+            <result name="cancel" type="redirect-action">userAdmin</result>
+        </action>
+        
+        <action name="globalCommentManagement!*" method="{1}"
+                class="org.apache.roller.ui.admin.struts2.GlobalCommentManagement">
+            <result name="list" type="tiles">.GlobalCommentManagement</result>
         </action>
         
         <action name="commonPingTargets!*" method="{1}"
-                class="org.apache.roller.ui.admin.struts2.CommonPingTargetsAction">
-            <result name="pingTargets.page">.CommonPingTargets</result>
-            <result name="pingTargetEdit.page">.CommonPingTargetEdit</result>
-            <result name="pingTargetDeleteOK.page">.CommonPingTargetDeleteOK</result>
+                class="org.apache.roller.ui.admin.struts2.CommonPingTargets">
+            <result name="list" type="tiles">.CommonPingTargets</result>
+            <result name="confirm" type="tiles">.CommonPingTargetConfirm</result>
+        </action>
+        
+        <action name="commonPingTargetAdd!*" method="{1}"
+                class="org.apache.roller.ui.admin.struts2.CommonPingTargetAdd">
+            <result name="input" type="tiles">.CommonPingTargetAdd</result>
+            <result name="success" type="chain">commonPingTargets</result>
+        </action>
+        
+        <action name="commonPingTargetEdit!*" method="{1}"
+                class="org.apache.roller.ui.admin.struts2.CommonPingTargetEdit">
+            <result name="input" type="tiles">.CommonPingTargetEdit</result>
+            <result name="error" type="chain">commonPingTargets</result>
         </action>
         
         <action name="cacheInfo!*" method="{1}"
-                class="org.apache.roller.ui.admin.struts2.CacheInfoAction">
-            <result name="cacheInfo.page">.cacheInfo</result>
+                class="org.apache.roller.ui.admin.struts2.CacheInfo">
+            <result name="success" type="tiles">.CacheInfo</result>
         </action>
         
+        
+        <!--
         <action name="planetConfig!*" method="{1}"
                 class="org.apache.roller.planet.ui.admin.struts2.PlanetConfigAction">
             <result name="planetConfig.page">.PlanetConfig</result>
@@ -134,33 +155,172 @@
                 class="org.apache.roller.planet.ui.admin.struts2.PlanetGroupsAction">
             <result name="planetGroups.page">.PlanetGroups</result>
         </action>
-        
+        -->
     </package>
-    -->
+    
     
     <!-- Weblogger Authoring UI -->
-    <!--
     <package name="weblogger-authoring" namespace="/roller-ui/authoring" extends="weblogger">
         
-        <action name="pingSetup!*" method="{1}"
-                class="org.apache.roller.ui.authoring.struts2.PingSetupAction">
-            <result name="pingSetup.page">.Pings</result>
-            <result name="pingResult.page">.PingResult</result>
+        <action name="postEntry">
+            <result>/roller-ui/authoring/weblog.do?method=create</result>
         </action>
-        <action name="customPingTargets!*" method="{1}"
-                class="org.apache.roller.ui.authoring.struts2.CustomPingTargetsAction">
-            <result name="pingTargets.page">.CustomPingTargets</result>
-            <result name="pingTargetEdit.page">.CustomPingTargetEdit</result>
-            <result name="pingTargetDeleteOK.page">.CustomPingTargetDeleteOK</result>
+        
+        <action name="entries">
+            <result>/roller-ui/authoring/weblogEntryManagement.do?method=query</result>
+        </action>
+        
+        <action name="comments">
+            <result>/roller-ui/authoring/commentManagement.do?method=query</result>
         </action>
+        
         <action name="categories!*" method="{1}"
-                class="org.apache.roller.ui.authoring.struts2.CategoriesAction">
-            <result name="CategoriesForm">.CategoriesForm</result>
+                class="org.apache.roller.ui.authoring.struts2.Categories">
+            <result name="list" type="tiles">.Categories</result>
+        </action>
+        
+        <action name="categoryAdd!*" method="{1}"
+                class="org.apache.roller.ui.authoring.struts2.CategoryAdd">
+            <result name="input" type="tiles">.CategoryAdd</result>
+            <result name="success" type="chain">categories</result>
+            <result name="error" type="chain">categories</result>
+        </action>
+        
+        <action name="categoryEdit!*" method="{1}"
+                class="org.apache.roller.ui.authoring.struts2.CategoryEdit">
+            <result name="input" type="tiles">.CategoryEdit</result>
+        </action>
+        
+        <action name="categoryRemove!*" method="{1}"
+                class="org.apache.roller.ui.authoring.struts2.CategoryRemove">
+            <result name="input" type="tiles">.CategoryRemove</result>
+            <result name="success" type="chain">categories</result>
+        </action>
+        
+        <action name="bookmarks!*" method="{1}"
+                class="org.apache.roller.ui.authoring.struts2.Bookmarks">
+            <result name="list" type="tiles">.Bookmarks</result>
+        </action>
+        
+        <action name="bookmarkAdd!*" method="{1}"
+                class="org.apache.roller.ui.authoring.struts2.BookmarkAdd">
+            <result name="input" type="tiles">.BookmarkAdd</result>
+            <result name="success" type="chain">bookmarks</result>
+            <result name="error" type="chain">bookmarks</result>
+        </action>
+        
+        <action name="bookmarkEdit!*" method="{1}"
+                class="org.apache.roller.ui.authoring.struts2.BookmarkEdit">
+            <result name="input" type="tiles">.BookmarkEdit</result>
+            <result name="error" type="chain">bookmarks</result>
+        </action>
+        
+        <action name="bookmarksImport!*" method="{1}"
+                class="org.apache.roller.ui.authoring.struts2.BookmarksImport">
+            <result name="input" type="tiles">.BookmarksImport</result>
+            <result name="success" type="chain">bookmarks</result>
+        </action>
+        
+        <action name="folderAdd!*" method="{1}"
+                class="org.apache.roller.ui.authoring.struts2.FolderAdd">
+            <result name="input" type="tiles">.FolderAdd</result>
+            <result name="success" type="chain">bookmarks</result>
+            <result name="error" type="chain">bookmarks</result>
+        </action>
+        
+        <action name="folderEdit!*" method="{1}"
+                class="org.apache.roller.ui.authoring.struts2.FolderEdit">
+            <result name="input" type="tiles">.FolderEdit</result>
+            <result name="error" type="chain">bookmarks</result>
+        </action>
+        
+        <action name="resources!*" method="{1}"
+                class="org.apache.roller.ui.authoring.struts2.Resources">
+            <result name="list" type="tiles">.Resources</result>
+        </action>
+        
+        <action name="referrers">
+            <result>/roller-ui/authoring/referers.do</result>
+        </action>
+        
+        
+        <action name="weblogConfig!*" method="{1}"
+                class="org.apache.roller.ui.authoring.struts2.WeblogConfig">
+            <result name="input" type="tiles">.WeblogConfig</result>
+        </action>
+        
+        <action name="weblogRemove!*" method="{1}"
+                class="org.apache.roller.ui.authoring.struts2.WeblogRemove">
+            <result name="confirm" type="tiles">.WeblogRemoveConfirm</result>
+            <result name="success" type="chain">menu</result>
+        </action>
+        
+        <action name="themeEdit!*" method="{1}"
+                class="org.apache.roller.ui.authoring.struts2.ThemeEdit">
+            <result name="success" type="tiles">.ThemeEdit</result>
+        </action>
+        
+        <action name="templates!*" method="{1}"
+                class="org.apache.roller.ui.authoring.struts2.Templates">
+            <result name="list" type="tiles">.Templates</result>
+        </action>
+        
+        <action name="templateRemove!*" method="{1}"
+                class="org.apache.roller.ui.authoring.struts2.TemplateRemove">
+            <result name="confirm" type="tiles">.TemplateRemove</result>
+            <result name="success" type="chain">templates</result>
+        </action>
+        
+        <action name="template!*" method="{1}"
+                class="org.apache.roller.ui.authoring.struts2.TemplateEdit">
+            <result name="list" type="chain">templates</result>
+            <result name="success" type="tiles">.TemplateEditForm</result>
+            <result name="cancel" type="redirect-action">templates</result>
+        </action>
+        
+        <action name="members!*" method="{1}"
+                class="org.apache.roller.ui.authoring.struts2.Members">
+            <result name="list" type="tiles">.Members</result>
         </action>
-        <action name="importBookmarks!*" method="{1}"
-                class="org.apache.roller.ui.authoring.struts2.ImportBookmarksFormAction">
-            <result name="importBookmarks.page">.import</result>
+        
+        <action name="invite!*" method="{1}"
+                class="org.apache.roller.ui.authoring.struts2.MembersInvite">
+            <result name="input" type="tiles">.MembersInvite</result>
+            <result name="disabled" type="tiles">.disabled</result>
+            <result name="success" type="chain">members</result>
+        </action>
+        
+        <action name="pings!*" method="{1}"
+                class="org.apache.roller.ui.authoring.struts2.Pings">
+            <result name="list" type="tiles">.Pings</result>
+        </action>
+        
+        <action name="customPingTargets!*" method="{1}"
+                class="org.apache.roller.ui.authoring.struts2.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.ui.authoring.struts2.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.ui.authoring.struts2.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.ui.authoring.struts2.Maintenance">
+            <result name="success" type="tiles">.Maintenance</result>
         </action>
+        
+        
+        <!--
+        
         <action name="importEntries!*" method="{1}"
                 class="org.apache.roller.ui.authoring.struts2.ImportEntriesAction">
             <result name="importEntries.page">.import-entries</result>
@@ -170,31 +330,16 @@
                 class="org.apache.roller.ui.authoring.struts2.CategoryDeleteAction">
             <result name="CategoryDeleteOK">.CategoryDeleteOK</result>
         </action>
+        
         <action name="categoryEdit!*" method="{1}"
                 class="org.apache.roller.ui.authoring.struts2.CategoryEditAction">
             <result name="CategoryForm">.CategoryForm</result>
         </action>
-        <action name="maintenance!*" method="{1}"
-                class="org.apache.roller.ui.authoring.struts2.MaintenanceAction">
-            <result name="maintenance.page">.Maintenance</result>
-        </action>
-        <action name="bookmarkEdit!*" method="{1}"
-                class="org.apache.roller.ui.authoring.struts2.BookmarkEditAction">
-            <result name="BookmarkForm">.BookmarkForm</result>
-        </action>
-        
-        <action name="bookmarks!*" method="{1}"
-                class="org.apache.roller.ui.authoring.struts2.BookmarksAction">
-            <result name="BookmarksForm">.BookmarksForm</result>
-        </action>
         
         <action name="categorySave!*" method="{1}"
                 class="org.apache.roller.ui.authoring.struts2.CategorySaveAction">
         </action>
-        <action name="inviteMember!*" method="{1}"
-                class="org.apache.roller.ui.authoring.struts2.InviteMemberAction">
-            <result name="inviteMember.page">.InviteMember</result>
-        </action>
+        
         <action name="weblog!*" method="{1}"
                 class="org.apache.roller.ui.authoring.struts2.WeblogEntryFormAction">
             <result name="weblogEdit.page">.WeblogEdit</result>
@@ -205,48 +350,16 @@
                 class="org.apache.roller.ui.authoring.struts2.WeblogEntryManagementAction">
             <result name="weblogEntryManagement.page">.WeblogEntryManagement</result>
         </action>
-        <action name="themeEditor!*" method="{1}"
-                class="org.apache.roller.ui.authoring.struts2.ThemeEditorAction">
-            <result name="editTheme.page">.theme-editor</result>
-        </action>
-        
-        <action name="memberPermissions!*" method="{1}"
-                class="org.apache.roller.ui.authoring.struts2.MemberPermissionsAction">
-            <result name="memberPermissions.page">.MemberPermissions</result>
-        </action>
         
         <action name="referers!*" method="{1}"
                 class="org.apache.roller.ui.authoring.struts2.ReferersAction">
             <result name="referers.page">.referers</result>
         </action>
         
-        <action name="folderEdit!*" method="{1}"
-                class="org.apache.roller.ui.authoring.struts2.FolderEditAction">
-            <result name="FolderForm">.FolderForm</result>
-        </action>
-        <action name="page!*" method="{1}"
-                class="org.apache.roller.ui.authoring.struts2.WeblogTemplateFormAction">
-            <result name="removePage.page">.remove-page</result>
-            <result name="editPage.page">.edit-page</result>
-            <result name="editPages.page">.edit-pages</result>
-        </action>
-        
-        <action name="folderSave!*" method="{1}"
-                class="org.apache.roller.ui.authoring.struts2.FolderSaveAction">
-            <result name="Bookmarks" type="dispatcher">/roller-ui/authoring/bookmarks.action!selectFolder</result>
-        </action>
-        <action name="invitations!*" method="{1}"
-                class="org.apache.roller.ui.authoring.struts2.InvitationsAction">
-            <result name="invitations.page">.Invitations</result>
-        </action>
         <action name="toggleLinkback!*" method="{1}"
                 class="org.apache.roller.ui.authoring.struts2.ToggleLinkbackDisplayAction">
         </action>
-        <action name="bookmarkSave!*" method="{1}"
-                class="org.apache.roller.ui.authoring.struts2.BookmarkSaveAction">
-            <result name="Bookmarks" type="dispatcher">/roller-ui/authoring/bookmarks.action!selectFolder</result>
-            <result name="BookmarkEdit" type="dispatcher">/roller-ui/authoring/bookmarkEdit.action</result>
-        </action>
+        
         <action name="commentManagement!*" method="{1}"
                 class="org.apache.roller.ui.authoring.struts2.CommentManagementAction">
             <result name="commentManagement.page">.CommentManagement</result>
@@ -257,18 +370,8 @@
             <result name="commentManagement.page">.CommentManagement</result>
             <result name="commentManagementGlobal.page">.CommentManagementGlobal</result>
         </action>
-        
-        <action name="website!*" method="{1}"
-                class="org.apache.roller.ui.authoring.struts2.WebsiteFormAction">
-            <result name="editWebsite.page">.edit-website</result>
-            <result name="removeWebsite.page">.WebsiteRemove</result>
-        </action>
-        <action name="uploadFiles!*" method="{1}"
-                class="org.apache.roller.ui.authoring.struts2.UploadFileFormAction">
-            <result name="uploadFiles.page">.upload-file</result>
-        </action>
+        -->
     </package>
-    -->
     
 </struts>
 

Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/admin/UserAdmin.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/admin/UserAdmin.jsp?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/admin/UserAdmin.jsp (original)
+++ roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/admin/UserAdmin.jsp Mon May 14 11:41:57 2007
@@ -79,6 +79,12 @@
         
     <table class="formtable">
     <tr>
+        <td class="label"><label for="screenName" /><fmt:message key="userSettings.screenname" /></label></td>
+        <td class="field"><html:text property="screenName" size="30" maxlength="30" /></td>
+        <td class="description"><fmt:message key="userAdmin.tip.screenName" /></td>
+    </tr>
+
+    <tr>
         <td class="label"><label for="fullName" /><fmt:message key="userSettings.fullname" /></label></td>
         <td class="field"><html:text property="fullName" size="30" maxlength="30" /></td>
         <td class="description"><fmt:message key="userAdmin.tip.fullName" /></td>

Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/UserNew.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/UserNew.jsp?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/UserNew.jsp (original)
+++ roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/UserNew.jsp Mon May 14 11:41:57 2007
@@ -45,6 +45,12 @@
 <table class="formtable">
 
 <tr>
+    <td class="label"><label for="screenName" /><fmt:message key="userSettings.screenname" /></label></td>
+    <td class="field"><html:text property="screenName" size="30" maxlength="30" /></td>
+    <td class="description"><fmt:message key="userRegister.tip.screenName" /></td>
+</tr>
+
+<tr>
     <td class="label"><label for="fullName" /><fmt:message key="userSettings.fullname" /></label></td>
     <td class="field"><html:text property="fullName" size="30" maxlength="30" /></td>
     <td class="description"><fmt:message key="userRegister.tip.fullName" /></td>

Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/YourProfile.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/YourProfile.jsp?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/YourProfile.jsp (original)
+++ roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/YourProfile.jsp Mon May 14 11:41:57 2007
@@ -31,6 +31,12 @@
 </tr>
 
 <tr>
+    <td class="label"><label for="screenName" /><fmt:message key="userSettings.screenname" /></label></td>
+    <td class="field"><html:text property="screenName" size="30" maxlength="30" /></td>
+    <td class="description"><fmt:message key="userRegister.tip.screenName" /></td>
+</tr>
+
+<tr>
     <td class="label"><label for="fullName" /><fmt:message key="userSettings.fullname" /></label></td>
     <td class="field"><html:text property="fullName" size="30" maxlength="30" /></td>
     <td class="description"><fmt:message key="userRegister.tip.fullName" /></td>

Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/MainMenu.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/MainMenu.jsp?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/MainMenu.jsp (original)
+++ roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/MainMenu.jsp Mon May 14 11:41:57 2007
@@ -134,8 +134,7 @@
                        <br />
                        
                        <s:if test="#perms.permissionMask == 3">
-                           <s:url action="websiteSettings" id="manageWeblog">
-                               <s:param name="method" value="edit" />
+                           <s:url action="weblogConfig" namespace="/roller-ui/authoring" id="manageWeblog">
                                <s:param name="weblog" value="#perms.website.handle" />
                            </s:url>
                            <img src='<s:url value="/images/cog.png"/>' />

Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/MainMenuSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/MainMenuSidebar.jsp?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/MainMenuSidebar.jsp (original)
+++ roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/MainMenuSidebar.jsp Mon May 14 11:41:57 2007
@@ -27,7 +27,7 @@
                 <hr size="1" noshade="noshade" />
                 
                 <s:if test="groupBloggingEnabled || (existingPermissions.isEmpty && pendingPermissions.isEmpty)">
-                    <h3><a href="<s:url action="createWeblog"/>"><s:text name="yourWebsites.createWeblog" /></a></h3>
+                    <h3><a href="<s:url action="createWeblog" />"><s:text name="yourWebsites.createWeblog" /></a></h3>
                     <p><s:text name="yourWebsites.createWeblog.desc" /></p>
                 </s:if>
                 
@@ -35,11 +35,11 @@
                 <p><s:text name="yourWebsites.editProfile.desc" /></p>
                 
                 <s:if test="userAdmin">               
-                    <h3><a href="<s:url action="rollerConfig"/>"><s:text name="yourWebsites.globalAdmin" /></a></h3>          
+                    <h3><a href="<s:url action="globalConfig" namespace="/roller-ui/admin" />"><s:text name="yourWebsites.globalAdmin" /></a></h3>          
                     <p><s:text name="yourWebsites.globalAdmin.desc" /></p>
                     
                     <s:if test="planetAggregated">               
-                        <h3><a href="<s:url action="planetConfig"/>"><s:text name="yourWebsites.planetAdmin" /></a></h3>
+                        <h3><a href="<s:url action="planetConfig" namespace="/roller-ui/admin" />"><s:text name="yourWebsites.planetAdmin" /></a></h3>
                         <p><s:text name="yourWebsites.planetAdmin.desc" /></p>
                     </s:if>
                 </s:if>

Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/ProfileForm.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/ProfileForm.jsp?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/ProfileForm.jsp (original)
+++ roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/ProfileForm.jsp Mon May 14 11:41:57 2007
@@ -31,6 +31,12 @@
 </tr>
 
 <tr>
+    <td class="label"><label for="screenName" /><s:text name="userSettings.screenname" /></label></td>
+    <td class="field"><s:textfield name="bean.screenName" size="30" maxlength="30" /></td>
+    <td class="description"><s:text name="userRegister.tip.screenName" /></td>
+</tr>
+
+<tr>
     <td class="label"><label for="fullName" /><s:text name="userSettings.fullname" /></label></td>
     <td class="field"><s:textfield name="bean.fullName" size="30" maxlength="30" /></td>
     <td class="description"><s:text name="userRegister.tip.fullName" /></td>

Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/RegisterForm.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/RegisterForm.jsp?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/RegisterForm.jsp (original)
+++ roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/RegisterForm.jsp Mon May 14 11:41:57 2007
@@ -26,6 +26,12 @@
 <table class="formtable">
 
 <tr>
+    <td class="label"><label for="screenName" /><s:text name="userSettings.screenname" /></label></td>
+    <td class="field"><s:textfield name="bean.screenName" size="30" maxlength="30" /></td>
+    <td class="description"><s:text name="userRegister.tip.screenName" /></td>
+</tr>
+
+<tr>
     <td class="label"><label for="fullName" /><s:text name="userSettings.fullname" /></label></td>
     <td class="field"><s:textfield name="bean.fullName" size="30" maxlength="30" /></td>
     <td class="description"><s:text name="userRegister.tip.fullName" /></td>

Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/taglibs-struts2.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/taglibs-struts2.jsp?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/taglibs-struts2.jsp (original)
+++ roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/taglibs-struts2.jsp Mon May 14 11:41:57 2007
@@ -21,4 +21,5 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"  prefix="fmt" %>
 <%@ taglib uri="http://struts.apache.org/tags-tiles2" prefix="tiles" %>
-<%@ taglib uri="/struts-tags" prefix="s" %>
\ No newline at end of file
+<%@ taglib uri="/struts-tags" prefix="s" %>
+<%@ taglib uri="http://jakarta.apache.org/taglibs/string-1.0.1" prefix="str" %>
\ No newline at end of file

Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp (original)
+++ roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp Mon May 14 11:41:57 2007
@@ -25,7 +25,7 @@
                 
                 <s:if test="authenticatedUser != null">
                     <s:text name="mainPage.loggedInAs" />
-                    <a href="<s:url action="profile"/>"><s:property value="authenticatedUser.userName"/></a>
+                    <a href="<s:url action="profile" namespace="/roller-ui" />"><s:property value="authenticatedUser.userName"/></a>
                 </s:if>
                 
                 
@@ -43,16 +43,16 @@
                 
                 <a href="<s:url value="/"/>"><s:property value="getProp('site.shortName')"/></a>
                 
-                | <a href="<s:url action="menu"/>"><s:text name="mainPage.mainMenu" /></a>
+                | <a href="<s:url action="menu" namespace="/roller-ui" />"><s:text name="mainPage.mainMenu" /></a>
                 
                 <s:if test="authenticatedUser != null">
-                    | <a href="<s:url action="logout"/>"><s:text name="navigationBar.logout"/></a>
+                    | <a href="<s:url action="logout" namespace="/roller-ui" />"><s:text name="navigationBar.logout"/></a>
                 </s:if>
                 <s:else>
-                    | <a href="<s:url action="login-redirect"/>"><s:text name="navigationBar.login"/></a>
+                    | <a href="<s:url action="login-redirect" namespace="/roller-ui" />"><s:text name="navigationBar.login"/></a>
                     
                     <s:if test="getBooleanProp('users.registration.enabled')">
-                        | <a href="<s:url action="register"/>"><s:text name="navigationBar.register"/></a>
+                        | <a href="<s:url action="register" namespace="/roller-ui" />"><s:text name="navigationBar.register"/></a>
                     </s:if>
                     <s:elseif test="getProp('users.registration.url') != null">
                         | <a href="<s:property value="getProp('users.registration.url')"/>"><s:text name="navigationBar.register"/></a>

Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/footer.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/footer.jsp?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/footer.jsp (original)
+++ roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/footer.jsp Mon May 14 11:41:57 2007
@@ -18,7 +18,7 @@
 <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
 
 Powered by <a href="http://www.rollerweblogger.org">Apache Roller</a> 
-<%= RollerFactory.getRoller().getVersion() %> |
+<%= org.apache.roller.business.RollerFactory.getRoller().getVersion() %> |
 
 <a href="http://opensource2.atlassian.com/projects/roller/">
     <s:text name="footer.reportIssue" /></a> | 

Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/head.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/head.jsp?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/head.jsp (original)
+++ roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/head.jsp Mon May 14 11:41:57 2007
@@ -5,13 +5,13 @@
 <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
 
 <link rel="stylesheet" type="text/css" media="all" 
-    href='<c:url value="/roller-ui/styles/layout.css"/>'>
+    href='<s:url value="/roller-ui/styles/layout.css"/>'>
 <link rel="stylesheet" type="text/css" media="all" 
-    href='<c:url value="/roller-ui/styles/roller.css"/>'>   
+    href='<s:url value="/roller-ui/styles/roller.css"/>'>   
 <link rel="stylesheet" type="text/css" media="all" 
-    href='<c:url value="/roller-ui/styles/menu.css"/>'>
+    href='<s:url value="/roller-ui/styles/menu.css"/>'>
 <link rel="stylesheet" type="text/css" media="all" 
-    href='<c:url value="/roller-ui/styles/calendar.css"/>'>
+    href='<s:url value="/roller-ui/styles/calendar.css"/>'>
 
 <link rel="stylesheet" type="text/css" media="all" 
     href="<%= request.getContextPath() %>/roller-ui/theme/<s:property value="getProp('editor.theme')"/>/colors.css" />
@@ -19,11 +19,8 @@
 <script type="text/javascript" 
     src="<%= request.getContextPath() %>/theme/scripts/roller.js"></script>
 <script type="text/javascript" 
-    src='<c:url value="/roller-ui/scripts/calendar.js"/>'></script>
+    src='<s:url value="/roller-ui/scripts/calendar.js"/>'></script>
 <script type="text/javascript" 
-    src='<c:url value="/roller-ui/scripts/overlib.js"/>'>
+    src='<s:url value="/roller-ui/scripts/overlib.js"/>'>
     <!-- overLIB (c) Erik Bosrup -->
-</script>  
-
-
-
+</script>

Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/tiles-mainmenupage.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/tiles-mainmenupage.jsp?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/tiles-mainmenupage.jsp (original)
+++ roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/tiles-mainmenupage.jsp Mon May 14 11:41:57 2007
@@ -18,47 +18,48 @@
 <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><s:property value="getProp('site.shortName')"/>: <s:property value="pageTitle" /></title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<tiles:insertAttribute name="head" />     
-<style type="text/css">
-<tiles:insertAttribute name="styles" />
-</style>
-</head>
-<body>
-
-<div id="banner">
-    <tiles:insertAttribute name="bannerStatus" />
-</div>
-
-<div id="content">
-    <div id="leftcontent_wrap">
-        <div id="leftcontent"> 
+    <head>
+        <title><s:property value="getProp('site.shortName')"/>: <s:property value="pageTitle" /></title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+        
+        <tiles:insertAttribute name="head" />     
+        <style type="text/css">
+            <tiles:insertAttribute name="styles" />
+        </style>
+    </head>
+    <body>
+        
+        <div id="banner">
+            <tiles:insertAttribute name="bannerStatus" />
         </div>
-    </div>
-    
-    <div id="centercontent_wrap">
-        <div id="centercontent">   
-            <h1><s:property value="pageTitle" /></h1>
-            <tiles:insertAttribute name="messages" /> 
-            <tiles:insertAttribute name="content" />    
+        
+        <div id="content">
+            <div id="leftcontent_wrap">
+                <div id="leftcontent"> 
+                </div>
+            </div>
+            
+            <div id="centercontent_wrap">
+                <div id="centercontent">   
+                    <h1><s:property value="pageTitle" /></h1>
+                    <tiles:insertAttribute name="messages" /> 
+                    <tiles:insertAttribute name="content" />    
+                </div>
+            </div>
+            
+            <div id="rightcontent_wrap">
+                <div id="rightcontent"> 
+                    <tiles:insertAttribute name="sidebar" />
+                </div>
+            </div>
         </div>
-    </div>
-    
-    <div id="rightcontent_wrap">
-        <div id="rightcontent"> 
-            <tiles:insertAttribute name="sidebar" />
+        
+        <div id="footer">
+            <tiles:insertAttribute name="footer" />
         </div>
-    </div>
-</div>
-
-<div id="footer">
-    <tiles:insertAttribute name="footer" />
-</div>
-
-<div id="datetagdiv" 
-   style="position:absolute;visibility:hidden;background-color:white;layer-background-color:white;">
-</div>
-</body>
+        
+        <div id="datetagdiv" 
+             style="position:absolute;visibility:hidden;background-color:white;layer-background-color:white;">
+        </div>
+    </body>
 </html>

Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/tiles-simplepage.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/tiles-simplepage.jsp?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/tiles-simplepage.jsp (original)
+++ roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/tiles-simplepage.jsp Mon May 14 11:41:57 2007
@@ -18,47 +18,48 @@
 <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><s:property value="getProp('site.shortName')"/>: <s:property value="pageTitle" /></title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<tiles:insertAttribute name="head" />
-<style type="text/css">
-<tiles:insertAttribute name="styles" />
-</style>
-</head>
-<body>
-
-<div id="banner">
-    <tiles:insertAttribute name="banner" />
-    <tiles:insertAttribute name="bannerStatus" />
-</div>
-    
-<div id="wrapper"> 
-    <div id="leftcontent_wrap">
-        <div id="leftcontent"> 
+    <head>
+        <title><s:property value="getProp('site.shortName')"/>: <s:property value="pageTitle" /></title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+        
+        <tiles:insertAttribute name="head" />
+        <style type="text/css">
+            <tiles:insertAttribute name="styles" />
+        </style>
+    </head>
+    <body>
+        
+        <div id="banner">
+            <tiles:insertAttribute name="banner" />
+            <tiles:insertAttribute name="bannerStatus" />
         </div>
-    </div>
-    
-    <div id="centercontent_wrap">
-        <div id="centercontent">   
-            <h1><s:property value="pageTitle" /></h1>
-            <tiles:insertAttribute name="messages" />
-            <tiles:insertAttribute name="content" />
+        
+        <div id="wrapper"> 
+            <div id="leftcontent_wrap">
+                <div id="leftcontent"> 
+                </div>
+            </div>
+            
+            <div id="centercontent_wrap">
+                <div id="centercontent">   
+                    <h1><s:property value="pageTitle" /></h1>
+                    <tiles:insertAttribute name="messages" />
+                    <tiles:insertAttribute name="content" />
+                </div>
+            </div>
+            
+            <div id="rightcontent_wrap">
+                <div id="rightcontent"> 
+                </div>
+            </div>
         </div>
-    </div>
-    
-    <div id="rightcontent_wrap">
-        <div id="rightcontent"> 
+        
+        <div id="footer">
+            <tiles:insertAttribute name="footer" />
         </div>
-    </div>
-</div>
-
-<div id="footer">
-    <tiles:insertAttribute name="footer" />
-</div>
-
-<div id="datetagdiv" 
-   style="position:absolute;visibility:hidden;background-color:white;layer-background-color:white;">
-</div>
-</body>
+        
+        <div id="datetagdiv" 
+             style="position:absolute;visibility:hidden;background-color:white;layer-background-color:white;">
+        </div>
+    </body>
 </html>

Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/tiles-tabbedpage.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/tiles-tabbedpage.jsp?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/tiles-tabbedpage.jsp (original)
+++ roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/tiles-tabbedpage.jsp Mon May 14 11:41:57 2007
@@ -18,51 +18,52 @@
 <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><s:property value="getProp('site.shortName')"/>: <s:property value="pageTitle" /></title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<tiles:insertAttribute name="head" />     
-<style type="text/css">
-<tiles:insertAttribute name="styles" />
-</style>
-</head>
-<body>
-
-<div id="banner">
-        <tiles:insertAttribute name="bannerStatus" />
-</div>
-    
-<div id="menu">
-        <h1><s:property value="pageTitle" /></h1>
-        <tiles:insertAttribute name="menu" />
-</div>
-    
-<div id="content"> 
-    <div id="leftcontent_wrap">
-        <div id="leftcontent"> 
+    <head>
+        <title><s:property value="getProp('site.shortName')"/>: <s:property value="pageTitle" /></title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+        
+        <tiles:insertAttribute name="head" />     
+        <style type="text/css">
+            <tiles:insertAttribute name="styles" />
+        </style>
+    </head>
+    <body>
+        
+        <div id="banner">
+            <tiles:insertAttribute name="bannerStatus" />
         </div>
-    </div>
-    
-    <div id="centercontent_wrap">
-        <div id="centercontent">   
-            <tiles:insertAttribute name="messages" /> 
-            <tiles:insertAttribute name="content" />    
+        
+        <div id="menu">
+            <h1><s:property value="pageTitle" /></h1>
+            <tiles:insertAttribute name="menu" />
         </div>
-    </div>
-    
-    <div id="rightcontent_wrap">
-        <div id="rightcontent"> 
-            <tiles:insertAttribute name="sidebar" />
+        
+        <div id="content"> 
+            <div id="leftcontent_wrap">
+                <div id="leftcontent"> 
+                </div>
+            </div>
+            
+            <div id="centercontent_wrap">
+                <div id="centercontent">   
+                    <tiles:insertAttribute name="messages" /> 
+                    <tiles:insertAttribute name="content" />    
+                </div>
+            </div>
+            
+            <div id="rightcontent_wrap">
+                <div id="rightcontent"> 
+                    <tiles:insertAttribute name="sidebar" />
+                </div>
+            </div>
         </div>
-    </div>
-</div>
-
-<div id="footer">
-    <tiles:insertAttribute name="footer" />
-</div>
-
-<div id="datetagdiv" 
-   style="position:absolute;visibility:hidden;background-color:white;layer-background-color:white;">
-</div>
-</body>
+        
+        <div id="footer">
+            <tiles:insertAttribute name="footer" />
+        </div>
+        
+        <div id="datetagdiv" 
+             style="position:absolute;visibility:hidden;background-color:white;layer-background-color:white;">
+        </div>
+    </body>
 </html>

Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/tiles.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/tiles.xml?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/WEB-INF/tiles.xml (original)
+++ roller/branches/roller_4.0_newbackend/web/WEB-INF/tiles.xml Mon May 14 11:41:57 2007
@@ -35,7 +35,7 @@
         <put name="bannerStatus" value="/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp" />
         <put name="head"         value="/WEB-INF/jsps/tiles/struts2/head.jsp" />
         <put name="styles"       value="/WEB-INF/jsps/tiles/struts2/empty.jsp" />
-        <put name="menu"         value="${menu}" />
+        <put name="menu"         value="/WEB-INF/jsps/tiles/struts2/menu.jsp" />
         <put name="messages"     value="/WEB-INF/jsps/tiles/struts2/messages.jsp" />
         <put name="content"      value="${content}" />
         <put name="sidebar"      value="/WEB-INF/jsps/tiles/struts2/empty.jsp" />
@@ -52,14 +52,6 @@
         <put name="footer"       value="/WEB-INF/jsps/tiles/struts2/footer.jsp" />
     </definition>
     
-    <definition name=".tiles-editorpage" extends=".tiles-tabbedpage" >
-        <put name="menu" value="/WEB-INF/jsps/tiles/struts2/menu-editor.jsp" />
-    </definition>
-    
-    <definition name=".tiles-adminpage" extends=".tiles-tabbedpage" >
-        <put name="menu" value="/WEB-INF/jsps/tiles/struts2/menu-admin.jsp" />
-    </definition>
-    
     
     <!-- core pages (and associates) -->
     <definition name=".Login" extends=".tiles-simplepage" >
@@ -89,164 +81,217 @@
     </definition>
     
     
-    <!-- weblog editor pages (and associates) -->
-    <definition name=".WeblogEdit" extends=".tiles-editorpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/WeblogEdit.jsp" />
-        <put name="sidebar" value="/WEB-INF/jsps/authoring/WeblogEditSidebar.jsp" />
-        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" />
+    <!-- global admin pages (and associates) -->
+    <definition name=".GlobalConfig" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/admin/struts2/GlobalConfig.jsp" />
     </definition>
-    <definition name=".WeblogEntryManagement" extends=".tiles-editorpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/WeblogEntryManagement.jsp" />
-        <put name="sidebar" value="/WEB-INF/jsps/authoring/WeblogEntryManagementSidebar.jsp" />
-        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" />
+    
+    <definition name=".UserAdmin" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/admin/struts2/UserAdmin.jsp" />
     </definition>
-    <definition name=".CommentManagement" extends=".tiles-editorpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/CommentManagement.jsp" />
-        <put name="sidebar" value="/WEB-INF/jsps/authoring/CommentManagementSidebar.jsp" />
-        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" />
+    
+    <definition name=".CreateUser" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/admin/struts2/CreateUser.jsp" />
+    </definition>
+    
+    <definition name=".ModifyUser" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/admin/struts2/ModifyUser.jsp" />
     </definition>
-    <definition name=".CategoriesForm" extends=".tiles-editorpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/CategoriesForm.jsp" />
-        <put name="sidebar" value="/WEB-INF/jsps/authoring/CategoriesSidebar.jsp" />
+    
+    <definition name=".GlobalCommentManagement" extends=".tiles-tabbedpage" >
+        <put name="head" value="/WEB-INF/jsps/tiles/struts2/head-ajax.jsp" />
+        <put name="content" value="/WEB-INF/jsps/admin/struts2/GlobalCommentManagement.jsp" />
+        <put name="sidebar" value="/WEB-INF/jsps/admin/struts2/GlobalCommentManagementSidebar.jsp" />
         <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" />
     </definition>
-    <definition name=".referers" extends=".tiles-editorpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/referers.jsp" />
+    
+    <definition name=".CommonPingTargets" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/admin/struts2/CommonPingTargets.jsp" />
     </definition>
-    <definition name=".BookmarksForm" extends=".tiles-editorpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/BookmarksForm.jsp" />
-        <put name="sidebar" value="/WEB-INF/jsps/authoring/BookmarksSidebar.jsp" />
-        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" />
+    
+    <definition name=".CommonPingTargetConfirm" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/admin/struts2/CommonPingTargetConfirm.jsp" />
+    </definition>
+    
+    <definition name=".CommonPingTargetAdd" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/admin/struts2/CommonPingTargetAdd.jsp" />
     </definition>
-    <definition name=".upload-file" extends=".tiles-editorpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/UploadFile.jsp" />
+    
+    <definition name=".CommonPingTargetEdit" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/admin/struts2/CommonPingTargetEdit.jsp" />
     </definition>
     
-    <!-- subpages -->
-    <definition name=".WeblogEntryRemove" extends=".tiles-editorpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/WeblogEntryRemove.jsp" />
-        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+    <definition name=".CacheInfo" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/admin/struts2/CacheInfo.jsp" />
     </definition>
-    <definition name=".CategoryForm" extends=".tiles-editorpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/CategoryForm.jsp" />
-        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+    
+    <definition name=".PlanetSubscriptions" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/admin/PlanetSubscriptions.jsp" />
     </definition>
-    <definition name=".CategoryDeleteOK" extends=".tiles-editorpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/CategoryDeleteOK.jsp" />
-        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+    
+    <definition name=".PlanetConfig" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/admin/PlanetConfig.jsp" />
     </definition>
-    <definition name=".BookmarkForm" extends=".tiles-editorpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/BookmarkForm.jsp" />
-        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+    
+    <definition name=".PlanetGroups" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/admin/PlanetGroups.jsp" />
     </definition>
-    <definition name=".FolderForm" extends=".tiles-editorpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/FolderForm.jsp" />
-        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+    
+    
+    <!-- weblog editor pages (and associates) -->
+    <definition name=".WeblogEdit" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/WeblogEdit.jsp" />
+        <put name="sidebar" value="/WEB-INF/jsps/authoring/WeblogEditSidebar.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" />
     </definition>
-    <definition name=".import" extends=".tiles-editorpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/import.jsp" />
+    
+    <definition name=".WeblogEntryRemove" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/WeblogEntryRemove.jsp" />
         <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
     </definition>
     
-    <!-- weblog admin pages (and associates) -->
-    <definition name=".edit-website" extends=".tiles-editorpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/edit-website.jsp" />
-    </definition>
-    <definition name=".theme-editor" extends=".tiles-editorpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/theme-editor.jsp" />
+    <definition name=".WeblogEntryManagement" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/WeblogEntryManagement.jsp" />
+        <put name="sidebar" value="/WEB-INF/jsps/authoring/WeblogEntryManagementSidebar.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" />
     </definition>
-    <definition name=".edit-pages" extends=".tiles-editorpage"  >
-        <put name="content" value="/WEB-INF/jsps/authoring/edit-pages.jsp" />
-        <put name="sidebar" value="/WEB-INF/jsps/authoring/edit-pages-sidebar.jsp" />
+    
+    <definition name=".CommentManagement" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/CommentManagement.jsp" />
+        <put name="sidebar" value="/WEB-INF/jsps/authoring/CommentManagementSidebar.jsp" />
         <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" />
     </definition>
-    <definition name=".CommentManagementGlobal" extends=".tiles-adminpage" >
+    
+    <definition name=".CommentManagementGlobal" extends=".tiles-tabbedpage" >
         <put name="content" value="/WEB-INF/jsps/authoring/CommentManagement.jsp" />
         <put name="sidebar" value="/WEB-INF/jsps/authoring/CommentManagementSidebar.jsp" />
         <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" />
     </definition>
-    <definition name=".MemberPermissions" extends=".tiles-editorpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/MemberPermissions.jsp" />
-        <put name="sidebar" value="/WEB-INF/jsps/authoring/MemberPermissionsSidebar.jsp" />
+    
+    <definition name=".Categories" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/Categories.jsp" />
+        <put name="sidebar" value="/WEB-INF/jsps/authoring/struts2/CategoriesSidebar.jsp" />
         <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" />
     </definition>
-    <definition name=".CustomPingTargets" extends=".tiles-editorpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/CustomPingTargets.jsp" />
+    
+    <definition name=".CategoryAdd" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/CategoryAdd.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
     </definition>
-    <definition name=".PingResult" extends=".tiles-editorpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/PingResult.jsp" />
+    
+    <definition name=".CategoryEdit" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/CategoryEdit.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
     </definition>
-    <definition name=".Pings" extends=".tiles-editorpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/Pings.jsp" />
+    
+    <definition name=".CategoryRemove" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/CategoryRemove.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
     </definition>
-    <definition name=".Maintenance" extends=".tiles-editorpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/Maintenance.jsp" />
+    
+    <definition name=".Bookmarks" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/Bookmarks.jsp" />
+        <put name="sidebar" value="/WEB-INF/jsps/authoring/struts2/BookmarksSidebar.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" />
     </definition>
     
-    <!-- subpages -->
-    <definition name=".WebsiteRemove" extends=".tiles-editorpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/WebsiteRemove.jsp" />
+    <definition name=".BookmarkAdd" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/BookmarkAdd.jsp" />
         <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
     </definition>
-    <definition name=".InviteMember" extends=".tiles-editorpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/InviteMember.jsp" />
+    
+    <definition name=".BookmarkEdit" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/BookmarkEdit.jsp" />
         <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
     </definition>
-    <definition name=".InviteMemberDone" extends=".tiles-editorpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/InviteMemberDone.jsp" />
+    
+    <definition name=".BookmarksImport" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/BookmarksImport.jsp" />
         <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
     </definition>
-    <definition name=".CustomPingTargetDeleteOK" extends=".tiles-editorpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/CustomPingTargetDeleteOK.jsp" />
+    
+    <definition name=".FolderAdd" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/FolderAdd.jsp" />
         <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
     </definition>
-    <definition name=".CustomPingTargetEdit" extends=".tiles-editorpage" >
-        <put name="content" value="/WEB-INF/jsps/authoring/CustomPingTargetEdit.jsp" />
+    
+    <definition name=".FolderEdit" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/FolderEdit.jsp" />
         <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
     </definition>
-    <definition name=".edit-page" extends=".tiles-editorpage"  >
-        <put name="content" value="/WEB-INF/jsps/authoring/edit-page.jsp" />
-        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+    
+    <definition name=".Resources" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/Resources.jsp" />
     </definition>
-    <definition name=".remove-page" extends=".tiles-editorpage"  >
-        <put name="content" value="/WEB-INF/jsps/authoring/remove-page.jsp" />
-        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+    
+    <definition name=".referers" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/referers.jsp" />
     </definition>
-    <definition name=".Invitations" extends=".tiles-editorpage"  >
-        <put name="content" value="/WEB-INF/jsps/authoring/Invitations.jsp" />
+    
+    
+    <!-- weblog admin pages (and associates) -->
+    <definition name=".WeblogConfig" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/WeblogConfig.jsp" />
+    </definition>
+    
+    <definition name=".WeblogRemoveConfirm" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/WeblogRemoveConfirm.jsp" />
         <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
     </definition>
     
+    <definition name=".ThemeEdit" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/ThemeEdit.jsp" />
+    </definition>
     
-    <!-- global admin pages (and associates) -->
-    <definition name=".rollerProperties" extends=".tiles-adminpage" >
-        <put name="content" value="/WEB-INF/jsps/admin/rollerProperties.jsp" />
+    <definition name=".Templates" extends=".tiles-tabbedpage"  >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/Templates.jsp" />
+        <put name="sidebar" value="/WEB-INF/jsps/authoring/struts2/TemplatesSidebar.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" />
+    </definition>
+    
+    <definition name=".TemplateRemove" extends=".tiles-tabbedpage"  >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/TemplateRemove.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+    </definition>
+    
+    <definition name=".TemplateEditForm" extends=".tiles-tabbedpage"  >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/TemplateEdit.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
     </definition>
-    <definition name=".UserAdmin" extends=".tiles-adminpage" >
-        <put name="content" value="/WEB-INF/jsps/admin/UserAdmin.jsp" />
+    
+    <definition name=".Members" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/Members.jsp" />
+        <put name="sidebar" value="/WEB-INF/jsps/authoring/struts2/MembersSidebar.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp" />
     </definition>
-    <definition name=".CommonPingTargets" extends=".tiles-adminpage" >
-        <put name="content" value="/WEB-INF/jsps/admin/CommonPingTargets.jsp" />
+    
+    <definition name=".MembersInvite" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/MembersInvite.jsp" />
+        <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
     </definition>
-    <definition name=".cacheInfo" extends=".tiles-adminpage" >
-        <put name="content" value="/WEB-INF/jsps/admin/cacheInfo.jsp" />
+    
+    <definition name=".Pings" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/Pings.jsp" />
     </definition>
     
-    <definition name=".CommonPingTargetDeleteOK" extends=".tiles-simplepage" >
-        <put name="content" value="/WEB-INF/jsps/admin/CommonPingTargetDeleteOK.jsp" />
+    <definition name=".CustomPingTargets" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/CustomPingTargets.jsp" />
     </definition>
-    <definition name=".CommonPingTargetEdit" extends=".tiles-simplepage" >
-        <put name="content" value="/WEB-INF/jsps/admin/CommonPingTargetEdit.jsp" />
+    
+    <definition name=".CustomPingTargetConfirm" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/CustomPingTargetConfirm.jsp" />
     </definition>
     
-    <definition name=".PlanetSubscriptions" extends=".tiles-adminpage" >
-        <put name="content" value="/WEB-INF/jsps/admin/PlanetSubscriptions.jsp" />
+    <definition name=".CustomPingTargetAdd" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/CustomPingTargetAdd.jsp" />
     </definition>
-    <definition name=".PlanetConfig" extends=".tiles-adminpage" >
-        <put name="content" value="/WEB-INF/jsps/admin/PlanetConfig.jsp" />
+    
+    <definition name=".CustomPingTargetEdit" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/CustomPingTargetEdit.jsp" />
     </definition>
-    <definition name=".PlanetGroups" extends=".tiles-adminpage" >
-        <put name="content" value="/WEB-INF/jsps/admin/PlanetGroups.jsp" />
+    
+    <definition name=".Maintenance" extends=".tiles-tabbedpage" >
+        <put name="content" value="/WEB-INF/jsps/authoring/struts2/Maintenance.jsp" />
     </definition>
     
     

Modified: roller/branches/roller_4.0_newbackend/web/roller-ui/styles/roller.css
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/roller-ui/styles/roller.css?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/roller-ui/styles/roller.css (original)
+++ roller/branches/roller_4.0_newbackend/web/roller-ui/styles/roller.css Mon May 14 11:41:57 2007
@@ -306,6 +306,12 @@
     vertical-align: top;
     color: black;
 }
+.rollertable_pending td {
+    border: 1px solid #ccc;
+    background: #ffffcc;
+    color: black;
+    vertical-align: top;
+}
 td.rollertable_entry, div.rollertable_entry {
     border: 1px solid #ccc;
     background: inherit;

Modified: roller/branches/roller_4.0_newbackend/web/themes/basic/_day.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/themes/basic/_day.vm?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/themes/basic/_day.vm (original)
+++ roller/branches/roller_4.0_newbackend/web/themes/basic/_day.vm Mon May 14 11:41:57 2007
@@ -17,7 +17,7 @@
         </p>
         <p class="entryInfo">
             Posted at <a href="$url.entry($entry.anchor)">$utils.formatDate($entry.pubTime, "hh:mma MMM dd, yyyy")</a>
-            by $entry.creator.fullName in <span class="category">$entry.category.name</span> &nbsp;|&nbsp;
+            by $entry.creator.screenName in <span class="category">$entry.category.name</span> &nbsp;|&nbsp;
             #if ($utils.isUserAuthorizedToAuthor($entry.website))
                 <a href="$url.editEntry($entry.anchor)">$text.get("macro.weblog.entrypermalink.edit")</a> &nbsp;|&nbsp;
             #end

Modified: roller/branches/roller_4.0_newbackend/web/themes/brushedmetal/_day.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/themes/brushedmetal/_day.vm?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/themes/brushedmetal/_day.vm (original)
+++ roller/branches/roller_4.0_newbackend/web/themes/brushedmetal/_day.vm Mon May 14 11:41:57 2007
@@ -18,7 +18,7 @@
 
         <p class="entryInfo">
             Posted at <a href="$url.entry($entry.anchor)">$utils.formatDate($entry.pubTime, "hh:mma MMM dd, yyyy")</a>
-            by $entry.creator.fullName in <span class="category">$entry.category.name</span> &nbsp;|&nbsp;
+            by $entry.creator.screenName in <span class="category">$entry.category.name</span> &nbsp;|&nbsp;
             #if ($utils.isUserAuthorizedToAuthor($entry.website))
                 <a href="$url.editEntry($entry.anchor)">$text.get("macro.weblog.entrypermalink.edit")</a> &nbsp;|&nbsp;
             #end

Modified: roller/branches/roller_4.0_newbackend/web/themes/frontpage/Weblog.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/themes/frontpage/Weblog.vm?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/themes/frontpage/Weblog.vm (original)
+++ roller/branches/roller_4.0_newbackend/web/themes/frontpage/Weblog.vm Mon May 14 11:41:57 2007
@@ -57,7 +57,7 @@
                                         <a href="$utils.escapeHTML($pinnedEntry.website.URL)">$pinnedEntry.website.name</a>
                                         #if($pinnedEntry.category.name)| $pinnedEntry.category.name #end
                                         #if($pinnedEntry.pubTime) | $utils.formatDate($pinnedEntry.pubTime, $text.get("macro.weblog.date.toStringFormat")) #end
-                                        #if($pinnedEntry.creator.userName)| By $pinnedEntry.creator.userName #end
+                                        #if($pinnedEntry.creator.screenName)| By $pinnedEntry.creator.screenName #end
                                         <br/> 
                                     </p>
                                     <p class="entryDescription">                    

Modified: roller/branches/roller_4.0_newbackend/web/themes/frontpage/_blogprofile.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/themes/frontpage/_blogprofile.vm?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/themes/frontpage/_blogprofile.vm (original)
+++ roller/branches/roller_4.0_newbackend/web/themes/frontpage/_blogprofile.vm Mon May 14 11:41:57 2007
@@ -10,7 +10,7 @@
         </tr>
         <tr>
             <td>Created by</td>
-            <td><$profileWeblog.creator.fullName/td>
+            <td>$profileWeblog.creator.screenName</td>
         </tr>
         <tr>
             <td>Last modified</td>
@@ -30,13 +30,11 @@
     #set($users = $site.getWeblogsUsers($profileWeblog.handle))
     <table width="70%">
         <tr>
-            <td width="25%">Username</td>
-            <td width="75%">Full name</td>
+            <td width="75%">Screen name</td>
         </tr>  
         #foreach($user in $users) 
         <tr>
-            <td>$user.userName</td>
-            <td>$user.fullName</td>
+            <td>$user.screenName</td>
         </tr>
         #end
     </table>
@@ -52,7 +50,7 @@
         </tr> 
         #foreach($entry in $entriesPager.items)
             <tr>
-                <td>$entry.creator.userName</td>
+                <td>$entry.creator.screenName</td>
                 <td>$utils.formatDate($entry.pubTime, $text.get("macro.weblog.date.toStringFormat"))</td>
                 <td><a href="$utils.escapeHTML($entry.permaLink)">
                     $utils.removeHTML($entry.title)</a></td>

Modified: roller/branches/roller_4.0_newbackend/web/themes/frontpage/_entry.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/themes/frontpage/_entry.vm?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/themes/frontpage/_entry.vm (original)
+++ roller/branches/roller_4.0_newbackend/web/themes/frontpage/_entry.vm Mon May 14 11:41:57 2007
@@ -7,7 +7,7 @@
         #if($entry.tags.size() > 0) $entry.getTagsAsString() |#end
         #if($entry.category.name)$entry.category.name |#end
         #if($entry.pubTime) $utils.formatDate($entry.pubTime, $text.get("macro.weblog.date.toStringFormat")) |#end
-        #if($entry.creator.userName) By $entry.creator.userName #end
+        #if($entry.creator.screenName) By $entry.creator.screenName #end
         <br/> 
     </p>
     <p class="entryDescription">                    

Modified: roller/branches/roller_4.0_newbackend/web/themes/sotto/Weblog.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/themes/sotto/Weblog.vm?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/themes/sotto/Weblog.vm (original)
+++ roller/branches/roller_4.0_newbackend/web/themes/sotto/Weblog.vm Mon May 14 11:41:57 2007
@@ -100,7 +100,7 @@
 </div>
 
 <div id="copyrightBoundingBox">
-  <a class="copyright" href="mailto:$utils.encodeEmail($model.weblog.emailAddress)">&copy; $model.weblog.creator.fullName</a>
+  <a class="copyright" href="mailto:$utils.encodeEmail($model.weblog.emailAddress)">&copy; $model.weblog.creator.screenName</a>
 </div>
 
 </body>

Modified: roller/branches/roller_4.0_newbackend/web/themes/sotto/_day.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/themes/sotto/_day.vm?view=diff&rev=537945&r1=537944&r2=537945
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/themes/sotto/_day.vm (original)
+++ roller/branches/roller_4.0_newbackend/web/themes/sotto/_day.vm Mon May 14 11:41:57 2007
@@ -29,7 +29,7 @@
         
 
         <div class="entryInfo">
-            $text.get("macro.weblog.postedby") $entry.creator.userName
+            $text.get("macro.weblog.postedby") $entry.creator.screenName
             <em class="smallText">@ $utils.formatDate($entry.pubTime, "hh:mm aa z")</em>
             #set($commentCount = $entry.commentCount)
             #if($entry.commentsStillAllowed || $commentCount > 0)