github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-30 01:08:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move multi / all info boxes above submit button.

Browse Source
This commit is contained in:
Max Goodman
2013-03-09 01:55:39 -08:00
parent 3f5b26bb48
commit 7cdee62f8e
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
r2/r2/lib/pages/pages.py
View File

@@ -350,6 +350,22 @@ class Reddit(Templated):
if c.user.pref_show_sponsorships or not c.user.gold:
ps.append(SponsorshipBox())
if isinstance(c.site, (MultiReddit, ModSR)) and c.user_is_loggedin:
srs = Subreddit._byID(c.site.sr_ids, data=True,
return_dict=False)
if c.user_is_admin or c.site.is_moderator(c.user):
ps.append(self.sr_admin_menu())
if srs:
if isinstance(c.site, ModSR):
box = SubscriptionBox(srs, multi_text=strings.mod_multi)
else:
box = SubscriptionBox(srs)
ps.append(SideContentBox(_('these subreddits'), [box]))
if isinstance(c.site, AllSR):
ps.append(AllInfoBar(c.site, c.user))
user_banned = c.user_is_loggedin and c.site.is_banned(c.user)
if (self.submit_box
@@ -400,21 +416,6 @@ class Reddit(Templated):
no_ads_yet = True
show_adbox = (c.user.pref_show_adbox or not c.user.gold) and not g.disable_ads
if isinstance(c.site, (MultiReddit, ModSR)) and c.user_is_loggedin:
srs = Subreddit._byID(c.site.sr_ids, data=True,
return_dict=False)
if c.user_is_admin or c.site.is_moderator(c.user):
ps.append(self.sr_admin_menu())
if srs:
if isinstance(c.site, ModSR):
box = SubscriptionBox(srs, multi_text=strings.mod_multi)
else:
box = SubscriptionBox(srs)
ps.append(SideContentBox(_('these subreddits'), [box]))
if isinstance(c.site, AllSR):
ps.append(AllInfoBar(c.site, c.user))
# don't show the subreddit info bar on cnames unless the option is set
if not isinstance(c.site, FakeSubreddit) and (not c.cname or c.site.show_cname_sidebar):