mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9105 from owncloud/fix_8874 

Make sure last seen tooltip always appears even after searching and filt...
This commit is contained in:
Morris Jobke 2014-06-19 15:16:33 +02:00
parent e1fd10f226 85894654ae
commit e8e53c81f8
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
settings/css/settings.css
View File

@ -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; }

16
settings/js/users/users.js
View File

@ -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

4
settings/templates/users/part.userlist.php
View File

@ -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'))?>">