From 0c490e4ecf879904e7f8eb6287329e28c7962337 Mon Sep 17 00:00:00 2001 From: Brian Simpson Date: Sat, 27 Jul 2013 00:55:32 -0400 Subject: [PATCH] Use AdminLinkMenu on LinkInfoPage. --- r2/r2/lib/pages/admin_pages.py | 6 ++++++ r2/r2/lib/pages/pages.py | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/r2/r2/lib/pages/admin_pages.py b/r2/r2/lib/pages/admin_pages.py index 836a84300..6d79a251f 100644 --- a/r2/r2/lib/pages/admin_pages.py +++ b/r2/r2/lib/pages/admin_pages.py @@ -68,6 +68,12 @@ class AdminProfileMenu(NavMenu): NavMenu.__init__(self, [], base_path = path, title = 'admin', type="tabdrop") + +class AdminLinkMenu(NavMenu): + def __init__(self, link): + NavMenu.__init__(self, [], title='admin', type="tabdrop") + + try: from r2admin.lib.pages import * except ImportError: diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py index 200103fc8..d7be64aa2 100755 --- a/r2/r2/lib/pages/pages.py +++ b/r2/r2/lib/pages/pages.py @@ -1194,14 +1194,15 @@ class LinkInfoPage(Reddit): if self.num_duplicates > 0: buttons.append(info_button('duplicates', num=self.num_duplicates)) - if c.user_is_admin: - buttons.append(NamedButton("details", dest="/details/"+self.link._fullname)) - toolbar = [NavMenu(buttons, base_path = "", type="tabmenu")] if not isinstance(c.site, DefaultSR) and not c.cname: toolbar.insert(0, PageNameNav('subreddit')) + if c.user_is_admin: + from admin_pages import AdminLinkMenu + toolbar.append(AdminLinkMenu(self.link)) + return toolbar def content(self):