Quam Plures

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

  1. plugins_no_subgroups
  2. Merge into trunk
Proposed by EdB
Status: Merged
Merged at revision: 7632
Proposed branch: lp:~edb/quam-plures/plugins_no_subgroups
Merge into: lp:quam-plures
Diff against target: 192 lines (+2/-75)
8 files modified
qp_inc/plugins/_plugin.class.php (+1/-5)
qp_inc/plugins/model/_plugins.class.php (+1/-23)
qp_inc/plugins/model/_plugins_admin.class.php (+0/-7)
qp_inc/plugins/views/_plugin_list_available.view.php (+0/-13)
qp_plugins/comment_gravatars_plugin/_comment_gravatars.plugin.php (+0/-1)
qp_plugins/test_plugin/_test.plugin.php (+0/-1)
qp_plugins/tinymce_plugin/_tinymce.plugin.php (+0/-1)
qp_view_admin/admin.global.css (+0/-24)
To merge this branch: bzr merge lp:~edb/quam-plures/plugins_no_subgroups
Reviewer Review Type Date Requested Status
Lee Turner (community) Approve
Tilman Blumenbach (community) Approve
Review via email: mp+73238@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Tilman Blumenbach (tblue) wrote :

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
Revision history for this message
EdB (edb) wrote :

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 updated
7620. By EdB

core to 7620, removed the PluginsSubGroup CSS rules

7621. By EdB

core to 7624

Revision history for this message
Lee Turner (leeturner) wrote :

Can't see any problems with this one

review: Approve
Revision history for this message
EdB (edb) wrote :

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 updated
7622. By EdB

core to 7628

Revision history for this message
EdB (edb) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
104 * Accepts any value you want, but please pick from the following:104 * Accepts any value you want, but please pick from the following:
105 * "toolbars, widgets, renderers, antispam, pingers, tools, comments, other"105 * "toolbars, widgets, renderers, antispam, pingers, tools, comments, other"
106 *106 *
107 * When there is a sub_group under 'other' with more than one plugin we
108 * will add that to the list of choices above. That way each 'group' will
109 * have at least 2 plugins in it ... and no subgroup will ever have 2 :)
110 *
111 * @var string107 * @var string
112 */108 */
113 var $group;109 var $group;
@@ -115,7 +111,7 @@
115 /**111 /**
116 * Sub-Group of the plugin.112 * Sub-Group of the plugin.
117 *113 *
118 * Use only if sub_group if group is "other"114 * OBSOLETE AND UN-USED! Left here only to not cause havoc with existing plugins
119 *115 *
120 * @var string116 * @var string
121 */117 */
122118
=== 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 @@
194194
195195
196 /**196 /**
197 * Will return an array that contents are references to plugins that have the same group, regardless of the sub_group.197 * Will return an array that contents are references to plugins that have the same group.
198 *198 *
199 * @return array199 * @return array
200 */200 */
@@ -216,28 +216,6 @@
216216
217217
218 /**218 /**
219 * Will return an array that contents are references to plugins that have the same group and sub_group.
220 *
221 * @return array
222 */
223 function get_Plugins_in_sub_group( $group, $sub_group = '' )
224 {
225 $result = array();
226
227 foreach( $this->sorted_IDs as $plugin_ID )
228 {
229 $Plugin = & $this->get_by_ID( $plugin_ID );
230 if( $Plugin->group == $group && $Plugin->sub_group == $sub_group )
231 {
232 $result[] = & $Plugin;
233 }
234 }
235
236 return $result;
237 }
238
239
240 /**
241 * Sets the status of a Plugin in DB and registers it into the internal indices when "enabled".219 * Sets the status of a Plugin in DB and registers it into the internal indices when "enabled".
242 * Otherwise it gets unregistered, but only when we're not in {@link Plugins_admin}, because we220 * Otherwise it gets unregistered, but only when we're not in {@link Plugins_admin}, because we
243 * want to keep it in then in our indices.221 * want to keep it in then in our indices.
244222
=== 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 @@
1135 return $r;1135 return $r;
1136 }1136 }
11371137
1138 // Compare Sub Group
1139 $r = strcasecmp( $a_Plugin->sub_group, $b_Plugin->sub_group );
1140 if( $r != 0 )
1141 {
1142 return $r;
1143 }
1144
1145 // Compare Name1138 // Compare Name
1146 return strcasecmp( $a_Plugin->name, $b_Plugin->name );1139 return strcasecmp( $a_Plugin->name, $b_Plugin->name );
1147 }1140 }
11481141
=== 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 @@
80$AvailablePlugins->sort('group');80$AvailablePlugins->sort('group');
81// Grouping81// Grouping
82$current_group = false; // False so it does the header once82$current_group = false; // False so it does the header once
83$current_sub_group = '';
8483
85$number_of_groups = count($AvailablePlugins->get_plugin_groups());84$number_of_groups = count($AvailablePlugins->get_plugin_groups());
8685
@@ -90,7 +89,6 @@
90 if( $loop_Plugin->group !== $current_group && $number_of_groups )89 if( $loop_Plugin->group !== $current_group && $number_of_groups )
91 { // Reason why $current_group is false90 { // Reason why $current_group is false
92 $current_group = $loop_Plugin->group;91 $current_group = $loop_Plugin->group;
93 $current_sub_group = '';
94 ?>92 ?>
95 <tr class="group">93 <tr class="group">
96 <td colspan="5" class="first"><?php94 <td colspan="5" class="first"><?php
@@ -107,17 +105,6 @@
107 <?php105 <?php
108 }106 }
109107
110 if( $loop_Plugin->sub_group != $current_sub_group )
111 {
112 $current_sub_group = $loop_Plugin->sub_group;
113 ?>
114 <tr class="PluginsSubGroup">
115 <th colspan="5"><?php echo $current_sub_group; ?></th>
116 </tr>
117 <?php
118 }
119
120 // fp> TODO: support for table.grouped tr.PluginsSubGroup td.firstcol (maybe... subgroups seem crazy anyway - where does it stop?).
121 $Table->display_line_start();108 $Table->display_line_start();
122109
123 $Table->display_col_start();110 $Table->display_col_start();
124111
=== 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 @@
31 var $author_url = 'http://www.bushleaguecritic.com/';31 var $author_url = 'http://www.bushleaguecritic.com/';
32 var $code = 'comment_gravatars';32 var $code = 'comment_gravatars';
33 var $group = 'comments';33 var $group = 'comments';
34 var $sub_group; // used if $group is 'other'
35 var $number_of_installs = 1;34 var $number_of_installs = 1;
36 var $priority = 50;35 var $priority = 50;
37 var $version = '0.1';36 var $version = '0.1';
3837
=== 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 @@
55 var $author_url = 'http://yourdomain.tld/';55 var $author_url = 'http://yourdomain.tld/';
56 var $code = 'test';56 var $code = 'test';
57 var $group = 'other';57 var $group = 'other';
58 var $sub_group = 'plugin demo'; // used if $group is 'other'
59 var $number_of_installs = 1;58 var $number_of_installs = 1;
60 var $priority = 50;59 var $priority = 50;
61 var $version = '0.2';60 var $version = '0.2';
6261
=== 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 @@
28{28{
29 var $code = 'tinymce';29 var $code = 'tinymce';
30 var $group = 'other';30 var $group = 'other';
31 var $sub_group = 'editor'; // used if $group is 'other'
32 var $number_of_installs = 1;31 var $number_of_installs = 1;
33 var $priority = 10;32 var $priority = 10;
34 var $version = '0.1';33 var $version = '0.1';
3534
=== 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 @@
213 color: #FF0000;213 color: #FF0000;
214}214}
215215
216
217/*
218 * Grouping of plugins:
219 */
220table.grouped tr.PluginsSubGroup {
221 text-align:left;
222}
223
224table.grouped tr.PluginsSubGroup th {
225 border-left:none;
226 border-bottom: 1px solid #9e9286;
227 border-top: 1px solid #9e9286;
228 background-color: #efede0;
229 color:#666666;
230}
231
232table.grouped tr.PluginsSubGroup th,
233table.grouped tr.PluginsSubGroup td.firstcol {
234 padding-left:15px;
235}
236
237/* / Grouping of plugins */
238
239
240/* Template screenshots */216/* Template screenshots */
241div.screenshot {217div.screenshot {
242 float: left;218 float: left;

Subscribers

People subscribed via source and target branches