avatar submenu altered and messages div coloured up

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

4 files changed, 46 insertions, 3 deletions

diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php
index e6223bec7..1585b963f 100644
--- a/mod/profile/views/default/profile/css.php
+++ b/mod/profile/views/default/profile/css.php
@@ -46,6 +46,26 @@
 .usericon div.sub_menu a:visited, 

 .usericon div.sub_menu a:hover{ display:block;}	

 .usericon div.sub_menu a:hover{ background:#cccccc; text-decoration:none;}

-.usericon .item_line { border-top:solid 1px #dddddd;}

+.usericon .item_line { }

 

-.usericon div.sub_menu h3 {font-size:1.2em;}

+.usericon div.sub_menu h3 {font-size:1.2em;padding-bottom:3px;border-bottom:solid 1px #dddddd;}

+

+.user_menu_addfriend,

+.user_menu_removefriend,

+.user_menu_profile,

+.user_menu_friends,

+.user_menu_friends_of,

+.user_menu_blog,

+.user_menu_file,

+.user_menu_messages,

+.user_menu_admin {

+	margin:0;

+	padding:0;

+}

+.user_menu_admin {

+	border-bottom:solid 1px #dddddd;

+	border-top:solid 1px #dddddd;

+}

+.user_menu_admin a {

+	color:#cc0033;

+}
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/menu/actions.php b/mod/profile/views/default/profile/menu/actions.php
index f69ad1316..2202de5a6 100644
--- a/mod/profile/views/default/profile/menu/actions.php
+++ b/mod/profile/views/default/profile/menu/actions.php
@@ -17,7 +17,7 @@
 			if ($vars['entity']->isFriend()) {

 				echo "<p class=\"user_menu_removefriend\"><a href=\"{$vars['url']}action/friends/remove?friend={$vars['entity']->getGUID()}\">" . elgg_echo("friend:remove") . "</a></p>";

 			} else {

-				echo "<p><a href=\"{$vars['url']}action/friends/add?friend={$vars['entity']->getGUID()}\">" . elgg_echo("friend:add") . "</a></p>";

+				echo "<p class=\"user_menu_addfriend\"><a href=\"{$vars['url']}action/friends/add?friend={$vars['entity']->getGUID()}\">" . elgg_echo("friend:add") . "</a></p>";

 			}

 		}

 	}

diff --git a/mod/profile/views/default/profile/menu/adminlinks.php b/mod/profile/views/default/profile/menu/adminlinks.php
index 9b703fb6f..1de4dc98c 100644
--- a/mod/profile/views/default/profile/menu/adminlinks.php
+++ b/mod/profile/views/default/profile/menu/adminlinks.php
@@ -15,10 +15,13 @@
 			if (isadminloggedin()){
 				if ($_SESSION['id']!=$vars['entity']->guid){
 ?>
+				<p class="user_menu_admin">
 				<a href="<?php echo $vars['url']; ?>actions/admin/user/ban?guid=<?php echo $vars['entity']->guid; ?>"><?php echo elgg_echo("ban"); ?></a>
 				<a href="<?php echo $vars['url']; ?>actions/admin/user/delete?guid=<?php echo $vars['entity']->guid; ?>"><?php echo elgg_echo("delete"); ?></a>				
 				<a href="<?php echo $vars['url']; ?>actions/admin/user/resetpassword?guid=<?php echo $vars['entity']->guid; ?>"><?php echo elgg_echo("resetpassword"); ?></a>				
 				<?php if (!$vars['entity']->admin) { ?><a href="<?php echo $vars['url']; ?>actions/admin/user/makeadmin?guid=<?php echo $vars['entity']->guid; ?>"><?php echo elgg_echo("makeadmin"); ?></a> <?php } ?>
+				</p>
+				
 <?php 
 				}
 			}
diff --git a/views/default/css.php b/views/default/css.php
index 837b441d9..1b51a9d34 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -700,6 +700,20 @@ a.toggle_customise_edit_panel:hover {
   System messages
 *************************************** */
 .messages {
+    /* 
+    border:1px solid #D3322A;
+    background:#F7DAD8;
+    */
+    border:1px solid #00cc00;
+    background:#ccffcc;
+    color:#000000;
+    padding:3px 10px 3px 10px;
+    margin:20px 20px 0px 180px;
+    z-index: 99999;
+    position:absolute;
+    width:776px;
+}
+.messages_error {
     border:1px solid #D3322A;
     background:#F7DAD8;
     color:#000000;
@@ -713,10 +727,16 @@ a.toggle_customise_edit_panel:hover {
 * html .messages { 
 	margin:20px 20px 0px 20px;
 }
+* html .messages_error { 
+	margin:20px 20px 0px 20px;
+}
 /* IE7 */
 *:first-child+html .messages {
 	margin:20px 20px 0px 20px;
 }
+*:first-child+html .messages_error {
+	margin:20px 20px 0px 20px;
+}
 
 
 /* ***************************************