diff --git a/r2/example.ini b/r2/example.ini index 10276f99f..7a571d55f 100644 --- a/r2/example.ini +++ b/r2/example.ini @@ -576,6 +576,8 @@ fastlane_links = announcement_message = # an info message placed in the sidebar sidebar_message = +# an info message placed in the sidebar for gold users +gold_sidebar_message = # spotlight links for subreddit discovery sr_discovery_links = # probability of the subreddit suggester showing up in the spotlight box diff --git a/r2/r2/lib/app_globals.py b/r2/r2/lib/app_globals.py index 9ff6ce6d4..edcb1aebc 100755 --- a/r2/r2/lib/app_globals.py +++ b/r2/r2/lib/app_globals.py @@ -229,6 +229,7 @@ class Globals(object): 'goldvertisement_has_gold_blurbs', 'welcomebar_messages', 'sidebar_message', + 'gold_sidebar_message', ], } diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py index 5e3bb272f..c77e930d6 100755 --- a/r2/r2/lib/pages/pages.py +++ b/r2/r2/lib/pages/pages.py @@ -332,6 +332,12 @@ class Reddit(Templated): if sidebar_message and isinstance(c.site, DefaultSR): ps.append(SidebarMessage(sidebar_message[0])) + gold_sidebar_message = g.live_config.get("gold_sidebar_message") + if (c.user_is_loggedin and c.user.gold and + gold_sidebar_message and isinstance(c.site, DefaultSR)): + ps.append(SidebarMessage(gold_sidebar_message[0], + extra_class="gold")) + if not c.user_is_loggedin and self.loginbox and not g.read_only_mode: ps.append(LoginFormWide()) @@ -1636,8 +1642,8 @@ class ClientInfoBar(InfoBar): class SidebarMessage(Templated): """An info message box on the sidebar.""" - def __init__(self, message): - Templated.__init__(self, message=message) + def __init__(self, message, extra_class=None): + Templated.__init__(self, message=message, extra_class=extra_class) class RedditError(BoringPage): site_tracking = False diff --git a/r2/r2/public/static/css/reddit.less b/r2/r2/public/static/css/reddit.less index 2406b7f84..24f6893d4 100755 --- a/r2/r2/public/static/css/reddit.less +++ b/r2/r2/public/static/css/reddit.less @@ -433,6 +433,20 @@ ul.flat-vert {text-align: left;} p + p { margin-top: .25em; } + + &.gold { + font-family: serif; + border: 1px solid lighten(#c4b487, 10%); + box-shadow: 0 0 10px lighten(#dad0b3, 10%) inset; + border-radius: 0; + + &:before { + background-image: url(../gold-coin.png); /* SPRITE */ + width: 13px; + height: 14px; + margin-top: 1px; + } + } } .morelink { diff --git a/r2/r2/templates/sidebarmessage.html b/r2/r2/templates/sidebarmessage.html index 76d9680a2..0031c63f5 100644 --- a/r2/r2/templates/sidebarmessage.html +++ b/r2/r2/templates/sidebarmessage.html @@ -24,6 +24,8 @@ from r2.lib.filters import safemarkdown %> -