Add quota to the files view by nickvergessen · Pull Request #5305 · nextcloud/server

nickvergessen · 2017-06-08T14:44:18Z

cc @jancborchardt apply beautification 😸

Dennis1993 · 2017-06-08T15:12:09Z

That's a very good idea. I think we can remove the quota overview in the personal settings and move it to the files overview.

My idea is to set it a little bit down and not of the top of the navigation. Here an example. Whats your opinion?

Normal state (free space available)

Full state (free space is low)

MorrisJobke · 2017-06-08T15:17:52Z

My idea is to set it a little bit down and not of the top of the navigation. Here an example. Whats your opinion?

That was also our idea to put in down there.

MariusBluem · 2017-06-08T15:20:42Z

I think we can remove the quota overview in the personal settings

👎 ... You'll get a nice overview there, and we need this bar for the quota-buttons (apps/external).

Dennis1993 · 2017-06-08T16:42:57Z

@MariusBluem oh okay. I don't know that, I don't use external storage :)

codecov · 2017-06-09T13:42:49Z

Codecov Report

❗ No coverage uploaded for pull request base (master@2f7f6e2). Click here to learn what that means.
The diff coverage is 40.9%.

@@ Coverage Diff @@## master #5305 +/- ##
=========================================
Coverage ? 54.14% Complexity ? 22313 =========================================
Files ? 1381 Lines ? 85470 Branches ? 1325 =========================================
Hits ? 46275 Misses ? 39195 Partials ? 0

Impacted Files	Coverage Δ	Complexity Δ
apps/files/templates/index.php	`0% <ø> (ø)`	`0 <0> (?)`
apps/files/templates/appnavigation.php	`0% <0%> (ø)`	`0 <0> (?)`
apps/files/lib/Controller/ViewController.php	`76.31% <81.81%> (ø)`	`18 <0> (?)`

jancborchardt · 2017-06-09T13:44:19Z

There you go:

Can we move it to the bottom, above »Deleted files«? Otherwise this really takes too much attention away from the important things. Same for the mobile apps.
The tooltip with the percentage can have the translation removed in the code. Couldn’t figure out how to do that last part.
The link needs to be linked to the actual place where it should go. For the normal release, it should go to the personal settings.
For the core version we should put a switch in which disables the »Do you need more space?« sentence, right?
If we have a CSS/canvas expert here we could even make the icon reflect the actual space usage. ;) cc @nextcloud/designers @Espina2

MorrisJobke · 2017-06-09T14:00:46Z

Can we move it to the bottom, above »Deleted files«? Otherwise this really takes too much attention away from the important things. Same for the mobile apps.

It is only in the branded apps on the top. :/

MorrisJobke · 2017-06-09T14:01:42Z

The link needs to be linked to the actual place where it should go. For the normal release, it should go to the personal settings.

Why is it there for the normal version? This should be the "quota" type link from the external sites app and if this is not configured should not show up at all.

MorrisJobke · 2017-06-09T14:02:01Z

For the core version we should put a switch in which disables the »Do you need more space?« sentence, right?

See comment above

jancborchardt · 2017-06-09T14:31:18Z

Ok, so TL;DR what to change here before we can merge? ;)

nickvergessen · 2017-06-09T15:10:57Z

I will have a look to bring the externals app link into this

MariusBluem · 2017-06-09T15:21:59Z

I will have a look to bring the externals app link into this

What about simply using the first quota-link? @nickvergessen

enoch85 · 2017-06-09T15:43:30Z

Will this PR also recognize the total amount of storage even if a quota isn't set, or will it still say "unlimited"?

nickvergessen · 2017-06-09T16:09:30Z

I removed the "of Unlimited" because I think it's useless, the blue bar however will should the percentage of the total available space

nickvergessen · 2017-06-12T08:04:04Z

So it's like this now:

Can we move it to the bottom, above »Deleted files«?

I can only move it to the bottom when the box shall be below the deleted files link. Or make it the last item in the list. Is that okay? @jancborchardt

jancborchardt · 2017-06-12T14:16:27Z

I'd say let's put it last in the list. If we add it to the sticky part on the bottom, it will obscire the list too much on mobile.

LukasReschke

Super cool stuff 🚀

MorrisJobke · 2017-06-12T21:03:49Z

This is needed to put it to the bottom:

position: fixed !important;
bottom:88px;
width: inherit !important;
background-color:#fff;
border-right:1px solid #eee;
z-index:1;

We also need to update the padding of the last element in the upper menu to have a padding of 44px by default:

.app-files#app-navigation>ulli:nth-last-child(2) {
margin-bottom:44px;
}

and update the same rule in the trashbin to have 88px (two menu entries):

.app-files#app-navigation>ulli:nth-last-child(2) {
margin-bottom:44px;
}

let me update the CSS.

MorrisJobke · 2017-06-12T22:08:35Z

I fixed the CSS and it now looks like this:

👍 from me now. (putting the DOM element to the bottom as well messes too much with the rest of the layout so I kept it where it is)

Signed-off-by: Joas Schilling <coding@schilljs.com>

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Signed-off-by: Joas Schilling <coding@schilljs.com>

LukasReschke · 2017-06-13T09:18:14Z

Rebased on master for test execution.

LukasReschke · 2017-06-13T09:21:33Z

@MorrisJobke Mind committing your patch for #5305 (comment)?

MorrisJobke

Updated the quota bar to not have an icon 👍

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

jancborchardt · 2017-06-13T15:42:32Z

Looked better before with the icon, in line with the others. Right now it might even be confused as being info of the Deleted files entry.

MariusBluem · 2017-06-13T15:55:54Z

Looked better before with the icon, in line with the others. Right now it might even be confused as being info of the Deleted files entry.

The quota bar is something different then the sidebar items (deleted files, ...). It is a static element and not something you should/can click on ;)

jancborchardt · 2017-06-13T16:11:35Z

It absolutely should be possible to click on in the future so you see how the storage is used. Like on iOS or Android where you see which apps / filetypes use most.

nickvergessen · 2017-06-13T16:30:56Z

It absolutely should be possible to click on in the future so you see how the storage is used.

Yeah but that is not part of todays story.

Currently 4 people prefer without the icon, and only you prefer with it. Do your thing, or merge. This needs to be merged and backported by friday, please take care of this @jancborchardt if you block this now.

jancborchardt · 2017-06-13T16:46:24Z

I did do it like this and it was overwritten. But sure, do design by voting.

MorrisJobke · 2017-06-13T17:19:11Z

It absolutely should be possible to click on in the future so you see how the storage is used. Like on iOS or Android where you see which apps / filetypes use most.

But currently on iOS and Android this item also doesn't have an item. So I think this is more in line with that, but as always: we can improve on this if the icon is the better way: sure - we should go for it. Let's see what the users say.

MorrisJobke · 2017-06-13T17:23:25Z

I will take care of the backport.

skjnldsv · 2017-06-14T14:53:21Z

Nice work here! 👍

nickvergessen added 2. developing Work in progress design Design, UI, UX, etc. enhancement feature: files labels Jun 8, 2017

nickvergessen added this to the Nextcloud 13 milestone Jun 8, 2017

nickvergessen assigned jancborchardt Jun 8, 2017

enoch85 mentioned this pull request Jun 9, 2017
Bring back the old way of counting storage #5159
Closed

nickvergessen assigned nickvergessen and unassigned jancborchardt Jun 9, 2017

nickvergessen mentioned this pull request Jun 9, 2017
Hijack the quota box in the files app nextcloud/external#40
Merged

enoch85 mentioned this pull request Jun 12, 2017
show used space in user list #5342
Merged

LukasReschke reviewed Jun 12, 2017
View reviewed changes

nickvergessenand others added 4 commits June 13, 2017 11:17

Remove the colored corners
3a17131
Signed-off-by: Joas Schilling <coding@schilljs.com>

Adjust the unit test
b481fa4
Signed-off-by: Joas Schilling <coding@schilljs.com>

Put the quota bar to the bottom
2fe2b5a
Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Remove unused element
27690e0
Signed-off-by: Joas Schilling <coding@schilljs.com>

LukasReschke force-pushed the add-quota-to-files-view branch from df5a8d9 to 27690e0Compare June 13, 2017 09:17

LukasReschke approved these changes Jun 13, 2017
View reviewed changes

LukasReschke added 4. to release Ready to be released and/or waiting for tests to finish 3. to review Waiting for reviews and removed 3. to review Waiting for reviews 4. to release Ready to be released and/or waiting for tests to finish labels Jun 13, 2017

MorrisJobke approved these changes Jun 13, 2017
View reviewed changes

MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jun 13, 2017

MorrisJobke unassigned nickvergessen Jun 13, 2017

Do not show icon for quota bar
4a256aa
Signed-off-by: Morris Jobke <hey@morrisjobke.de>

MorrisJobke force-pushed the add-quota-to-files-view branch from 6328dc7 to 4a256aaCompare June 13, 2017 15:30

MorrisJobke merged commit 666e4de into masterJun 13, 2017

MorrisJobke deleted the add-quota-to-files-view branch June 13, 2017 17:19

MorrisJobke mentioned this pull request Jun 13, 2017
[stable12] Add quota to the files view #5389
Merged

jancborchardt mentioned this pull request Jun 26, 2017
Move percentdone bar to bottom of task nextcloud/tasks#87
Merged

Uh oh!

Uh oh!

Conversation

nickvergessen commented Jun 8, 2017

Uh oh!

Dennis1993 commented Jun 8, 2017• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MorrisJobke commented Jun 8, 2017

Uh oh!

MariusBluem commented Jun 8, 2017• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Dennis1993 commented Jun 8, 2017

Uh oh!

codecovBot commented Jun 9, 2017• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

jancborchardt commented Jun 9, 2017• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MorrisJobke commented Jun 9, 2017

Uh oh!

MorrisJobke commented Jun 9, 2017

Uh oh!

MorrisJobke commented Jun 9, 2017

Uh oh!

jancborchardt commented Jun 9, 2017

Uh oh!

nickvergessen commented Jun 9, 2017

Uh oh!

MariusBluem commented Jun 9, 2017

Uh oh!

enoch85 commented Jun 9, 2017

Uh oh!

nickvergessen commented Jun 9, 2017

Uh oh!

nickvergessen commented Jun 12, 2017• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jancborchardt commented Jun 12, 2017

Uh oh!

LukasReschke left a comment

Choose a reason for hiding this comment

Uh oh!

MorrisJobke commented Jun 12, 2017

Uh oh!

MorrisJobke commented Jun 12, 2017

Uh oh!

LukasReschke commented Jun 13, 2017

Uh oh!

LukasReschke commented Jun 13, 2017

Uh oh!

MorrisJobke left a comment

Choose a reason for hiding this comment

Uh oh!

jancborchardt commented Jun 13, 2017

Uh oh!

MariusBluem commented Jun 13, 2017

Uh oh!

jancborchardt commented Jun 13, 2017

Uh oh!

nickvergessen commented Jun 13, 2017

Uh oh!

jancborchardt commented Jun 13, 2017

Uh oh!

MorrisJobke commented Jun 13, 2017

Uh oh!

MorrisJobke commented Jun 13, 2017

Uh oh!

skjnldsv commented Jun 14, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

Dennis1993 commented Jun 8, 2017•
edited
Loading

MariusBluem commented Jun 8, 2017•
edited
Loading

codecovBot commented Jun 9, 2017•
edited
Loading

jancborchardt commented Jun 9, 2017•
edited
Loading

nickvergessen commented Jun 12, 2017•
edited
Loading