From 32387e6db0c56935e93314217b52eab4d9dca016 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 26 Jun 2011 08:16:19 -0400 Subject: Fixes #3470 using rel=toggle now --- views/default/object/plugin/advanced.php | 2 +- views/default/object/plugin/invalid.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'views/default/object/plugin') diff --git a/views/default/object/plugin/advanced.php b/views/default/object/plugin/advanced.php index 51fb69d17..84fc0439b 100644 --- a/views/default/object/plugin/advanced.php +++ b/views/default/object/plugin/advanced.php @@ -242,7 +242,7 @@ if (elgg_view_exists($settings_view_old) || elgg_view_exists($settings_view_new) echo elgg_view('output/url', array( 'href' => "#elgg-plugin-manifest-{$plugin->getID()}", 'text' => elgg_echo("admin:plugins:label:moreinfo"), - 'class' => 'elgg-toggler', + 'rel' => 'toggle', )); ?> diff --git a/views/default/object/plugin/invalid.php b/views/default/object/plugin/invalid.php index 9e239b7ca..f29ee8d12 100644 --- a/views/default/object/plugin/invalid.php +++ b/views/default/object/plugin/invalid.php @@ -29,7 +29,7 @@ $error = $plugin->getError(); echo elgg_view('output/url', array( 'href' => "#elgg-plugin-manifest-{$plugin->getID()}", 'text' => elgg_echo("admin:plugins:label:moreinfo"), - 'class' => 'elgg-toggler', + 'rel' => 'toggle', )); ?> -- cgit v1.2.3 From 8ed11a8881f65339446fccae64864e0d57dfff51 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Wed, 29 Jun 2011 06:46:51 -0400 Subject: Fixes #3630 using the plugin id for the css id --- actions/admin/plugins/activate.php | 3 ++- actions/admin/plugins/deactivate.php | 3 ++- actions/admin/plugins/set_priority.php | 5 ++--- views/default/object/plugin/advanced.php | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) (limited to 'views/default/object/plugin') diff --git a/actions/admin/plugins/activate.php b/actions/admin/plugins/activate.php index feb986b27..5a945e8eb 100644 --- a/actions/admin/plugins/activate.php +++ b/actions/admin/plugins/activate.php @@ -44,7 +44,8 @@ if (count($activated_guids) === 1) { if ($query) { $url .= "?$query"; } - forward($url . '#elgg-plugin-' . $plugin_guids[0]); + $plugin = get_entity($plugin_guids[0]); + forward("$url#{$plugin->getID()}"); } else { forward(REFERER); } \ No newline at end of file diff --git a/actions/admin/plugins/deactivate.php b/actions/admin/plugins/deactivate.php index 6c9a55c15..f5eca3aaa 100644 --- a/actions/admin/plugins/deactivate.php +++ b/actions/admin/plugins/deactivate.php @@ -43,7 +43,8 @@ if (count($plugin_guids) == 1) { if ($query) { $url .= "?$query"; } - forward($url . '#elgg-plugin-' . $plugin_guids[0]); + $plugin = get_entity($plugin_guids[0]); + forward("$url#{$plugin->getID()}"); } else { forward(REFERER); } diff --git a/actions/admin/plugins/set_priority.php b/actions/admin/plugins/set_priority.php index 702aae91b..1f8bc24af 100644 --- a/actions/admin/plugins/set_priority.php +++ b/actions/admin/plugins/set_priority.php @@ -6,9 +6,8 @@ * overriding as well as the order of view extensions. Plugins with higher * priority are loaded after and override plugins with lower priorities. * - * NOTE: When viewing the admin page (advanced plugin admin in >= 1.8) plugins - * LOWER on the page have HIGHER priority and will override views, etc - * from plugins above them. + * NOTE: When viewing the plugin admin page, plugins LOWER on the page + * have HIGHER priority and will override views, etc from plugins above them. * * @package Elgg.Core * @subpackage Administration.Plugins diff --git a/views/default/object/plugin/advanced.php b/views/default/object/plugin/advanced.php index 84fc0439b..9fdbc99ee 100644 --- a/views/default/object/plugin/advanced.php +++ b/views/default/object/plugin/advanced.php @@ -189,7 +189,7 @@ if ($files) { ?> -
+
-- cgit v1.2.3 From 3b6e176b58655a6a5f46f3a93e4c70512eb6010e Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Thu, 30 Jun 2011 06:33:50 -0400 Subject: Fixes #3635 added strings for activate and deactivate --- languages/en.php | 2 ++ views/default/object/plugin/advanced.php | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'views/default/object/plugin') diff --git a/languages/en.php b/languages/en.php index 113585a12..72369c82f 100644 --- a/languages/en.php +++ b/languages/en.php @@ -634,6 +634,8 @@ $english = array( 'admin:plugins' => "Plugins", 'admin:plugins:activate_all' => 'Activate All', 'admin:plugins:deactivate_all' => 'Deactivate All', + 'admin:plugins:activate' => 'Activate', + 'admin:plugins:deactivate' => 'Deactivate', 'admin:plugins:description' => "This admin panel allows you to control and configure tools installed on your site.", 'admin:plugins:opt:linktext' => "Configure tools...", 'admin:plugins:opt:description' => "Configure the tools installed on the site. ", diff --git a/views/default/object/plugin/advanced.php b/views/default/object/plugin/advanced.php index 9fdbc99ee..08da89c01 100644 --- a/views/default/object/plugin/advanced.php +++ b/views/default/object/plugin/advanced.php @@ -98,7 +98,7 @@ $options = array( if ($active) { $active_class = 'elgg-state-active'; $action = 'deactivate'; - $options['text'] = elgg_echo('deactivate'); + $options['text'] = elgg_echo('admin:plugins:deactivate'); $options['class'] = "elgg-button elgg-button-cancel"; if (!$can_activate) { @@ -108,7 +108,7 @@ if ($active) { } else if ($can_activate) { $active_class = 'elgg-state-inactive'; $action = 'activate'; - $options['text'] = elgg_echo('activate'); + $options['text'] = elgg_echo('admin:plugins:activate'); $options['class'] = "elgg-button elgg-button-submit"; } else { $active_class = 'elgg-state-inactive'; -- cgit v1.2.3