Added suggests to the plugins deps system. It parallels the requires system, but doesn't affect if the plugin can be enabled and only shows up in the deps table on the advanced view.

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

3 files changed, 21 insertions, 6 deletions

diff --git a/views/default/admin/components/plugin.php b/views/default/admin/components/plugin.php
index 229dd8c57..e75c2c63e 100644
--- a/views/default/admin/components/plugin.php
+++ b/views/default/admin/components/plugin.php
@@ -167,15 +167,12 @@ if (elgg_view_exists($settings_view)) {
 }
 ?>
 	<h3 class="elgg-head"><?php echo $plugin->manifest->getName() . " $version $settings_link"; ?></h3>
-		<div class="plugin_description"><?php echo $description; ?></div>
-		<p class="plugin_author"><?php echo $author . ' - ' . $website; ?></p>
-
 		<?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=\"plugin-cannot-activate\">$message</p>";
+				echo "<p class=\"elgg-unsatisfied-dependency\">$message</p>";
 			}
 		}
 
@@ -185,6 +182,9 @@ if (elgg_view_exists($settings_view)) {
 		}
 		?>
 
+		<div class="plugin_description"><?php echo $description; ?></div>
+		<p class="plugin_author"><?php echo $author . ' - ' . $website; ?></p>
+
 		<div class="pts"><a class="manifest_details small link"><?php echo elgg_echo("admin:plugins:label:moreinfo"); ?></a></div>
 
 		<div class="manifest_file hidden">
diff --git a/views/default/admin/components/plugin_dependencies.php b/views/default/admin/components/plugin_dependencies.php
index cd38e98b0..bb0fa4eec 100644
--- a/views/default/admin/components/plugin_dependencies.php
+++ b/views/default/admin/components/plugin_dependencies.php
@@ -27,11 +27,12 @@ echo '<tr/>';
 $row = 'odd';
 foreach ($deps as $dep) {
 	$fields = elgg_get_plugin_dependency_strings($dep);
+	$type = $dep['type'];
 
 	if ($dep['status']) {
-		$class = 'elgg-satisfied-dependency';
+		$class = "elgg-satisfied-dependency elgg-dependency-$type";
 	} else {
-		$class = 'elgg-unsatisfied-dependency';
+		$class = "elgg-unsatisfied-dependency elgg-dependency-$type";
 	}
 
 	echo "<tr class=\"$row\">";
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index e1aee66fe..729c770bb 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -1001,6 +1001,7 @@ ul.admin_plugins {
 .plugin_details h3 {
 	margin-top:-13px;
 	color:black;
+	padding-bottom: 10px;
 }
 .plugin_settings {
 	font-weight: normal;
@@ -1008,9 +1009,22 @@ ul.admin_plugins {
 .elgg-unsatisfied-dependency {
 	font-weight: bold;
 }
+.elgg-dependency-suggests {
+	font-weight: normal;
+}
+p.elgg-unsatisfied-dependency {
+	padding: 5px 0;
+	font-weight: bold;
+}
+p.elgg-dependency-suggests {
+	font-weight: normal;
+}
 .elgg-plugin-screenshot {
 	display: inline;
 }
+.elgg-plugin-screenshot img {
+	border: 1px solid #999999;
+}
 .elgg-plugin-screenshot-lightbox {
 	display: block;
 	position: absolute;