From f09a70e9b56a7f83857dad684cc4574a08db3421 Mon Sep 17 00:00:00 2001
From: "John Molakvoæ (skjnldsv)" <skjnldsv@protonmail.com>
Date: Wed, 27 Sep 2017 16:35:33 +0200
Subject: Quota bar fix on user list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 settings/js/users/users.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'settings/js/users/users.js')

diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 6fb74e1ba63..8b97485e1b2 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -571,7 +571,12 @@ var UserList = {
 			//asymptotic curve approaching 50% at 10GB to visualize used stace with infinite quota
 			usedQuota = 95 * (1 - (1 / (usedInGB + 1)));
 		}
-		$tr.find('.quota_progress').width(usedQuota + '%');
+		$tr.find('.quota-user-progress').val(usedQuota);
+		if (usedQuota > 80) {
+			$tr.find('.quota-user-progress').addClass('warn');
+		} else {
+			$tr.find('.quota-user-progress').removeClass('warn');
+		}
 	},
 
 	/**
-- 
cgit v1.2.3


From c1795b0611875b309ad099e285fdfd54dad91804 Mon Sep 17 00:00:00 2001
From: "John Molakvoæ (skjnldsv)" <skjnldsv@protonmail.com>
Date: Thu, 28 Sep 2017 11:12:52 +0200
Subject: Fix tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 settings/js/users/users.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'settings/js/users/users.js')

diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 8b97485e1b2..f0ba433e862 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -571,7 +571,7 @@ var UserList = {
 			//asymptotic curve approaching 50% at 10GB to visualize used stace with infinite quota
 			usedQuota = 95 * (1 - (1 / (usedInGB + 1)));
 		}
-		$tr.find('.quota-user-progress').val(usedQuota);
+		$tr.find('.quota-user-progress').val( isNaN(usedQuota) ? 0 : usedQuota );
 		if (usedQuota > 80) {
 			$tr.find('.quota-user-progress').addClass('warn');
 		} else {
-- 
cgit v1.2.3


From 7fb329294958beab28a2cbd8370d5733de8ec4d0 Mon Sep 17 00:00:00 2001
From: "John Molakvoæ (skjnldsv)" <skjnldsv@protonmail.com>
Date: Thu, 28 Sep 2017 11:55:25 +0200
Subject: Popover to css guidelines
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 settings/css/settings.scss                 | 52 +++++++++---------------------
 settings/js/users/users.js                 |  3 ++
 settings/templates/users/part.userlist.php |  2 +-
 3 files changed, 19 insertions(+), 38 deletions(-)

(limited to 'settings/js/users/users.js')

diff --git a/settings/css/settings.scss b/settings/css/settings.scss
index 1ba3c76bfed..9ef7052e95e 100644
--- a/settings/css/settings.scss
+++ b/settings/css/settings.scss
@@ -576,42 +576,6 @@ span.usersLastLoginTooltip {
 	.groupsListContainer.hidden {
 		display: none;
 	}
-	.bubble {
-		z-index: 1;
-		right: -6px;
-		top: auto;
-		&:after {
-			right: 5px;
-		}
-	}
-	.popovermenu {
-		a.menuitem {
-			height: 20px;
-			margin: 0;
-			padding: 0;
-			line-height: initial;
-		}
-		margin-top: 4px;
-		border-top-right-radius: 3px;
-		right: 3px;
-		opacity: 0;
-		display: block;
-		visibility: hidden;
-		transition: opacity 0.1s, visibility 0.1s;
-	}
-	tr.active .popovermenu {
-		opacity: 1;
-		visibility: visible;
-	}
-	.popovermenu > ul.userActionsMenu {
-		right: 15px;
-		a {
-			margin: 5px 0;
-			span:last-child {
-				margin-left: 5px;
-			}
-		}
-	}
 }
 
 /* because of accessibility the name cell is <th> - therefore we enforce the black color */
@@ -646,10 +610,24 @@ tr:hover > td {
 td.userActions {
 	width: 25px;
 	text-align: center;
+	position: relative;
 	.action {
 		position: relative;
 		top: 3px;
 	}
+	.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;
+		}
+	}
 }
 
 tr.active td.userActions .action {
@@ -694,7 +672,7 @@ select {
 	&.quota-user {
 		width: 10em;
 		height: 34px;
-		z-index: 150;
+		z-index: 50;
 		position: relative;
 	}
 	+ progress.quota-user-progress {
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index f0ba433e862..4a4faf13ec7 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -955,9 +955,12 @@ $(document).ready(function () {
 
 		if ($tr.is('.active')) {
 			$tr.removeClass('active');
+			menudiv.removeClass('open');
 			return;
 		}
 		$('#userlist tr.active').removeClass('active');
+		$('#userlist .popovermenu').removeClass('open');
+		menudiv.addClass('open');
 		menudiv.find('.action-togglestate').empty();
 		if ($tr.data('userEnabled')) {
 			$('.action-togglestate', $td).html('<span class="icon icon-close"></span><span>' + t('settings', 'Disable') + '</span>');
diff --git a/settings/templates/users/part.userlist.php b/settings/templates/users/part.userlist.php
index e626a0c537d..146e35d11ac 100644
--- a/settings/templates/users/part.userlist.php
+++ b/settings/templates/users/part.userlist.php
@@ -65,7 +65,7 @@
 			<td class="userBackend"></td>
 			<td class="lastLogin"></td>
 			<td class="userActions"><span></span>
-				<div class="popovermenu bubble open menu">
+				<div class="popovermenu bubble menu">
 					<ul class="userActionsMenu">
 						<li>
 							<a href="#" class="menuitem action-togglestate permanent" data-action="togglestate"></a>
-- 
cgit v1.2.3