[Pkg-owncloud-commits] [owncloud] 204/223: Make sure last seen tooltip always appears even after searching and filtering

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 85894654ae5dfa004fd29d876b49e32cab03b7c2
Author: Arthur Schiwon <blizzz at owncloud.com>
Date:   Thu Jun 19 14:30:22 2014 +0200

    Make sure last seen tooltip always appears even after searching and filtering
---
 settings/css/settings.css                  |  1 +
 settings/js/users/users.js                 | 16 +++++++++++++---
 settings/templates/users/part.userlist.php |  4 ++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/settings/css/settings.css b/settings/css/settings.css
index 906712a..ef8428b 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -83,6 +83,7 @@ td.name, td.password { padding-left:.8em; }
 td.password>img,td.displayName>img, td.remove>a, td.quota>img { visibility:hidden; }
 td.password, td.quota, td.displayName { width:12em; cursor:pointer; }
 td.password>span, td.quota>span, rd.displayName>span { margin-right: 1.2em; color: #C7C7C7; }
+span.usersLastLoginTooltip { white-space: nowrap; }
 
 td.remove { width:1em; padding-right:1em; }
 tr:hover>td.password>span, tr:hover>td.displayName>span { margin:0; cursor:pointer; }
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index a911225..1c0f3ee 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -80,13 +80,23 @@ var UserList = {
 			}
 		}
 		$tr.find('td.storageLocation').text(storageLocation);
+
 		if(lastLogin === 0) {
-			lastLogin = t('settings', 'never');
+			var lastLoginRel = t('settings', 'never');
+			var lastLoginAbs = lastLoginRel;
 		} else {
 			lastLogin = new Date(lastLogin * 1000);
-			lastLogin = relative_modified_date(lastLogin.getTime() / 1000);
+			var lastLoginRel = relative_modified_date(lastLogin.getTime() / 1000);
+			var lastLoginAbs = formatDate(lastLogin.getTime());
 		}
-		$tr.find('td.lastLogin').text(lastLogin);
+		$tdLastLogin = $tr.find('td.lastLogin');
+		$tdLastLogin.text(lastLoginRel);
+		//tooltip makes it complicated … to not insert new HTML, we adjust the 
+		//original title. We use a temporary div to get back the html that we 
+		//can pass later. It is also required to initialise tipsy.
+		var tooltip = $('<div>').html($($tdLastLogin.attr('original-title')).text(lastLoginAbs)).html();
+		$tdLastLogin.tipsy({gravity:'s', fade:true, html:true});
+		$tdLastLogin.attr('title', tooltip);
 		$tr.appendTo($userList);
 		if(UserList.isEmpty === true) {
 			//when the list was emptied, one row was left, necessary to keep
diff --git a/settings/templates/users/part.userlist.php b/settings/templates/users/part.userlist.php
index c74fdcc..25b1727 100644
--- a/settings/templates/users/part.userlist.php
+++ b/settings/templates/users/part.userlist.php
@@ -96,13 +96,13 @@
 			<?php
 			if($user["lastLogin"] === 0) {
 				$lastLogin = $l->t('never');
-				$lastLoginDate = '';
+				$lastLoginDate = $lastLogin;
 			} else {
 				$lastLogin = relative_modified_date($user["lastLogin"]);
 				$lastLoginDate = \OC_Util::formatDate($user["lastLogin"]);
 			}
 			?>
-			<td class="lastLogin" title="<?php p('<span style="white-space: nowrap;">'.$lastLoginDate.'</span>'); ?>"><?php p($lastLogin); ?></td>
+			<td class="lastLogin" title="<?php p('<span class="usersLastLoginTooltip">'.$lastLoginDate.'</span>'); ?>"><?php p($lastLogin); ?></td>
 			<td class="remove">
 				<?php if($user['name']!=OC_User::getUser()):?>
 					<a href="#" class="action delete" original-title="<?php p($l->t('Delete'))?>">

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git