aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2011-09-13 21:14:11 -0400
committerCash Costello <cash.costello@gmail.com>2011-09-13 21:14:11 -0400
commit3161a7b0b27508066f26b8cd920b1817f23beeef (patch)
tree950b5490d197a85ea0a614402ec8ce71a86ef496
parent50aa0ce357fd307ac2623e96f22d7c0f973b22ff (diff)
downloadelgg-3161a7b0b27508066f26b8cd920b1817f23beeef.tar.gz
elgg-3161a7b0b27508066f26b8cd920b1817f23beeef.tar.bz2
Fixes #3623 added non-bundled filter option for plugins
-rw-r--r--languages/en.php1
-rw-r--r--views/default/admin/plugins.php11
2 files changed, 12 insertions, 0 deletions
diff --git a/languages/en.php b/languages/en.php
index ab3c523de..6e07b256b 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -601,6 +601,7 @@ $english = array(
'admin:plugins:category:inactive' => 'Inactive plugins',
'admin:plugins:category:admin' => 'Admin',
'admin:plugins:category:bundled' => 'Bundled',
+ 'admin:plugins:category:nonbundled' => 'Non-bundled',
'admin:plugins:category:content' => 'Content',
'admin:plugins:category:development' => 'Development',
'admin:plugins:category:enhancement' => 'Enhancements',
diff --git a/views/default/admin/plugins.php b/views/default/admin/plugins.php
index cd0b83c00..62e6f556a 100644
--- a/views/default/admin/plugins.php
+++ b/views/default/admin/plugins.php
@@ -45,6 +45,11 @@ foreach ($installed_plugins as $id => $plugin) {
unset($installed_plugins[$id]);
}
break;
+ case 'nonbundled':
+ if (in_array('bundled', $plugin_categories)) {
+ unset($installed_plugins[$id]);
+ }
+ break;
default:
if (!in_array($show_category, $plugin_categories)) {
unset($installed_plugins[$id]);
@@ -96,10 +101,16 @@ switch ($sort) {
asort($categories);
+// we want bundled/nonbundled pulled to be at the top of the list
+unset($categories['bundled']);
+unset($categories['nonbundled']);
+
$common_categories = array(
'all' => elgg_echo('admin:plugins:category:all'),
'active' => elgg_echo('admin:plugins:category:active'),
'inactive' => elgg_echo('admin:plugins:category:inactive'),
+ 'bundled' => elgg_echo('admin:plugins:category:bundled'),
+ 'nonbundled' => elgg_echo('admin:plugins:category:nonbundled'),
);
$categories = array_merge($common_categories, $categories);