From ebe1f7a9faa5e355ec4664e866be5d0b8e3b3aac Mon Sep 17 00:00:00 2001 From: Ricky Ramirez Date: Mon, 23 Sep 2013 15:29:18 -0700 Subject: [PATCH] Remove obsolete selfserviceoatmeal.html --- r2/r2/config/routing.py | 5 +++- r2/r2/controllers/front.py | 6 ---- r2/r2/lib/pages/pages.py | 3 -- r2/r2/templates/selfserviceoatmeal.html | 40 ------------------------- 4 files changed, 4 insertions(+), 50 deletions(-) delete mode 100644 r2/r2/templates/selfserviceoatmeal.html diff --git a/r2/r2/config/routing.py b/r2/r2/config/routing.py index e1b284bd7..4e196198c 100644 --- a/r2/r2/config/routing.py +++ b/r2/r2/config/routing.py @@ -250,7 +250,7 @@ def make_map(): mc('/password', controller='forms', action="password") mc('/:action', controller='front', - requirements=dict(action="random|framebuster|selfserviceoatmeal")) + requirements=dict(action="random|framebuster")) mc('/:action', controller='embed', requirements=dict(action="blog")) mc('/help/gold', controller='redirect', action='redirect', @@ -390,6 +390,9 @@ def make_map(): mc("/web/log/:level", controller="weblog", action="message", requirements=dict(level="error")) + # Obsolete content redirects + mc("/selfserviceoatmeal", controller="redirect", dest="/ad_inq") + # This route handles displaying the error page and # graphics used in the 404/500 # error pages. It should likely stay at the top diff --git a/r2/r2/controllers/front.py b/r2/r2/controllers/front.py index 4cc9e9776..238f3a80c 100755 --- a/r2/r2/controllers/front.py +++ b/r2/r2/controllers/front.py @@ -154,12 +154,6 @@ class FrontController(RedditController, OAuth2ResourceController): kw['reverse'] = False return DetailsPage(thing=thing, expand_children=False, **kw).render() - def GET_selfserviceoatmeal(self): - return BoringPage(_("self service help"), - show_sidebar=False, - content=SelfServiceOatmeal()).render() - - @validate(article=VLink('article')) def GET_shirt(self, article): if not can_view_link_comments(article): diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py index ed48aa5a6..4c85d7da0 100644 --- a/r2/r2/lib/pages/pages.py +++ b/r2/r2/lib/pages/pages.py @@ -3396,9 +3396,6 @@ class Cnameframe(Templated): class FrameBuster(Templated): pass -class SelfServiceOatmeal(Templated): - pass - class PromotePage(Reddit): create_reddit_box = False submit_box = False diff --git a/r2/r2/templates/selfserviceoatmeal.html b/r2/r2/templates/selfserviceoatmeal.html deleted file mode 100644 index 3eed77486..000000000 --- a/r2/r2/templates/selfserviceoatmeal.html +++ /dev/null @@ -1,40 +0,0 @@ -## The contents of this file are subject to the Common Public Attribution -## License Version 1.0. (the "License"); you may not use this file except in -## compliance with the License. You may obtain a copy of the License at -## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public -## License Version 1.1, but Sections 14 and 15 have been added to cover use of -## software over a computer network and provide for limited attribution for the -## Original Developer. In addition, Exhibit A has been modified to be -## consistent with Exhibit B. -## -## Software distributed under the License is distributed on an "AS IS" basis, -## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for -## the specific language governing rights and limitations under the License. -## -## The Original Code is reddit. -## -## The Original Developer is the Initial Developer. The Initial Developer of -## the Original Code is reddit Inc. -## -## All portions of the code written by reddit are Copyright (c) 2006-2013 -## reddit Inc. All Rights Reserved. -############################################################################### - -
- - - - - - - - - - - - - - - - -