[pLog-svn] r5698 - in plog/trunk: class/action/admin locale/admin templates/admin

oscar at devel.lifetype.net oscar at devel.lifetype.net
Fri Jul 20 16:58:11 EDT 2007


Author: oscar
Date: 2007-07-20 16:58:11 -0400 (Fri, 20 Jul 2007)
New Revision: 5698

Modified:
   plog/trunk/class/action/admin/admincontrolcenteraction.class.php
   plog/trunk/locale/admin/locale_en_UK.php
   plog/trunk/templates/admin/menus.xml
Log:
Reorganized the menus according to the discussion early this week, and updated the locale file accordingly.


Modified: plog/trunk/class/action/admin/admincontrolcenteraction.class.php
===================================================================
--- plog/trunk/class/action/admin/admincontrolcenteraction.class.php	2007-07-20 20:46:02 UTC (rev 5697)
+++ plog/trunk/class/action/admin/admincontrolcenteraction.class.php	2007-07-20 20:58:11 UTC (rev 5698)
@@ -26,12 +26,7 @@
          */
         function perform()
         {
-        	// create the view, which will take care of fetching the right data
-        	$this->_view = new AdminTemplatedView( $this->_blogInfo, "controlcenter" );
-            $this->setCommonData();
-
-            // better to return true if everything fine
-            return true;
+			AdminController::setForwardAction( "blogSettings" );
         }
     }
 ?>

Modified: plog/trunk/locale/admin/locale_en_UK.php
===================================================================
--- plog/trunk/locale/admin/locale_en_UK.php	2007-07-20 20:46:02 UTC (rev 5697)
+++ plog/trunk/locale/admin/locale_en_UK.php	2007-07-20 20:58:11 UTC (rev 5698)
@@ -28,7 +28,6 @@
 $messages['in'] = 'In';
 
 // menu options
-$messages['newPost'] = 'New Post';
 $messages['Manage'] = 'Manage';
 $messages['managePosts'] = 'Manage Posts';
 $messages['editPosts'] = 'Posts';
@@ -45,21 +44,16 @@
 $messages['blogCustomFields'] = 'Custom Fields';
 $messages['newCustomField'] = 'New Custom Field';
 $messages['resourceCenter'] = 'Media';
-$messages['resources'] = 'Resources';
+
 $messages['newResourceAlbum'] = 'New Album';
 $messages['newResource'] = 'New Resource';
-$messages['controlCenter'] = 'Control Centre';
 $messages['manageSettings'] = 'Settings';
-$messages['blogSettings'] = 'Blog Settings';
-$messages['userSettings'] = 'User Settings';
+
 $messages['pluginCenter'] = 'Plugin Centre';
 $messages['Stats'] = 'Statistics';
 $messages['manageBlogUsers'] = 'Manage Blog Users';
 $messages['newBlogUser'] = 'New Blog User';
-$messages['showBlogUsers'] = 'Blog Users';
-$messages['manageBlogTemplates'] = 'Blog Templates';
 $messages['newBlogTemplate'] = 'New Blog Template';
-$messages['blogTemplates'] = 'Blog Templates';
 $messages['adminSettings'] = 'Administration';
 $messages['Users'] = 'Users';
 $messages['createUser'] = 'Create User';
@@ -1265,5 +1259,16 @@
 // added in LT 1.3
 ////
 $messages['error_incorrect_value'] = 'The value is not correct';
+$messages['error_updating_comment2'] = 'There was an error updating the comment';
+$messages['error_invalid_ip_address'] = 'The IP address is not valid';
 
+$messages["Content"] = "Content";
+$messages['newPost'] = 'Write';
+$messages['resources'] = 'Media';
+$messages['controlCenter'] = 'Settings';
+$messages['blogSettings'] = 'Blog';
+$messages['userSettings'] = 'My Profile';
+$messages['showBlogUsers'] = 'Users';
+$messages['showBlogLocations'] = 'Locations';
+$messages['blogTemplates'] = 'Templates';
 ?>
\ No newline at end of file

Modified: plog/trunk/templates/admin/menus.xml
===================================================================
--- plog/trunk/templates/admin/menus.xml	2007-07-20 20:46:02 UTC (rev 5697)
+++ plog/trunk/templates/admin/menus.xml	2007-07-20 20:58:11 UTC (rev 5698)
@@ -1,5 +1,5 @@
 <menu url="?op=Dashboard" localeId="dashboard"> 
-	<Manage url="?op=editPosts">
+	<Content url="?op=editPosts">
 	    <managePosts ignoreBreadCrumbs="1" orPerms="add_post,view_posts,add_category,view_categories,view_comments,view_trackbacks">
 	       <newPost url="?op=newPost" andPerms="add_post" />	
 	       <editPosts url="?op=editPosts" andPerms="view_posts" />
@@ -9,7 +9,7 @@
 		   <editLinkCategories url="?op=editLinkCategories" andPerms="view_link_categories" />	
 		  <blogCustomFields url="?op=blogCustomFields" andPerms="view_custom_fields" />		
  		</managePosts>
-	</Manage>
+	</Content>
 	<resources url="?op=resources" andPerms="view_resources" />
 	<friendManagement url="?op=friendManagement">
 	  <manageFriends ignoreBreadCrumbs="1">
@@ -25,22 +25,12 @@
 	  </managePrivateMessages>
 	</friendManagement>
 	<controlCenter url="?op=controlCenter">
-	    <manageSettings ignoreBreadCrumbs="1"> 
   		  <blogSettings url="?op=blogSettings" andPerms="update_blog" />	
 		  <userSettings url="?op=userSettings" />
 		  <Stats url="?op=Stats" andPerms="view_blog_stats" />
-		</manageSettings>
-		<manageBlogUsers ignoreBreadCrumbs="1" orPerms="add_blog_user,view_blog_users"> 
-		  <newBlogUser url="?op=newBlogUser" andPerms="add_blog_user" />
-		  <showBlogUsers url="?op=showBlogUsers" andPerms="view_blog_users" />
-		 </manageBlogUsers>
-		<manageBlogLocations ignoreBreadCrumbs="1" andPerms=""> 
+		  <showBlogUsers url="?op=showBlogUsers" orPerms="add_blog_user,view_blog_users" />
 		  <showBlogLocations url="?op=showBlogLocations" andPerms="" />
-		 </manageBlogLocations>		
-		 <manageBlogTemplates ignoreBreadCrumbs="1" orPerms="add_blog_template,view_blog_templates"> 
-		  <newBlogTemplate url="?op=newBlogTemplate" andPerms="add_blog_template" />
-		  <blogTemplates url="?op=blogTemplates" andPerms="view_blog_templates" />
-		 </manageBlogTemplates> 
+		  <blogTemplates url="?op=blogTemplates" orPerms="add_blog_template,view_blog_templates" />
 	</controlCenter>
 	<adminSettings url="?op=adminSettings" admin="1" orPerms="add_user,view_users,add_permission,view_permissions,add_site_blog,view_site_blogs,add_blog_category,view_blog_categories,add_locale,view_locales,add_template,view_templates,add_global_category,view_global_categories,view_global_settings,view_plugins,update_plugin_settings,purge_data">
 		<Users ignoreBreadCrumbs="1" orPerms="add_user,view_users,add_permission,view_permissions" admin="1">



More information about the pLog-svn mailing list