diff --git a/r2/r2/controllers/listingcontroller.py b/r2/r2/controllers/listingcontroller.py index ad241c335..329a2428f 100755 --- a/r2/r2/controllers/listingcontroller.py +++ b/r2/r2/controllers/listingcontroller.py @@ -914,6 +914,9 @@ class RedditsController(ListingController): if not c.over18: reddits._filter(Subreddit.c.over_18 == False) + if self.where == 'popular': + self.render_params = {"show_interestbar": True} + return reddits @listing_api_doc(section=api_section.subreddits, diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py index 883cf135f..a0682d3a3 100755 --- a/r2/r2/lib/pages/pages.py +++ b/r2/r2/lib/pages/pages.py @@ -1156,20 +1156,22 @@ class SubredditsPage(Reddit): searchbox = False submit_box = False def __init__(self, prev_search = '', num_results = 0, elapsed_time = 0, - title = '', loginbox = True, infotext = None, + title = '', loginbox = True, infotext = None, show_interestbar=False, search_params = {}, *a, **kw): Reddit.__init__(self, title = title, loginbox = loginbox, infotext = infotext, *a, **kw) self.searchbar = SearchBar(prev_search = prev_search, elapsed_time = elapsed_time, num_results = num_results, - header = _('search reddits'), + header = _('search subreddits by name'), search_params = {}, simple=True, subreddit_search=True ) self.sr_infobar = InfoBar(message = strings.sr_subscribe) + self.interestbar = InterestBar(True) if show_interestbar else None + def build_toolbars(self): buttons = [NavButton(menu.popular, ""), NamedButton("new")] @@ -1187,8 +1189,9 @@ class SubredditsPage(Reddit): NavMenu(buttons, base_path = '/reddits', type="tabmenu")] def content(self): - return self.content_stack((self.searchbar, self.nav_menu, - self.sr_infobar, self._content)) + return self.content_stack((self.interestbar, self.searchbar, + self.nav_menu, self.sr_infobar, + self._content)) def rightbox(self): ps = Reddit.rightbox(self)