Merge lp:~edb/quam-plures/plugins_no_subgroups into lp:quam-plures

[EdB]

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

2) Get rid of sub-group. Just not bother to have it or use it.

[Tilman Blumenbach (tblue)]

Looks and works fine, but please remove the PluginsSubGroup CSS rules from qp_view_admin/admin.global.css as well (lines 217-237).

review: Approve

[EdB (edb)]

will do. needs fixin till then as I'd hate to forget I need to tidy up something.

I believe we have lots of styles that have no value anymore. unrelated example is the idea of forms with less room for labels and more for the other side. I think we have the styles but never use them. So yeah cleanup of css needs to be part of the branch.

Good catch :)

[lp:~edb/quam-plures/plugins_no_subgroups]

7620. By EdB on 2011-09-01

core to 7620, removed the PluginsSubGroup CSS rules

7621. By EdB on 2011-09-01

core to 7624

[Lee Turner (leeturner)]

Can't see any problems with this one

review: Approve

[EdB (edb)]

I am adding core updates AND retesting everything I have in merge just to be sure, but it is taking a long time due to many conflicts this time around. Will send another comment when I got them back up to speed.

[lp:~edb/quam-plures/plugins_no_subgroups]

7622. By EdB on 2011-09-04

core to 7628

[EdB (edb)]

Okay cool. This one is good to go - no issues when re-testing after merging from core.

=== modified file 'qp_inc/plugins/_plugin.class.php'
--- qp_inc/plugins/_plugin.class.php	2011-09-04 02:17:13 +0000
+++ qp_inc/plugins/_plugin.class.php	2011-09-04 22:28:35 +0000
@@ -104,10 +104,6 @@
 	 * Accepts any value you want, but please pick from the following:
 	 * "toolbars, widgets, renderers, antispam, pingers, tools, comments, other"
 	 *
-	 * When there is a sub_group under 'other' with more than one plugin we
-	 * will add that to the list of choices above.  That way each 'group' will
-	 * have at least 2 plugins in it ... and no subgroup will ever have 2 :)
-	 *
 	 * @var string
 	 */
 	var $group;
@@ -115,7 +111,7 @@
 	/**
 	 * Sub-Group of the plugin.
 	 *
-	 * Use only if sub_group if group is "other"
+	 * OBSOLETE AND UN-USED! Left here only to not cause havoc with existing plugins
 	 *
 	 * @var string
 	 */

=== modified file 'qp_inc/plugins/model/_plugins.class.php'
--- qp_inc/plugins/model/_plugins.class.php	2011-08-31 20:47:52 +0000
+++ qp_inc/plugins/model/_plugins.class.php	2011-09-04 22:28:35 +0000
@@ -194,7 +194,7 @@
 
 
 	/**
-	 * Will return an array that contents are references to plugins that have the same group, regardless of the sub_group.
+	 * Will return an array that contents are references to plugins that have the same group.
 	 *
 	 * @return array
 	 */
@@ -216,28 +216,6 @@
 
 
 	/**
-	 * Will return an array that contents are references to plugins that have the same group and sub_group.
-	 *
-	 * @return array
-	 */
-	function get_Plugins_in_sub_group( $group, $sub_group = '' )
-	{
-		$result = array();
-
-		foreach( $this->sorted_IDs as $plugin_ID )
-		{
-			$Plugin = & $this->get_by_ID( $plugin_ID );
-			if( $Plugin->group == $group && $Plugin->sub_group == $sub_group )
-			{
-				$result[] = & $Plugin;
-			}
-		}
-
-		return $result;
-	}
-
-
-	/**
 	 * Sets the status of a Plugin in DB and registers it into the internal indices when "enabled".
 	 * Otherwise it gets unregistered, but only when we're not in {@link Plugins_admin}, because we
 	 * want to keep it in then in our indices.

=== modified file 'qp_inc/plugins/model/_plugins_admin.class.php'
--- qp_inc/plugins/model/_plugins_admin.class.php	2011-09-03 13:05:37 +0000
+++ qp_inc/plugins/model/_plugins_admin.class.php	2011-09-04 22:28:35 +0000
@@ -1135,13 +1135,6 @@
 			return $r;
 		}
 
-		// Compare Sub Group
-		$r = strcasecmp( $a_Plugin->sub_group, $b_Plugin->sub_group );
-		if( $r != 0 )
-		{
-			return $r;
-		}
-
 		// Compare Name
 		return strcasecmp( $a_Plugin->name, $b_Plugin->name );
 	}

=== modified file 'qp_inc/plugins/views/_plugin_list_available.view.php'
--- qp_inc/plugins/views/_plugin_list_available.view.php	2011-09-03 13:05:37 +0000
+++ qp_inc/plugins/views/_plugin_list_available.view.php	2011-09-04 22:28:35 +0000
@@ -80,7 +80,6 @@
 $AvailablePlugins->sort('group');
 // Grouping
 $current_group = false; // False so it does the header once
-$current_sub_group = '';
 
 $number_of_groups = count($AvailablePlugins->get_plugin_groups());
 
@@ -90,7 +89,6 @@
 	if( $loop_Plugin->group !== $current_group && $number_of_groups )
 	{ // Reason why $current_group is false
 		$current_group = $loop_Plugin->group;
-		$current_sub_group = '';
 		?>
 		<tr class="group">
 			<td colspan="5" class="first"><?php
@@ -107,17 +105,6 @@
 		<?php
 	}
 
-	if( $loop_Plugin->sub_group != $current_sub_group )
-	{
-		$current_sub_group = $loop_Plugin->sub_group;
-		?>
-		<tr class="PluginsSubGroup">
-			<th colspan="5"><?php echo $current_sub_group; ?></th>
-		</tr>
-		<?php
-	}
-
-	// fp> TODO: support for table.grouped tr.PluginsSubGroup td.firstcol (maybe... subgroups seem crazy anyway - where does it stop?).
 	$Table->display_line_start();
 
 		$Table->display_col_start();

=== modified file 'qp_plugins/comment_gravatars_plugin/_comment_gravatars.plugin.php'
--- qp_plugins/comment_gravatars_plugin/_comment_gravatars.plugin.php	2011-07-20 06:26:28 +0000
+++ qp_plugins/comment_gravatars_plugin/_comment_gravatars.plugin.php	2011-09-04 22:28:35 +0000
@@ -31,7 +31,6 @@
 	var $author_url = 'http://www.bushleaguecritic.com/';
 	var $code = 'comment_gravatars';
 	var $group = 'comments';
-	var $sub_group; // used if $group is 'other'
 	var $number_of_installs = 1;
 	var $priority = 50;
 	var $version = '0.1';

=== modified file 'qp_plugins/test_plugin/_test.plugin.php'
--- qp_plugins/test_plugin/_test.plugin.php	2011-06-18 22:22:09 +0000
+++ qp_plugins/test_plugin/_test.plugin.php	2011-09-04 22:28:35 +0000
@@ -55,7 +55,6 @@
 	var $author_url = 'http://yourdomain.tld/';
 	var $code = 'test';
 	var $group = 'other';
-	var $sub_group = 'plugin demo'; // used if $group is 'other'
 	var $number_of_installs = 1;
 	var $priority = 50;
 	var $version = '0.2';

=== modified file 'qp_plugins/tinymce_plugin/_tinymce.plugin.php'
--- qp_plugins/tinymce_plugin/_tinymce.plugin.php	2011-03-14 09:38:23 +0000
+++ qp_plugins/tinymce_plugin/_tinymce.plugin.php	2011-09-04 22:28:35 +0000
@@ -28,7 +28,6 @@
 {
 	var $code = 'tinymce';
 	var $group = 'other';
-	var $sub_group = 'editor'; // used if $group is 'other'
 	var $number_of_installs = 1;
 	var $priority = 10;
 	var $version = '0.1';

=== modified file 'qp_view_admin/admin.global.css'
--- qp_view_admin/admin.global.css	2010-09-07 07:48:45 +0000
+++ qp_view_admin/admin.global.css	2011-09-04 22:28:35 +0000
@@ -213,30 +213,6 @@
 	color: #FF0000;
 }
 
-
-/*
- * Grouping of plugins:
- */
-table.grouped tr.PluginsSubGroup {
-	text-align:left;
-}
-
-table.grouped tr.PluginsSubGroup th {
-	border-left:none;
-	border-bottom: 1px solid #9e9286;
-	border-top: 1px solid #9e9286;
-	background-color: #efede0;
-	color:#666666;
-}
-
-table.grouped tr.PluginsSubGroup th,
-table.grouped tr.PluginsSubGroup td.firstcol {
-	padding-left:15px;
-}
-
-/* / Grouping of plugins */
-
-
 /* Template screenshots */
 div.screenshot {
 	float: left;