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

Tweak for part 1 of #400 #423

Merged
merged 3 commits into from
Jan 31, 2017
Merged

Tweak for part 1 of #400 #423

merged 3 commits into from
Jan 31, 2017

Conversation

yuya-oc
Copy link
Contributor

@yuya-oc yuya-oc commented Jan 27, 2017

Before submitting, please confirm you've

Please provide the following information:

Summary
The part 1 of #400.

  • Some tweak of labels
  • Remain settings page on clicking "x" button when there are no servers in config.

Issue link
#400

Test Cases

  1. Open settings page.
  2. Click "x" on top right of UI.
  3. If no servers are saved yet, the settings page remain open.

Additional Notes
artifacts: https://circleci.com/gh/yuya-oc/desktop/142#artifacts

@jasonblais
Copy link
Contributor

It works for me on Win10, thanks @yuya-oc!

As a future improvement, we could consider disabling or hiding the 'x' on the top corner of the page (similar to the "Save" button) when no servers have been added.

@yuya-oc
Copy link
Contributor Author

yuya-oc commented Jan 29, 2017

Thanks! Now the button is disabled when no servers have been saved.

https://circleci.com/gh/yuya-oc/desktop/143#artifacts

@jasonblais jasonblais added this to the v3.6.0 milestone Jan 29, 2017
@jasonblais
Copy link
Contributor

jasonblais commented Jan 30, 2017

Thanks @yuya-oc! I tried, but it seems like the button isn't disabled (clicking it performs the same action as "cancel"

However, I'm wondering if this is needed after PART 3 in #401

If the user has no servers, then the 'add server' dialog should appear automatically, I think.

@yuya-oc
Copy link
Contributor Author

yuya-oc commented Jan 30, 2017

@jasonblais Sorry, my description was a little insufficient. In the latest, the close button performs when there are servers in "saved" settings. It's proposal in this PR.
Once servers are saved, users can go back to main page even if the list is blank.

@jasonblais
Copy link
Contributor

Cool, that sounds reasonable. This is good to merge now, thanks! 👍

@yuya-oc yuya-oc merged commit b057ba8 into mattermost:master Jan 31, 2017
@yuya-oc yuya-oc deleted the issue400-part1 branch January 31, 2017 13:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants