topbar with message count and icon

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

2 files changed, 25 insertions, 5 deletions

diff --git a/views/default/css.php b/views/default/css.php
index 4156305ce..69d371804 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -404,11 +404,12 @@ h6 { font-size: 0.8em; }
 }
 
 #elgg_topbar_container_left .toolbarlinks,
+#elgg_topbar_container_left .toolbarlinks2,
 #elgg_topbar_container_left .toolbarimages {
 	float:left;
 	margin-right:20px;
 }
-#elgg_topbar_container_left .toolbarlinks {
+#elgg_topbar_container_left .toolbarlinks2 {
 	margin:3px 0 0 0;
 }
 #elgg_topbar_container_left a.loggedinuser {
@@ -419,14 +420,35 @@ h6 { font-size: 0.8em; }
 #elgg_topbar_container_left a.pagelinks {
 	color:white;
 	margin:0 15px 0 5px;
+	display:block;
+	padding:3px;
 }
 #elgg_topbar_container_left a.pagelinks:hover {
-	color:#4690d6;
+	background: #4690d6;
+	text-decoration: none;
+}
+#elgg_topbar_container_left a.privatemessages {
+	background:transparent url(<?php echo $vars['url']; ?>_graphics/toolbar_messages_icon.gif) no-repeat left 2px;
+	padding:0 0 0 16px;
+	margin:0 15px 0 5px;
+}
+#elgg_topbar_container_left a.privatemessages:hover {
+	text-decoration: none;
+}
+#elgg_topbar_container_left a.privatemessages_new {
+	background:transparent url(<?php echo $vars['url']; ?>_graphics/toolbar_messages_icon.gif) no-repeat left bottom;
+	padding:0 0 0 18px;
+	margin:0 15px 0 5px;
+	color:white;
+}
+#elgg_topbar_container_left a.privatemessages_new:hover {
+	text-decoration: none;
 }
 
 #elgg_topbar_container_left a.usersettings {
 	margin:0 0 0 20px;
 	color:#999999;
+	padding:3px;
 }
 #elgg_topbar_container_left a.usersettings:hover {
 	color:#eeeeee;
diff --git a/views/default/page_elements/elgg_topbar.php b/views/default/page_elements/elgg_topbar.php
index d830e7d76..628b8c6d2 100644
--- a/views/default/page_elements/elgg_topbar.php
+++ b/views/default/page_elements/elgg_topbar.php
@@ -28,8 +28,6 @@
 		
 	</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>
 	</div>
         <?php
@@ -39,7 +37,7 @@
         ?>
         	
         	
-        <div class="toolbarlinks">		
+        <div class="toolbarlinks2">		
 		<?php
 		//allow people to extend this top menu
 		echo elgg_view('elgg_topbar/extend', $vars);