Moved toolbar dropdown menu to main nav.

Added CSS for main nav dropdown.
Emptied navigation/topbar_tools view.



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

1 files changed, 8 insertions, 7 deletions

diff --git a/views/default/page_elements/elgg_topbar.php b/views/default/page_elements/elgg_topbar.php
index c57020e79..240cd0465 100644
--- a/views/default/page_elements/elgg_topbar.php
+++ b/views/default/page_elements/elgg_topbar.php
@@ -14,14 +14,15 @@
 	<a href="http://www.elgg.org" target="_blank"><img class="site_logo" src="<?php echo $vars['url']; ?>_graphics/elgg_toolbar_logo.gif" alt="Elgg logo" /></a>
 	<a href="<?php echo $_SESSION['user']->getURL(); ?>"><img class="user_mini_avatar" src="<?php echo $_SESSION['user']->getIcon('topbar'); ?>" alt="User avatar" /></a>
 
-    <?php
-	    // elgg tools menu
-        echo elgg_view("navigation/topbar_tools");
+	<?php
+		// elgg tools menu
+		// need to echo this empty view for backward compatibility.
+		echo elgg_view("navigation/topbar_tools");
 
 		// enable elgg topbar extending
 		echo elgg_view('elgg_topbar/extend', $vars);
 	?>
-	
+
 	<div class="log_out">
 		<?php echo elgg_view('output/url', array('href' => "{$vars['url']}action/logout", 'text' => elgg_echo('logout'), 'is_action' => TRUE)); ?>
 	</div>
@@ -43,10 +44,10 @@
 	?>
 	<?php
 		// The administration link is for admin or site admin users only
-		if ($vars['user']->admin || $vars['user']->siteadmin) { 
+		if ($vars['user']->admin || $vars['user']->siteadmin) {
 	?>
 		<a href="<?php echo $vars['url']; ?>pg/admin/" class="admin"><?php echo elgg_echo("admin"); ?></a>
-	
+
 	<?php
 		}
 	?>
@@ -55,5 +56,5 @@
 
 </div>
 <?php
-    }
+	}
 ?>
\ No newline at end of file