aboutsummaryrefslogtreecommitdiff
path: root/views/default
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-14 23:07:31 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-14 23:07:31 +0000
commitbd28cf062af5f516e8c1b273577a530fc215255b (patch)
treedcca8a9cbcfe9fe961b6fef2b6a398be49a05b9e /views/default
parenteaf59ee54011c3dcc4ee7e344e0dd06160fd9bf4 (diff)
downloadelgg-bd28cf062af5f516e8c1b273577a530fc215255b.tar.gz
elgg-bd28cf062af5f516e8c1b273577a530fc215255b.tar.bz2
Fixes #2928: Invalid plugins are shown on the advance page with details about the problem and a link to the docs.
git-svn-id: http://code.elgg.org/elgg/trunk@8709 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default')
-rw-r--r--views/default/admin/plugins/advanced.php5
-rw-r--r--views/default/object/plugin/invalid.php26
2 files changed, 23 insertions, 8 deletions
diff --git a/views/default/admin/plugins/advanced.php b/views/default/admin/plugins/advanced.php
index e78dbe2f1..02e9ae58b 100644
--- a/views/default/admin/plugins/advanced.php
+++ b/views/default/admin/plugins/advanced.php
@@ -9,7 +9,7 @@
*/
elgg_generate_plugin_entities();
-$installed_plugins = elgg_get_plugins('any');
+$installed_plugins = elgg_get_plugins('any', true);
$show_category = get_input('category', null);
// Get a list of the all categories
@@ -85,9 +85,6 @@ $buttons .= $category_form;
<div id="elgg-plugin-list">
<?php
-$options = array(
-
-);
echo elgg_view_entity_list($installed_plugins, 0, 0, 0, true, false, false);
?>
diff --git a/views/default/object/plugin/invalid.php b/views/default/object/plugin/invalid.php
index 7fd5d6f5e..9e239b7ca 100644
--- a/views/default/object/plugin/invalid.php
+++ b/views/default/object/plugin/invalid.php
@@ -15,10 +15,28 @@ $plugin = $vars['entity'];
$id = $plugin->getID();
$path = htmlspecialchars($plugin->getPath());
$message = elgg_echo('admin:plugins:warning:invalid', array($id));
+$error = $plugin->getError();
?>
-<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>
+<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>
+
+ <div class="pts">
+ <?php
+ echo elgg_view('output/url', array(
+ 'href' => "#elgg-plugin-manifest-{$plugin->getID()}",
+ 'text' => elgg_echo("admin:plugins:label:moreinfo"),
+ 'class' => 'elgg-toggler',
+ ));
+ ?>
+ </div>
+
+ <div class="hidden manifest_file" id="elgg-plugin-manifest-<?php echo $plugin->getID(); ?>">
+ <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