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

Fix popover and styling in user management 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2018-01-11 12:13:10 +01:00
parent d56c566ff5
commit f8910ad898
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
3 changed files with 35 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
settings/css/settings.scss
View File

@ -347,7 +347,7 @@ table.nostyle {
} }
.token-list { .token-list {
td > a.icon { td > a.icon {
opacity: 0;
transition: opacity 0.5s; transition: opacity 0.5s;
} }
a.icon { a.icon {
@ -563,36 +563,26 @@ tr:hover > td {
} }
td.userActions { td.userActions {
width: 25px; width: 44px;
text-align: center;
position: relative;
.action {
position: relative;
top: 3px;
}
.toggleUserActions { .toggleUserActions {
border: none; width: 44px;
background-color: rgba(0, 0, 0, 0); height: 44px;
width: 34px; position: relative;
height: 34px; .action {
margin: 0; display: block;
opacity: 0.5; padding: 14px;
&:hover, opacity: 0.5;
&:focus { .icon-more {
background-color: transparent; display: inline-block;
opacity: 1; }
&:hover,
&:focus {
opacity: 1;
}
} }
} }
} }
tr.active td.userActions .action {
opacity: 1;
}
td.userActions .action:hover {
cursor: pointer;
}
div.recoveryPassword { div.recoveryPassword {
left: 50em; left: 50em;
display: block; display: block;

11
settings/js/users/users.js
View File

@ -101,16 +101,9 @@ var UserList = {
$tdSubadmins.find('.action').tooltip({placement: 'top'}); $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) { if (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) {
$tr.find('td.userActions').empty(); $tr.find('td.userActions').empty();
} }

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

@ -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> <thead>
<tr> <tr>
<th id="headerAvatar" scope="col"></th> <th id="headerAvatar" scope="col"></th>
@ -64,19 +64,22 @@
<td class="storageLocation"></td> <td class="storageLocation"></td>
<td class="userBackend"></td> <td class="userBackend"></td>
<td class="lastLogin"></td> <td class="lastLogin"></td>
<td class="userActions"><span></span> <td class="userActions">
<div class="popovermenu bubble menu"> <div class="toggleUserActions">
<ul class="userActionsMenu"> <a class="action"><span class="icon-more"></span></a>
<li> <div class="popovermenu bubble menu">
<a href="#" class="menuitem action-togglestate permanent" data-action="togglestate"></a> <ul class="userActionsMenu">
</li> <li>
<li> <a href="#" class="menuitem action-togglestate permanent" data-action="togglestate"></a>
<a href="#" class="menuitem action-remove permanent" data-action="remove"> </li>
<span class="icon icon-delete"></span> <li>
<span><?php p($l->t('Delete')); ?></span> <a href="#" class="menuitem action-remove permanent" data-action="remove">
</a> <span class="icon icon-delete"></span>
</li> <span><?php p($l->t('Delete')); ?></span>
</ul> </a>
</li>
</ul>
</div>
</div> </div>
</td> </td>
</tr> </tr>