Merge lp:~leeturner/quam-plures/num_blogs_config into lp:quam-plures

[Lee Turner]

See this thread for details:

http://forums.quamplures.net/viewtopic.php?f=6&t=668

Removes the hardcoded value and adds a user configurable option to specify the number of blogs to display on the blog menu in the admin console. Defaults to 10.

[EdB (edb)]

Gonna make this as a comment only for the moment. The text on the User Profile page isn't very good IMHO, but I dunno what I think would be better. The thing is my first thought was "why would I limit how many - I want all of them displayed" even though I knew in my head it was referring to how many get displayed before a dropdown menu is created for all blogs beyond the number entered. I'll throw some ideas (if I have any) for the label and note out in the forums.

Otherwise works as advertised and doesn't cause problems and adds coolness so I'm totally okay with marking this "yay+" or whatever means good and doing the merge.

[lp:~leeturner/quam-plures/num_blogs_config]

7615. By Lee Turner <email address hidden> on 2011-08-25

updated text on user settings form

[Lee Turner (leeturner)]

I have updated the text on the user settings form as per EdB's suggestion here:

http://forums.quamplures.net/viewtopic.php?f=6&t=668&start=10#p5969

If anyone else has any further comments on the labels then please comment in the forums.

L

[Tilman Blumenbach (tblue)]

I don't have a better suggestion re. the labels and everything works as advertised, so I'm happy to approve this.

review: Approve

[EdB (edb)]

Tblue you should put Lee on the gatekeepers team.

review: Approve

=== modified file 'qp_inc/users/model/_usersettings.class.php'
--- qp_inc/users/model/_usersettings.class.php	2010-12-31 12:12:03 +0000
+++ qp_inc/users/model/_usersettings.class.php	2011-08-25 19:59:41 +0000
@@ -71,6 +71,8 @@
 		'login_multiple_sessions' => 1, 	// allow multiple concurrent sessions? (PARAMOUNT ON DEMO SERVER)
 
 		'results_per_page' => 20,
+
+		'num_admin_blogs' => 10,
 	);
 
 
@@ -207,4 +209,4 @@
 }
 
 
-?>
\ No newline at end of file
+?>

=== modified file 'qp_inc/users/users.ctrl.php'
--- qp_inc/users/users.ctrl.php	2010-12-31 12:12:03 +0000
+++ qp_inc/users/users.ctrl.php	2011-08-25 19:59:41 +0000
@@ -329,6 +329,7 @@
 			param( 'edited_user_bozo', 'integer', 0 );
 			param( 'edited_user_focusonfirst', 'integer', 0 );
 			param( 'edited_user_results_per_page', 'integer', null );
+			param( 'edited_user_num_admin_blogs', 'integer', null );
 
 			/**
 			 * @todo EdB: probably don't need the messages->count(error) bit
@@ -404,6 +405,11 @@
 			{
 				$UserSettings->set( 'results_per_page', $edited_user_results_per_page, $edited_User->ID );
 			}
+			// Number of blogs to display in admin
+			if( isset($edited_user_num_admin_blogs) )
+			{
+				$UserSettings->set( 'num_admin_blogs', $edited_user_num_admin_blogs, $edited_User->ID );
+			}
 
 			// Update user settings:
 			if( $UserSettings->dbupdate() )

=== modified file 'qp_inc/users/views/_user.form.php'
--- qp_inc/users/views/_user.form.php	2010-12-31 12:12:03 +0000
+++ qp_inc/users/views/_user.form.php	2011-08-25 19:59:41 +0000
@@ -238,7 +238,9 @@
 
 		// Number of results per page
 		$Form->text( 'edited_user_results_per_page', $UserSettings->get( 'results_per_page', $edited_User->ID ), 3, T_('Results per page'), T_('Number of rows displayed in results tables.') );
-
+		
+		// Number of blogs to display in the admin
+		$Form->text( 'edited_user_num_admin_blogs', $UserSettings->get( 'num_admin_blogs', $edited_User->ID ), 2, T_('Blog menu length'), T_('Number of blogs displayed in the admin console before using a select box') );
 	}
 	else
 	{ // display only

=== modified file 'qp_view_admin/_adminUI_general.class.php'
--- qp_view_admin/_adminUI_general.class.php	2011-01-09 17:19:59 +0000
+++ qp_view_admin/_adminUI_general.class.php	2011-08-25 19:59:41 +0000
@@ -532,9 +532,9 @@
 	 */
 	function get_bloglist_buttons( $title = '' )
 	{
-		global $current_User, $blog, $pagenow;
+		global $current_User, $blog, $pagenow, $UserSettings;
 
-		$max_buttons = 7;
+		$max_buttons = $UserSettings->get('num_admin_blogs', $current_User->ID );
 
 		if( empty( $this->coll_list_permname ) )
 		{	// We have not requested a list of blogs to be displayed