12 files changed, 57 insertions, 121 deletions

diff --git a/admin/plugins.php b/admin/plugins.php
index 358c42ec5..55035830a 100644
--- a/admin/plugins.php
+++ b/admin/plugins.php
@@ -20,9 +20,7 @@ regenerate_plugin_list();
 
 // Display main admin menu
 $vars = array('installed_plugins' => get_installed_plugins());
-
-$title = elgg_view_title(elgg_echo('admin:plugins'));
 $main_box = elgg_view("admin/plugins", $vars);
-$content = elgg_view_layout("one_column_with_sidebar", $title . $main_box);
+$content = elgg_view_layout("one_column_with_sidebar", $main_box);
 
 page_draw(elgg_echo('admin:plugins'), $content);
diff --git a/mod/profile/defaultprofile.php b/mod/profile/defaultprofile.php
index 233214c15..daba723e3 100644
--- a/mod/profile/defaultprofile.php
+++ b/mod/profile/defaultprofile.php
@@ -39,7 +39,7 @@ while ($translation = get_plugin_setting("admin_defined_profile_$n", 'profile'))
 
 $listing .= "<div class='default_profile_reset'>" . elgg_view('input/form', 
 	array(
-		'body' => elgg_view('input/submit', array('value' => elgg_echo('profile:resetdefault'))), 
+		'body' => elgg_view('input/submit', array('value' => elgg_echo('profile:resetdefault'),'class' => 'action_button disable')), 
 		'action' => $CONFIG->wwwroot . 'action/profile/editdefault/reset'
 	)
 ) . "</div>";
diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php
index cde028f12..254c9bed2 100644
--- a/mod/profile/views/default/profile/css.php
+++ b/mod/profile/views/default/profile/css.php
@@ -307,18 +307,9 @@ p.visit_twitter a {
 	border-top: 1px solid #dedede;
 	margin-top:30px;
 }
-.default_profile_reset input[type="submit"] {
-	background: #dedede;
-	border-color: #dedede;
-	color:#666666;
-	text-shadow: none;
+.default_profile_reset .action_button {
 	float:right;
 }
-.default_profile_reset input[type="submit"]:hover {
-	background: red;
-	border-color: red;
-	color:white;
-}
 
 
 /* ***************************************
diff --git a/mod/profile/views/default/profile/editdefaultprofile.php b/mod/profile/views/default/profile/editdefaultprofile.php
index 42680f4df..338204d36 100644
--- a/mod/profile/views/default/profile/editdefaultprofile.php
+++ b/mod/profile/views/default/profile/editdefaultprofile.php
@@ -29,5 +29,5 @@ $formbody = <<< END
 		$submit_control</p>
 END;
 
-echo "<p>" . elgg_echo('profile:explainchangefields') . "</p>";
+echo "<p class='margin_top'>" . elgg_echo('profile:explainchangefields') . "</p>";
 echo elgg_view('input/form', array('body' => $formbody, 'action' => $vars['url'] . 'action/profile/editdefault'));
diff --git a/mod/reportedcontent/views/default/reportedcontent/listing.php b/mod/reportedcontent/views/default/reportedcontent/listing.php
index 8bad802ce..54ebd6a27 100644
--- a/mod/reportedcontent/views/default/reportedcontent/listing.php
+++ b/mod/reportedcontent/views/default/reportedcontent/listing.php
@@ -42,5 +42,5 @@ if($vars['entity']){
     }
     
 } else {
-	echo elgg_echo('reportedcontent:none');
+	echo "<p class='margin_top'>".elgg_echo('reportedcontent:none')."</p>";
 }
\ No newline at end of file
diff --git a/mod/sitepages/views/default/sitepages/menu.php b/mod/sitepages/views/default/sitepages/menu.php
index e676b6c96..5cffc610a 100644
--- a/mod/sitepages/views/default/sitepages/menu.php
+++ b/mod/sitepages/views/default/sitepages/menu.php
@@ -14,7 +14,7 @@ $url = $vars['url'] . 'pg/sitepages/edit/';
 
 ?>
 
-<div class="elgg_horizontal_tabbed_nav">
+<div class="elgg_horizontal_tabbed_nav margin_top">
 <ul>
 	<li <?php if($page_type == 'front') echo "class = 'selected'"; ?>><a href="<?php echo $url; ?>front"><?php echo elgg_echo('sitepages:frontpage'); ?></a></li>
 	<li <?php if($page_type == 'about') echo "class = 'selected'"; ?>><a href="<?php echo $url; ?>about"><?php echo elgg_echo('sitepages:about'); ?></a></li>
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));
diff --git a/views/default/css.php b/views/default/css.php
index 660b0ab53..0ce9d0dde 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -26,6 +26,7 @@
 	USER SETTINGS & ADMIN AREA	styles for user settings and default admin area
 	GENERAL FORM ELEMENTS		default styles for all elgg input/form elements
 	FRIENDS PICKER
+	ADMIN AREA
 	
 
 */
@@ -196,6 +197,9 @@ h2 {
 .link {
 	cursor:pointer;
 }
+.small {
+	font-size: 90%;
+}
 .divider {
 	border-top:1px solid #cccccc;
 }
@@ -758,7 +762,7 @@ h2 {
 	display:block;
 	float:left;
 	background:#4690d6;
-	border:1px solid #cccccc;
+	border:1px solid #4690d6;
 	text-align: center;
 	color:white;
 	font-size: 12px;
@@ -1091,33 +1095,6 @@ select.styled .select_option {
 .add_user form {
 	width:300px;
 }
-/* PLUGINS MANAGEMENT (ADMIN) */
-.plugin_details {
-	margin:0 0 5px 0;
-	padding:0 7px 4px 10px;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-}
-.plugin_details p {
-	margin:0;
-	padding:0;
-}
-.plugin_details a.pluginsettings_link {
-	cursor:pointer;
-	font-size:80%;
-}
-.plugin_details a.manifest_details {
-	cursor:pointer;
-	font-size:80%;
-}
-.active {
-	border:1px solid #999999;
-	background:white;
-}
-.not_active {
-	border:1px solid #999999;
-	background:#dedede;
-}
 
 
 /* ***************************************
@@ -1508,18 +1485,10 @@ a.action_button:focus {
 }
 
 
-/*  //////////////////////////////////////////////////////////////////////////////////////////	>>>End Verified */
-
-
-
-
-
-
-
-
-
-
-/* @todo OLD ADMIN AREA - will be replaced/updated with multi-admin */
+/* ***************************************
+	ADMIN AREA
+	@todo - replace with standalone admin area
+*************************************** */
 .admin_settings.users_online .profile_status {
 	-webkit-border-radius: 4px;
 	-moz-border-radius: 4px;
@@ -1534,15 +1503,6 @@ a.action_button:focus {
 .admin_settings.users_online  p.owner_timestamp {
 	padding-left:3px;
 }
-/*
-.admin_users_online .search_listing {
-	margin:0 0 5px 0;
-	padding:5px;
-	border:1px solid #cccccc;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-}
-*/
 .admin_plugin_reorder {
 	float:right;
 	width:200px;
@@ -1566,50 +1526,8 @@ a.action_button:focus {
 	float:right;
 	text-align: right;
 }
- .enableallplugins,
- .disableallplugins {
-	float:right;
-}
- .enableallplugins {
-	margin-left:10px;
-}
- .enableallplugins,
-.not_active .admin_plugin_enable_disable a {
-	font: 12px/100% Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	color: #ffffff;
-	background:#4690d6;
-	border: 1px solid #4690d6;
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-	width: auto;
-	padding: 4px;
-	cursor: pointer;
-}
- .enableallplugins:hover,
-.not_active .admin_plugin_enable_disable a:hover {
-	background: #0054a7;
-	border: 1px solid #0054a7;
-	text-decoration: none;
-}
- .disableallplugins,
-.active .admin_plugin_enable_disable a {
-	font: 12px/100% Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	color: #ffffff;
-	background:#999999;
-	border: 1px solid #999999;
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-	width: auto;
-	padding: 4px;
-	cursor: pointer;
-}
- .disableallplugins:hover,
-.active .admin_plugin_enable_disable a:hover {
-	background: #333333;
-	border: 1px solid #333333;
-	text-decoration: none;
+.admin_plugin_enable_disable a {
+	margin:0;
 }
 .pluginsettings {
 	margin:15px 0 5px 0;
@@ -1628,6 +1546,26 @@ a.action_button:focus {
 	margin:0;
 	border:none;
 }
-
+.plugin_details {
+	margin:0 0 5px 0;
+	padding:0 7px 4px 10px;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+}
+.plugin_details p {
+	margin:0;
+	padding:0;
+}
+.plugin_settings {
+	font-weight: normal;
+}
+.active {
+	border:1px solid #999999;
+	background:white;
+}
+.not_active {
+	border:1px solid #999999;
+	background:#dedede;
+}
 
 
diff --git a/views/default/settings/system.php b/views/default/settings/system.php
index bcc5206f4..500fa546f 100644
--- a/views/default/settings/system.php
+++ b/views/default/settings/system.php
@@ -65,5 +65,5 @@ $form_body .= "</p>";
 $form_body .= elgg_view('input/hidden', array('internalname' => 'settings', 'value' => 'go'));
 
 $form_body .= "<div class='divider'></div>".elgg_view('input/submit', array('value' => elgg_echo("save")));
-$form_body = "<div class='admin_settings site_admin'>".$form_body."</div>";
+$form_body = "<div class='admin_settings site_admin margin_top'>".$form_body."</div>";
 echo elgg_view('input/form', array('action' => $action, 'body' => $form_body));
\ No newline at end of file