7 files changed, 110 insertions, 4 deletions
diff --git a/views/default/admin/main.php b/views/default/admin/main.php
index 7a1358f03..84be45780 100644
--- a/views/default/admin/main.php
+++ b/views/default/admin/main.php
@@ -6,15 +6,14 @@
 	 * @package Elgg
 	 * @subpackage Core
 	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
+	 * @author Marcus Povey
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
-	**/
+	 */
 
 	// Description of what's going on
 		echo "<p>" . nl2br(elgg_echo("admin:description")) . "</p>";
 		
-	// Main menu items
-		echo elgg_view("admin/mainmenu");
+	
 		
 ?>
 \ No newline at end of file
diff --git a/views/default/admin/main_opt/plugins.php b/views/default/admin/main_opt/plugins.php
new file mode 100644
index 000000000..f110007a8
--- /dev/null
+++ b/views/default/admin/main_opt/plugins.php
@@ -0,0 +1,19 @@
+<?php
+	/**
+	 * Elgg plugin sub-component on the main menu.
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Marcus Povey
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+
+	global $CONFIG;
+?>
+<div class="admin-menu-option">
+	<h2><?php echo elgg_echo('admin:plugins'); ?> </h2>
+	<p><?php echo elgg_echo('admin:plugins:opt:description'); ?><br />
+	<a href="<?php echo $CONFIG->wwwroot . "admin/plugins/"; ?>"><?php echo elgg_echo('admin:plugins:opt:linktext'); ?></a></p> 
+</div>
+\ No newline at end of file
diff --git a/views/default/admin/main_opt/site.php b/views/default/admin/main_opt/site.php
new file mode 100644
index 000000000..40373e647
--- /dev/null
+++ b/views/default/admin/main_opt/site.php
@@ -0,0 +1,17 @@
+<?php
+	/**
+	 * Elgg site sub-component on the main menu.
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Marcus Povey
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+?>
+<div class="admin-menu-option">
+	<h2><?php echo elgg_echo('admin:site'); ?> </h2>
+	<p><?php echo elgg_echo('admin:site:opt:description'); ?><br />
+	<a href="<?php echo $CONFIG->wwwroot . "admin/site/"; ?>"><?php echo elgg_echo('admin:site:opt:linktext'); ?></a></p>
+</div>
+\ No newline at end of file
diff --git a/views/default/admin/main_opt/user.php b/views/default/admin/main_opt/user.php
new file mode 100644
index 000000000..8505098fd
--- /dev/null
+++ b/views/default/admin/main_opt/user.php
@@ -0,0 +1,17 @@
+<?php
+	/**
+	 * Elgg user sub-component on the main menu.
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Marcus Povey
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+?>
+<div class="admin-menu-option">
+	<h2><?php echo elgg_echo('admin:user'); ?> </h2>
+	<p><?php echo elgg_echo('admin:user:opt:description'); ?><br />
+	<a href="<?php echo $CONFIG->wwwroot . "admin/user/"; ?>"><?php echo elgg_echo('admin:user:opt:linktext'); ?></a></p>
+</div>
+\ No newline at end of file
diff --git a/views/default/admin/plugins.php b/views/default/admin/plugins.php
new file mode 100644
index 000000000..9461640d7
--- /dev/null
+++ b/views/default/admin/plugins.php
@@ -0,0 +1,18 @@
+<?php
+
+	/**
+	 * Elgg administration plugin main screen
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Marcus Povey
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+
+	// Description of what's going on
+		echo "<p>" . nl2br(elgg_echo("admin:plugins:description")) . "</p>";
+	
+		
+?>
+\ No newline at end of file
diff --git a/views/default/admin/site.php b/views/default/admin/site.php
new file mode 100644
index 000000000..30fa901fd
--- /dev/null
+++ b/views/default/admin/site.php
@@ -0,0 +1,18 @@
+<?php
+
+	/**
+	 * Elgg administration site main screen
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	**/
+
+	// Description of what's going on
+		echo "<p>" . nl2br(elgg_echo("admin:site:description")) . "</p>";
+	
+		
+?>
+\ No newline at end of file
diff --git a/views/default/admin/user.php b/views/default/admin/user.php
new file mode 100644
index 000000000..0f5a5daf6
--- /dev/null
+++ b/views/default/admin/user.php
@@ -0,0 +1,18 @@
+<?php
+
+	/**
+	 * Elgg administration user main screen
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Marcus Povey
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	**/
+
+	// Description of what's going on
+		echo "<p>" . nl2br(elgg_echo("admin:user:description")) . "</p>";
+	
+		
+?>
+\ No newline at end of file