6 files changed, 47 insertions, 12 deletions

diff --git a/views/default/object/elements/summary.php b/views/default/object/elements/summary.php
index 22db03f51..c0f3ad340 100644
--- a/views/default/object/elements/summary.php
+++ b/views/default/object/elements/summary.php
@@ -13,7 +13,7 @@
  * @uses $vars['title']     Title link (optional) false = no title, '' = default
  * @uses $vars['metadata']  HTML for entity menu and metadata (optional)
  * @uses $vars['subtitle']  HTML for the subtitle (optional)
- * @uses $vars['tags']      HTML for the tags (optional)
+ * @uses $vars['tags']      HTML for the tags (default is tags on entity, pass false for no tags)
  * @uses $vars['content']   HTML for the entity content (optional)
  */
 
@@ -39,7 +39,7 @@ $subtitle = elgg_extract('subtitle', $vars, '');
 $content = elgg_extract('content', $vars, '');
 
 $tags = elgg_extract('tags', $vars, '');
-if ($tags !== false) {
+if ($tags === '') {
 	$tags = elgg_view('output/tags', array('tags' => $entity->tags));
 }
 
diff --git a/views/default/object/plugin/elements/dependencies.php b/views/default/object/plugin/elements/dependencies.php
index 8abd61692..d8daedd33 100644
--- a/views/default/object/plugin/elements/dependencies.php
+++ b/views/default/object/plugin/elements/dependencies.php
@@ -29,6 +29,8 @@ foreach ($deps as $dep) {
 
 	if ($dep['status']) {
 		$class = "elgg-state-success elgg-dependency elgg-dependency-$type";
+	} elseif ($dep['type'] == 'suggests') {
+		$class = "elgg-state-warning elgg-dependency elgg-dependency-$type";
 	} else {
 		$class = "elgg-state-error elgg-dependency elgg-dependency-$type";
 	}
diff --git a/views/default/object/plugin/full.php b/views/default/object/plugin/full.php
index db0a52416..2de65b555 100644
--- a/views/default/object/plugin/full.php
+++ b/views/default/object/plugin/full.php
@@ -172,6 +172,26 @@ $website = elgg_view('output/url', array(
 	'is_trusted' => true,
 ));
 
+$resources = array(
+	'repository' => $plugin->getManifest()->getRepositoryURL(),
+	'bugtracker' => $plugin->getManifest()->getBugTrackerURL(),
+	'donate' => $plugin->getManifest()->getDonationsPageURL(),
+);
+
+$resources_html = "<ul class=\"elgg-plugin-resources\">";
+foreach ($resources as $id => $href) {
+	if ($href) {
+		$resources_html .= "<li class=\"prm\">";
+		$resources_html .= elgg_view('output/url', array(
+			'href' => $href,
+			'text' => elgg_echo("admin:plugins:label:$id"),
+			'is_trusted' => true,
+		));
+		$resources_html .= "</li>";
+	}
+}
+$resources_html .= "</ul>";
+
 $copyright = elgg_view('output/text', array('value' => $plugin->getManifest()->getCopyright()));
 $license = elgg_view('output/text', array('value' => $plugin->getManifest()->getLicense()));
 
@@ -242,7 +262,11 @@ if (elgg_view_exists($settings_view_old) || elgg_view_exists($settings_view_new)
 	
 			<div><?php echo $description; ?></div>
 			<p><?php echo $author . ' - ' . $website; ?></p>
-			<?php echo $docs; ?>
+			
+			<?php
+				echo $resources_html;
+				echo $docs;
+			?>
 	
 			<div class="pts">
 			<?php 
@@ -281,4 +305,4 @@ if (elgg_view_exists($settings_view_old) || elgg_view_exists($settings_view_new)
 		?>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/views/default/object/plugin/invalid.php b/views/default/object/plugin/invalid.php
index f24e1836c..828bceaba 100644
--- a/views/default/object/plugin/invalid.php
+++ b/views/default/object/plugin/invalid.php
@@ -14,8 +14,7 @@ $plugin = $vars['entity'];
 
 $id = $plugin->getID();
 $path = htmlspecialchars($plugin->getPath());
-$message = elgg_echo('admin:plugins:warning:invalid', array($id));
-$error = $plugin->getError();
+$message = elgg_echo('admin:plugins:warning:invalid', array($plugin->getError()));
 $css_id = preg_replace('/[^a-z0-9-]/i', '-', $plugin->getID());
 
 ?>
@@ -23,7 +22,8 @@ $css_id = preg_replace('/[^a-z0-9-]/i', '-', $plugin->getID());
 <div class="elgg-state-draggable elgg-plugin elgg-state-inactive elgg-state-error" id="elgg-plugin-<?php echo $plugin->guid; ?>">
 	<div class="elgg-head"><h3><?php echo $id; ?></h3></div>
 	<div class="elgg-body">
-		<p><?php echo $message; ?></p>
+		<p class="elgg-state-error"><?php echo $message; ?></p>
+		<p><?php echo elgg_echo('admin:plugins:warning:invalid:check_docs'); ?></p>
 		
 		<div class="pts">
 			<?php
@@ -37,7 +37,6 @@ $css_id = preg_replace('/[^a-z0-9-]/i', '-', $plugin->getID());
 
 		<div class="hidden elgg-plugin-more" id="elgg-plugin-manifest-<?php echo $css_id; ?>">
 			<p><?php echo elgg_echo('admin:plugins:label:location') . ": " . $path; ?></p>
-			<p><?php echo $error; ?></p>
 		</div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/views/default/object/widget/elements/controls.php b/views/default/object/widget/elements/controls.php
index d1d630c4f..57a935f62 100644
--- a/views/default/object/widget/elements/controls.php
+++ b/views/default/object/widget/elements/controls.php
@@ -8,9 +8,7 @@
 
 echo elgg_view_menu('widget', array(
 	'entity' => elgg_extract('widget', $vars),
-	'params' => array(
-		'show_edit' => elgg_extract('show_edit', $vars, true)
-	),
+	'show_edit' => elgg_extract('show_edit', $vars, true),
 	'sort_by' => 'priority',
 	'class' => 'elgg-menu-hz',
 ));
diff --git a/views/default/object/widget/elements/settings.php b/views/default/object/widget/elements/settings.php
index 5afe56ed8..25cda58c9 100644
--- a/views/default/object/widget/elements/settings.php
+++ b/views/default/object/widget/elements/settings.php
@@ -6,8 +6,20 @@
  */
 
 $widget = elgg_extract('widget', $vars);
+
+// not using elgg_view_form() so that we can detect if the form is empty
+$form_body = elgg_view('forms/widgets/save', $vars);
+if (!$form_body) {
+	return true;
+}
+
+$form = elgg_view('input/form', array(
+	'action' => 'action/widgets/save',
+	'body' => $form_body,
+	'class' => 'elgg-form-widgets-save',
+));
 ?>
 
 <div class="elgg-widget-edit" id="widget-edit-<?php echo $widget->guid; ?>">
-	<?php echo elgg_view_form('widgets/save', array(), $vars); ?>
+	<?php echo $form; ?>
 </div>