aboutsummaryrefslogtreecommitdiff
path: root/views/default/page_elements
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-20 20:21:44 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-20 20:21:44 +0000
commitad745e050da855d326d1b6bc3df8032c05574392 (patch)
treeb6387add3efde9340aac120ab16c727b5f30f278 /views/default/page_elements
parent6f8da12756183dc29227b3b4c07650ef293144d0 (diff)
downloadelgg-ad745e050da855d326d1b6bc3df8032c05574392.tar.gz
elgg-ad745e050da855d326d1b6bc3df8032c05574392.tar.bz2
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
Diffstat (limited to 'views/default/page_elements')
-rw-r--r--views/default/page_elements/elgg_topbar.php15
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