This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via c07baedbba58cbe1f191c6acb4ad57236fae8902 (commit)
from d610efb13e3be0b9de2a25b8e8adad3db9abc0a6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=c07baedbba58cbe1f191c6acb4ad57236fae8902
commit c07baedbba58cbe1f191c6acb4ad57236fae8902
Author: Franck Villaume <[email protected]>
Date: Sun Apr 2 14:21:43 2017 +0200
display user logo close to Logout
diff --git a/src/common/include/Navigation.class.php
b/src/common/include/Navigation.class.php
index 0f163bb..d7ffad3 100644
--- a/src/common/include/Navigation.class.php
+++ b/src/common/include/Navigation.class.php
@@ -186,7 +186,7 @@ class Navigation extends FFError {
$res = array();
if (session_loggedin()) {
$u = user_get_object(user_getid());
- $res['titles'][] = sprintf("%s (%s)", _('Log Out'),
$u->getRealName());
+ $res['titles'][] = sprintf("%s (%s)", _('Log Out'),
util_display_user($u->getUnixName(), $u->getID(), $u->getRealName()));
$res['urls'][] = util_make_uri('/account/logout.php');
$res['titles'][] = _('My Account');
diff --git a/src/common/include/utils.php b/src/common/include/utils.php
index f45addc..5be905c 100644
--- a/src/common/include/utils.php
+++ b/src/common/include/utils.php
@@ -1093,7 +1093,7 @@ function util_display_user($username, $user_id = 0, $text
= '', $size = 'xs') {
$url = util_make_link_u($username, $user_id, $text);
if ($params['content']) {
- return $params['content'].$url.'<div class="new_line"></div>';
+ return $params['content'].$url;
}
return $url;
}
diff --git a/src/plugins/compactpreview/include/CompactResource.class.php
b/src/plugins/compactpreview/include/CompactResource.class.php
index a17d96a..3b05ece 100644
--- a/src/plugins/compactpreview/include/CompactResource.class.php
+++ b/src/plugins/compactpreview/include/CompactResource.class.php
@@ -102,7 +102,7 @@ class UserCompactResource extends CompactResource {
$url = util_make_link($resource_url, $link_text, array('class'
=> $css_class), true);
if ($logo_params['content']) {
- $html = $logo_params['content'] . $url .'<div
class="new_line"></div>';
+ $html = $logo_params['content'].$url;
} else {
$html = $url;
}
diff --git a/src/www/themes/css/fusionforge.css
b/src/www/themes/css/fusionforge.css
index 1084679..f367d32 100644
--- a/src/www/themes/css/fusionforge.css
+++ b/src/www/themes/css/fusionforge.css
@@ -798,7 +798,7 @@ div.ef-column-remove_hover {
}
.img-shadow-xs {
- float:left;
+ display: inline-flex;
margin-right: 2px;
}
-----------------------------------------------------------------------
Summary of changes:
src/common/include/Navigation.class.php | 2 +-
src/common/include/utils.php | 2 +-
src/plugins/compactpreview/include/CompactResource.class.php | 2 +-
src/www/themes/css/fusionforge.css | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
