Updates to Admin area UI.

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

4 files changed, 18 insertions, 9 deletions

diff --git a/views/default/admin/plugins.php b/views/default/admin/plugins.php
index 70e5d2683..465b019f6 100644
--- a/views/default/admin/plugins.php
+++ b/views/default/admin/plugins.php
@@ -13,9 +13,18 @@ global $CONFIG;
 $ts = time();
 $token = generate_action_token($ts);
 
-// Description of what's going on
-$buttons = " <a class='enableallplugins' href=\"{$CONFIG->url}action/admin/plugins/enableall?__elgg_token=$token&__elgg_ts=$ts\">".elgg_echo('enableall')."</a>  <a class='disableallplugins' href=\"{$CONFIG->url}action/admin/plugins/disableall?__elgg_token=$token&__elgg_ts=$ts\">".elgg_echo('disableall')."</a> ";
-echo $buttons . elgg_view('output/longtext', array('value' => elgg_echo("admin:plugins:description")));
+// Page Header elements
+$title = elgg_view_title(elgg_echo('admin:plugins'));
+$buttons = "<a class='action_button' href=\"{$CONFIG->url}action/admin/plugins/enableall?__elgg_token=$token&__elgg_ts=$ts\">".elgg_echo('enableall')."</a>  <a class='action_button disabled' href=\"{$CONFIG->url}action/admin/plugins/disableall?__elgg_token=$token&__elgg_ts=$ts\">".elgg_echo('disableall')."</a> ";
+
+// construct page header
+?>
+<div id="content_header" class="clearfloat">
+	<div class="content_header_title"><?php echo $title ?></div>
+	<div class="content_header_options"><?php echo $buttons ?></div>
+</div>
+<?php
+echo elgg_view('output/longtext', array('value' => elgg_echo("admin:plugins:description")));
 
 $limit = get_input('limit', 10);
 $offset = get_input('offset', 0);
diff --git a/views/default/admin/plugins_opt/plugin.php b/views/default/admin/plugins_opt/plugin.php
index dabf25c55..0150e76d8 100644
--- a/views/default/admin/plugins_opt/plugin.php
+++ b/views/default/admin/plugins_opt/plugin.php
@@ -47,13 +47,13 @@ $token = generate_action_token($ts);
 	</div><div class="clearfloat"></div>
 	<div class="admin_plugin_enable_disable">
 		<?php if ($active) { ?>
-			<a href="<?php echo $vars['url']; ?>action/admin/plugins/disable?plugin=<?php echo $plugin; ?>&__elgg_token=<?php echo $token; ?>&__elgg_ts=<?php echo $ts; ?>"><?php echo elgg_echo("disable"); ?></a>
+			<a class="cancel_button" href="<?php echo $vars['url']; ?>action/admin/plugins/disable?plugin=<?php echo $plugin; ?>&__elgg_token=<?php echo $token; ?>&__elgg_ts=<?php echo $ts; ?>"><?php echo elgg_echo("disable"); ?></a>
 		<?php } else { ?>
-			<a href="<?php echo $vars['url']; ?>action/admin/plugins/enable?plugin=<?php echo $plugin; ?>&__elgg_token=<?php echo $token; ?>&__elgg_ts=<?php echo $ts; ?>"><?php echo elgg_echo("enable"); ?></a>
+			<a class="submit_button" href="<?php echo $vars['url']; ?>action/admin/plugins/enable?plugin=<?php echo $plugin; ?>&__elgg_token=<?php echo $token; ?>&__elgg_ts=<?php echo $ts; ?>"><?php echo elgg_echo("enable"); ?></a>
 		<?php } ?>
 	</div>
 
-	<h3><?php echo $plugin; ?><?php if (elgg_view("settings/{$plugin}/edit")) { ?> <a class="pluginsettings_link" onclick="elgg_slide_toggle(this,'.plugin_details','.pluginsettings');">[<?php echo elgg_echo('settings'); ?>]</a><?php } ?></h3>
+	<h3><?php echo $plugin; ?><?php if (elgg_view("settings/{$plugin}/edit")) { ?> <a class="plugin_settings small link" onclick="elgg_slide_toggle(this,'.plugin_details','.pluginsettings');">[<?php echo elgg_echo('settings'); ?>]</a><?php } ?></h3>
 
 	<?php if (elgg_view("settings/{$plugin}/edit")) { ?>
 	<div class="pluginsettings hidden">
@@ -75,7 +75,7 @@ $token = generate_action_token($ts);
 
 	?>
 
-	<p><a class="manifest_details" onclick="elgg_slide_toggle(this,'.plugin_details','.manifest_file');"><?php echo elgg_echo("admin:plugins:label:moreinfo"); ?></a></p>
+	<p><a class="manifest_details small link" onclick="elgg_slide_toggle(this,'.plugin_details','.manifest_file');"><?php echo elgg_echo("admin:plugins:label:moreinfo"); ?></a></p>
 
 	<div class="manifest_file hidden">
 
diff --git a/views/default/admin/site.php b/views/default/admin/site.php
index 0893e4970..2c2775ad0 100644
--- a/views/default/admin/site.php
+++ b/views/default/admin/site.php
@@ -11,6 +11,6 @@
 global $CONFIG;
 
 // Description of what's going on
-echo elgg_view('output/longtext', array('value' => elgg_echo("admin:site:description")));
+echo "<div class='margin_top'>".elgg_view('output/longtext', array('value' => elgg_echo("admin:site:description")))."</div>";
 
 echo elgg_view("settings/system",array("action" => $CONFIG->wwwroot."action/admin/site/update_basic")); // Always want to do this first.
\ No newline at end of file
diff --git a/views/default/admin/user.php b/views/default/admin/user.php
index eb07d120e..ba7eb3d4a 100644
--- a/views/default/admin/user.php
+++ b/views/default/admin/user.php
@@ -9,7 +9,7 @@
  */
 
 // Intro
-echo elgg_view('output/longtext', array('value' => elgg_echo("admin:user:description")));
+echo "<div class='margin_top'>".elgg_view('output/longtext', array('value' => elgg_echo("admin:user:description")))."</div>";
 //echo elgg_view("admin/user_opt/adduser");
 // add a new user form
 echo elgg_view('account/forms/useradd', array('show_admin'=>true));