diff --git a/r2/example.ini b/r2/example.ini index 2392e1963..760408482 100644 --- a/r2/example.ini +++ b/r2/example.ini @@ -610,3 +610,5 @@ goldvertisement_blurbs = "Make reddit better. Try %(reddit_gold)." "This year, g goldvertisement_has_gold_blurbs = "**“Exquisite!”** \nGrab a drink and join us in [the lounge](/r/lounge)." # sample multireddits (displayed when a user has no multis) listing_chooser_sample_multis = /user/reddit/m/hello, /user/reddit/m/world +# multi of subreddits to share with gold users +listing_chooser_gold_multi = /user/reddit/m/gold diff --git a/r2/r2/lib/app_globals.py b/r2/r2/lib/app_globals.py index 7bb1f14e1..318b07d51 100755 --- a/r2/r2/lib/app_globals.py +++ b/r2/r2/lib/app_globals.py @@ -229,6 +229,9 @@ class Globals(object): 'fastlane_links', 'listing_chooser_sample_multis', ], + ConfigValue.str: [ + 'listing_chooser_gold_multi', + ], ConfigValue.dict(ConfigValue.int, ConfigValue.float): [ 'comment_tree_version_weights', ], diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py index b83838e5b..f747992f7 100755 --- a/r2/r2/lib/pages/pages.py +++ b/r2/r2/lib/pages/pages.py @@ -4127,6 +4127,11 @@ class ListingChooser(Templated): self.add_item("other", _("saved"), path='/user/%s/saved' % c.user.name) + gold_multi = g.live_config["listing_chooser_gold_multi"] + if c.user_is_loggedin and c.user.gold and gold_multi: + self.add_item("other", name=_("gold perks"), path=gold_multi, + extra_class="gold-perks") + self.show_samples = False if c.user_is_loggedin: multis = LabeledMulti.by_owner(c.user) @@ -4142,13 +4147,15 @@ class ListingChooser(Templated): if self.selected_item: self.selected_item["selected"] = True - def add_item(self, section, name, path=None, site=None, description=None): + def add_item(self, section, name, path=None, site=None, description=None, + extra_class=None): self.sections[section].append({ "name": name, "description": description, "path": path or site.user_path, "site": site, "selected": False, + "extra_class": extra_class, }) def add_samples(self): diff --git a/r2/r2/public/static/css/reddit.less b/r2/r2/public/static/css/reddit.less index c443465e4..60a451616 100755 --- a/r2/r2/public/static/css/reddit.less +++ b/r2/r2/public/static/css/reddit.less @@ -7438,6 +7438,21 @@ body.with-listing-chooser { border-left-color: lighten(#369, 25%); } } + + &.gold-perks { + background: #fdfbf2; + a { + color: #9a7d2e; + } + + &.selected { + border-color: lighten(#c4b487, 6%); + + &:before { + border-left-color: lighten(#9a7d2e, 15%); + } + } + } } diff --git a/r2/r2/templates/listingchooser.html b/r2/r2/templates/listingchooser.html index 3bcf13173..846128169 100644 --- a/r2/r2/templates/listingchooser.html +++ b/r2/r2/templates/listingchooser.html @@ -20,13 +20,11 @@ ## reddit Inc. All Rights Reserved. ############################################################################### +<%namespace file="utils.html" import="classes"/> + <%def name="section_items(itemlist)"> %for item in itemlist: -