latest interface stuff

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

2 files changed, 16 insertions, 8 deletions

diff --git a/views/default/navigation/toolbox.php b/views/default/navigation/toolbox.php
index 2a96d34b2..e98ccd934 100644
--- a/views/default/navigation/toolbox.php
+++ b/views/default/navigation/toolbox.php
@@ -20,6 +20,7 @@
 		

 ?>

 <div class="elggtoolbar">

+<div class="elggtoolbar_header"><h1>Your tools</h1></div>

 <ul class="drawers">

 

 <?php

@@ -55,7 +56,7 @@
 ?>

 

 </ul>    

-</div>

+</div><!-- /.elggtoolbar -->

 

 <?php

 

@@ -65,7 +66,8 @@
 

 <script type="text/javascript">

 $(document).ready(function () {

-	$('li.drawer ul:not(:first)').hide();

+	//$('li.drawer ul:not(:first)').hide();

+	$('li.drawer ul').hide();

 	

 	$('h2.drawer-handle').click(function () {	

 		$('li.drawer ul:visible').slideUp('medium').prev().removeClass('open');

diff --git a/views/default/navigation/topmenu.php b/views/default/navigation/topmenu.php
index a8211f67a..e9306d9da 100644
--- a/views/default/navigation/topmenu.php
+++ b/views/default/navigation/topmenu.php
@@ -19,13 +19,19 @@
      if (isloggedin()) {

 ?>

 <div id="topmenu">

-	<div class="usericon">

-	<?php

+<div class="usericon">

+<?php

+	echo elgg_view("profile/icon",array('entity' => $vars['user'], 'size' => 'small'));

+?>

+</div>

 

-    	echo elgg_view("profile/icon",array('entity' => $vars['user'], 'size' => 'small'));

+<div id="header_search">

+<form id="searchform" action="#" method="get">

+	<input type="text" size="21" name="tag" value="Search" onclick="if (this.value=='Search') { this.value='' }" class="search_input" />

+	<input type="submit" value="Go" class="search_submit_button" />

+</form>    

+</div>

     

-    ?>

-    </div>

     <ul>

         <li><a href="<?php echo $vars['url']; ?>pg/dashboard/"><?php echo elgg_echo('dashboard'); ?></a></li>

         <li><a href="<?php echo $vars['url']; ?>pg/settings/"><?php echo elgg_echo('settings'); ?></a></li>

@@ -45,7 +51,7 @@
 ?>

         <li><a href="<?php echo $vars['url']; ?>action/logout"><?php echo elgg_echo('logout'); ?></a></li>

     </ul>

-</div>

+</div><!-- /#topmenu -->

 <?php

     }

 ?>
\ No newline at end of file