3 files changed, 37 insertions, 4 deletions
diff --git a/views/default/admin/main.php b/views/default/admin/main.php
new file mode 100644
index 000000000..7a1358f03
--- /dev/null
+++ b/views/default/admin/main.php
@@ -0,0 +1,20 @@
+<?php
+
+	/**
+	 * Elgg administration 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:description")) . "</p>";
+		
+	// Main menu items
+		echo elgg_view("admin/mainmenu");
+		
+?>
+\ No newline at end of file
diff --git a/views/default/editmenu.php b/views/default/editmenu.php
index e08a512d1..5d05e7a14 100644
--- a/views/default/editmenu.php
+++ b/views/default/editmenu.php
@@ -9,5 +9,5 @@
 	 * @author Curverider Ltd
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.org/
-
+	**/
 ?>
 \ No newline at end of file
diff --git a/views/default/navigation/topmenu.php b/views/default/navigation/topmenu.php
index fe289a7ba..a8211f67a 100644
--- a/views/default/navigation/topmenu.php
+++ b/views/default/navigation/topmenu.php
@@ -27,9 +27,22 @@
     ?>
     </div>
     <ul>
-        <li><a href="<?php echo $vars['url']; ?>mod/dashboard/"><?php echo elgg_echo('dashboard'); ?></a></li>
-        <li><a href=""><?php echo elgg_echo('profile'); ?></a></li>
-        <li><a href=""><?php echo elgg_echo('account'); ?></a></li>
+        <li><a href="<?php echo $vars['url']; ?>pg/dashboard/"><?php echo elgg_echo('dashboard'); ?></a></li>
+        <li><a href="<?php echo $vars['url']; ?>pg/settings/"><?php echo elgg_echo('settings'); ?></a></li>
+<?php
+
+		// The administration link is for admin or site admin users only
+		if ($vars['user']->admin || $vars['user']->siteadmin) { 
+
+?>
+
+		<li><a href="<?php echo $vars['url']; ?>pg/admin/"><?php echo elgg_echo("admin"); ?></a></li>
+
+<?php
+
+		}
+
+?>
         <li><a href="<?php echo $vars['url']; ?>action/logout"><?php echo elgg_echo('logout'); ?></a></li>
     </ul>
 </div>