change quota design #18818

GretaD · 2020-01-10T15:55:12Z

fixes #18540, #19969

jancborchardt

The text should be left-aligned, as with the other entries
If nothing is used, it can be "(0 used)", no unit needed
Would still be nice to get the bar back, otherwise people need to read it all and calc in their head

Otherwise it looks good! :)

kesselb · 2020-01-16T13:47:46Z

Thanks @GretaD 👍

Index: apps/settings/src/components/UserList/UserRowSimple.vue
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- apps/settings/src/components/UserList/UserRowSimple.vue	(revision 8d84710e266bd821fec441b238f7801216c8d11a)
+++ apps/settings/src/components/UserList/UserRowSimple.vue	(date 1579182181172)
@@ -33,7 +33,12 @@
 			{{ userSubAdminsGroupsLabels }}
 		</div>
 		<div class="quota">
-			{{ userQuota }} ({{ usedSpace }})
+			<span>{{ userQuota }} ({{ usedSpace }})</span>
+			<progress
+					class="quota-user-progress"
+					:class="{'warn': usedSpace > 80}"
+					:value="usedSpace"
+					max="100" />
 		</div>
 		<div v-if="showConfig.showLanguages" class="languages">
 			{{ userLanguage.name }}
@@ -169,4 +174,13 @@
 		text-overflow: ellipsis;
 		white-space: nowrap;
 	}
+	.quota span {
+		margin-left: 10px;
+	}
+	.quota progress {
+		position: absolute;
+		bottom: 0;
+	}
 </style>

I guess there are cleaner ways to do it ;) Also some tweaks for smaller screens would be good.

done

apps/settings/css/settings.scss

kesselb · 2020-02-21T21:52:03Z

Needs a rebase.

kesselb · 2020-02-21T21:59:44Z

Looks like that on my machine. I run make all a few times but the result seems to be the same.

The quota header column should be aligned with the other header columns (text left not centered)
Also the quota text for a user is centered
The overlapping with the edit button is probably fixed with a rebase

apps/settings/src/components/UserList/UserRowSimple.vue

kesselb · 2020-02-26T20:41:47Z

😕

GretaD · 2020-02-27T09:23:15Z

confused

ouch, what happened there? /hides

kesselb · 2020-02-27T13:55:48Z

Looks good to me.

Would be nice to see the current quota also in edit mode. But not a blocker for this pr.

juliusknorr · 2020-03-02T08:08:54Z

The quota bar positioning still seems a bit off

juliusknorr · 2020-03-02T08:10:34Z

apps/settings/css/settings.scss

+						width: 150px;
+						margin-top: 35px;
 						height: 3px;
+						position: absolute;


I would suggest to wrap both the text and process in a wrapping div so you can more easily style those without the need of a absolute positioning.

kesselb · 2020-03-15T19:01:38Z

cc @GretaD mind to rebase?

tanderson8 · 2020-03-19T15:02:04Z

apps/settings/src/components/UserList/UserRowSimple.vue

I'm not seeing an /src directory from my /settings directory. Do I need to just add it and push the file to it for these changes to take effect?

GretaD · 2020-03-22T16:01:44Z

@tanderson8 is you master up to date? You normally should have the UserRowSimple.vue file when you checkout out at rethink_quota branch.

juliusknorr · 2020-03-23T08:22:55Z

Let's do this. The quota/language assignment issue will be fixed by nextcloud-libraries/nextcloud-vue#924

@GretaD Mind to rebase and commit the bundles?

juliusknorr · 2020-03-23T08:23:16Z

/backport to stable18

Signed-off-by: GretaD <gretadoci@gmail.com>

backportbot-nextcloud · 2020-03-23T13:19:58Z

The backport to stable18 failed. Please do this backport manually.

kesselb · 2020-04-04T16:44:29Z

This pull request reverts #18555 partly. It's again not possible to edit my own user account.

cc @GretaD @juliushaertl

juliusknorr · 2020-04-04T18:38:32Z

apps/settings/src/components/UserList/UserRowSimple.vue

 			}
 			return t('settings', '{size} used', { size: OC.Util.humanFileSize(0) })
 		},
-		canEditUser() {


@GretaD It seems this was reverted for some reason as @kesselb mentioned as well as the related part in the template. I did not notice that during review, so it was probably during rebase? Could you look into fixing that again?

GretaD added the 2. developing Work in progress label Jan 10, 2020

GretaD changed the title ~~(wip) change quota design~~ change quota design Jan 13, 2020

GretaD requested review from jancborchardt and kesselb January 13, 2020 17:39

GretaD added 3. to review Waiting for reviews design Design, UI, UX, etc. and removed 2. developing Work in progress labels Jan 13, 2020

jancborchardt previously requested changes Jan 13, 2020

View reviewed changes

GretaD force-pushed the rethink_quota branch 2 times, most recently from 11b632b to 92bb9d7 Compare February 19, 2020 15:27

GretaD requested review from jancborchardt and juliusknorr February 19, 2020 15:38

juliusknorr reviewed Feb 19, 2020

View reviewed changes

apps/settings/css/settings.scss Outdated Show resolved Hide resolved

GretaD force-pushed the rethink_quota branch from 92bb9d7 to 22756b4 Compare February 19, 2020 16:54

GretaD requested a review from juliusknorr February 19, 2020 16:55

kesselb mentioned this pull request Feb 25, 2020

Allow to edit admin/own user in the user management #18555

Merged

juliusknorr reviewed Feb 26, 2020

View reviewed changes

apps/settings/src/components/UserList/UserRowSimple.vue Outdated Show resolved Hide resolved

juliusknorr reviewed Feb 26, 2020

View reviewed changes

apps/settings/src/components/UserList/UserRowSimple.vue Outdated Show resolved Hide resolved

GretaD force-pushed the rethink_quota branch 2 times, most recently from eb8ba26 to 35995f5 Compare February 26, 2020 16:18

GretaD requested a review from juliusknorr February 26, 2020 16:20

GretaD force-pushed the rethink_quota branch from 35995f5 to 90c3e3b Compare February 27, 2020 09:22

kesselb approved these changes Feb 27, 2020

View reviewed changes

kesselb requested a review from skjnldsv February 29, 2020 22:19

juliusknorr reviewed Mar 2, 2020

View reviewed changes

kesselb mentioned this pull request Mar 15, 2020

18.0.2: setting space quota of user cannot be changed #19969

Closed

kesselb requested a review from juliusknorr March 15, 2020 19:01

GretaD force-pushed the rethink_quota branch 2 times, most recently from 4df4c1a to a59ad69 Compare March 16, 2020 12:21

juliusknorr mentioned this pull request Mar 20, 2020

Force single multiselect value to be shown when the input is not active nextcloud-libraries/nextcloud-vue#924

Merged

juliusknorr approved these changes Mar 23, 2020

View reviewed changes

juliusknorr added bug 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Mar 23, 2020

juliusknorr added this to the Nextcloud 19 milestone Mar 23, 2020

backportbot-nextcloud bot added the backport-request label Mar 23, 2020

Fix unlimited and progress bar

5cc08ac

Signed-off-by: GretaD <gretadoci@gmail.com>

GretaD force-pushed the rethink_quota branch from a59ad69 to 5cc08ac Compare March 23, 2020 09:21

ChristophWurst merged commit e4adccb into master Mar 23, 2020

ChristophWurst deleted the rethink_quota branch March 23, 2020 13:18

GretaD mentioned this pull request Mar 24, 2020

[stable18] change quota design #20144

Merged

juliusknorr reviewed Apr 4, 2020

View reviewed changes

GretaD mentioned this pull request Apr 9, 2020

Allow to edit admin user #20381

Merged

skjnldsv removed the backport-request label Apr 10, 2020

GretaD mentioned this pull request May 19, 2020

Quota setting of the user management screen becomes "0B" #16185

Closed

Uh oh!

change quota design #18818

change quota design #18818

Uh oh!

Conversation

GretaD commented Jan 10, 2020 • edited by kesselb Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jancborchardt left a comment • edited by GretaD Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kesselb commented Jan 16, 2020

Uh oh!

Uh oh!

kesselb commented Feb 21, 2020

Uh oh!

kesselb commented Feb 21, 2020

Uh oh!

Uh oh!

Uh oh!

kesselb commented Feb 26, 2020

Uh oh!

GretaD commented Feb 27, 2020

Uh oh!

kesselb commented Feb 27, 2020

Uh oh!

juliusknorr commented Mar 2, 2020

Uh oh!

juliusknorr Mar 2, 2020

Choose a reason for hiding this comment

Uh oh!

kesselb commented Mar 15, 2020

Uh oh!

tanderson8 commented Mar 19, 2020

Uh oh!

GretaD commented Mar 22, 2020

Uh oh!

juliusknorr commented Mar 23, 2020

Uh oh!

juliusknorr commented Mar 23, 2020

Uh oh!

backportbot-nextcloud bot commented Mar 23, 2020

Uh oh!

kesselb commented Apr 4, 2020

Uh oh!

juliusknorr Apr 4, 2020

Choose a reason for hiding this comment

Uh oh!

GretaD Apr 9, 2020

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

GretaD commented Jan 10, 2020 •

edited by kesselb

Loading

jancborchardt left a comment •

edited by GretaD

Loading