aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/default/css.php24
-rw-r--r--views/default/page_elements/elgg_topbar.php16
2 files changed, 23 insertions, 17 deletions
diff --git a/views/default/css.php b/views/default/css.php
index 7c4b1210e..872850494 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -314,7 +314,7 @@ h6 { font-size: 0.8em; }
top:0px;
position:absolute;
text-align:left;
- width:50%;
+ width:60%;
}
#elgg_topbar_container_right {
@@ -330,7 +330,7 @@ h6 { font-size: 0.8em; }
#elgg_topbar_container_search {
float:right;
height:21px;
- width:280px;
+ /*width:280px;*/
position:relative;
right:120px;
text-align:right;
@@ -344,24 +344,28 @@ h6 { font-size: 0.8em; }
#elgg_topbar_container_left .toolbarlinks {
margin:3px 0 0 0;
}
-#elgg_topbar_container_left .toolbarlinks a {
- /* margin:0 0 0 20px;*/
- color:#4690d6;
-}
-#elgg_topbar_container_left .toolbarlinks a:hover {
- color:#eeeeee;
-}
#elgg_topbar_container_left a.loggedinuser {
color:#eeeeee;
font-weight:bold;
margin:0 0 0 5px;
}
#elgg_topbar_container_left a.pagelinks {
- margin:0 0 0 30px;
+ color:white;
+ margin:0 15px 0 5px;
+}
+#elgg_topbar_container_left a.pagelinks:hover {
+ color:#4690d6;
}
+
#elgg_topbar_container_left a.usersettings {
margin:0 0 0 20px;
+ color:#4690d6;
+}
+#elgg_topbar_container_left a.usersettings:hover {
+ color:#eeeeee;
}
+
+
#elgg_topbar_container_left img {
margin:2px 0 0 5px;
}
diff --git a/views/default/page_elements/elgg_topbar.php b/views/default/page_elements/elgg_topbar.php
index 0bbebc7f8..fbeae43c8 100644
--- a/views/default/page_elements/elgg_topbar.php
+++ b/views/default/page_elements/elgg_topbar.php
@@ -24,26 +24,28 @@
<div class="toolbarimages">
<a href="http://www.elgg.org" target="_blank"><img src="<?php echo $vars['url']; ?>_graphics/elgg_toolbar_logo.gif" /></a>
- <!-- new icon size needed 16px square - mini -->
<a href="<?php echo $_SESSION['user']->getURL(); ?>"><img class="user_mini_avatar" src="<?php echo $vars['url']; ?>pg/icon/<?php echo $_SESSION['user']->username; ?>/topbar/<?php echo $_SESSION['user']->timecreated; ?>.jpg"></a>
</div>
<div class="toolbarlinks">
<a href="<?php echo $_SESSION['user']->getURL(); ?>" class="pagelinks"><?php echo elgg_echo('profile'); ?></a> <!-- class="loggedinuser" <?php echo $_SESSION['user']->username; ?></a> -->
<a href="<?php echo $vars['url']; ?>pg/dashboard/" class="pagelinks"><?php echo elgg_echo('dashboard'); ?></a>
+
+ <?php
+ //allow people to extend this top menu
+ echo elgg_view('elgg_topbar/extend', $vars);
+ ?>
+
<a href="<?php echo $vars['url']; ?>settings/" class="usersettings"><?php echo elgg_echo('settings'); ?></a>
<?php
-
- //allow people to extend this top menu
- echo elgg_view('elgg_topbar/extend', $vars);
- // The administration link is for admin or site admin users only
- if ($vars['user']->admin || $vars['user']->siteadmin) {
+ // The administration link is for admin or site admin users only
+ if ($vars['user']->admin || $vars['user']->siteadmin) {
?>
- <a href="<?php echo $vars['url']; ?>pg/admin/" class="usersettings"><?php echo elgg_echo("admin"); ?></a>
+ <a href="<?php echo $vars['url']; ?>pg/admin/" class="usersettings"><?php echo elgg_echo("admin"); ?></a>
<?php