5 files changed, 2 insertions, 300 deletions

diff --git a/views/default/admin/components/invalid_plugin.php b/views/default/admin/components/invalid_plugin.php
deleted file mode 100644
index 97c1bacf4..000000000
--- a/views/default/admin/components/invalid_plugin.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Displays an invalid plugin on the admin screen.
- *
- * An invalid plugin is a plugin whose isValid() method returns false.
- * This usually means there are required files missing, unreadable or in the
- * wrong format.
- *
- * @package Elgg.Core
- * @subpackage Plugins
- */
-
-$plugin = elgg_extract('plugin', $vars);
-$id = $plugin->getID();
-$path = htmlspecialchars($plugin->getPath());
-$message = elgg_echo('admin:plugins:warning:invalid', array($id));
-
-?>
-
-<div class="elgg-plugin elgg-state-inactive elgg-state-error">
-	<p><?php echo $message; ?></p>
-	<p><?php echo elgg_echo('admin:plugins:label:location') . ": " . $path; ?></p>
-</div>
diff --git a/views/default/admin/components/plugin.php b/views/default/admin/components/plugin.php
deleted file mode 100644
index 7549ea8ca..000000000
--- a/views/default/admin/components/plugin.php
+++ /dev/null
@@ -1,221 +0,0 @@
-<?php
-/**
- * Displays a plugin on the admin screen.
- *
- * This file renders a plugin for the admin screen, including active/deactive,
- * manifest details & display plugin settings.
- *
- * @package Elgg.Core
- * @subpackage Plugins
- */
-
-$plugin = $vars['plugin'];
-$priority = $plugin->getPriority();
-$active = $plugin->isActive();
-
-$name = $plugin->manifest->getName();
-$can_activate = $plugin->canActivate();
-$max_priority = elgg_get_max_plugin_priority();
-$actions_base = '/action/admin/plugins/';
-
-$ts = time();
-$token = generate_action_token($ts);
-$active_class = ($active && $can_activate) ? 'elgg-state-active' : 'elgg-state-inactive';
-
-// build reordering links
-$links = '';
-
-// top and up link only if not at top
-if ($priority > 1) {
-	$top_url = elgg_http_add_url_query_elements($actions_base . 'set_priority', array(
-		'plugin_guid' => $plugin->guid,
-		'priority' => 'first',
-		'is_action' => true
-	));
-
-	$links .= "<li>" . elgg_view('output/url', array(
-		'href' 		=> $top_url,
-		'text'		=> elgg_echo('top'),
-		'is_action'	=> true
-	)) . "</li>";
-
-	$up_url = elgg_http_add_url_query_elements($actions_base . 'set_priority', array(
-		'plugin_guid' => $plugin->guid,
-		'priority' => '-1',
-		'is_action' => true
-	));
-
-	$links .= "<li>" . elgg_view('output/url', array(
-		'href' 		=> $up_url,
-		'text'		=> elgg_echo('up'),
-		'is_action'	=> true
-	)) . "</li>";
-}
-
-// down and bottom links only if not at bottom
-if ($priority < $max_priority) {
-	$down_url = elgg_http_add_url_query_elements($actions_base . 'set_priority', array(
-		'plugin_guid' => $plugin->guid,
-		'priority' => '+1',
-		'is_action' => true
-	));
-
-	$links .= "<li>" . elgg_view('output/url', array(
-		'href' 		=> $down_url,
-		'text'		=> elgg_echo('down'),
-		'is_action'	=> true
-	)) . "</li>";
-
-	$bottom_url = elgg_http_add_url_query_elements($actions_base . 'set_priority', array(
-		'plugin_guid' => $plugin->guid,
-		'priority' => 'last',
-		'is_action' => true
-	));
-
-	$links .= "<li>" . elgg_view('output/url', array(
-		'href' 		=> $bottom_url,
-		'text'		=> elgg_echo('bottom'),
-		'is_action'	=> true
-	)) . "</li>";
-}
-
-// activate / deactivate links
-if ($can_activate) {
-	if ($active) {
-		$action = 'deactivate';
-		$class = 'elgg-button-cancel';
-	} else {
-		$action = 'activate';
-		$class = 'elgg-button-submit';
-	}
-
-	$url = elgg_http_add_url_query_elements($actions_base . $action, array(
-		'plugin_guids[]' => $plugin->guid,
-		'is_action' => true
-	));
-
-	$action_button = elgg_view('output/url', array(
-		'href' 		=> $url,
-		'text'		=> elgg_echo($action),
-		'is_action'	=> true,
-		'class'		=> "elgg-button $class"
-	));
-} else {
-	$action_button = elgg_view('output/url', array(
-		'text'		=> elgg_echo('admin:plugins:cannot_activate'),
-		'disabled'	=> 'disabled',
-		'class'		=> "elgg-button-action elgg-state-disabled"
-	));
-}
-
-// Display categories
-$categories_html = '';
-if ($categories) {
-	$categories_arr = array();
-	$base_url = elgg_get_site_url() . "pg/admin/plugins?category=";
-
-	foreach ($categories as $category) {
-		$url = $base_url . urlencode($category);
-		$categories_arr[] = "<a href=\"$url\">" . htmlspecialchars($category) . '</a>';
-	}
-
-	$categories_html = implode(', ', $categories_arr);
-}
-
-$screenshots_html = '';
-$screenshots = $plugin->manifest->getScreenshots();
-if ($screenshots) {
-	$base_url = elgg_get_plugins_path() . $plugin->getID() . '/';
-	foreach ($screenshots as $screenshot) {
-		$desc = elgg_echo($screenshot['description']);
-		$alt = htmlentities($desc, ENT_QUOTES, 'UTF-8');
-		$screenshot_full = "{$vars['url']}pg/admin_plugin_screenshot/{$plugin->getID()}/full/{$screenshot['path']}";
-		$screenshot_src = "{$vars['url']}pg/admin_plugin_screenshot/{$plugin->getID()}/thumbnail/{$screenshot['path']}";
-
-		$screenshots_html .= "<li class=\"elgg-plugin-screenshot prm ptm\"><a href=\"$screenshot_full\">"
-							. "<img src=\"$screenshot_src\" alt=\"$alt\"></a></li>";
-	}
-}
-
-// metadata
-$description = elgg_view('output/longtext', array('value' => $plugin->manifest->getDescription()));
-$author = '<span>' . elgg_echo('admin:plugins:label:author') . '</span>: '
-			. elgg_view('output/text', array('value' => $plugin->manifest->getAuthor()));
-$version = htmlspecialchars($plugin->manifest->getVersion());
-$website = elgg_view('output/url', array(
-	'href' => $plugin->manifest->getWebsite(),
-	'text' => $plugin->manifest->getWebsite()
-));
-
-$copyright = elgg_view('output/text', array('value' => $plugin->manifest->getCopyright()));
-$license = elgg_view('output/text', array('value' => $plugin->manifest->getLicense()));
-
-?>
-
-<div id="elgg-plugin-<?php echo $plugin->guid; ?>" class="elgg-state-draggable elgg-plugin <?php echo $active_class ?>">
-	<div class="elgg-image-block">
-		<div class="elgg-image-alt">
-			<div class="elgg-list-metadata">
-				<?php echo "$links"; ?>
-			</div>
-			<div class="clearfloat right mtm">
-				<?php echo $action_button; ?>
-			</div>
-		</div>
-		<div class="elgg-body">
-<?php
-$settings_view = 'settings/' . $plugin->getID() . '/edit';
-if (elgg_view_exists($settings_view)) {
-	$link = elgg_get_site_url() . "pg/admin/plugin_settings/" . $plugin->getID();
-	$settings_link = "<a class='plugin_settings small link' href='$link'>[" . elgg_echo('settings') . "]</a>";
-}
-?>
-			<h3 class="elgg-head"><?php echo $plugin->manifest->getName() . " $version $settings_link"; ?></h3>
-			<?php
-			if ($plugin->manifest->getApiVersion() < 1.8) {
-				$reqs = $plugin->manifest->getRequires();
-				if (!$reqs) {
-					$message = elgg_echo('admin:plugins:warning:elgg_version_unknown');
-					echo "<p class=\"elgg-state-error\">$message</p>";
-				}
-			}
-	
-			if (!$can_activate) {
-				$message = elgg_echo('admin:plugins:warning:unmet_dependencies');
-				echo "<p class=\"elgg-state-error\">$message</p>";
-			}
-			?>
-	
-			<div class="plugin_description"><?php echo $description; ?></div>
-			<p class="plugin_author"><?php echo $author . ' - ' . $website; ?></p>
-	
-			<div class="pts"><a class="elgg-toggle" id="elgg-toggler-plugin-manifest-<?php echo $plugin->getID(); ?>"><?php echo elgg_echo("admin:plugins:label:moreinfo"); ?></a></div>
-		</div>
-	</div>
-	<div class="hidden manifest_file" id="elgg-togglee-plugin-manifest-<?php echo $plugin->getID(); ?>">
-
-		<?php
-		if ($screenshots_html) {
-			?>
-			<div><ul><?php echo $screenshots_html; ?></ul></div>
-			<?php
-		}
-
-		if ($categories_html) {
-			?>
-			<div><?php echo elgg_echo('admin:plugins:label:categories') . ": " . $categories_html; ?></div>
-			<?php
-		}
-
-		?>
-		<div><?php echo elgg_echo('admin:plugins:label:copyright') . ": " . $copyright; ?></div>
-		<div><?php echo elgg_echo('admin:plugins:label:licence') . ": " . $license; ?></div>
-		<div><?php echo elgg_echo('admin:plugins:label:location') . ": " . htmlspecialchars($plugin->getPath()) ?></div>
-
-		<div><?php echo elgg_echo('admin:plugins:label:dependencies'); ?>:
-		<?php
-			echo elgg_view('admin/components/plugin_dependencies', array('plugin' => $plugin));
-		?>
-		</div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/views/default/admin/components/plugin_dependencies.php b/views/default/admin/components/plugin_dependencies.php
deleted file mode 100644
index ea2b3a188..000000000
--- a/views/default/admin/components/plugin_dependencies.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Shows a table of plugin dependecies for ElggPlugin in $vars['plugin'].
- *
- * This uses a table because it's a table of data.
- *
- * @package Elgg.Core
- * @subpackage Admin.Plugins
- */
-
-$plugin = elgg_extract('plugin', $vars, false);
-$deps = $plugin->package->checkDependencies(true);
-
-$columns = array('type', 'name', 'expected_value', 'local_value', 'comment');
-
-echo '<table class="elgg-plugins-dependencies styled">
-	<tr>
-';
-
-foreach ($columns as $column) {
-	$column = elgg_echo("admin:plugins:dependencies:$column");
-	echo "<th class=\"pas\">$column</th>";
-}
-
-echo '<tr/>';
-
-$row = 'odd';
-foreach ($deps as $dep) {
-	$fields = elgg_get_plugin_dependency_strings($dep);
-	$type = $dep['type'];
-
-	if ($dep['status']) {
-		$class = "elgg-state-success elgg-dependency-$type";
-	} else {
-		$class = "elgg-state-error elgg-dependency-$type";
-	}
-
-	echo "<tr class=\"$row\">";
-
-	foreach ($columns as $column) {
-		echo "<td class=\"pas $class\">{$fields[$column]}</td>";
-	}
-
-	echo '</tr>';
-
-	$row = ($row == 'odd') ? 'even' : 'odd';
-}
-
-echo '</table>';
\ No newline at end of file
diff --git a/views/default/admin/components/plugin_settings.php b/views/default/admin/plugin_settings.php
index c2801cec3..c2801cec3 100644
--- a/views/default/admin/components/plugin_settings.php
+++ b/views/default/admin/plugin_settings.php
diff --git a/views/default/admin/plugins/advanced.php b/views/default/admin/plugins/advanced.php
index 6b32035f3..8b12cd899 100644
--- a/views/default/admin/plugins/advanced.php
+++ b/views/default/admin/plugins/advanced.php
@@ -82,12 +82,7 @@ $buttons .= $category_form;
 <div id="elgg-plugin-list">
 <?php
 
-// Display list of plugins
-foreach ($installed_plugins as $plugin) {
-	$view = ($plugin->isValid()) ? 'admin/components/plugin' : 'admin/components/invalid_plugin';
-	echo elgg_view($view, array(
-		'plugin' => $plugin
-	));
-}
+	echo elgg_view_entity_list($installed_plugins, 0, 0, 0, true, false, false); 
+
 ?>
 </div>
\ No newline at end of file