Added category and name as valid plugin manifest keys/values.

git-svn-id: http://code.elgg.org/elgg/trunk@5629 36083f99-b078-4883-b0ff-0f9b5a30f544

2 files changed, 31 insertions, 4 deletions

diff --git a/views/default/admin/plugins.php b/views/default/admin/plugins.php
index a2bc99b1c..d92c837f6 100644
--- a/views/default/admin/plugins.php
+++ b/views/default/admin/plugins.php
@@ -12,11 +12,35 @@ global $CONFIG;
 
 $ts = time();
 $token = generate_action_token($ts);
+$categories = array_merge(array('' => elgg_echo('admin:plugins:categories:all')), $vars['categories']);
+
+$category_pulldown = elgg_view('input/pulldown', array(
+	'internalname' => 'category',
+	'options_values' => $categories,
+	'value' => $vars['show_category']
+));
+
+$category_button = elgg_view('input/button', array(
+	'value' => elgg_echo('filter'),
+	'class' => 'action_button'
+));
+
+$category_form = elgg_view('input/form', array(
+	'body' => $category_pulldown . $category_button
+));
 
 // Page Header elements
 $title = elgg_view_title(elgg_echo('admin:plugins'));
-$buttons = "<a class='action_button' href=\"{$CONFIG->url}action/admin/plugins/enableall?__elgg_token=$token&amp;__elgg_ts=$ts\">".elgg_echo('enableall')."</a>";
-$buttons .= "<a class='action_button' href=\"{$CONFIG->url}action/admin/plugins/disableall?__elgg_token=$token&amp;__elgg_ts=$ts\">".elgg_echo('disableall')."</a> ";
+
+// @todo Until "en/disable all" means "All plugins on this page" hide when not looking at all.
+if (!isset($vars['show_category']) || empty($vars['show_category'])) {
+	$buttons = "<a class='action_button' href=\"{$CONFIG->url}action/admin/plugins/enableall?__elgg_token=$token&amp;__elgg_ts=$ts\">".elgg_echo('enableall')."</a>  <a class='action_button disabled' href=\"{$CONFIG->url}action/admin/plugins/disableall?__elgg_token=$token&amp;__elgg_ts=$ts\">".elgg_echo('disableall')."</a> ";
+	$buttons .= "<br /><br />";
+} else {
+	$buttons = '';
+}
+
+$buttons .= $category_form;
 
 // construct page header
 ?>
@@ -45,4 +69,4 @@ $n = 0;
 foreach ($installed_plugins as $plugin => $data) {
 	echo elgg_view("admin/plugins_opt/plugin", array('plugin' => $plugin, 'details' => $data, 'maxorder' => $max, 'order' => array_search($plugin, $plugin_list)));
 	$n++;
-}
\ No newline at end of file
+}
diff --git a/views/default/admin/plugins_opt/plugin.php b/views/default/admin/plugins_opt/plugin.php
index 6184580d8..c03477bea 100644
--- a/views/default/admin/plugins_opt/plugin.php
+++ b/views/default/admin/plugins_opt/plugin.php
@@ -17,6 +17,8 @@ $details = $vars['details'];
 $active = $details['active'];
 $manifest = $details['manifest'];
 
+$plugin_pretty_name = (isset($manifest['name'])) ? $manifest['name'] : $plugin;
+
 // Check elgg version if available
 $version_check_valid = false;
 if ($manifest['elgg_version']) {
@@ -64,7 +66,7 @@ $token = generate_action_token($ts);
 		<?php } ?>
 	</div>
 
-	<h3><?php echo $plugin; ?><?php if (elgg_view("settings/{$plugin}/edit")) { ?> <a class="plugin_settings small link" onclick="elgg_slide_toggle(this,'.plugin_details','.pluginsettings');">[<?php echo elgg_echo('settings'); ?>]</a><?php } ?></h3>
+	<h3><?php echo $plugin_pretty_name; ?><?php if (elgg_view("settings/{$plugin}/edit")) { ?> <a class="plugin_settings small link" onclick="elgg_slide_toggle(this,'.plugin_details','.pluginsettings');">[<?php echo elgg_echo('settings'); ?>]</a><?php } ?></h3>
 
 	<?php if (elgg_view("settings/{$plugin}/edit")) { ?>
 	<div class="pluginsettings hidden">
@@ -101,6 +103,7 @@ $token = generate_action_token($ts);
 			?>
 		</div>
 		<?php } ?>
+		<div><?php echo elgg_echo('admin:plugins:label:directory') . ": ". htmlspecialchars($plugin) ?></div>
 		<div><?php echo elgg_echo('admin:plugins:label:version') . ": ". htmlspecialchars($manifest['version']) ?></div>
 		<div><?php echo elgg_echo('admin:plugins:label:author') . ": ". htmlspecialchars($manifest['author']) ?></div>
 		<div><?php echo elgg_echo('admin:plugins:label:copyright') . ": ". htmlspecialchars($manifest['copyright']) ?></div>