From 4239301a547601b5139076c9c8994b59f67e6b46 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 27 Apr 2011 21:22:10 +0000
Subject: Added very basic CSS for elgg-markdown in admin area.

git-svn-id: http://code.elgg.org/elgg/trunk@9038 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/css/admin.php | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(limited to 'views/default/css/admin.php')

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index b41649c06..97c7777d2 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -1200,3 +1200,35 @@ ul.admin_plugins {
 .add-user form {
 	width:300px;
 }
+
+/****************************************
+	Markdown Text
+****************************************/
+
+.elgg-markdown {
+	margin: 15px;
+}
+
+.elgg-markdown h1,
+.elgg-markdown h2,
+.elgg-markdown h3,
+.elgg-markdown h4,
+.elgg-markdown h5,
+.elgg-markdown h6 {
+	margin: 1em 0 1em -15px;
+	color: #333;
+}
+
+.elgg-markdown ol {
+	list-style: decimal;
+	padding-left: 2em;
+}
+
+.elgg-markdown ul {
+	list-style: disc;
+	padding-left: 2em;
+}
+
+.elgg-markdown p {
+	margin: 15px 0;
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 35a7bdb47509571c7072ff63084f51353b52e255 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 28 Apr 2011 02:27:03 +0000
Subject: Fixes #3326. Added CSS for inputs in admin area. No more tiny text
 fields!

git-svn-id: http://code.elgg.org/elgg/trunk@9042 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/css/admin.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'views/default/css/admin.php')

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 97c7777d2..10cb38cd1 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -402,9 +402,17 @@ input {
 .input-text,
 .input-tags,
 .input-url,
-.input-textarea {
+.input-textarea,
+<?php // until we're all on elgg-, need to duplicate ?>
+.elgg-input-text,
+.elgg-input-tags,
+.elgg-input-url,
+.elgg-input-textarea {
 	width:98%;
 }
+textarea {
+	height: 100px;
+}
 input[type="submit"], .elgg-button-submit, .elgg-button-action {
 	font-size: 14px;
 	font-weight: bold;
-- 
cgit v1.2.3


From f9bf4a37b7990f275b814fc01dce244cd1a41ea3 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 28 Apr 2011 19:13:13 +0000
Subject: Refs #3236 cleaned up the widget css in admin area

git-svn-id: http://code.elgg.org/elgg/trunk@9044 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/css/admin.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'views/default/css/admin.php')

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 10cb38cd1..3a9db0fd0 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -100,6 +100,7 @@ h6 { font-size: 0.8em; }
 
 a {
 	color: #333;
+	text-decoration: none;
 }
 a:hover {
 	color: black;
@@ -330,7 +331,11 @@ table.mceLayout {
 	width: 100%;
 	border-top: 1px solid #ccc;
 }
-.elgg-table-alt td {
+.elgg-table-alt th {
+	background-color: #eee;
+	font-weight: bold;
+}
+.elgg-table-alt td, th {
 	padding: 2px 4px;
 	border-bottom: 1px solid #ccc;
 }
@@ -692,18 +697,17 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 }
 .elgg-module-widget > .elgg-head {
 	background-color: #f5f5f5;
-	height: 30px;
-	line-height: 30px;
+	height: 26px;
 	overflow: hidden;
 }
 .elgg-module-widget > .elgg-head h3 {
 	float: left;
-	padding: 0 45px 0 20px;
+	padding: 4px 45px 0 20px;
 	color: #333;
 }
 .elgg-module-widget > .elgg-head a {
 	position: absolute;
-	top: 5px;
+	top: 4px;
 	display: inline-block;
 	width: 18px;
 	height: 18px;
-- 
cgit v1.2.3


From 4661a25efbdec0680681d76fd1da41519d4d7eb9 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 28 Apr 2011 19:53:05 +0000
Subject: Refs #3236 removed elgg-states-* from admin css since it was
 overaggressive

git-svn-id: http://code.elgg.org/elgg/trunk@9045 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/css/admin.php                        | 81 +++++++++-------------
 .../object/plugin/elements/dependencies.php        |  4 +-
 2 files changed, 34 insertions(+), 51 deletions(-)

(limited to 'views/default/css/admin.php')

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 3a9db0fd0..ae3002dcb 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -226,6 +226,17 @@ table.mceLayout {
 	border: 2px solid #ddd;
 	cursor: pointer;
 }
+.elgg-message.elgg-state-error {
+	background: #fbe3e4;
+	color: #8a1f11;
+	border-color: #fbc2c4;
+	font-weight: bold;
+}
+.elgg-message.elgg-state-success {
+	background: #e6efc2;
+	color: #264409;
+	border-color: #c6d880;
+}
 
 /* ***************************************
 	BODY
@@ -685,6 +696,16 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 .elgg-widgets-add-panel li a {
 	display: block;
 }
+.elgg-widget-single.elgg-state-available {
+	color: #333;
+	cursor: pointer;
+}
+.elgg-widget-single.elgg-state-available:hover {
+	border-color: #aaa;
+}
+.elgg-widget-single.elgg-state-unavailable {
+	color: #888;
+}
 
 .elgg-module-widget {
 	background-color: #dedede;
@@ -1044,58 +1065,11 @@ a.elgg-longtext-control {
 .right {float:right}
 .elgg-toggle {cursor:pointer}
 
-/* ***************************************
-	STATES
-*************************************** */
-
-.elgg-state-active {
-	background:#ccc;
-	color: #333;
-}
-
-.elgg-state-inactive {
-	background:#dedede;
-}
-
-.elgg-state-available {
-	color: #333;
-	cursor: pointer;
-}
-
-.elgg-state-available:hover {
-	border-color: #aaa;
-}
-
-.elgg-state-unavailable {
-	color: #888;
-}
-
-.elgg-state-success {
-	background: #e6efc2;
-	color: #264409;
-	border-color: #c6d880;
-}
-
-.elgg-state-error {
-	background: #fbe3e4;
-	color: #8a1f11;
-	border-color: #fbc2c4;
-	font-weight: bold;
-}
-
-p.elgg-state-error {
-	padding: 5px;
-}
-
 <?php //@todo elgg-drag-handle instead? ?>
 .elgg-state-draggable .elgg-head {
 	cursor: move;
 }
 
-<?php //What to do with states that don't have default styles? ?>
-.elgg-state-selected {}
-.elgg-state-disabled {}
-
 /* ***************************************
 	ADMIN MISC
 *************************************** */
@@ -1134,8 +1108,8 @@ form.admin_plugins_simpleview .elgg-button-submit {
 	margin-right: 10px;
 }
 ul.admin_plugins {
-	margin-bottom:0;
-	padding-left:0;
+	margin-bottom: 0;
+	padding-left: 0;
 	list-style: none;
 }
 .elgg-plugin {
@@ -1185,6 +1159,15 @@ ul.admin_plugins {
 .elgg-plugin.elgg-state-active {
 	background: white;
 }
+.elgg-plugin.elgg-state-inactive {
+	background: #dedede;
+}
+.elgg-dependency.elgg-state-error {
+	background: #fbe3e4;
+	color: #8a1f11;
+	border-color: #fbc2c4;
+	font-weight: bold;
+}
 
 .admin_notices {
 	padding-bottom: 15px;
diff --git a/views/default/object/plugin/elements/dependencies.php b/views/default/object/plugin/elements/dependencies.php
index b5cdaf8b6..f4d1ccc5a 100644
--- a/views/default/object/plugin/elements/dependencies.php
+++ b/views/default/object/plugin/elements/dependencies.php
@@ -28,9 +28,9 @@ foreach ($deps as $dep) {
 	$type = $dep['type'];
 
 	if ($dep['status']) {
-		$class = "elgg-state-success elgg-dependency-$type";
+		$class = "elgg-state-success elgg-dependency elgg-dependency-$type";
 	} else {
-		$class = "elgg-state-error elgg-dependency-$type";
+		$class = "elgg-state-error elgg-dependency elgg-dependency-$type";
 	}
 
 	echo "<tr class=\"$row\">";
-- 
cgit v1.2.3


From 6d47049d72562d74f0c6838fc2d9d3d89c016a47 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 28 Apr 2011 20:08:16 +0000
Subject: Refs #3236 updated the button css so that disable plugin button looks
 like a button

git-svn-id: http://code.elgg.org/elgg/trunk@9047 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 languages/en.php                             |  2 +-
 views/default/css/admin.php                  | 17 +++++++++++++++--
 views/default/forms/profile/fields/reset.php |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'views/default/css/admin.php')

diff --git a/languages/en.php b/languages/en.php
index 5fbf50142..42712cadf 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -650,7 +650,7 @@ $english = array(
 	'admin:plugins:warning:elgg_version_unknown' => 'This plugin uses a legacy manifest file and does not specify a compatible Elgg version. It probably will not work!',
 	'admin:plugins:warning:unmet_dependencies' => 'This plugin has unmet dependencies and cannot be activated. Check dependencies under more info.',
 	'admin:plugins:warning:invalid' => '%s is not a valid Elgg plugin.  Check <a href="http://docs.elgg.org/Invalid_Plugin">the Elgg documentation</a> for troubleshooting tips.',
-	'admin:plugins:cannot_activate' => 'Cannot Activate',
+	'admin:plugins:cannot_activate' => 'cannot activate',
 
 	'admin:plugins:set_priority:yes' => "Reordered %s.",
 	'admin:plugins:set_priority:no' => "Could not reorder %s.",
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index ae3002dcb..68720b89a 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -429,7 +429,7 @@ input {
 textarea {
 	height: 100px;
 }
-input[type="submit"], .elgg-button-submit, .elgg-button-action {
+input[type="submit"], .elgg-button-submit, .elgg-button-action, .elgg-button-cancel {
 	font-size: 14px;
 	font-weight: bold;
 	color: white;
@@ -453,9 +453,22 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 	background-color: #000;
 	text-decoration: none;
 }
-.elgg-button-submit, .elgg-button-action {
+.elgg-button-submit, .elgg-button-action, .elgg-button-cancel {
 	padding: 4px 8px;
 }
+.elgg-button-cancel {
+	color: #333;
+	background-color: #999;
+}
+.elgg-button-cancel:hover {
+	color: #222;
+	background-color: #666;
+	text-decoration: none;
+}
+.elgg-button-action.elgg-state-disabled {
+	background-color: #aaa;
+}
+
 /* ***************************************
 	PAGINATION
 *************************************** */
diff --git a/views/default/forms/profile/fields/reset.php b/views/default/forms/profile/fields/reset.php
index 57dc00e85..4e0f51dc6 100644
--- a/views/default/forms/profile/fields/reset.php
+++ b/views/default/forms/profile/fields/reset.php
@@ -5,6 +5,6 @@
 
 $params = array(
 	'value' => elgg_echo('profile:resetdefault'),
-	'class' => 'elgg-button elgg-button-action elgg-state-disabled',
+	'class' => 'elgg-button-cancel',
 );
 echo elgg_view('input/submit', $params);
-- 
cgit v1.2.3


From 099d20345018ac424cc7d89b7111fba0c94d79f3 Mon Sep 17 00:00:00 2001
From: ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 29 Apr 2011 22:44:41 +0000
Subject: Made admin welcome widget a bit more semantic

git-svn-id: http://code.elgg.org/elgg/trunk@9055 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 languages/en.php                                | 10 +++++-----
 views/default/css/admin.php                     |  3 +++
 views/default/widgets/admin_welcome/content.php |  4 +++-
 3 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'views/default/css/admin.php')

diff --git a/languages/en.php b/languages/en.php
index 943dbb285..1e32caf6f 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -578,11 +578,11 @@ $english = array(
 	'admin:widget:admin_welcome:admin_overview' =>
 "Navigation for the administration area is provide by the menu to the right. It is organized into"
 . " three sections:
-	<ul>
-		<li><b>Administer</b> - Everyday tasks like monitoring reported content, checking who is online, and viewing statistics.</li>
-		<li><b>Configure</b> - Occasional tasks like setting the site name or activating a plugin.</li>
-		<li><b>Develop</b> - For developers who are building plugins or designing themes. (Requires a developer plugin.)</li>
-	</ul>
+	<dl>
+		<dt>Administer</dt><dd>Everyday tasks like monitoring reported content, checking who is online, and viewing statistics.</dd>
+		<dt>Configure</dt><dd>Occasional tasks like setting the site name or activating a plugin.</dd>
+		<dt>Develop</dt><dd>For developers who are building plugins or designing themes. (Requires a developer plugin.)</dd>
+	</dl>
 	",
 
 	// argh, this is ugly
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 68720b89a..3801fee32 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -116,6 +116,9 @@ p {
 	margin-bottom: 15px;
 }
 
+.elgg-output dt { font-weight: bold }
+.elgg-output dd { margin: 0 0 1em 2em }
+
 table.mceLayout {
 	width:100% !important;
 }
diff --git a/views/default/widgets/admin_welcome/content.php b/views/default/widgets/admin_welcome/content.php
index 6a9a92e27..f4b92ea66 100644
--- a/views/default/widgets/admin_welcome/content.php
+++ b/views/default/widgets/admin_welcome/content.php
@@ -12,6 +12,8 @@ $sections = array(
 
 // don't use longtext because it filters output.
 // that's annoying.
+echo '<div class="elgg-output">';
 foreach ($sections as $section => $strings) {
 	echo '<p>' . elgg_echo("admin:widget:admin_welcome:$section", $strings) . '</p>';
-}
\ No newline at end of file
+}
+echo '</div>';
\ No newline at end of file
-- 
cgit v1.2.3


From 22fd09fa332ed11118e8cc81e82dd2497b874ac5 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 20 May 2011 02:57:21 +0000
Subject: Refs #3236 added some margin to the bottom of the admin footer

git-svn-id: http://code.elgg.org/elgg/trunk@9110 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/css/admin.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'views/default/css/admin.php')

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 3801fee32..c4dacad91 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -281,6 +281,7 @@ table.mceLayout {
 	background-color: #111;
 	border: 1px solid #999;
 	padding: 10px 20px;
+	margin-bottom: 10px;
 }
 .elgg-page-footer a {
 	color: #ddd;
-- 
cgit v1.2.3


From 9a68be3c337ed98475535ab6b0483f53073678e1 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 24 May 2011 17:59:51 +0000
Subject: Fixes #3467. Fixed bugs in priority deps. Can now disable active
 plugins with unmet dependencies.

git-svn-id: http://code.elgg.org/elgg/trunk@9111 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/classes/ElggPluginPackage.php     | 13 +++----
 languages/en.php                         |  1 +
 views/default/css/admin.php              |  9 ++++-
 views/default/object/plugin/advanced.php | 61 +++++++++++++++++++-------------
 4 files changed, 50 insertions(+), 34 deletions(-)

(limited to 'views/default/css/admin.php')

diff --git a/engine/classes/ElggPluginPackage.php b/engine/classes/ElggPluginPackage.php
index 9aa4af8bf..977b72d76 100644
--- a/engine/classes/ElggPluginPackage.php
+++ b/engine/classes/ElggPluginPackage.php
@@ -457,16 +457,11 @@ class ElggPluginPackage {
 		// grab the ElggPlugin using this package.
 		$plugin_package = elgg_get_plugin_from_id($this->getID());
 		$plugin_priority = $plugin_package->getPriority();
+		$test_plugin = elgg_get_plugin_from_id($dep['plugin']);
 
-		foreach ($plugins as $test_plugin) {
-			if ($test_plugin->getID() == $dep['plugin']) {
-				break;
-			}
-		}
-
-		// If this isn't a plugin or there are no active plugins,
-		// we can't satisfy this dep.
-		if (!$plugin_package || !$plugins) {
+		// If this isn't a plugin or the plugin isn't installed or active
+		// priority doesn't matter. Use requires to check if a plugin is active.
+		if (!$plugin_package || !$test_plugin || !$test_plugin->isActive()) {
 			return array(
 				'status' => true,
 				'value' => 'uninstalled'
diff --git a/languages/en.php b/languages/en.php
index 509de7fb0..83fb66dad 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -661,6 +661,7 @@ $english = array(
 	'admin:plugins:simple_simple_fail' => 'Could not save settings.',
 	'admin:plugins:simple_simple_success' => 'Settings saved.',
 	'admin:plugins:simple:cannot_activate' => 'Cannot activate this plugin. Check the advanced plugin admin area for more information.',
+	'admin:plugins:warning:unmet_dependencies_active' => 'This plugin is active but has unmet dependencies. You may encounter problems. See "more info" below for details.',
 
 	'admin:plugins:dependencies:type' => 'Type',
 	'admin:plugins:dependencies:name' => 'Name',
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index c4dacad91..744211a20 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -1179,12 +1179,19 @@ ul.admin_plugins {
 .elgg-plugin.elgg-state-inactive {
 	background: #dedede;
 }
-.elgg-dependency.elgg-state-error {
+
+.elgg-state-error {
 	background: #fbe3e4;
 	color: #8a1f11;
 	border-color: #fbc2c4;
 	font-weight: bold;
 }
+.elgg-state-warning {
+	background: #fbedb5;
+	color: #000000;
+	border-color: #fbe58b;
+	font-weight: bold;
+}
 
 .admin_notices {
 	padding-bottom: 15px;
diff --git a/views/default/object/plugin/advanced.php b/views/default/object/plugin/advanced.php
index 9aed4163c..56e680ad5 100644
--- a/views/default/object/plugin/advanced.php
+++ b/views/default/object/plugin/advanced.php
@@ -20,7 +20,6 @@ $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 = '';
@@ -80,33 +79,42 @@ if ($priority < $max_priority) {
 }
 
 // activate / deactivate links
-if ($can_activate) {
-	if ($active) {
-		$action = 'deactivate';
-		$class = 'elgg-button-cancel';
-	} else {
-		$action = 'activate';
-		$class = 'elgg-button-submit';
+
+// always let them deactivate
+$options = array(
+	'is_action' => true
+);
+if ($active) {
+	$active_class = 'elgg-state-active';
+	$action = 'deactivate';
+	$options['text'] = elgg_echo('deactivate');
+	$options['class'] = "elgg-button elgg-button-cancel";
+
+	if (!$can_activate) {
+		$active_class = 'elgg-state-active';
+		$options['class'] = 'elgg-button elgg-state-warning';
 	}
+} else if ($can_activate) {
+	$active_class = 'elgg-state-inactive';
+	$action = 'activate';
+	$options['text'] = elgg_echo('activate');
+	$options['class'] = "elgg-button elgg-button-submit";
+} else {
+	$active_class = 'elgg-state-inactive';
+	$action = '';
+	$options['text'] = elgg_echo('admin:plugins:cannot_activate');
+	$options['class'] = "elgg-button elgg-button-disabled";
+	$options['disabled'] = 'disabled';
+}
 
+if ($action) {
 	$url = elgg_http_add_url_query_elements($actions_base . $action, array(
-		'plugin_guids[]' => $plugin->guid,
-		'is_action' => true
+		'plugin_guids[]' => $plugin->guid
 	));
 
-	$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 elgg-button-action elgg-state-disabled"
-	));
+	$options['href'] = $url;
 }
+$action_button = elgg_view('output/url', $options);
 
 // Display categories
 $categories_html = '';
@@ -202,8 +210,13 @@ if (elgg_view_exists($settings_view_old) || elgg_view_exists($settings_view_new)
 			}
 	
 			if (!$can_activate) {
-				$message = elgg_echo('admin:plugins:warning:unmet_dependencies');
-				echo "<p class=\"elgg-state-error\">$message</p>";
+				if ($active) {
+					$message = elgg_echo('admin:plugins:warning:unmet_dependencies_active');
+					echo "<p class=\"elgg-state-warning\">$message</p>";
+				} else {
+					$message = elgg_echo('admin:plugins:warning:unmet_dependencies');
+					echo "<p class=\"elgg-state-error\">$message</p>";
+				}
 			}
 			?>
 	
-- 
cgit v1.2.3


From 64045426f4eb5150c46dd2534058c3522bbe6ecf Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 9 Jun 2011 20:19:08 +0000
Subject: Fixes #2871 activate all/deactivate all now sensitive to filtering

git-svn-id: http://code.elgg.org/elgg/trunk@9158 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 actions/admin/plugins/activate_all.php             | 20 ++++++----
 actions/admin/plugins/deactivate_all.php           | 20 ++++++----
 views/default/admin/plugins.php                    | 44 ++++++++++++----------
 views/default/css/admin.php                        |  7 ++++
 views/default/forms/admin/plugins/change_state.php | 20 ++++++++++
 5 files changed, 76 insertions(+), 35 deletions(-)
 create mode 100644 views/default/forms/admin/plugins/change_state.php

(limited to 'views/default/css/admin.php')

diff --git a/actions/admin/plugins/activate_all.php b/actions/admin/plugins/activate_all.php
index 0f0352877..19eb82142 100644
--- a/actions/admin/plugins/activate_all.php
+++ b/actions/admin/plugins/activate_all.php
@@ -1,21 +1,25 @@
 <?php
 /**
- * Activates all installed and inactive plugins.
+ * Activates all specified installed and inactive plugins.
  *
- * All plugins in the mod/ directory are that aren't active are activated and the views
+ * All specified plugins in the mod/ directory are that aren't active are activated and the views
  * cache and simplecache are invalidated.
  *
  * @package Elgg.Core
  * @subpackage Administration.Plugins
  */
 
-$plugins = elgg_get_plugins('inactive');
+$guids = get_input('guids');
+$guids = explode(',', $guids);
 
-foreach ($plugins as $plugin) {
-	if ($plugin->activate()) {
-		//system_message(elgg_echo('admin:plugins:activate:yes', array($plugin->getManifest()->getName())));
-	} else {
-		register_error(elgg_echo('admin:plugins:activate:no', array($plugin->getManifest()->getName())));
+foreach ($guids as $guid) {
+	$plugin = get_entity($guid);
+	if (!$plugin->isActive()) {
+		if ($plugin->activate()) {
+			//system_message(elgg_echo('admin:plugins:activate:yes', array($plugin->getManifest()->getName())));
+		} else {
+			register_error(elgg_echo('admin:plugins:activate:no', array($plugin->getManifest()->getName())));
+		}
 	}
 }
 
diff --git a/actions/admin/plugins/deactivate_all.php b/actions/admin/plugins/deactivate_all.php
index 446cad8c0..436a3ad30 100644
--- a/actions/admin/plugins/deactivate_all.php
+++ b/actions/admin/plugins/deactivate_all.php
@@ -1,21 +1,25 @@
 <?php
 /**
- * Disable all installed plugins.
+ * Disable all specified installed plugins.
  *
- * All plugins in the mod/ directory are disabled and the views cache and simplecache
+ * Specified plugins in the mod/ directory are disabled and the views cache and simplecache
  * are reset.
  *
  * @package Elgg.Core
  * @subpackage Administration.Plugins
  */
 
-$plugins = elgg_get_plugins('active');
+$guids = get_input('guids');
+$guids = explode(',', $guids);
 
-foreach ($plugins as $plugin) {
-	if ($plugin->deactivate()) {
-		//system_message(elgg_echo('admin:plugins:deactivate:yes', array($plugin->getManifest()->getName())));
-	} else {
-		register_error(elgg_echo('admin:plugins:deactivate:no', array($plugin->getManifest()->getName())));
+foreach ($guids as $guid) {
+	$plugin = get_entity($guid);
+	if ($plugin->isActive()) {
+		if ($plugin->deactivate()) {
+			//system_message(elgg_echo('admin:plugins:activate:yes', array($plugin->getManifest()->getName())));
+		} else {
+			register_error(elgg_echo('admin:plugins:deactivate:no', array($plugin->getManifest()->getName())));
+		}
 	}
 }
 
diff --git a/views/default/admin/plugins.php b/views/default/admin/plugins.php
index 9f426fae2..1aa899fcc 100644
--- a/views/default/admin/plugins.php
+++ b/views/default/admin/plugins.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Elgg administration advanced plugin screen
+ * Elgg administration plugin screen
  *
- * Shows a list of all plugins sorted by load order.
+ * Shows a list of plugins that can be sorted and filtered.
  *
  * @package Elgg.Core
  * @subpackage Admin.Plugins
@@ -56,6 +56,11 @@ foreach ($installed_plugins as $id => $plugin) {
 	}
 }
 
+$guids = array();
+foreach ($installed_plugins as $plugin) {
+	$guids[] = $plugin->getGUID();
+}
+
 // sort plugins
 switch ($sort) {
 	case 'date':
@@ -99,7 +104,7 @@ if (!array_key_exists($show_category, $categories)) {
 }
 
 $category_form = elgg_view_form('admin/plugins/filter', array(
-	'action' => 'admin/plugins/advanced',
+	'action' => 'admin/plugins',
 	'method' => 'get',
 	'disable_security' => true,
 ), array(
@@ -120,7 +125,7 @@ if (!array_key_exists($sort, $sort_options)) {
 }
 
 $sort_form = elgg_view_form('admin/plugins/sort', array(
-	'action' => 'admin/plugins/advanced',
+	'action' => 'admin/plugins',
 	'method' => 'get',
 	'disable_security' => true,
 ), array(
@@ -129,21 +134,22 @@ $sort_form = elgg_view_form('admin/plugins/sort', array(
 	'category' => $show_category,
 ));
 
-
-// @todo Until "en/deactivate all" means "All plugins on this page" hide when not looking at all.
-if ($show_category == 'all') {
-	$activate_url = "action/admin/plugins/activate_all";
-	$activate_url = elgg_add_action_tokens_to_url($activate_url);
-	$deactivate_url = "action/admin/plugins/deactivate_all";
-	$deactivate_url = elgg_add_action_tokens_to_url($deactivate_url);
-
-	$buttons = "<div class=\"mbl\">";
-	$buttons .= "<a class='elgg-button elgg-button-action' href=\"$activate_url\">" . elgg_echo('admin:plugins:activate_all') . '</a> ';
-	$buttons .=	"<a class='elgg-button elgg-button-cancel' href=\"$deactivate_url\">" . elgg_echo('admin:plugins:deactivate_all') . '</a> ';
-	$buttons .= "</div>";
-} else {
-	$buttons = '';
-}
+$buttons = "<div class=\"clearfix mbm\">";
+$buttons .= elgg_view_form('admin/plugins/change_state', array(
+	'action' => 'action/admin/plugins/activate_all',
+	'class' => 'float',
+), array(
+	'guids' => $guids,
+	'action' => 'activate',
+));
+$buttons .= elgg_view_form('admin/plugins/change_state', array(
+	'action' => 'action/admin/plugins/deactivate_all',
+	'class' => 'float',
+), array(
+	'guids' => $guids,
+	'action' => 'deactivate',
+));
+$buttons .= "</div>";
 
 $buttons .= $category_form . $sort_form;
 
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 744211a20..e04bdc568 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -158,6 +158,13 @@ table.mceLayout {
 .center {
 	text-align: center;
 }
+.float {
+	float: left;
+}
+.float-alt {
+	float: right;
+}
+
 /* ***************************************
 	PAGE WRAPPER
 *************************************** */
diff --git a/views/default/forms/admin/plugins/change_state.php b/views/default/forms/admin/plugins/change_state.php
new file mode 100644
index 000000000..ba5d873e7
--- /dev/null
+++ b/views/default/forms/admin/plugins/change_state.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Activate/deactive all plugins specified by guids array
+ *
+ * @uses $vars['guids']  Array of GUIDs
+ * @uses $vars['action'] 'activate' or 'deactivate'
+ */
+
+$guids = elgg_extract('guids', $vars, array());
+$guids = implode(',', $guids);
+
+echo elgg_view('input/hidden', array(
+	'name' => 'guids',
+	'value' => $guids,
+));
+
+echo elgg_view('input/submit', array(
+	'value' => elgg_echo("admin:plugins:{$vars['action']}_all"),
+	'class' => 'elgg-button elgg-button-action'
+));
-- 
cgit v1.2.3


From a1a341ee6f4d0065929931a4caa0b4c79dbcb32c Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 13 Jun 2011 00:03:34 +0000
Subject: added the css for longtext control menu to admin theme

git-svn-id: http://code.elgg.org/elgg/trunk@9196 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/css/admin.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'views/default/css/admin.php')

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index e04bdc568..a4d413781 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -685,6 +685,9 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 .elgg-menu-admin-footer > li {
 	padding-right: 25px;
 }
+.elgg-menu-longtext {
+	float: right;
+}
 
 /* ***************************************
 	WIDGETS
@@ -854,9 +857,10 @@ a.elgg-widget-collapsed:before {
 	margin-bottom: 5px;
 }
 
-a.elgg-longtext-control {
-	float: right;
+.elgg-longtext-control {
 	margin-left: 14px;
+	font-size: 80%;
+	cursor: pointer;
 }
 
 /* ***************************************
-- 
cgit v1.2.3