updates to toolbar menu fixes, error messages, owner block

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

3 files changed, 87 insertions, 75 deletions

diff --git a/views/default/css.php b/views/default/css.php
index 6ce71b224..9d0daa2a9 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -571,12 +571,15 @@ h6 { font-size: 0.8em; }
 }
 #tools_menu ul a:hover {
 	color:white;
-	background: #4690d6 url(<?php echo $vars['url']; ?>_graphics/tools_over.png) repeat-x top left !important;
+	background: #4690d6 !important; /* url(<?php echo $vars['url']; ?>_graphics/tools_over.png) repeat-x top left !important; */
+	border-left:1px solid #99ccff;
+	border-top:1px solid #99ccff;
 }
-/* IE 6 - remove transparent png in menu */
+/* IE 6 - remove transparent png in menu 
 * html #tools_menu ul a:hover {
 	background: #4690d6;
 }
+*/
 #tools_menu li ul a {
 	width:120px;
 	height:auto;
@@ -609,7 +612,8 @@ h6 { font-size: 0.8em; }
     margin:20px 20px 0px 20px;
     z-index: 99999;
     position:absolute;
-    width:611px;
+    /* width:611px; */
+    width:936px;
 }
 .messages_error {
     border:1px solid #D3322A;
@@ -619,23 +623,24 @@ h6 { font-size: 0.8em; }
     margin:20px 20px 0px 20px;
     z-index: 99999;
     position:absolute;
-    width:611px;
+    width:936px;
 }
-/* IE6 fix */
+/* IE6 fix 
 * html .messages { 
 	margin:20px 20px 0px 20px;
 }
 * html .messages_error { 
 	margin:20px 20px 0px 20px;
 }
-/* IE7 */
+*/
+/* IE7 
 *:first-child+html .messages {
 	margin:20px 20px 0px 20px;
 }
 *:first-child+html .messages_error {
 	margin:20px 20px 0px 20px;
 }
-
+*/
 
 
 
@@ -1241,7 +1246,9 @@ table.search_gallery {
 	margin:0 10px 0 0;
 }
 #owner_block_rss_feed {
+	border-top:1px solid #cccccc;
 	margin:0 0 4px 0;
+	padding:5px 0 0 0;
 }
 #owner_block_odd_feed {
 	padding:0 0 7px 0;
@@ -1265,12 +1272,17 @@ table.search_gallery {
 #owner_block_odd_feed a:hover {
 	color: #0054a7;
 }
+#owner_block_desc {
+	padding:4px 0 0 0;
+	margin:0 0 5px 0;
+	line-height: 1.2em;
+	border-top:1px solid #cccccc;
+	color:#666666;
+}
 #owner_block_content {
 	margin:0 0 4px 0;
 	padding:3px 0 0 0;
 	min-height:35px;
-	border-bottom:1px solid #cccccc;
-	
 	font-weight: bold;
 }
 #owner_block_submenu {
diff --git a/views/default/navigation/topbar_tools.php b/views/default/navigation/topbar_tools.php
index b6968d9ea..bb9021380 100644
--- a/views/default/navigation/topbar_tools.php
+++ b/views/default/navigation/topbar_tools.php
@@ -1,66 +1,64 @@
-<?php

-

-	/**

-	 * Elgg standard tools drop down

-	 * This will be populated depending on the plugins active - only plugin navigation will appear here

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2

-	 * @author Curverider Ltd

-	 * @copyright Curverider Ltd 2008

-	 * @link http://elgg.org/

-	 * 

-	 */

-	 

-		$menu = get_register('menu');

-		

-		//var_export($menu);

-

-		if (is_array($menu) && sizeof($menu) > 0) {

-		

-?>

-

-<ul id="tools_menu">

-    <li><a href="#">Tools</a>

-      <ul>

-      <?php

-

-			foreach($menu as $item) {

-    			

-    			echo "<li><a href=\"{$item->value}\">" . $item->name . "</a></li>";

-    			

-			} 

-				

-     ?>

-      </ul>

-    </li>

-</ul>

-

-<?php

-

-		}

-

-?>

-

-<script type="text/javascript">

-function tools_menu(){

-$(" #tools_menu ul ").css({display: "none"}); // opera + ie fix

-$(" #tools_menu li").hover(function(){

-		$(this).find('ul:first').css("display", "none");

-        $(this).find('ul:first').slideDown("fast");

-		$(this).parent().parent().parent().find("#tools_menu a").addClass('tools_menu_on');

-		

-		},function(){

-		$(this).find('ul:first').slideUp("fast");

-		$(this).parent().parent().parent().find("#tools_menu a").removeClass('tools_menu_on');

-		});

-}

-

- 

- 

- $(document).ready(function(){					

-	tools_menu();

-});

-</script>

-

+<?php
+
+	/**
+	 * Elgg standard tools drop down
+	 * This will be populated depending on the plugins active - only plugin navigation will appear here
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 * 
+	 */
+	 
+		$menu = get_register('menu');
+		
+		//var_export($menu);
+
+		if (is_array($menu) && sizeof($menu) > 0) {
+		
+?>
+
+<ul id="tools_menu">
+    <li><a href="#">Tools</a>
+      <ul>
+      <?php
+
+			foreach($menu as $item) {
+    			
+    			echo "<li><a href=\"{$item->value}\">" . $item->name . "</a></li>";
+    			
+			} 
+				
+     ?>
+      </ul>
+    </li>
+</ul>
+
+<?php
+
+		}
+
+?>
+
+<script type="text/javascript">
+function tools_menu(){
+$(" #tools_menu li").hover(function(){
+        $(this).find('ul:first').slideDown("fast");
+		$(this).parent().parent().parent().find("#tools_menu a").addClass('tools_menu_on');
+		
+		},function(){
+		$(this).find('ul:first').slideUp("fast");
+		$(this).parent().parent().parent().find("#tools_menu a").removeClass('tools_menu_on');
+		});
+}
+
+ 
+ 
+ $(document).ready(function(){					
+	tools_menu();
+});
+</script>
+
diff --git a/views/default/page_elements/footer.php b/views/default/page_elements/footer.php
index a2e01b932..2f8a48043 100644
--- a/views/default/page_elements/footer.php
+++ b/views/default/page_elements/footer.php
@@ -24,9 +24,11 @@
 <table width="958" height="79" border="1" cellpadding="0" cellspacing="0">
 	<tr>
 		<td width="310" height="50">
+		<!--
 		<a href="http://www.elgg.org" target="_blank">
 		<img src="<?php echo $vars['url']; ?>_graphics/footer_logo.gif" border="0" />
 		</a>
+		-->
 		</td>
 		
 		<td width="648" height="50" align="right">