Skip to content

change quota design - #18818

Merged
ChristophWurst merged 1 commit into
masterfrom
rethink_quota
Mar 23, 2020
Merged

change quota design#18818
ChristophWurst merged 1 commit into
masterfrom
rethink_quota

Conversation

@GretaD

@GretaDGretaD commented Jan 10, 2020

Copy link
Copy Markdown
Contributor

@GretaDGretaD added the 2. developing Work in progress label Jan 10, 2020
@GretaDGretaD changed the title (wip) change quota designchange quota designJan 13, 2020
@GretaDGretaD added 3. to review Waiting for reviews design Design, UI, UX, etc. and removed 2. developing Work in progress labels Jan 13, 2020

@jancborchardtjancborchardt left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • 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

Copy link
Copy Markdown
Contributor

Thanks @GretaD 👍

image

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.

Comment threadapps/settings/css/settings.scss Outdated
@kesselb

Copy link
Copy Markdown
Contributor

Needs a rebase.

@kesselb

Copy link
Copy Markdown
Contributor

image

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

Comment threadapps/settings/src/components/UserList/UserRowSimple.vue Outdated
Comment threadapps/settings/src/components/UserList/UserRowSimple.vue Outdated
@GretaD
GretaDforce-pushed the rethink_quota branch 2 times, most recently from eb8ba26 to 35995f5CompareFebruary 26, 2020 16:18
@kesselb

Copy link
Copy Markdown
Contributor

image

😕

@GretaD

Copy link
Copy Markdown
ContributorAuthor

image

confused

ouch, what happened there? /hides

@kesselb

Copy link
Copy Markdown
Contributor

image

Looks good to me.

image

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

@juliusknorr

Copy link
Copy Markdown
Member

The quota bar positioning still seems a bit off
image

Comment threadapps/settings/css/settings.scss Outdated
width: 150px;
margin-top: 35px;
height: 3px;
position: absolute;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Copy Markdown
Contributor

cc @GretaD mind to rebase?

@GretaD
GretaDforce-pushed the rethink_quota branch 2 times, most recently from 4df4c1a to a59ad69CompareMarch 16, 2020 12:21
@tanderson8

Copy link
Copy Markdown

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

Copy link
Copy Markdown
ContributorAuthor

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

@juliusknorr

Copy link
Copy Markdown
Member

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?

@juliusknorrjuliusknorr 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
@juliusknorrjuliusknorr added this to the Nextcloud 19 milestone Mar 23, 2020
@juliusknorr

Copy link
Copy Markdown
Member

/backport to stable18

Signed-off-by: GretaD <gretadoci@gmail.com>
@ChristophWurst
ChristophWurst merged commit e4adccb into masterMar 23, 2020
@ChristophWurst
ChristophWurst deleted the rethink_quota branch March 23, 2020 13:18
@backportbot-nextcloud

Copy link
Copy Markdown

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

@kesselb

Copy link
Copy Markdown
Contributor

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

cc @GretaD@juliushaertl

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

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes sure

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugdesignDesign, UI, UX, etc.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

User management view: Rethink quota

7 participants

@GretaD@kesselb@juliusknorr@tanderson8@jancborchardt@ChristophWurst@skjnldsv