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

Site Settings: Adds holidaysnow to general site settings #1210

Merged
merged 3 commits into from
Dec 2, 2015

Conversation

ebinnion
Copy link
Contributor

@ebinnion ebinnion commented Dec 2, 2015

Closes #1123

@jeherve reported in #1123 that the holiday snow options weren't ported to Calypso. In #1138, I added the holiday snow override to /me and this PR adds the holiday snow site setting to the /settings/general/$site.

Note: The first two commits are ESLint fixes. So, if you'd like to see the changeset to add holidaysnow, see the third commit.

To test:

  • Checkout add/site-settings-holiday-snow branch
  • Go to /me/account and ensure you have holiday snow enabled
  • Go to /settings/general/$site where $site is a WP.com site and ensure that snow is enabled
  • Go to $site. Do you see snow? Good
  • Go to /settings/general/$site and disable snow.
  • Go to $site. You should not see snow.
  • Go to /settings/general/$site where $site is a Jetpack site. You should not see the holiday snow option yet. Since this requires an API change, it is unlikely that holiday snow will be changeable via the API until 4.0 (late January 2016)

cc @lancewillett who pointed the issue out to me and @lezama who has done some work in form-general.

WP.com site
screen shot 1

Jetpack site
screen shot

@ebinnion ebinnion added [Feature] Site Settings All other general site settings. [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. labels Dec 2, 2015
@ebinnion ebinnion self-assigned this Dec 2, 2015
@lancewillett
Copy link
Contributor

QA 👍 — works exactly as expected. Nice!

<span>{ this.translate( 'I would like my site to be private, visible only to users I choose' ) }</span>
</label>;
}
var site = this.props.site;
Copy link
Contributor

Choose a reason for hiding this comment

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

this could be const

@lezama
Copy link
Contributor

lezama commented Dec 2, 2015

:shipit:

@lezama lezama added [Status] Ready to Merge and removed [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. labels Dec 2, 2015
ebinnion added a commit that referenced this pull request Dec 2, 2015
Site Settings: Adds holidaysnow to general site settings
@ebinnion ebinnion merged commit 7080329 into master Dec 2, 2015
@ebinnion ebinnion deleted the add/site-settings-holiday-snow branch December 2, 2015 23:24
@alisterscott
Copy link
Contributor

I can no longer see the option to disable snow for a simple site in Calypso - it still exists in wp-admin for simple sites. Raised here: #20395

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Feature] Site Settings All other general site settings.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Holiday Snow settings: add site and user option
5 participants