[Fusionforge-commits] r7073 - in trunk/gforge/www: include themes/gforge themes/gforge-simple-theme themes/lite themes/osx

[Alain Peyrat]

Author: aljeux
Date: 2009-02-26 18:41:52 +0100 (Thu, 26 Feb 2009)
New Revision: 7073

Modified:
   trunk/gforge/www/include/Layout.class.php
   trunk/gforge/www/themes/gforge-simple-theme/Theme.class.php
   trunk/gforge/www/themes/gforge/Theme.class.php
   trunk/gforge/www/themes/lite/Theme.class.php
   trunk/gforge/www/themes/osx/Theme.class.php
Log:
display the username on the logout button

Modified: trunk/gforge/www/include/Layout.class.php
===================================================================
--- trunk/gforge/www/include/Layout.class.php	2009-02-26 17:41:45 UTC (rev 7072)
+++ trunk/gforge/www/include/Layout.class.php	2009-02-26 17:41:52 UTC (rev 7073)
@@ -146,7 +146,8 @@
 		<td><?php echo $this->searchBox(); ?></td>
 		<td align="right"><?php
 			if (session_loggedin()) {
-				echo util_make_link ('/account/logout.php',_('Log Out'),array('class'=>'lnkutility'));
+				$u =& user_get_object(user_getid());
+				echo util_make_link ('/account/logout.php', sprintf("%s (%s)", _('Log Out'), $u->getRealName()),array('class'=>'lnkutility'));
 				echo util_make_link ('/account/',_('My Account'),array('class'=>'lnkutility'));
 			} else {
 				echo util_make_link ('/account/login.php',_('Log In'),array('class'=>'lnkutility'));

Modified: trunk/gforge/www/themes/gforge/Theme.class.php
===================================================================
--- trunk/gforge/www/themes/gforge/Theme.class.php	2009-02-26 17:41:45 UTC (rev 7072)
+++ trunk/gforge/www/themes/gforge/Theme.class.php	2009-02-26 17:41:52 UTC (rev 7073)
@@ -157,8 +157,9 @@
 		  <td class="topLeft"><?php echo util_make_link ('/', html_image('header/top-logo.png',192,54,array('border'=>'0'))); ?></td>
         <td class="middleRight"><?php echo $this->searchBox(); ?></td>
         <td class="middleRight"><?php
-        if (session_loggedin()) {
-        	echo util_make_link ('/account/logout.php', _('Log Out'));
+	if (session_loggedin()) {
+		$u =& user_get_object(user_getid());
+		echo util_make_link ('/account/logout.php', sprintf("%s (%s)", _('Log Out'), $u->getRealName()));
         	echo ' | ';
         	echo util_make_link ('/account/', _('My Account'));
         } else {

Modified: trunk/gforge/www/themes/gforge-simple-theme/Theme.class.php
===================================================================
--- trunk/gforge/www/themes/gforge-simple-theme/Theme.class.php	2009-02-26 17:41:45 UTC (rev 7072)
+++ trunk/gforge/www/themes/gforge-simple-theme/Theme.class.php	2009-02-26 17:41:52 UTC (rev 7073)
@@ -149,7 +149,8 @@
 <div id="util">
 <?php
 if (session_loggedin()) {
-	echo util_make_link ('/account/logout.php',_('Log Out'));
+	$u =& user_get_object(user_getid());
+	echo util_make_link ('/account/logout.php', sprintf("%s (%s)", _('Log Out'), $u->getRealName()));
 	echo '<br />';
 	echo util_make_link ('/account/',_('My Account'));
 	echo '<br />';

Modified: trunk/gforge/www/themes/lite/Theme.class.php
===================================================================
--- trunk/gforge/www/themes/lite/Theme.class.php	2009-02-26 17:41:45 UTC (rev 7072)
+++ trunk/gforge/www/themes/lite/Theme.class.php	2009-02-26 17:41:52 UTC (rev 7073)
@@ -122,7 +122,9 @@
 		<td align="right"><?php echo $this->searchBox(); ?></td>
 		<td align="right"><?php
 			if (session_loggedin()) {
-				echo util_make_link ('/account/logout.php',_('Logout')); ?><br /><?php
+				$u =& user_get_object(user_getid());
+				echo util_make_link ('/account/logout.php', sprintf("%s (%s)", _('Log Out'), $u->getRealName()));
+				?><br /><?php
 				echo util_make_link ('/account/',_('My Account')); ?><br /><?php
 			} else { 
 				echo util_make_link ('/account/login.php',_('Login')); ?><br /><?php

Modified: trunk/gforge/www/themes/osx/Theme.class.php
===================================================================
--- trunk/gforge/www/themes/osx/Theme.class.php	2009-02-26 17:41:45 UTC (rev 7072)
+++ trunk/gforge/www/themes/osx/Theme.class.php	2009-02-26 17:41:52 UTC (rev 7073)
@@ -75,7 +75,11 @@
 		<td style="text-align:right"><?php
 			if (session_loggedin()) {
 				?>
-				<b><?php echo util_make_link ('/account/logout.php',_('Log Out')); ?></b><br />
+				<b><?php
+
+				$u =& user_get_object(user_getid());
+				echo util_make_link ('/account/logout.php', sprintf("%s (%s)", _('Log Out'), $u->getRealName()));
+					?></b><br />
 				<b><?php echo util_make_link ('/account/',_('My Account')); ?></b><?php
 			} else {
 				?>