Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Files external settings polish #787

Merged
merged 5 commits into from
Aug 17, 2016
Merged

Conversation

icewind1991
Copy link
Member

  • Hide "global credentails" and dependency notes when a user can't create mounts
  • hide "External Storage" from personal settings if there is nothing to show

@icewind1991 icewind1991 added the 3. to review Waiting for reviews label Aug 9, 2016
@icewind1991 icewind1991 added this to the Nextcloud 11.0 milestone Aug 9, 2016
@mention-bot
Copy link

@icewind1991, thanks for your PR! By analyzing the annotation information on this pull request, we identified @jancborchardt, @Xenopathic and @PVince81 to be potential reviewers

var mainForm = $('#files_external');
if (result.length === 0 && mainForm.attr('data-can-create') === 'false') {
mainForm.hide();
$('a[href="#external-storage"]').parent().hide();
Copy link
Member

Choose a reason for hiding this comment

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

This works but is a little bit ugly because the time that loading takes is around 0.5 seconds here and then the navigation bar on the left magically removes one item.

Copy link
Member Author

Choose a reason for hiding this comment

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

Not much we can easily do about it

Copy link
Member

Choose a reason for hiding this comment

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

Just a idea by @nickvergessen, shouldn't it be possible to already decide on PHP level if we want to show the settings or not and don't return a settings page here https://github.com/nextcloud/server/blob/master/apps/files_external/personal.php if we don't want to show the settings?

@LukasReschke
Copy link
Member

Works but https://github.com/nextcloud/server/pull/787/files#r74160076 makes it a little bit of a bad UX.

@MorrisJobke MorrisJobke force-pushed the files_external-settings-polish branch from a488b94 to 1522beb Compare August 9, 2016 23:05
@MorrisJobke
Copy link
Member

I fixed some casing stuff too.

This addresses some issues of #735

@MorrisJobke MorrisJobke mentioned this pull request Aug 9, 2016
67 tasks
@schiessle
Copy link
Member

Works but https://github.com/nextcloud/server/pull/787/files#r74160076 makes it a little bit of a bad UX.

Agree... So what should we do here? How to move forward? @nextcloud/designers opinions?

@schiessle
Copy link
Member

Should we split it up and first merge the uncontroversial part like fix whitespace, non italic text, "using OC login", no note,... And put the "hide if empty" part in a new PR for further discussion so that we have at least something for the RC?

@icewind1991 icewind1991 force-pushed the files_external-settings-polish branch from 1522beb to 8f751c7 Compare August 15, 2016 13:37
@icewind1991
Copy link
Member Author

It now hides the "Files External" section on the server side

@schiessle
Copy link
Member

Works great, @icewind1991 !

Just one small thing I discovered while testing. The drop-down to select the external storage has a option "ownCloud". I would suggest to change it to "Nextcloud / ownCloud".

@icewind1991
Copy link
Member Author

Changes it to "Nextcloud", showing both only adds clutter imo

@schiessle
Copy link
Member

👍

@MorrisJobke MorrisJobke self-assigned this Aug 17, 2016
@MorrisJobke MorrisJobke force-pushed the files_external-settings-polish branch from dcdc6b3 to 9a7193c Compare August 17, 2016 09:16
@MorrisJobke
Copy link
Member

I rebased because of the conflict (was only a string change in a file that was moved for the admin page split PR - #796)

I tested it and it works 👍

@MorrisJobke 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 Aug 17, 2016
@MariusBluem
Copy link
Member

👍

@MariusBluem MariusBluem merged commit baaf152 into master Aug 17, 2016
@MariusBluem MariusBluem deleted the files_external-settings-polish branch August 17, 2016 10:32
@MariusBluem
Copy link
Member

stable10 backport? @icewind1991 @karlitschek 😁

@karlitschek
Copy link
Member

please backport :-)

@MariusBluem
Copy link
Member

On it 💪

@MariusBluem
Copy link
Member

Backport is in #902 👊

@schiessle
Copy link
Member

schiessle commented Aug 17, 2016

We lost at least two commits, probably during a rebase.

  1. hide the "Files External" section on the server side
  2. Change ownCloud to Nextcloud

@icewind1991 can you have a look and bring this commits back? Maybe you have a local copy?

@icewind1991
Copy link
Member Author

#906

GitHubUser4234 pushed a commit to GitHubUser4234/server that referenced this pull request Aug 30, 2016
…gs-polish

Files external settings polish
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants