Skip to content

Commit

Permalink
Move advertising page from core to about plugin.
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Lee committed Jun 20, 2014
1 parent f823d37 commit 4ad980f
Show file tree
Hide file tree
Showing 10 changed files with 1 addition and 366 deletions.
2 changes: 1 addition & 1 deletion r2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ clean_ini:

#################### CSS file lists
SPRITED_STYLESHEETS += reddit.less compact.css
LESS_STYLESHEETS := wiki.less adminbar.less policies.less selfserve.less
LESS_STYLESHEETS := wiki.less adminbar.less policies.less
OTHER_STYLESHEETS := reddit-ie6-hax.css reddit-ie7-hax.css mobile.css highlight.css

#################### Static Files
Expand Down
3 changes: 0 additions & 3 deletions r2/r2/config/routing.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,6 @@ def make_map():
mc('/feedback', controller='redirect', action='redirect',
dest='/contact')
mc('/contact', controller='front', action='contact_us')
mc('/ad_inq', controller='redirect', action='redirect',
dest='/advertising')
mc('/advertising', controller='front', action='advertising')

mc('/admin/awards', controller='awards')
mc('/admin/awards/:awardcn/:action', controller='awards',
Expand Down
5 changes: 0 additions & 5 deletions r2/r2/controllers/front.py
Original file line number Diff line number Diff line change
Expand Up @@ -1127,11 +1127,6 @@ def GET_contact_us(self):
content=ContactUs(), page_classes=["contact-us-page"]
).render()

def GET_advertising(self):
return AdvertisingPage('advertise',
content = SelfServeBlurb(),
loginbox = False).render()

def GET_rules(self):
return BoringPage(_("rules of reddit"), show_sidebar=False,
content=RulesPage(), page_classes=["rulespage-body"]
Expand Down
6 changes: 0 additions & 6 deletions r2/r2/lib/pages/pages.py
Original file line number Diff line number Diff line change
Expand Up @@ -1081,9 +1081,6 @@ def __init__(self, pagename, show_sidebar = False, *a, **kw):
BoringPage.__init__(self, pagename, show_sidebar = show_sidebar,
*a, **kw)

class AdvertisingPage(FormPage):
extra_stylesheets = ['selfserve.less']

class LoginPage(BoringPage):
enable_login_cover = False
short_title = "login"
Expand Down Expand Up @@ -2754,9 +2751,6 @@ class ButtonDemoPanel(Templated):
"""The page for showing the different styles of embedable voting buttons"""
pass

class SelfServeBlurb(Templated):
pass

class ContactUs(Templated):
pass

Expand Down
201 changes: 0 additions & 201 deletions r2/r2/public/static/css/selfserve.less

This file was deleted.

Binary file removed r2/r2/public/static/selfserve_ads/col1.png
Binary file not shown.
Binary file removed r2/r2/public/static/selfserve_ads/col2.png
Binary file not shown.
Binary file removed r2/r2/public/static/selfserve_ads/col3.png
Binary file not shown.
Binary file removed r2/r2/public/static/selfserve_ads/col4.png
Binary file not shown.
Loading

0 comments on commit 4ad980f

Please sign in to comment.