Beginnings of a stand-alone admin area.

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

3 files changed, 299 insertions, 147 deletions

diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index 6a64bc19a..b9c21ba56 100644
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -207,7 +207,7 @@ function admin_settings_page_handler($page) {
 		$content = "<div class=\"admin_notices\">$notices_html</div>$content";
 	}
 
-	$body = elgg_view_layout('one_column_with_sidebar', $content);
+	$body = elgg_view_layout('administration', $content);
 	page_draw($title, $body);
 }
 
diff --git a/views/default/canvas/layouts/administration.php b/views/default/canvas/layouts/administration.php
new file mode 100644
index 000000000..bd61ae75f
--- /dev/null
+++ b/views/default/canvas/layouts/administration.php
@@ -0,0 +1,288 @@
+<?php
+/**
+ * Elgg Admin Area Canvas
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+?>
+<style type="text/css">
+/**
+ * ELGG DEFAULT ADMIN AREA CSS
+   @todo - move into separate css file
+*/
+/* temporary force-hide / override some base elements  */
+body { background-color: #444444; }
+#elgg_header { display:none; }
+#elgg_footer { display:none; }
+
+#admin_header {
+	background-color:#333333;
+	border-bottom:1px solid #555555;
+}
+#admin_footer {
+	background:#333333;
+	border-top:1px solid #222222;
+	clear:both;
+	height:30px;
+	width:100%;
+}
+#admin_header .network_title h2 {
+	height:45px;
+	line-height:45px;
+	margin:0;
+	padding:0 0 0 20px;
+	border:0;
+}
+#admin_header .network_title h2 a {
+	color:white;
+}
+#admin_header .network_title h2 a:hover {
+	color:white;
+	text-decoration: underline;
+}
+#elgg_content.admin_area {
+	margin:20px;
+	min-height:400px;
+	position:relative;
+	width:auto;
+}
+#elgg_content.admin_area #elgg_page_contents  {
+	float:left;
+	margin:0;
+	padding:14px;
+	width:75%;
+	background-color: white;
+	-webkit-border-radius: 6px; 
+	-moz-border-radius: 6px;
+}
+#elgg_content.admin_area #elgg_sidebar  {
+	float:left;
+	margin:0;
+	min-height:400px;
+	padding:0 0 0 3%;
+	position:relative;
+	width:17%;
+}
+
+.admin_area h1, 
+.admin_area h2,
+.admin_area h3,
+.admin_area h4,
+.admin_area h5,
+.admin_area h6 { 
+	color:#666666;
+}
+.admin_area .submenu {
+	margin:0;
+	padding:0;
+	list-style: none;
+}
+.admin_area .submenu li.selected a {
+	background-color: #666666;
+	color:white;
+}
+.admin_area .submenu li a {
+	display:block;
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	background-color:white;
+	margin:0 0 3px 0;
+	padding:2px 4px 2px 8px;
+	color:#333333;
+}
+.admin_area .submenu li a:hover {
+	background-color:black;
+	color:white;
+	text-decoration:none;
+}
+.admin_area .submenu .child li a {
+	margin-left:15px;
+	background-color:#dedede;
+	color:#333333;
+}
+.admin_area .submenu .child li a:hover {
+	background-color:black;
+	color:white;
+}
+
+.admin_settings h3 {
+	background:#999999;
+	color:white;
+	padding:5px;
+	margin-top:10px;
+	margin-bottom:10px;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+}
+.admin_settings label {
+	color:#333333;
+	font-size:100%;
+	font-weight:normal;
+}
+.admin_settings {
+	margin-bottom:20px;
+}
+.admin_settings table.styled {
+	width:100%;
+}
+.admin_settings table.styled {
+	border-top:1px solid #cccccc;
+}
+.admin_settings table.styled td {
+	padding:2px 4px 2px 4px;
+	border-bottom:1px solid #cccccc;
+}
+.admin_settings table.styled td.column_one {
+	width:200px;
+}
+.admin_settings table.styled tr:hover {
+	background: #E4E4E4;
+}
+.admin_settings.users_online .profile_status {
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	line-height:1.2em;
+}
+.admin_settings.users_online .profile_status span {
+	font-size:90%;
+	color:#666666;
+}
+.admin_settings.users_online  p.owner_timestamp {
+	padding-left:3px;
+}
+.admin_plugin_reorder {
+	float:right;
+	width:200px;
+	text-align: right;
+}
+.admin_plugin_reorder a {
+	padding-left:10px;
+	font-size:80%;
+	color:#999999;
+}
+.manifest_file {
+	background-color:#eeeeee;
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	padding:5px 10px 5px 10px;
+	margin:4px 0 4px 0;
+}
+.admin_plugin_enable_disable {
+	width:150px;
+	margin:10px 0 0 0;
+	float:right;
+	text-align: right;
+}
+.admin_plugin_enable_disable a {
+	margin:0;
+}
+.pluginsettings {
+	margin:15px 0 5px 0;
+	background-color:#eeeeee;
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	padding:10px;
+}
+.pluginsettings h3 {
+	padding:0 0 5px 0;
+	margin:0 0 5px 0;
+	border-bottom:1px solid #999999;
+}
+#updateclient_settings h3 {
+	padding:0;
+	margin:0;
+	border:none;
+}
+.plugin_controls {
+	padding: 3px 3px 3px 0;
+	font-weight: bold;
+	float: left;
+	width: 150px;
+}
+form.admin_plugins_simpleview .submit_button {
+	margin-right:20px;
+}
+.plugin_info {
+	margin: 3px;
+	padding-left: 150px;
+	display: block;
+}
+.plugin_metadata {
+	display:block;
+	color:#999999;
+}
+.plugin_name input[type="checkbox"] {
+	margin-right: 10px;
+}
+.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;
+}
+.configure_menuitems {
+	margin-bottom:30px;
+}
+.admin_settings.menuitems .input_pulldown {
+	margin-right:15px;
+	margin-bottom:10px;
+}
+.admin_settings.menuitems li.custom_menuitem {
+	margin-bottom:20px;
+}
+.admin_notices {
+	padding-bottom: 15px;
+}
+.admin_notices p {
+	background-color:#BDE5F8;
+	color: black;
+	border: 1px solid blue;
+	font-weight: bold;
+	padding:3px 10px;
+	-webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
+	-moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+}
+</style>
+
+<div id="admin_header">
+	<span class="network_title"><h2>
+	<a href="<?php echo $vars['url']; ?>">
+	<?php echo $vars['config']->sitename; echo " ".elgg_echo('admin'); ?></a></h2></span>
+</div>
+
+<div id="elgg_content" class="clearfloat admin_area">
+	
+	<div id="elgg_page_contents" class="clearfloat">
+		<?php 
+			if (isset($vars['area1'])) echo $vars['area1'];
+		?>
+	</div>
+	<div id="elgg_sidebar" class="clearfloat">
+		<?php 
+			echo elgg_view('page_elements/owner_block'); 
+			if (isset($vars['area2'])) echo $vars['area2']; 
+			if (isset($vars['area3'])) echo $vars['area3'];	
+		?>
+	</div>
+</div>
+<div id="admin_footer"></div>
\ No newline at end of file
diff --git a/views/default/css.php b/views/default/css.php
index bdef42982..78edaa24c 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -1025,17 +1025,14 @@ li.navigation_more ul li {
 	background-color:white;
 }
 
+
 /* ***************************************
-	USER SETTINGS & ADMIN AREA
-	@todo - pull admin css into stand-alone css
+	USER SETTINGS
 *************************************** */
-/* GENERAL STYLES */
-.user_settings,
-.admin_settings {
+.user_settings {
 	margin-bottom:20px;
 }
-.user_settings h3,
-.admin_settings h3 {
+.user_settings h3 {
 	background:#e4e4e4;
 	color:#333333;
 	padding:5px;
@@ -1044,31 +1041,25 @@ li.navigation_more ul li {
 	-webkit-border-radius: 3px;
 	-moz-border-radius: 3px;
 }
-.user_settings label,
-.admin_settings label {
+.user_settings label {
 	color:#333333;
 	font-size:100%;
 	font-weight:normal;
 }
-.user_settings table.styled,
-.admin_settings table.styled {
+.user_settings table.styled {
 	width:100%;
 }
-.user_settings table.styled,
-.admin_settings table.styled {
+.user_settings table.styled {
 	border-top:1px solid #cccccc;
 }
-.user_settings table.styled td,
-.admin_settings table.styled td {
+.user_settings table.styled td {
 	padding:2px 4px 2px 4px;
 	border-bottom:1px solid #cccccc;
 }
-.user_settings table.styled td.column_one,
-.admin_settings table.styled td.column_one {
+.user_settings table.styled td.column_one {
 	width:200px;
 }
-.user_settings table.styled tr:hover,
-.admin_settings table.styled tr:hover {
+.user_settings table.styled tr:hover {
 	background: #E4E4E4;
 }
 .add_user form {
@@ -1522,130 +1513,3 @@ a.action_button:focus {
 p.elgg_likes_owner {
 	padding-top:4px;
 }
-
-
-/* ***************************************
-	ADMIN AREA
-	@todo - replace with standalone admin area
-*************************************** */
-.admin_settings.users_online .profile_status {
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-	line-height:1.2em;
-}
-.admin_settings.users_online .profile_status span {
-	font-size:90%;
-	color:#666666;
-}
-.admin_settings.users_online  p.owner_timestamp {
-	padding-left:3px;
-}
-.admin_plugin_reorder {
-	float:right;
-	width:200px;
-	text-align: right;
-}
-.admin_plugin_reorder a {
-	padding-left:10px;
-	font-size:80%;
-	color:#999999;
-}
-.manifest_file {
-	background-color:#eeeeee;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	padding:5px 10px 5px 10px;
-	margin:4px 0 4px 0;
-}
-.admin_plugin_enable_disable {
-	width:150px;
-	margin:10px 0 0 0;
-	float:right;
-	text-align: right;
-}
-.admin_plugin_enable_disable a {
-	margin:0;
-}
-.pluginsettings {
-	margin:15px 0 5px 0;
-	background-color:#eeeeee;
-	-webkit-border-radius: 8px;
-	-moz-border-radius: 8px;
-	padding:10px;
-}
-.pluginsettings h3 {
-	padding:0 0 5px 0;
-	margin:0 0 5px 0;
-	border-bottom:1px solid #999999;
-}
-#updateclient_settings h3 {
-	padding:0;
-	margin:0;
-	border:none;
-}
-.plugin_controls {
-	padding: 3px 3px 3px 0;
-	font-weight: bold;
-	float: left;
-	width: 150px;
-}
-form.admin_plugins_simpleview .submit_button {
-	margin-right:20px;
-}
-.plugin_info {
-	margin: 3px;
-	padding-left: 150px;
-	display: block;
-}
-.plugin_metadata {
-	display:block;
-	color:#999999;
-}
-.plugin_name input[type="checkbox"] {
-	margin-right: 10px;
-}
-.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;
-}
-.configure_menuitems {
-	margin-bottom:30px;
-}
-.admin_settings.menuitems .input_pulldown {
-	margin-right:15px;
-	margin-bottom:10px;
-}
-.admin_settings.menuitems li.custom_menuitem {
-	margin-bottom:20px;
-}
-.admin_notices {
-	padding-bottom: 15px;
-}
-.admin_notices p {
-	background-color:#BDE5F8;
-	color: black;
-	border: 1px solid blue;
-	font-weight: bold;
-	padding:3px 10px;
-	-webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45); /* safari v3+ */
-	-moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45); /* FF v3.5+ */
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-}