Commit Graph

6430 Commits

Author SHA1 Message Date
Chad Birch
fae672ea8e Quarantine: hide subscribers / users here now
This hides the display of the subscribers and "users here now" counts
for quarantined subreddits. 0 will be returned for both values through
the API.
2015-08-05 13:18:44 -07:00
MelissaCole
2d38338eab Add API endpoint for opting into a quarantined subreddit 2015-08-05 13:18:44 -07:00
Matt Lee
3da619597a Replace over18 interstitial image. 2015-08-05 13:18:42 -07:00
Matt Lee
86ca226720 Remove style changes to NSFW stamp. 2015-08-05 13:18:42 -07:00
Matt Lee
143a8a7e14 Feature flag changes to existing interstitials. 2015-08-05 13:18:38 -07:00
Matt Lee
f022c3d110 Update content interstitials.
Add new templates for interstitial pages, and update the banned, private, gold-only,
quarantined, and over 18 interstitials to use them.
2015-08-05 13:18:38 -07:00
Matt Lee
17eccffd8c Quarantine: Fix caching issue with sidebar notice. 2015-08-05 13:18:38 -07:00
Matt Lee
b56db4a6bf Fix nsfw-stamp style in Firefox.
Remove dotted bottom border.  Fixes for both old and new stamps.
2015-08-05 13:18:34 -07:00
Matt Lee
bc7d4cf928 Quarantine: Move feature flag checks out of templates. 2015-08-05 13:18:34 -07:00
Florence Yeun
e2a7345a02 Quarantine: Add missing feature flag check
Add the `quarantine` page class only when the feature is enabled.
2015-08-05 13:18:28 -07:00
Florence Yeun
948b091180 Quarantine: Update wording 2015-08-05 13:18:28 -07:00
Florence Yeun
91bc08e843 Quarantine: 404 for unavailable content in api
For non-html render types, return a 404 error instead of redirecting
to the content gate.
2015-08-05 13:18:28 -07:00
Florence Yeun
e7c711c9ec Quarantine: Update header image
Update the header image for quarantined subreddits and remove the
create subreddit snoos using a new `body` class.
2015-08-05 13:18:28 -07:00
Florence Yeun
64ad1e8709 Quarantine: Opt out from content gate
Declining to view a quarantined subreddit from the content gate should
send the user to the home page and opt out the user if applicable.
2015-08-05 13:18:28 -07:00
Matt Lee
514ea2722e Update quarantined interstitial icon. 2015-08-05 13:18:27 -07:00
MelissaCole
3fd0cfd5d7 Fix uuid import bug 2015-08-05 13:18:27 -07:00
MelissaCole
cf9a9781cc Send quarantined subreddit actions to event-collector
The available event_types are:
    quarantine_interstitial_view, quarantine_interstitial_dismiss,
    quarantine_opt_in, quarantine_opt_out
2015-08-05 13:18:24 -07:00
Florence Yeun
a8cab6f148 Quarantine: Update feature flag 2015-08-05 13:17:23 -07:00
Florence Yeun
613eead51a Don't show welcome message for interstitials 2015-08-05 13:17:23 -07:00
Florence Yeun
8b7509b37b Readjust stamp padding
For the new bold stamp style, increase stamp padding to 4px.
2015-08-05 13:17:23 -07:00
Florence Yeun
7de163ef7f Quarantine: Add stamp to .compact
Add the quarantine stamp for compact links throughout. Add the
quarantine stamp and NSFW stamp for compact comments on the user page.

Also, show both the quarantine stamp and NSFW stamp for comments on
the user page when applicable, to match the behavior for links.
2015-08-05 13:17:23 -07:00
Matt Lee
9848155166 Quarantine: Add feature flag. 2015-08-05 13:17:23 -07:00
Matt Lee
c0de887fea Lower quarantine interstitial priority.
If we would otherwise show a private or gold-only interstitial, show
that first.
2015-08-05 13:17:23 -07:00
MelissaCole
a1c689c1fe Redirect /quarantine when dest doesn't include quarantined subreddit 2015-08-05 13:17:23 -07:00
Matt Lee
2792b84f68 Show quarantined subreddits in mod list if otherwise viewable. 2015-08-05 13:17:23 -07:00
Matt Lee
c626c7ae61 Newsletter: Don't show on over18 interstitial. 2015-08-05 13:17:23 -07:00
Matt Lee
2726158f2c Newsletter: Don't show on quarantine interstitial. 2015-08-05 13:17:23 -07:00
Matt Lee
d9a19e2b55 Extend interstitial to handle logged out and unverified cases. 2015-08-05 13:17:23 -07:00
Matt Lee
bd4b6e448a Update quarantine interstitial design. 2015-08-05 13:17:19 -07:00
Matt Lee
d9ffad5bcf Add quarantine notice to sidebar.
Wraps the opt-out button in a box with some messaging.  Also moves the
opt-out above the subscribe button per the latest design specs.
2015-08-05 13:16:58 -07:00
MelissaCole
6714b63d9f Quarantined optins: Include schema args for cassandra 2015-08-05 13:16:58 -07:00
MelissaCole
21c3a1d2a3 Exclude quarantine from api_docs 2015-08-05 13:16:58 -07:00
Matt Lee
62914fbe8d ReadNext: Use updated NSFW stamp style. 2015-08-05 13:16:58 -07:00
Matt Lee
1cdf540a94 Add NSFW and Quarantined stamps to comments on profile pages. 2015-08-05 13:16:58 -07:00
Matt Lee
9084cff6f9 Quarantine: Update stamp display text. 2015-08-05 13:16:58 -07:00
Matt Lee
4f9baf5732 Update NSFW and Quarantine stamp styles. 2015-08-05 13:16:58 -07:00
Matt Lee
6d5bb543c4 Add content warning stamps to moderator list. 2015-08-05 13:16:58 -07:00
Matt Lee
b07d1f4c6b Quarantine: Disable share api endpoint. 2015-08-05 13:16:58 -07:00
Florence Yeun
b601c465c9 Quarantine: Remove disabled subreddit settings
Remove two disabled options from the subreddit settings page for
quarantined subreddits:
1. allow this subreddit to be included /r/all
2. show thumbnail images of content

These settings are stored independently of the quarantine state.
2015-08-05 13:16:58 -07:00
Matt Lee
9a643e2a0c Don't display header image if quarantined. 2015-08-05 13:16:57 -07:00
Matt Lee
f6f56a0792 Disable images in quarantined subreddit stylesheets.
When a subreddit is marked as quarantined, reparse their stylesheet with all image references replaced with a blank png.
2015-08-05 13:16:57 -07:00
Matt Lee
b53ebded00 Disable image upload form on stylesheet editor. 2015-08-05 13:16:57 -07:00
Matt Lee
468b0551d0 Quarantine: Remove header image upload. 2015-08-05 13:16:57 -07:00
Matt Lee
7cae78b6de Disable upload_sr_image api endpoint for quarantined subreddits. 2015-08-05 13:16:57 -07:00
MelissaCole
38b3bf57aa Add opt out button for quarantined subreddits 2015-08-05 13:16:57 -07:00
MelissaCole
a4e6172fc5 Quarantine Subreddits: Require verified email 2015-08-05 13:16:57 -07:00
Florence Yeun
4868801ada robots.txt: Disallow /quarantine
Restrict crawlers from the quarantined content gate via robots.txt.

Also add robots=noindex,nofollow meta tag to /quarantine page.
2015-08-05 13:16:57 -07:00
Florence Yeun
cd4f3b1f1d robots.txt: Disallow /over18
Restrict crawlers from the NSFW content gate via robots.txt.

Also add robots=noindex,nofollow meta tag to /over18 page.
2015-08-05 13:16:57 -07:00
Matt Lee
3229d27251 Quarantine: Disable share feature on quarantined links. 2015-08-05 13:16:57 -07:00
Matt Lee
2f6a58ae81 Quarantine: Don't allow in /random.
For consistency
2015-08-05 13:16:57 -07:00