From 4e53ac0106be97e3b24f3bc431be6a2e92b3a3d7 Mon Sep 17 00:00:00 2001
From: pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 11 Aug 2008 11:33:45 +0000
Subject: toolbar messages icon rollover state added. Logged in/out front page
 wrapped in paragraph tags

git-svn-id: https://code.elgg.org/elgg/trunk@1822 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 _graphics/toolbar_messages_icon.gif  | Bin 410 -> 502 bytes
 views/default/css.php                |   4 +++-
 views/default/welcome/logged_in.php  |   2 +-
 views/default/welcome/logged_out.php |   2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/_graphics/toolbar_messages_icon.gif b/_graphics/toolbar_messages_icon.gif
index e98ebd9d0..72eebf32f 100644
Binary files a/_graphics/toolbar_messages_icon.gif and b/_graphics/toolbar_messages_icon.gif differ
diff --git a/views/default/css.php b/views/default/css.php
index 4e58529f4..e29e15ec5 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -451,12 +451,14 @@ h6 { font-size: 0.8em; }
 	background:transparent url(<?php echo $vars['url']; ?>_graphics/toolbar_messages_icon.gif) no-repeat left 2px;
 	padding:0 0 4px 16px;
 	margin:0 15px 0 5px;
+	cursor:pointer;
 }
 #elgg_topbar_container_left a.privatemessages:hover {
 	text-decoration: none;
+	background:transparent url(<?php echo $vars['url']; ?>_graphics/toolbar_messages_icon.gif) no-repeat left -36px;
 }
 #elgg_topbar_container_left a.privatemessages_new {
-	background:transparent url(<?php echo $vars['url']; ?>_graphics/toolbar_messages_icon.gif) no-repeat left bottom;
+	background:transparent url(<?php echo $vars['url']; ?>_graphics/toolbar_messages_icon.gif) no-repeat left -17px;
 	padding:0 0 0 18px;
 	margin:0 15px 0 5px;
 	color:white;
diff --git a/views/default/welcome/logged_in.php b/views/default/welcome/logged_in.php
index 717eeceff..97428a1a7 100644
--- a/views/default/welcome/logged_in.php
+++ b/views/default/welcome/logged_in.php
@@ -17,7 +17,7 @@
 
 		//add various views to area1
 		$area1 = "<h2>" . sprintf(elgg_echo("welcome"),$vars['user']->name) . "</h2>"; 
-		$area1 .= elgg_echo("welcome_message") . "<br />";
+		$area1 .= "<p>" . elgg_echo("welcome_message") . "</p><br />";
 		$url = $vars['url'] . "action/logout";
 		$area1 .= "<a href=" . $url . ">" . elgg_echo('logout') . "</a>";
 
diff --git a/views/default/welcome/logged_out.php b/views/default/welcome/logged_out.php
index 20b0e0f09..b218242a9 100644
--- a/views/default/welcome/logged_out.php
+++ b/views/default/welcome/logged_out.php
@@ -16,7 +16,7 @@
 	<?php
 
 		//add various views to area1
-		$area1 = elgg_echo("welcome_message");
+		$area1 = "<p>" . elgg_echo("welcome_message") . "</p>";
 		$area1 .= elgg_view("account/forms/login");
 
 		//send area one to the appropriate canvas layout
-- 
cgit v1.2.3