diff --git a/r2/r2/lib/menus.py b/r2/r2/lib/menus.py index 71d081b3d..569b5a179 100644 --- a/r2/r2/lib/menus.py +++ b/r2/r2/lib/menus.py @@ -99,6 +99,7 @@ menu = MenuHandler(hot = _('hot'), store = _("store"), ad_inq = _("advertise on reddit"), toplinks = _("top links"), + iphone = _("iPhone app"), #preferences options = _('options'), diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py index 7f6f79128..456380d5b 100644 --- a/r2/r2/lib/pages/pages.py +++ b/r2/r2/lib/pages/pages.py @@ -206,7 +206,8 @@ class Reddit(Wrapped): NamedButton("buttons", True), NamedButton("code", False, nocname=True), NamedButton("socialite", False), - NamedButton("widget", True)], + NamedButton("widget", True), + NamedButton("iphone", False),], title = 'reddit tools', type = 'flat_vert', separator = ''), @@ -229,7 +230,9 @@ class Reddit(Wrapped): OffsiteButton('redditGadgetGuide', "http://www.redditgadgetguide.com"), OffsiteButton('WeHeartGossip', - "http://www.weheartgossip.com")], + "http://www.weheartgossip.com"), + OffsiteButton('idealistNews', + "http://www.idealistnews.com"),], title = 'brothers', type = 'flat_vert', separator = ''), NavMenu([OffsiteButton('Wired.com', @@ -238,9 +241,6 @@ class Reddit(Wrapped): "http://www.arstechnica.com"), OffsiteButton('Style.com', "http://www.style.com"), - OffsiteButton('Portfolio.com', - "http://www.portfolio.com", - css_class="line-through"), OffsiteButton('Epicurious.com', "http://www.epicurious.com"), OffsiteButton('Concierge.com', diff --git a/r2/r2/templates/redditfooter.html b/r2/r2/templates/redditfooter.html index 508094364..99fb98687 100644 --- a/r2/r2/templates/redditfooter.html +++ b/r2/r2/templates/redditfooter.html @@ -39,7 +39,7 @@

${text_with_links(_("Use of this site constitutes acceptance of our %(user_agreement)s and %(privacy_policy)s"), nocname=True, user_agreement= (_("User Agreement {Genitive}"), "http://reddit.com/help/useragreement"), privacy_policy = (_("Privacy Policy {Genitive}"), "http://reddit.com/help/privacypolicy"))}. - ${_("(c) %(year)d CondeNet, Inc. All rights reserved.") % \ + ${_("(c) %(year)d Conde Nast Digital. All rights reserved.") % \ dict(year=datetime.datetime.now().timetuple()[0])}

%if g.tracker_url and thing.site_tracking: