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

Remove obsolete selfserviceoatmeal.html

Browse Source
This commit is contained in:
Ricky Ramirez
2013-09-23 15:29:18 -07:00
parent 1c4b0de378
commit ebe1f7a9fa
4 changed files with 4 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
r2/r2/config/routing.py
View File

@@ -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

6
r2/r2/controllers/front.py
View File

@@ -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):

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

@@ -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

40
r2/r2/templates/selfserviceoatmeal.html
View File

@@ -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.
###############################################################################
<div class="oatmeal">
<a href="http://www.theoatmeal.com/">
<img src="http://static.reddit.com/0_header.png"/>
</a>
<img src="http://static.reddit.com/1_wtf.png"/>
<img src="http://static.reddit.com/2_short.png"/>
<img src="http://static.reddit.com/3_long.png"/>
<a href="/promoted/new_promo">
<img src="http://static.reddit.com/4_create.png"/>
</a>
<img src="http://static.reddit.com/5_campaign.png"/>
<img src="http://static.reddit.com/6_understand.png"/>
<img src="http://static.reddit.com/7_targeting.png"/>
<img src="http://static.reddit.com/8_wait.png"/>
<img src="http://static.reddit.com/9_finished.png"/>
</div>