diff --git a/r2/Makefile b/r2/Makefile index d5354abf3..b7f40fce6 100644 --- a/r2/Makefile +++ b/r2/Makefile @@ -32,7 +32,7 @@ main_css = reddit.css main_sprite = $(static_dir)/sprite-main.png compact_css = compact.css compact_sprite = $(static_dir)/sprite-compact.png -css_targets = $(main_css) $(compact_css) reddit-ie6-hax.css reddit-ie7-hax.css mobile.css spreadshirt.css +css_targets = $(main_css) $(compact_css) reddit-ie6-hax.css reddit-ie7-hax.css mobile.css package = r2 static_dir = $(package)/public/static diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py index 1f6fc8f63..7b39dc08f 100644 --- a/r2/r2/controllers/api.py +++ b/r2/r2/controllers/api.py @@ -40,7 +40,6 @@ from r2.lib.pages import FlairList, FlairCsv, FlairTemplateEditor, \ from r2.lib.utils.trial_utils import indict, end_trial, trial_info from r2.lib.pages.things import wrap_links, default_thing_wrapper -from r2.lib import spreadshirt from r2.lib.menus import CommentSortMenu from r2.lib.captcha import get_iden from r2.lib.strings import strings @@ -2288,19 +2287,3 @@ class ApiController(RedditController): wrapped = wrap_links(link) wrapped = list(wrapped)[0] return websafe(spaceCompress(wrapped.link_child.content())) - - @validatedForm(link = VByName('name', thing_cls = Link, multiple = False), - color = VOneOf('color', spreadshirt.ShirtPane.colors), - style = VOneOf('style', spreadshirt.ShirtPane.styles), - size = VOneOf("size", spreadshirt.ShirtPane.sizes), - quantity = VInt("quantity", min = 1)) - def POST_shirt(self, form, jquery, link, color, style, size, quantity): - if not g.spreadshirt_url: - return self.abort404() - else: - res = spreadshirt.shirt_request(link, color, style, size, quantity) - if res: - form.set_html(".status", _("redirecting...")) - jquery.redirect(res) - else: - form.set_html(".status", _("error (sorry)")) diff --git a/r2/r2/controllers/front.py b/r2/r2/controllers/front.py index f87eae038..03b5eb1be 100644 --- a/r2/r2/controllers/front.py +++ b/r2/r2/controllers/front.py @@ -127,9 +127,6 @@ class FrontController(RedditController): def GET_shirt(self, article): if not can_view_link_comments(article): abort(403, 'forbidden') - if g.spreadshirt_url: - from r2.lib.spreadshirt import ShirtPage - return ShirtPage(link = article).render() return self.abort404() def _comment_visits(self, article, user, new_visit=None): diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py index 12e98bfd5..5f79b28d4 100644 --- a/r2/r2/lib/pages/pages.py +++ b/r2/r2/lib/pages/pages.py @@ -2280,11 +2280,6 @@ class Embed(Templated): Templated.__init__(self, content = content) -class Page_down(Templated): - def __init__(self, **kw): - message = kw.get('message', _("This feature is currently unavailable. Sorry")) - Templated.__init__(self, message = message) - def wrapped_flair(user, subreddit, force_show_flair): if (not hasattr(subreddit, '_id') or not (force_show_flair or getattr(subreddit, 'flair_enabled', True))): diff --git a/r2/r2/lib/spreadshirt.py b/r2/r2/lib/spreadshirt.py deleted file mode 100644 index 814667b19..000000000 --- a/r2/r2/lib/spreadshirt.py +++ /dev/null @@ -1,145 +0,0 @@ -from pylons import g, c -import sha, base64, time, re, urllib, socket -import ImageFont -from r2.lib.wrapped import Templated -from r2.lib.pages import LinkInfoPage -from r2.models import * -from httplib import HTTPConnection -from urlparse import urlparse -from BeautifulSoup import BeautifulStoneSoup - -colors = (("black",2), ("white", 1), ("navy",4), ("heather",231), ("red",5)) -sizes = (("small",2), ("medium",3), ("large",4), ("xlarge", 5), ("xxlarge",6)) - -articles = {"women": - dict(black = 4604645, - heather = 4604654, - navy = 4737035, - red = 4604670, - white = 4604694, - ), - "men" : - dict(black = 4589785, - heather = 4599883, - navy = 4737029, - red = 4589762, - white = 4589259, - ) } - - -spreadshirt_url = urlparse(g.spreadshirt_url) -try: - test_font = ImageFont.truetype(g.spreadshirt_test_font, - int(g.spreadshirt_min_font)) -except IOError: - test_font = None - -word_re = re.compile(r"\w*\W*", re.UNICODE) -def layout_text(text, max_width = None): - if test_font: - words = list(reversed(word_re.findall(text))) - lines = [""] - while words: - word = words.pop() - w = test_font.getsize(lines[-1] + word)[0] - if w < max_width: - lines[-1] += word - else: - lines.append(word) - lines = [x.strip() for x in filter(None, lines)] - return all(test_font.getsize(x)[0] < max_width for x in lines), lines - return None, [] - -def spreadshirt_validation(s): - t = str(int(time.time())) - return t, base64.b64encode(sha.new(s+t+g.spreadshirt_vendor_id).digest()) - -def shirt_request(link, color, style, size, quantity): - article = articles.get(style, {}).get(color) - size = dict(sizes).get(size) - color = dict(colors).get(color) - - # load up previous session id (if there was one) - sessionid = c.cookies.get("spreadshirt") - sessionid = sessionid.value if sessionid else "" - - if link and color and size and quantity and article: - # try to layout the text - text = ShirtPane.make_text(link) - if text: - author = Account._byID(link.author_id, True) - request_dict = dict(color = color, - quantity = quantity, - sessionId = sessionid, - size = size, - article_id = article) - for i, t in enumerate(text): - request_dict["textrow_%d" % (i+1)] = t - request_dict["textrow_6"] = "submitted by %s" % author.name - request_dict["textrow_7"] = link._date.strftime("%B %e, %Y") - text.extend([request_dict["textrow_6"], request_dict["textrow_7"]]) - - t, code = spreadshirt_validation("".join(text)) - request_dict['timestamp'] = t - request_dict['hash'] = code - - params = urllib.urlencode(request_dict) - headers = {"Content-type": "application/x-www-form-urlencoded", - "Accept": "text/plain"} - data = None - try: - conn = HTTPConnection(spreadshirt_url.hostname) - conn.request("POST", spreadshirt_url.path, params, headers) - response = conn.getresponse() - if int(response.status) == 200: - data = BeautifulStoneSoup(response.read()) - conn.close() - except socket.error: - return - - if data: - if not data.find("error"): - session_id = data.sessionid.contents[0] - data = data.basketurl.contents[0] - # set session id before redirecting - c.cookies.add("spreadshirt", session_id) - else: - g.log.error("Spreadshirt Error:\n" ) - g.log.error(data.prettify() + '\n') - g.log.error("POST and params: " + g.spreadshirt_url) - g.log.error(params) - data = None - - return data - - -class ShirtPage(LinkInfoPage): - extension_handling= False - additional_css = "spreadshirt.css" - def __init__(self, *a, **kw): - kw['show_sidebar'] = False - LinkInfoPage.__init__(self, *a, **kw) - - def content(self): - return self.content_stack((self.link_listing, - ShirtPane(self.link))) - -class ShirtPane(Templated): - default_color = "black" - default_size = "large" - default_style = "men" - - colors = [x for x, y in colors] - styles = ("men", "women") - sizes = [x for x, y in sizes] - - def __init__(self, link, **kw): - Templated.__init__(self, link = link, text = self.make_text(link), **kw) - - @classmethod - def make_text(cls, link): - fit, text = layout_text(link.title, - int(g.spreadshirt_max_width)) - if len(text) > 5 or not fit: - text = [] - return text diff --git a/r2/r2/public/static/css/reddit-ie6-hax.css b/r2/r2/public/static/css/reddit-ie6-hax.css index 4a62fb661..a7573e1f4 100644 --- a/r2/r2/public/static/css/reddit-ie6-hax.css +++ b/r2/r2/public/static/css/reddit-ie6-hax.css @@ -93,58 +93,6 @@ div.popup { top: expression( ( 40 + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop ) ) + 'px' ); } -.shirt .shirt-container .red { - background-image: url(/static/spreadshirt/red.gif); -} -.shirt .shirt-container .white { - background-image: url(/static/spreadshirt/white.gif); -} -.shirt .shirt-container .navy { - background-image: url(/static/spreadshirt/navy.gif); -} -.shirt .shirt-container .heather { - background-image: url(/static/spreadshirt/heather.gif); -} -.shirt .shirt-container .black { - background-image: url(/static/spreadshirt/black.gif); -} - -.shirt .shirt-container .main .caption #layout { - height: 5em; - background-image: url(/static/spreadshirt/spreadshirt-arrows.gif); -} - -.shirt .shirt-container .main.navy .caption #layout, -.shirt .shirt-container .main.black .caption #layout { - background-image:url(/static/spreadshirt/spreadshirt-arrows-white.gif); -} -.shirt .shirt-container .main.red .caption #layout { - background-image:url(/static/spreadshirt/spreadshirt-arrows-red.gif); -} - -.shirt .shirt-container .main .caption .byline { - background-image: url(/static/spreadshirt/spreadshirt-header.gif); -} -.shirt .shirt-container .main.navy .caption .byline, -.shirt .shirt-container .main.black .caption .byline { - background-image:url(/static/spreadshirt/spreadshirt-header-white.gif); -} -.shirt .shirt-container .main.red .caption .byline { - background-image:url(/static/spreadshirt/spreadshirt-header-red.gif); -} - -.shirt .shirt-container .main .caption.big .byline { - background-image: none; -} - -.shirt .shirt-container .main.navy .caption.big .byline, -.shirt .shirt-container .main.black .caption.big .byline { - background-image: none; -} -.shirt .shirt-container .main.red .caption.big .byline { - background-image: non; -} - .usertext .bottom-area .usertext-buttons {display: inline; } .arrow.upmod { diff --git a/r2/r2/public/static/css/reddit.css b/r2/r2/public/static/css/reddit.css index ebc8b1e54..c1e1a3dc5 100644 --- a/r2/r2/public/static/css/reddit.css +++ b/r2/r2/public/static/css/reddit.css @@ -2895,84 +2895,6 @@ ul#image-preview-list .description pre { color: black; } -/* Socialite */ -.socialite.instructions ul { - margin: 10px; - max-width: 60em; -} - -.socialite.instructions ul > li { - list-style-type: disc; - list-style-position: inside; -} - -.socialite.instructions hr { - color: #C6C6C6; - border: none; - border-top: 1px solid #C6C6C6; - margin: 20px 0px 20px 0px; - max-width: 60em; -} - -.socialite.instructions p.screenshot { - text-align: center; -} - -.socialite.instructions .logotext { - line-height: 32px; -} - -.socialite.instructions .logotext .logo { - float: left; - margin-right: 10px; -} - -.socialite.instructions .logoclear { - clear: left; -} - -.socialite.instructions .features { - padding-left: 15px; - max-width: 60em; -} - -/* From http://www.oscaralexander.com/tutorials/how-to-make-sexy-buttons-with-css.html */ -.socialite .buttonclear { - overflow: hidden; - float: right; - margin-right: 20px; - -} - -.socialite a.installbutton { - background: transparent none no-repeat scroll top right; - background-image: url(/static/socialite/installbutton-end.png); /* SPRITE */ - color: #FFF; - display: block; - float: left; - font: bold 18px "Trebuchet MS",Helvetica,"Helvetica Neue",Arial,sans-serif; - height: 50px; - margin-right: 6px; - padding-right: 48px; /* sliding doors padding */ - text-decoration: none; -} - -.socialite a.installbutton span { - background: transparent none no-repeat; - background-image: url(/static/socialite/installbutton.png); /* SPRITE */ - display: block; - line-height: 30px; - padding: 10px 0 10px 17px; -} - -.socialite a.installbutton:hover { - background-position: bottom right; -} - -.socialite a.installbutton:hover span { - background-position: bottom left; -} - #sr-header-area { padding: 3px 0px 3px 5px; background-color: #f0f0f0; diff --git a/r2/r2/public/static/css/spreadshirt.css b/r2/r2/public/static/css/spreadshirt.css deleted file mode 100644 index e8d53cd04..000000000 --- a/r2/r2/public/static/css/spreadshirt.css +++ /dev/null @@ -1,165 +0,0 @@ -.shirt { - margin-left: 30px; - } -.shirt p { - font-family: arial; - font-size: larger; - color: #111; -} -.shirt h2 { - font-family: arial; - color:gray; - font-size:x-large; - font-weight:normal; - } -.shirt .shirt-container { margin: 10px; } -.shirt .shirt-container .left { - border: 1px solid #5f99cf; - background-color: #EFF7FF; - margin-top: 10px; - float:left; -} -.shirt .shirt-container .left h4 { - color: #336699; - margin: 2px; -} -.shirt .shirt-container .left input[type=submit] { - background-color: #5f99cf; - width: 95px; - color: white; - text-transform: uppercase; - font-size: larger; - font-weight: bold; - border-width: 1px; - border-color: black black black black; -} -.shirt .shirt-container .left input[type=radio] { - margin: 0 2px; - vertical-align: bottom; -} -.shirt .shirt-container .left input[type=text] { - border: 1px solid #AAA; - margin: 5px; -} - -.shirt select { margin-left: 5px; } - -.shirt .shirt-container .main.white.men { - background-image: url(/static/spreadshirt/white.png); -} -.shirt .shirt-container .main.heather.men { - background-image: url(/static/spreadshirt/heather.png); -} -.shirt .shirt-container .main.navy.men { - background-image: url(/static/spreadshirt/navy.png); -} -.shirt .shirt-container .main.black.men { - background-image: url(/static/spreadshirt/black.png); -} -.shirt .shirt-container .main.red.men { - background-image: url(/static/spreadshirt/red.png); -} -.shirt .shirt-container .main.white.women { - background-image: url(/static/spreadshirt/white-womens.png); -} -.shirt .shirt-container .main.navy.women { - background-image: url(/static/spreadshirt/navy-womens.png); -} -.shirt .shirt-container .main.heather.women { - background-image: url(/static/spreadshirt/heather-womens.png); -} -.shirt .shirt-container .main.black.women { - background-image: url(/static/spreadshirt/black-womens.png); -} -.shirt .shirt-container .main.red.women { - background-image: url(/static/spreadshirt/red-womens.png); -} - -.shirt .shirt-container .main.black .caption #layout, -.shirt .shirt-container .main.black .caption .byline, -.shirt .shirt-container .main.navy .caption #layout, -.shirt .shirt-container .main.navy .caption .byline, -.shirt .shirt-container .main.red .caption #layout, -.shirt .shirt-container .main.red .caption .byline - { - color: white; - } - - - -.shirt .shirt-container .main { - background-image: url(/static/spreadshirt/white.png); - background-repeat: no-repeat; - background-position: center center; - border: 1px solid #5f99cf; - width: 450px; - height: 350px; - margin-left: 96px; - position: relative; - margin-bottom: 75px; - } - -.shirt .shirt-container .main .caption { - width: 160px; - margin-top: 80px; - margin-left: auto; - margin-right: auto; - font-family: verdana; - font-size: 9px; - text-align: left; -} -.shirt .shirt-container .main .caption #layout { - padding-left: 17px; - background-image: url(/static/spreadshirt/spreadshirt-arrows.png); - background-repeat: no-repeat; - background-position: top left; - min-height: 30px; -} -.shirt .shirt-container .main.navy .caption #layout, -.shirt .shirt-container .main.black .caption #layout { - background-image:url(/static/spreadshirt/spreadshirt-arrows-white.png); -} -.shirt .shirt-container .main.red .caption #layout { - background-image:url(/static/spreadshirt/spreadshirt-arrows-red.png); -} - - -.shirt .shirt-container .main .caption .byline { - margin-top: 5px; - border: none; - text-align: right; - font-weight: bold; - font-size: 4pt; - margin-left: 12px; - padding-bottom: 20px; - background-image: url(/static/spreadshirt/spreadshirt-header.png); - background-repeat: no-repeat; - background-position: bottom left; -} -.shirt .shirt-container .main.navy .caption .byline, -.shirt .shirt-container .main.black .caption .byline { - background-image:url(/static/spreadshirt/spreadshirt-header-white.png); -} -.shirt .shirt-container .main.red .caption .byline { - background-image:url(/static/spreadshirt/spreadshirt-header-red.png); -} - -.shirt .shirt-container .main .caption.big { - font-family: verdana; - width: 340px; - padding: 10px; - border: 3px solid #369; - font-size: 20px; - background-color: white; - position: absolute; - top: 250px; - left: 45px; - margin: 0px; -} - -.shirt .shirt-container .main .caption.big .byline { - font-size: x-small; - background: none; - color: black; -} - diff --git a/r2/r2/public/static/frame.css b/r2/r2/public/static/frame.css deleted file mode 100644 index 2d93de159..000000000 --- a/r2/r2/public/static/frame.css +++ /dev/null @@ -1,19 +0,0 @@ -body {font: normal small verdana, arial, helvetica, sans-serif; margin: 0px; background-color: white;} -.arrow {margin: 0 0px 0px 0px; width: 15px; height: 14px; display: block; cursor: pointer;} -.arrow.upmod {background: url(/static/aupmod.png); background-repeat: no-repeat } -.arrow.downmod {background: url(/static/adownmod.png); background-repeat: no-repeat } -.arrow.up {background: url(/static/aupgray.png); background-repeat: no-repeat } -.arrow.down {background: url(/static/adowngray.png); background-repeat: no-repeat } -.txt { border: 1px solid #336699; margin: 0 0 0 3px; vertical-align: bottom} -.btn { background-color: #e9e9e9; border: 1px solid #336699; margin: 0 0 0 3px; vertical-align: bottom } -label { margin-right: 3px } -a.gray { text-decoration: none; background-color: #f0f0f0; color: #848484; margin: 0px 1px 0px 2px; padding: 0px 2px 0 2px;} -a.gray:hover { text-decoration: underline } -.error { color: red } - -.menu {text-align: right; color: gray } -.menu a {text-decoration: none; color: #336699; margin: 0 3px 0 3px} -.menu a:hover {text-decoration: underline; } - -#buttons a { margin-right: 4px; vertical-align: center } - diff --git a/r2/r2/public/static/lipstick.css b/r2/r2/public/static/lipstick.css deleted file mode 100644 index 6c86d555d..000000000 --- a/r2/r2/public/static/lipstick.css +++ /dev/null @@ -1,109 +0,0 @@ -/* (c) 2005-2006 Not A Bug, Inc. */ -@import "styles.css"; - -#topbar {margin-left: 220px; margin-bottom: 10px;} -#header { top: 7px} - -.menu {color: gray;} -.menu a {color: #c15d64} - -#topstrip { margin-top: 7px; background-color: #ffe9eb;} -#topstrip a:hover { color: white; background-color: red; } - -#searchform { margin: 7px 0 0 5px} - -.tempstrip { padding: 2px 0 2px 0; background-color: #c6def7;} -.username { background-color: white; padding: 2px 15px 2px 0px; font-weight: bold; color: #c15d64} - -#usermenu { margin: 10px 0 5px 0; padding: 2px 0 2px 0; border-bottom: 2px solid #c15d64; background-color: whitesmoke} -#usermenu a { - color: black; - padding: 2px 7px 2px 7px; - text-decoration: none; - border-bottom: 2px solid #c15d64; - /*border-right: 2px solid white;*/ - background-color: whitesmoke; -} - -#usermenu a:hover { color: white; background-color: #c15d64; } -#usermenu .sel-user { color: white; background-color: #c15d64 } - -.menu-item { color: black; background-color: #d3d3d3} -.sel-menu-item {color: white; background-color: red;} - -.oddRow {background-color: #ffe9eb;} -.evenRow {background-color: white;} -.highRow {background-color: #ffff99;} - -.spacing { height: 6px} -.spacing.top { border-top: 1px solid #d3d3d3 } - -.title { font-family: monospace, courier, serif; font-size: medium; color: #0c0c0c;} -.title:visited { color: #0c0c0c } - -.title.loggedin { color: #0c0c0c } -.title.loggedin:visited { color: #0c0c0c} -.title.loggedin.click { color: #0c0c0c } -.title.loggedin.click:visited { color: #0c0c0c } - -.arrow.upmod { background: url(/static/aupmod.gif); background-repeat: no-repeat } -.arrow.downmod { background: url(/static/adownmod.gif); background-repeat: no-repeat } -.arrow.up { background: url(/static/aupgray.gif); background-repeat: no-repeat } -.arrow.down { background: url(/static/adowngray.gif); background-repeat: no-repeat } - -h2 {color: #c15d64; font-size: 13px;} - -.pbox {border: 2px solid #c15d64;} - -.sortbox a {text-decoration: none; color: #c15d64} -.sortbox a:visited { color: #c15d64 } - - -.little a {color: #c15d64; text-decoration: none;} -.little a.friend {color: #c15d64 } - -a.bylink {background-color: transparent; color: #848484; margin: 0px 1px 0px 2px; padding: 0px 2px 0 2px;} - -.numbercol { - font-family: monospace, courier, serif; - font-size: medium; - text-align: right; - color: #0c0c0c; - padding-right: 2px} - -.stats a {color: #c15d64} -.stats th { text-align: left; background-color: whitesmoke; color: #c15d64; font-weight: bold;} - -input.btn {background-color:#e9e9e9; border: 1px solid #c15d64;} -input.txt { background-color:#f7f7f7; border: 1px solid #c15d64; margin: 0px} - -.btn {background-color:#e9e9e9; border: 1px solid #c15d64; margin: 0 5px 0 5px; vertical-align: bottom} - -#infobar { - background-image: url(/static/gradient.png); - background-repeat: repeat-x; - background-position: bottom; - background-color: transparent; - margin: 0; - padding-top: 0px; - padding-left: 40px; - z-index: 10; -} - -#infobar a{ color: #c15d64} - -.feed {border:1px solid;border-color:#FC9 #630 #330 #F96;padding:0 3px;font:bold 10px verdana,sans-serif;color:#FFF;background:#F60;;margin:4px;} - -.collapse.r { background: url(/static/pinkr.png); background-repeat: no-repeat } -.collapse.d { background: url(/static/pinkd.png); background-repeat: no-repeat } - -#contactlst th { color: #c15d64; border-bottom: 1px solid #c15d64; text-align: left; padding-right: 10px } -#contactlst a.add { color: #c15d64} - -.commenttable.border { border: 1px solid #c15d64; } - -.iform button {background-color:#e9e9e9; border: 1px solid #c15d64; vertical-align: bottom} - -.star a { text-decoration: none; color: black } - -#main {padding: 0px 7px 0 7px} diff --git a/r2/r2/public/static/newlayout.css b/r2/r2/public/static/newlayout.css deleted file mode 100644 index 3e64eac75..000000000 --- a/r2/r2/public/static/newlayout.css +++ /dev/null @@ -1,524 +0,0 @@ -body { - font: normal small verdana, arial, helvetica, sans-serif; - margin: 0px; - background-color: white; -} - -html,body { height: 100% } - - -/* html element defaults */ - -h1 { font-size: 18px; font-weight: normal; } - -h2 { color: #336699; font-size: 13px; } -h2 a { text-decoration: none } -h2 a:visited { color: #336699 } -h2 a:hover { text-decoration: underline } - -h3 { margin: 0px; } - -li { margin: 0px; } - -table { border-collapse: collapse; } -a img { border:none } - -a { text-decoration: none } - -div.autosize { display: table; width: 1px} -div.autosize > div { display: table-cell; } - -input.btn { background-color:#e9e9e9; border: 1px solid #336699;} -input.txt { - background-color:#f7f7f7; - border: 1px solid #336699; - margin: 0px; -} -input.check { padding: 0px; - margin: 0px;} - -/* forms */ - -.iform th { text-align: right; color: black; font-weight: normal; text-transform: lowercase; } -.iform button {background-color:#e9e9e9; border: 1px solid #336699; vertical-align: bottom} -.wrong {color: red; font-weight: normal} - -.subform input.text { width: 25em } -.subform textarea.text { width: 25em } -.subform label { margin: 0 5px 0 5px } -.subform td { padding: 0px 5px 5px 0} -.subform td.nopadding { padding: 0px} - -.nowrap { white-space: nowrap; } -.leftpad { padding-left: 1em } -.nomargin { margin: 0px } -.nopadding { padding: 0px } - - - -/* */ - -:-moz-any-link:focus { outline: none } - -a img { border: none; } -a { color: #336699; text-decoration: none } -.hover a:hover { text-decoration: underline } - -.flat-list { - list-style-type: none; - margin: 0px; - padding: 0px; - display: inline; - } - -.flat-list li { display: inline; - padding: 0px; - padding-left: 5px; - } -.flat-list .first { padding-left: 0px; } - -.flat-list a {padding-right: 5px; } -.flat-list form {display: inline; padding: 0px; margin: 0px; } - -.flat-list .selected { color: orangered; - font-weight: bold; - padding-right: 5px; - } - -.pref-lang { font-weight: bold; } -.pref { font-weight: bold; } - -#header { z-index: 2; - width: 100%; - position: absolute; - top: 0px; - } - - -#header-img { - height: 40px; - width: 120px; - float: left; -} - -#header-top { - height: 15px; - text-align: right; - font-size: smaller; -} - -#header-top li { - border-left: 2px solid #D3D3D3; -} -#header-top .first { - border-left: none; -} - -#header-bottom { height: 25px; - border-left: 3px solid gray; - margin-left: 125px; - } - -#mail { padding-right: 5px; - vertical-align: middle; } - -#user { margin: 0px 5px 0px 5px; color: gray; - border-right: 2px solid #D3D3D3; - padding-right: 5px; - } - -#pagename, -#reddit { float: left; - margin-left: 0px; - border: 1px solid white; - padding-top: 0px; - } -#reddit .selected a { color: black; } -#reddit .selected a:hover { color: black; - text-decoration: underline; } - -#reddit:hover { border: 1px outset black } - -#pagename, -#reddit .selected { font-weight: bold; - font-variant: small-caps; - font-size: large; - } - -.dropdown { - margin-left: 10px; - float: left; - border: 1px solid gray; - padding: 3px 0px 5px 0px; - background: white url(/static/droparrow.png) no-repeat scroll top right; - height: 1em; - overflow: hidden; - cursor: default; - z-index: 2; - position: relative; -} - - -.dropdown:hover { - border: 1px outset black; - overflow: auto; - height: auto; - padding-bottom: 0px; - } - -.dropdown ul { - list-style-type: none; - padding: 0px; - margin: 0px; -} - -.dropdown li { padding: 0px 5px 0px 5px; - cursor: pointer} - -.dropdown li:hover { - background-color: #c7def7; -} - -.dropdown .selected { - padding-left: 5px; - font-weight: bold; - margin-right: 25px; -} - -.cover { - position: fixed; - top: 0px; - left: 0px; - height: 100%; - width: 100%; - background-color: gray; - opacity: .7; - filter:alpha(opacity=70); /* IE patch */ - z-index: 1000; -} - -.popup { - position: absolute; - left: 10%; - float: center; - background-color: white; - top: 100px; - width: 80%; - text-align: left; - z-index: 1001; - padding: 10px; -} - -#time { float: left; - margin-left: 10px; - padding-top: 5px; } - -#time li { - color: #d3d3d3; - padding: 0; - font-size: smaller; -} - -#time a { - padding: 0px 1ex 0px 0px; - text-decoration: underline; -} - -#time a:hover { color: orangered } - - -#search { float: right; - margin-top: 3px; - margin-bottom: 0px; - position: relative; - background: white url(/static/find.png) no-repeat scroll center right; - } - -#search input { height: 15px; - margin-right: 19px; - border: 1px solid #d3d3d3; - width: 25ex; - color: gray; - padding-left: 3px; - } - -.main { - z-index: 1; - padding-top: 50px; - margin-left: 7px; -} - -.main .notoolbar { padding-top: 0px; } - -.side { border-top: 1px solid #d3d3d3; - width: 305px; - float: right; - background-color: white; } - -.sidebox { - border-left: 2px solid #d3d3d3; - margin-bottom: 10px; - padding-left: 5px; - clear: both; -} - -.sidebox ul { padding-left: 10px; - list-style-type: none; - float: left; - margin-top: 0px; - margin-bottom: 0px; - } - -.sidebox a { font-size: small; - padding-right: 15px; - color: #336699} - -.subredditbox { border-left: 1px solid #d3d3d3; - padding-left: 0px; - } - -.subredditbox .morelink { padding-top: 10px; - clear: left; - } - -.subredditbox .morelink a { background-color: lightgray; - color: #4d4d4d; - padding: 0 5px 1px 5px; - margin-top: 10px; - font-size: x-small; - } - -.sidebox .head { font-weight: bold; - margin-left: 10px; - padding-top: 10px; - margin-top: 0px; - margin-bottom: 10px; - } - - - -.arrow { - margin: 2px 0px 0px 0px; - width: 15px; - height: 14px; - display: block; - cursor: pointer; -} - -.arrow.upmod { - background: url(/static/aupmod.png); - background-repeat: no-repeat } -.arrow.downmod { - background: url(/static/adownmod.png); - background-repeat: no-repeat } -.arrow.up { - background: url(/static/aupgray.png); - background-repeat: no-repeat } -.arrow.down { - background: url(/static/adowngray.png); - background-repeat: no-repeat } - -.numbercol { font-size: medium; - text-align: right; - color: darkgray; - padding-right: 2px; width: 0%; - float: left; - } - -.midcol { float: left; padding-right: 2px; } - - -.titlerow { margin: 0px 10px 0px 0px; } - -.title { font-size: medium; color: blue; padding: 0px} -.title:visited { color: #551a8b } -.title.click { color: #551a8b } - -.title.loggedin { color: blue } -.title.loggedin:visited { color: #551a8b } -.title.loggedin.click { color: #551a8b } -.title.loggedin.click:visited { color: #551a8b } - - -.buttons { color: gray; - padding-top: 5px - } - -.buttons a { text-decoration: underline; - color: #336699; - padding-right: 5px} - - -.sitetable { list-style-type: none; - padding: 0px; - margin: 0px; - } - -.toolbar { width: 100%; - position: absolute; - padding-top: 10px; } - - -#profbar { border-bottom: 2px solid #336699; } - -#profbar .selected, -#profbar a { padding-left: 5px; - padding-right: 5px; } - -#profbar a:hover, -#profbar .selected { background: #336699; - color: white; - text-decoration: none; } -#profbar li { padding: 0 } - - -.infobar { - background-color: #f6e69f; - padding: 0px 10px 0px 10px; - margin: 5px; -} -.md { max-width: 60em; overflow: auto; } - -.link { margin-bottom: 10px; } -.link p { margin-top: 0px; - margin-bottom: 1px; } - -.comment { margin-bottom: 10px; } -.comment p { margin-top: 0px; - margin-bottom: 1px; } -.comment .author { font-weight: bold; } - -.subreddit { margin-bottom: 10px; } -.subreddit p { margin-top: 0px; - margin-bottom: 1px; } -.subreddit .description {font-size: small; } -.subreddit .key {display: block;} - -.commentbody { font-size: small } -.commentbody blockquote { border-left: 2px solid #336699; padding-left: 4px; - margin-top: 5px; margin-left: 5px; - margin-bottom: 5px; margin-right: 15px; } -.commentbody p, -.commentbody ul, -.commentbody ol { margin-top: 5px; margin-bottom: 5px} -.commentbody > * { margin-bottom: 0px } -.commentbody img { display: none } -.commentbody.border { background-color: #ffffcc; padding-left: 5px} - - - - -.entry { overflow: hidden; - font-size: x-small; - padding-left: 3px; - margin-top: 0px; - padding-top: 0px; - } - -.clear {clear: left} - -.link-subreddit { color: gray; text-decoration: none; padding-left: 5px; } - -.domain { color: gray; padding-left: 5px} - -.tagline {font-size: x-small; color: gray; } -.tagline a {color: #336699; text-decoration: none; } -.tagline a.friend {color: orangered } -.tagline a:hover { text-decoration: underline } - -.buttons - - - -.sponsored .entry { margin-right: 20px; - } - -.sponsored .titlerow { background: #fcfcfc; - padding: 10px; - border-top: #BCBCBC solid 1px; - border-left: #BCBCBC solid 1px; - border-bottom: #E0E0E0 solid 1px; - border-right: #E0E0E0 solid 1px; - } - -.sponsored .asterisk { - width: 15px; - background: url(/static/asterisk.png); - background-repeat: no-repeat } - - -.footer { width: 100%; - text-align: center; - clear: both; - padding-top: 1em; - color: gray; - } - -.footer p { font-size: smaller; } - -.wired a {text-decoration: underline; - color: #336699; - font-size: smaller; - padding-left: 5px; - padding-right: 5px; } -.wired img {vertical-align: middle;} - - - -.login-form-side { margin: 0px; - border:2px solid #73A1CA; - border-collapse:collapse; - } -.login-form-side div { padding: 5px; } -.login-form-side div.error { padding: 0px; } -.login-form-side input { vertical-align: middle} -.login-form-side input.logtxt { color:black; width: 135px} -.login-form-side label { padding-right: 5px; - white-space: nowrap; } -.login-form-side a {padding-right: 5px; } -.login-form-side button { margin: 0px; - padding: 2px 3px 2px 3px; - float: right; - } - -.little {font-size: smaller} -.btn { - background-color:#e9e9e9; - border: 1px solid #336699; - margin: 0 5px 0 5px; - } - -.error { color: red } - - - -#ad-frame { border: 0px; overflow: hidden; height: 300px; width: 300px} - - -/* search */ - -#searchmenu { margin: 10px 0 0px 0; padding: 2px 0 0 0; - border-bottom: 2px solid #336699; - background-color: whitesmoke} - -#searchmenu .searchlabel { background-color: white; - padding: 2px 15px 0px 0px; - font-weight: bold; color: #336699 } - -#searchmenu .searchtime { font-weight: bold; - display: inline; - width: 305px; } - - -.searchparams { margin: 5px 20px 5px 20px - } -.searchparams .labels {text-align: right; - margin-left: 10px; } - -.searchpane { margin-left: 20px } -.searchpane h2 { margin-bottom: 3px } -.searchpane p { margin-bottom: 5px; margin-top:3px; } -.searchpane a { color: #336699 } - - -.advsearchtoggle { margin-bottom: 5px; margin-top:3px; } diff --git a/r2/r2/public/static/spreadshirt/black-womens.gif b/r2/r2/public/static/spreadshirt/black-womens.gif deleted file mode 100644 index a699bf3d6..000000000 Binary files a/r2/r2/public/static/spreadshirt/black-womens.gif and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/black-womens.png b/r2/r2/public/static/spreadshirt/black-womens.png deleted file mode 100644 index ddf5aa383..000000000 Binary files a/r2/r2/public/static/spreadshirt/black-womens.png and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/black.gif b/r2/r2/public/static/spreadshirt/black.gif deleted file mode 100644 index 97917fccb..000000000 Binary files a/r2/r2/public/static/spreadshirt/black.gif and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/black.png b/r2/r2/public/static/spreadshirt/black.png deleted file mode 100644 index d76ea2f3a..000000000 Binary files a/r2/r2/public/static/spreadshirt/black.png and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/heather-womens.gif b/r2/r2/public/static/spreadshirt/heather-womens.gif deleted file mode 100644 index db0d8d745..000000000 Binary files a/r2/r2/public/static/spreadshirt/heather-womens.gif and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/heather-womens.png b/r2/r2/public/static/spreadshirt/heather-womens.png deleted file mode 100644 index 90f9cabbf..000000000 Binary files a/r2/r2/public/static/spreadshirt/heather-womens.png and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/heather.gif b/r2/r2/public/static/spreadshirt/heather.gif deleted file mode 100644 index 5faa45223..000000000 Binary files a/r2/r2/public/static/spreadshirt/heather.gif and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/heather.png b/r2/r2/public/static/spreadshirt/heather.png deleted file mode 100644 index 2bf1ccd69..000000000 Binary files a/r2/r2/public/static/spreadshirt/heather.png and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/navy-womens.gif b/r2/r2/public/static/spreadshirt/navy-womens.gif deleted file mode 100644 index 0f248f7df..000000000 Binary files a/r2/r2/public/static/spreadshirt/navy-womens.gif and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/navy-womens.png b/r2/r2/public/static/spreadshirt/navy-womens.png deleted file mode 100644 index facf82157..000000000 Binary files a/r2/r2/public/static/spreadshirt/navy-womens.png and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/navy.gif b/r2/r2/public/static/spreadshirt/navy.gif deleted file mode 100644 index 20bb5f18c..000000000 Binary files a/r2/r2/public/static/spreadshirt/navy.gif and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/navy.png b/r2/r2/public/static/spreadshirt/navy.png deleted file mode 100644 index e8091afbe..000000000 Binary files a/r2/r2/public/static/spreadshirt/navy.png and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/red-womens.gif b/r2/r2/public/static/spreadshirt/red-womens.gif deleted file mode 100644 index bd36eabea..000000000 Binary files a/r2/r2/public/static/spreadshirt/red-womens.gif and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/red-womens.png b/r2/r2/public/static/spreadshirt/red-womens.png deleted file mode 100644 index 4e4448385..000000000 Binary files a/r2/r2/public/static/spreadshirt/red-womens.png and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/red.gif b/r2/r2/public/static/spreadshirt/red.gif deleted file mode 100644 index a41041272..000000000 Binary files a/r2/r2/public/static/spreadshirt/red.gif and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/red.png b/r2/r2/public/static/spreadshirt/red.png deleted file mode 100644 index 383083ed9..000000000 Binary files a/r2/r2/public/static/spreadshirt/red.png and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/spreadshirt-arrows-red.gif b/r2/r2/public/static/spreadshirt/spreadshirt-arrows-red.gif deleted file mode 100644 index 26d6ea3a9..000000000 Binary files a/r2/r2/public/static/spreadshirt/spreadshirt-arrows-red.gif and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/spreadshirt-arrows-red.png b/r2/r2/public/static/spreadshirt/spreadshirt-arrows-red.png deleted file mode 100644 index 5d1481d6b..000000000 Binary files a/r2/r2/public/static/spreadshirt/spreadshirt-arrows-red.png and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/spreadshirt-arrows-white.gif b/r2/r2/public/static/spreadshirt/spreadshirt-arrows-white.gif deleted file mode 100644 index 69f2bcf20..000000000 Binary files a/r2/r2/public/static/spreadshirt/spreadshirt-arrows-white.gif and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/spreadshirt-arrows-white.png b/r2/r2/public/static/spreadshirt/spreadshirt-arrows-white.png deleted file mode 100644 index 4a52b7461..000000000 Binary files a/r2/r2/public/static/spreadshirt/spreadshirt-arrows-white.png and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/spreadshirt-arrows.gif b/r2/r2/public/static/spreadshirt/spreadshirt-arrows.gif deleted file mode 100644 index 8989349ee..000000000 Binary files a/r2/r2/public/static/spreadshirt/spreadshirt-arrows.gif and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/spreadshirt-arrows.png b/r2/r2/public/static/spreadshirt/spreadshirt-arrows.png deleted file mode 100644 index 0dc10cfc4..000000000 Binary files a/r2/r2/public/static/spreadshirt/spreadshirt-arrows.png and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/spreadshirt-header-red.gif b/r2/r2/public/static/spreadshirt/spreadshirt-header-red.gif deleted file mode 100644 index 047532e25..000000000 Binary files a/r2/r2/public/static/spreadshirt/spreadshirt-header-red.gif and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/spreadshirt-header-red.png b/r2/r2/public/static/spreadshirt/spreadshirt-header-red.png deleted file mode 100644 index 891529f7f..000000000 Binary files a/r2/r2/public/static/spreadshirt/spreadshirt-header-red.png and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/spreadshirt-header-white.gif b/r2/r2/public/static/spreadshirt/spreadshirt-header-white.gif deleted file mode 100644 index 7361ce155..000000000 Binary files a/r2/r2/public/static/spreadshirt/spreadshirt-header-white.gif and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/spreadshirt-header-white.png b/r2/r2/public/static/spreadshirt/spreadshirt-header-white.png deleted file mode 100644 index 5b47d4219..000000000 Binary files a/r2/r2/public/static/spreadshirt/spreadshirt-header-white.png and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/spreadshirt-header.gif b/r2/r2/public/static/spreadshirt/spreadshirt-header.gif deleted file mode 100644 index 186cb6470..000000000 Binary files a/r2/r2/public/static/spreadshirt/spreadshirt-header.gif and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/spreadshirt-header.png b/r2/r2/public/static/spreadshirt/spreadshirt-header.png deleted file mode 100644 index 51fb7972b..000000000 Binary files a/r2/r2/public/static/spreadshirt/spreadshirt-header.png and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/white-womens.gif b/r2/r2/public/static/spreadshirt/white-womens.gif deleted file mode 100644 index e3a73d3bb..000000000 Binary files a/r2/r2/public/static/spreadshirt/white-womens.gif and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/white-womens.png b/r2/r2/public/static/spreadshirt/white-womens.png deleted file mode 100644 index 08eeb7c99..000000000 Binary files a/r2/r2/public/static/spreadshirt/white-womens.png and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/white.gif b/r2/r2/public/static/spreadshirt/white.gif deleted file mode 100644 index 95d19a406..000000000 Binary files a/r2/r2/public/static/spreadshirt/white.gif and /dev/null differ diff --git a/r2/r2/public/static/spreadshirt/white.png b/r2/r2/public/static/spreadshirt/white.png deleted file mode 100644 index 8b6e9f1f2..000000000 Binary files a/r2/r2/public/static/spreadshirt/white.png and /dev/null differ diff --git a/r2/r2/public/static/wiredcomment.css b/r2/r2/public/static/wiredcomment.css deleted file mode 100644 index 4b143ee05..000000000 --- a/r2/r2/public/static/wiredcomment.css +++ /dev/null @@ -1,79 +0,0 @@ -.sortbox { - border-left: 2px solid #d3d3d3; - margin-bottom: 20px; - margin-left: 5px; - padding: 0 0 0 5px; - clear: both; -} -.sortbox p.head { color: gray; font-weight: bold; margin: 5px 0 0 0} -.sortbox ul { list-style: none; margin: 0; padding: 0 } -.sortbox a {text-decoration: none; color: #336699} -.sortbox a:visited { color: #336699 } -.sortbox a:hover { text-decoration: underline } - - -.btn {background-color:#e9e9e9; border: 1px solid #336699; margin: -1px 3px -1px 3px; vertical-align: bottom, font-size: small; } - -input.btn {background-color:#e9e9e9; border: 1px solid #336699;} - - -.right { width: 80px; float: right;;} - -a.bylink { color: #848484; margin: 0px 1px 0px 2px; padding: 0px 2px 0 2px; text-decoration: none } - -.arrow { - margin: 2px 0px 0px 0px; - width: 15px; - height: 14px; - display: block; - cursor: pointer; -} - -.arrow.upmod { background: url(http://s3.amazonaws.com/reddit/aupmod.png); background-repeat: no-repeat } -.arrow.downmod { background: url(http://s3.amazonaws.com/reddit/adownmod.png); background-repeat: no-repeat } -.arrow.up { background: url(http://s3.amazonaws.com/reddit/aupgray.png); background-repeat: no-repeat } -.arrow.down { background: url(http://s3.amazonaws.com/reddit/adowngray.png); background-repeat: no-repeat } - -.collapseinline { padding-left: 12px } -.collapseinline.r { background: url(/static/bluer.png); background-repeat: no-repeat } -.collapseinline.d { background: url(/static/blued.png); background-repeat: no-repeat } - - -.commentbody blockquote { border-left: 2px solid #336699; padding-left: 4px; margin: 5px 5px 5px 15px } -.commentbody p, -.commentbody ul, -.commentbody ol { margin-top: 0px; margin-bottom: 0px} -.commentbody > * { margin-bottom: 0px } -.commentbody img { display: none } - - -.little {font-size: x-small; color: gray;} -.little a {text-decoration: none;} -.little a.friend {color: orangered } -.little a:hover { text-decoration: underline } -.little .gray { color: gray } - - -#cover { - position: absolute; - top: 0px; - left: 0px; - height: 100%; - width: 100%; - background-color: gray; - opacity: .7; - filter: alpha(opacity=70); - z-index: 5000; -} - -#loginpopup { - position: absolute; - background-color: white; - top: 100px; - width: 80%; - margin-left: 10%; - margin-right: 10%; - z-index: 10000; - padding: 10px; -} - diff --git a/r2/r2/templates/page_down.html b/r2/r2/templates/page_down.html deleted file mode 100644 index cdbd4707e..000000000 --- a/r2/r2/templates/page_down.html +++ /dev/null @@ -1,26 +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 CondeNet, Inc. -## -## All portions of the code written by CondeNet are Copyright (c) 2006-2010 -## CondeNet, Inc. All Rights Reserved. -################################################################################ - -
-${thing.message}
-- ${_("sorry. That title is too long to fit on a t-shirt.")} -
-%else: - -