From 65e30cac8e839554951ff7a5cd50bab030942867 Mon Sep 17 00:00:00 2001
From: Pim Snel <mipmip@alumni.egroupware.org>
Date: Tue, 9 Jan 2007 23:15:00 +0000
Subject: [PATCH] display current users in topmenu when topmenu is enabled

---
 phpgwapi/templates/idots/class.idots_framework.inc.php | 2 ++
 phpgwapi/templates/idots/topmenu.tpl.php               | 5 +----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/phpgwapi/templates/idots/class.idots_framework.inc.php b/phpgwapi/templates/idots/class.idots_framework.inc.php
index 231fa66f0e..82ab596c3f 100644
--- a/phpgwapi/templates/idots/class.idots_framework.inc.php
+++ b/phpgwapi/templates/idots/class.idots_framework.inc.php
@@ -460,6 +460,7 @@
 
 		 if($GLOBALS['egw_info']['user']['preferences']['common']['show_general_menu'] != 'sidebox')
 		 {
+			$var['current_users'] = '';
 			$var['quick_add'] = '';
 			$var['user_info']='';
 		 }
@@ -627,6 +628,7 @@
 		 $this->tplsav2->assign('info_icons',$this->topmenu_icon_arr);
 
 		 $this->_add_topmenu_info_item($this->_user_time_info());
+		 $this->_add_topmenu_info_item($this->_current_users());
 		 $this->_add_topmenu_info_item($this->_get_quick_add());
 
 		 $this->tplsav2->display('topmenu.tpl.php');
diff --git a/phpgwapi/templates/idots/topmenu.tpl.php b/phpgwapi/templates/idots/topmenu.tpl.php
index 236a9b2496..b6a0922d8a 100644
--- a/phpgwapi/templates/idots/topmenu.tpl.php
+++ b/phpgwapi/templates/idots/topmenu.tpl.php
@@ -41,7 +41,7 @@
 <div id="topmenu">
    <div id="topmenu_items">
 	  <?php foreach($this->menuitems as $mitems):?>
-	  <div style="padding:0px 10px 0px 10px;position:relative;float:left;"><img src="<?=$this->icon_or_star?>" />&nbsp;<a href="<?=$mitems['url']?>"><?=$mitems['label']?></a></div>
+	  <div style="padding:0px 0px 0px 10px;position:relative;float:left;"><img src="<?=$this->icon_or_star?>" />&nbsp;<a href="<?=$mitems['url']?>"><?=$mitems['label']?></a></div>
 	  <?php endforeach?>
    </div>
 
@@ -63,7 +63,4 @@
 	  setInterval("shiftOpacity('<?=$iicon['id']?>', 500)",1500);
 	  <?php endif?>
 	  <?php endforeach?>
-
-   //shiftOpacity('blinkimg', 500);
-
 </script>