Browse Source
Fix popover and styling in user management
Signed-off-by: Julius Härtl <jus@bitgrid.net>
pull/7790/head
Julius Härtl
9 years ago
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
3 changed files with
35 additions and
49 deletions
-
settings/css/settings.scss
-
settings/js/users/users.js
-
settings/templates/users/part.userlist.php
|
|
|
@ -347,7 +347,7 @@ table.nostyle { |
|
|
|
} |
|
|
|
.token-list { |
|
|
|
td > a.icon { |
|
|
|
opacity: 0; |
|
|
|
|
|
|
|
transition: opacity 0.5s; |
|
|
|
} |
|
|
|
a.icon { |
|
|
|
@ -563,36 +563,26 @@ tr:hover > td { |
|
|
|
} |
|
|
|
|
|
|
|
td.userActions { |
|
|
|
width: 25px; |
|
|
|
text-align: center; |
|
|
|
position: relative; |
|
|
|
.action { |
|
|
|
position: relative; |
|
|
|
top: 3px; |
|
|
|
} |
|
|
|
width: 44px; |
|
|
|
.toggleUserActions { |
|
|
|
border: none; |
|
|
|
background-color: rgba(0, 0, 0, 0); |
|
|
|
width: 34px; |
|
|
|
height: 34px; |
|
|
|
margin: 0; |
|
|
|
opacity: 0.5; |
|
|
|
&:hover, |
|
|
|
&:focus { |
|
|
|
background-color: transparent; |
|
|
|
opacity: 1; |
|
|
|
width: 44px; |
|
|
|
height: 44px; |
|
|
|
position: relative; |
|
|
|
.action { |
|
|
|
display: block; |
|
|
|
padding: 14px; |
|
|
|
opacity: 0.5; |
|
|
|
.icon-more { |
|
|
|
display: inline-block; |
|
|
|
} |
|
|
|
&:hover, |
|
|
|
&:focus { |
|
|
|
opacity: 1; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
tr.active td.userActions .action { |
|
|
|
opacity: 1; |
|
|
|
} |
|
|
|
|
|
|
|
td.userActions .action:hover { |
|
|
|
cursor: pointer; |
|
|
|
} |
|
|
|
|
|
|
|
div.recoveryPassword { |
|
|
|
left: 50em; |
|
|
|
display: block; |
|
|
|
|
|
|
|
@ -101,16 +101,9 @@ var UserList = { |
|
|
|
$tdSubadmins.find('.action').tooltip({placement: 'top'}); |
|
|
|
|
|
|
|
/** |
|
|
|
* user actions menu |
|
|
|
* hide user actions menu for current user |
|
|
|
*/ |
|
|
|
if ($tr.find('td.userActions > span > img').length === 0 && OC.currentUser !== user.name) { |
|
|
|
var menuImage = $('<img class="svg action">').attr({ |
|
|
|
src: OC.imagePath('core', 'actions/more') |
|
|
|
}); |
|
|
|
var menuLink = $('<span class="toggleUserActions"></span>') |
|
|
|
.append(menuImage); |
|
|
|
$tr.find('td.userActions > span').replaceWith(menuLink); |
|
|
|
} else if (OC.currentUser === user.name) { |
|
|
|
if (OC.currentUser === user.name) { |
|
|
|
$tr.find('td.userActions').empty(); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -1,4 +1,4 @@ |
|
|
|
<table id="userlist" class="hascontrols grid" data-groups="<?php p($_['allGroups']);?>"> |
|
|
|
<table id="userlist" class="grid" data-groups="<?php p($_['allGroups']);?>"> |
|
|
|
<thead> |
|
|
|
<tr> |
|
|
|
<th id="headerAvatar" scope="col"></th> |
|
|
|
@ -64,19 +64,22 @@ |
|
|
|
<td class="storageLocation"></td> |
|
|
|
<td class="userBackend"></td> |
|
|
|
<td class="lastLogin"></td> |
|
|
|
<td class="userActions"><span></span> |
|
|
|
<div class="popovermenu bubble menu"> |
|
|
|
<ul class="userActionsMenu"> |
|
|
|
<li> |
|
|
|
<a href="#" class="menuitem action-togglestate permanent" data-action="togglestate"></a> |
|
|
|
</li> |
|
|
|
<li> |
|
|
|
<a href="#" class="menuitem action-remove permanent" data-action="remove"> |
|
|
|
<span class="icon icon-delete"></span> |
|
|
|
<span><?php p($l->t('Delete')); ?></span>
|
|
|
|
</a> |
|
|
|
</li> |
|
|
|
</ul> |
|
|
|
<td class="userActions"> |
|
|
|
<div class="toggleUserActions"> |
|
|
|
<a class="action"><span class="icon-more"></span></a> |
|
|
|
<div class="popovermenu bubble menu"> |
|
|
|
<ul class="userActionsMenu"> |
|
|
|
<li> |
|
|
|
<a href="#" class="menuitem action-togglestate permanent" data-action="togglestate"></a> |
|
|
|
</li> |
|
|
|
<li> |
|
|
|
<a href="#" class="menuitem action-remove permanent" data-action="remove"> |
|
|
|
<span class="icon icon-delete"></span> |
|
|
|
<span><?php p($l->t('Delete')); ?></span>
|
|
|
|
</a> |
|
|
|
</li> |
|
|
|
</ul> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</td> |
|
|
|
</tr> |
|
|
|
|
