+
+
+
+ Track your karma in real-time
+ You deserve better than just mashing reload to see how your reddit-worth fluctuates. Now it’s always on your desktop.
+
+ ([^<]+)')
a_re = re.compile('>([^<]+)')
fix_url = re.compile('<(http://[^\s\'\"\]\)]+)>')
-
#TODO markdown should be looked up in batch?
#@memoize('markdown')
def safemarkdown(text, nofollow=False, target=None):
diff --git a/r2/r2/lib/jsonresponse.py b/r2/r2/lib/jsonresponse.py
index 5b60db4d7..5fcf12dff 100644
--- a/r2/r2/lib/jsonresponse.py
+++ b/r2/r2/lib/jsonresponse.py
@@ -78,10 +78,12 @@ class JsonResponse(object):
def has_errors(self, field_name, *errors, **kw):
have_error = False
+ field_name = tup(field_name)
for error_name in errors:
- if (error_name, field_name) in c.errors:
- self.set_error(error_name, field_name)
- have_error = True
+ for fname in field_name:
+ if (error_name, fname) in c.errors:
+ self.set_error(error_name, fname)
+ have_error = True
return have_error
def _things(self, things, action, *a, **kw):
diff --git a/r2/r2/lib/jsontemplates.py b/r2/r2/lib/jsontemplates.py
index 142b850eb..dc9ab563b 100644
--- a/r2/r2/lib/jsontemplates.py
+++ b/r2/r2/lib/jsontemplates.py
@@ -74,6 +74,10 @@ class JsonTemplate(Template):
def render(self, thing = None, *a, **kw):
return ObjectTemplate({})
+class TakedownJsonTemplate(JsonTemplate):
+ def render(self, thing = None, *a, **kw):
+ return thing.explanation
+
class TableRowTemplate(JsonTemplate):
def cells(self, thing):
raise NotImplementedError
@@ -202,11 +206,12 @@ class LinkJsonTemplate(ThingJsonTemplate):
domain = "domain",
title = "title",
url = "url",
- author = "author",
+ author = "author",
thumbnail = "thumbnail",
media = "media_object",
media_embed = "media_embed",
selftext = "selftext",
+ selftext_html= "selftext_html",
num_comments = "num_comments",
subreddit = "subreddit",
subreddit_id = "subreddit_id")
@@ -228,6 +233,8 @@ class LinkJsonTemplate(ThingJsonTemplate):
elif attr == 'subreddit_id':
return thing.subreddit._fullname
elif attr == 'selftext':
+ return thing.selftext
+ elif attr == 'selftext_html':
return safemarkdown(thing.selftext)
return ThingJsonTemplate.thing_attr(self, thing, attr)
@@ -237,6 +244,9 @@ class LinkJsonTemplate(ThingJsonTemplate):
return d
+class PromotedLinkJsonTemplate(LinkJsonTemplate):
+ _data_attrs_ = LinkJsonTemplate.data_attrs(promoted = "promoted")
+ del _data_attrs_['author']
class CommentJsonTemplate(ThingJsonTemplate):
_data_attrs_ = ThingJsonTemplate.data_attrs(ups = "upvotes",
@@ -293,8 +303,13 @@ class MoreCommentJsonTemplate(CommentJsonTemplate):
def kind(self, wrapped):
return "more"
+ def thing_attr(self, thing, attr):
+ if attr in ('body', 'body_html'):
+ return ""
+ return CommentJsonTemplate.thing_attr(self, thing, attr)
+
def rendered_data(self, wrapped):
- return ThingJsonTemplate.rendered_data(self, wrapped)
+ return CommentJsonTemplate.rendered_data(self, wrapped)
class MessageJsonTemplate(ThingJsonTemplate):
_data_attrs_ = ThingJsonTemplate.data_attrs(new = "new",
@@ -309,9 +324,9 @@ class MessageJsonTemplate(ThingJsonTemplate):
def thing_attr(self, thing, attr):
if attr == "was_comment":
- return hasattr(thing, "was_comment")
+ return thing.was_comment
elif attr == "context":
- return ("" if not hasattr(thing, "was_comment")
+ return ("" if not thing.was_comment
else thing.permalink + "?context=3")
elif attr == "dest":
return thing.to.name
diff --git a/r2/r2/lib/media.py b/r2/r2/lib/media.py
index e88dad847..1d31f8306 100644
--- a/r2/r2/lib/media.py
+++ b/r2/r2/lib/media.py
@@ -23,17 +23,17 @@
from pylons import g, config
from r2.models.link import Link
-from r2.lib.workqueue import WorkQueue
from r2.lib import s3cp
from r2.lib.utils import timeago, fetch_things2
+from r2.lib.utils import TimeoutFunction, TimeoutFunctionException
from r2.lib.db.operators import desc
from r2.lib.scraper import make_scraper, str_to_image, image_to_str, prepare_image
+from r2.lib import amqp
import tempfile
-from Queue import Queue
+import traceback
s3_thumbnail_bucket = g.s3_thumb_bucket
-media_period = g.media_period
threads = 20
log = g.log
@@ -41,6 +41,7 @@ def thumbnail_url(link):
"""Given a link, returns the url for its thumbnail based on its fullname"""
return 'http:/%s%s.png' % (s3_thumbnail_bucket, link._fullname)
+
def upload_thumb(link, image):
"""Given a link and an image, uploads the image to s3 into an image
based on the link's fullname"""
@@ -52,26 +53,6 @@ def upload_thumb(link, image):
s3cp.send_file(f.name, resource, 'image/png', 'public-read', None, False)
log.debug('thumbnail %s: %s' % (link._fullname, thumbnail_url(link)))
-def make_link_info_job(results, link, useragent):
- """Returns a unit of work to send to a work queue that downloads a
- link's thumbnail and media object. Places the result in the results
- dict"""
- def job():
- try:
- scraper = make_scraper(link.url)
-
- thumbnail = scraper.thumbnail()
- media_object = scraper.media_object()
-
- if thumbnail:
- upload_thumb(link, thumbnail)
-
- results[link] = (thumbnail, media_object)
- except:
- log.warning('error fetching %s %s' % (link._fullname, link.url))
- raise
-
- return job
def update_link(link, thumbnail, media_object):
"""Sets the link's has_thumbnail and media_object attributes iin the
@@ -84,40 +65,48 @@ def update_link(link, thumbnail, media_object):
link._commit()
-def process_new_links(period = media_period, force = False):
- """Fetches links from the last period and sets their media
- properities. If force is True, it will fetch properities for links
- even if the properties already exist"""
- links = Link._query(Link.c._date > timeago(period), sort = desc('_date'),
- data = True)
- results = {}
- jobs = []
- for link in fetch_things2(links):
- if link.is_self or link.promoted:
- continue
- elif not force and (link.has_thumbnail or link.media_object):
- continue
- jobs.append(make_link_info_job(results, link, g.useragent))
+def set_media(link, force = False):
+ if link.is_self:
+ return
+ if not force and link.promoted:
+ return
+ elif not force and (link.has_thumbnail or link.media_object):
+ return
+
+ scraper = make_scraper(link.url)
- #send links to a queue
- wq = WorkQueue(jobs, num_workers = 20, timeout = 30)
- wq.start()
- wq.jobs.join()
+ thumbnail = scraper.thumbnail()
+ media_object = scraper.media_object()
- #when the queue is finished, do the db writes in this thread
- for link, info in results.items():
- update_link(link, info[0], info[1])
+ if thumbnail:
+ upload_thumb(link, thumbnail)
-def set_media(link):
- """Sets the media properties for a single link."""
- results = {}
- make_link_info_job(results, link, g.useragent)()
- update_link(link, *results[link])
+ update_link(link, thumbnail, media_object)
def force_thumbnail(link, image_data):
image = str_to_image(image_data)
image = prepare_image(image)
upload_thumb(link, image)
update_link(link, thumbnail = True, media_object = None)
-
+
+def run():
+ def process_msgs(msgs):
+ def _process_link(fname):
+ print "media: Processing %s" % fname
+
+ link = Link._by_fullname(fname, data=True, return_dict=False)
+ set_media(link)
+ for msg in msgs:
+ fname = msg.body
+ try:
+ TimeoutFunction(_process_link, 30)(fname)
+ except TimeoutFunctionException:
+ print "Timed out on %s" % fname
+ except KeyboardInterrupt:
+ raise
+ except:
+ print "Error fetching %s" % fname
+ print traceback.format_exc()
+
+ amqp.handle_items('scraper_q', process_msgs, limit=1)
diff --git a/r2/r2/lib/menus.py b/r2/r2/lib/menus.py
index 06408bfbb..9d2de0052 100644
--- a/r2/r2/lib/menus.py
+++ b/r2/r2/lib/menus.py
@@ -1,4 +1,3 @@
-
# 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
@@ -62,6 +61,7 @@ menu = MenuHandler(hot = _('hot'),
more = _('more'),
relevance = _('relevance'),
controversial = _('controversial'),
+ confidence = _('best'),
saved = _('saved {toolbar}'),
recommended = _('recommended'),
rising = _('rising'),
@@ -83,7 +83,6 @@ menu = MenuHandler(hot = _('hot'),
adminon = _("turn admin on"),
adminoff = _("turn admin off"),
prefs = _("preferences"),
- stats = _("stats"),
submit = _("submit"),
help = _("help"),
blog = _("the reddit blog"),
@@ -115,27 +114,31 @@ menu = MenuHandler(hot = _('hot'),
sent = _("sent"),
# comments
+ comments = _("comments {toolbar}"),
related = _("related"),
details = _("details"),
duplicates = _("other discussions (%(num)s)"),
shirt = _("shirt"),
- traffic = _("traffic"),
+ traffic = _("traffic stats"),
# reddits
home = _("home"),
about = _("about"),
- edit = _("edit"),
- banned = _("banned"),
+ edit = _("edit this reddit"),
+ moderators = _("edit moderators"),
+ contributors = _("edit contributors"),
+ banned = _("ban users"),
banusers = _("ban users"),
popular = _("popular"),
create = _("create"),
mine = _("my reddits"),
- i18n = _("translate site"),
+ i18n = _("help translate"),
+ awards = _("awards"),
promoted = _("promoted"),
reporters = _("reporters"),
- reports = _("reports"),
+ reports = _("reported links"),
reportedauth = _("reported authors"),
info = _("info"),
share = _("share"),
@@ -148,9 +151,15 @@ menu = MenuHandler(hot = _('hot'),
deleted = _("deleted"),
reported = _("reported"),
- promote = _('promote'),
- new_promo = _('new promoted link'),
- current_promos = _('promoted links'),
+ promote = _('self-serve'),
+ new_promo = _('create promotion'),
+ my_current_promos = _('my promoted links'),
+ current_promos = _('all promoted links'),
+ future_promos = _('unapproved'),
+ graph = _('analytics'),
+ live_promos = _('live'),
+ unpaid_promos = _('unpaid'),
+ pending_promos = _('pending')
)
def menu_style(type):
@@ -179,7 +188,10 @@ class NavMenu(Styled):
base_path = '', separator = '|', **kw):
self.options = options
self.base_path = base_path
- kw['style'], kw['css_class'] = menu_style(type)
+
+ #add the menu style, but preserve existing css_class parameter
+ kw['style'], css_class = menu_style(type)
+ kw['css_class'] = css_class + ' ' + kw.get('css_class', '')
#used by flatlist to delimit menu items
self.separator = separator
@@ -223,11 +235,11 @@ class NavButton(Styled):
nocname=False, opt = '', aliases = [],
target = "", style = "plain", **kw):
# keep original dest to check against c.location when rendering
- aliases = set(a.rstrip('/') for a in aliases)
- aliases.add(dest.rstrip('/'))
+ aliases = set(_force_unicode(a.rstrip('/')) for a in aliases)
+ aliases.add(_force_unicode(dest.rstrip('/')))
self.request_params = dict(request.GET)
- self.stripped_path = request.path.rstrip('/').lower()
+ self.stripped_path = _force_unicode(request.path.rstrip('/').lower())
Styled.__init__(self, style = style, sr_path = sr_path,
nocname = nocname, target = target,
@@ -264,6 +276,8 @@ class NavButton(Styled):
else:
if self.stripped_path == self.bare_path:
return True
+ if self.bare_path and self.stripped_path.startswith(self.bare_path):
+ return True
if self.stripped_path in self.aliases:
return True
@@ -388,10 +402,13 @@ class SortMenu(SimpleGetMenu):
return operators.desc('_score')
elif sort == 'controversial':
return operators.desc('_controversy')
+ elif sort == 'confidence':
+ return operators.desc('_confidence')
class CommentSortMenu(SortMenu):
"""Sort menu for comments pages"""
- options = ('hot', 'new', 'controversial', 'top', 'old')
+ default = 'confidence'
+ options = ('hot', 'new', 'controversial', 'top', 'old', 'confidence')
class SearchSortMenu(SortMenu):
"""Sort menu for search pages."""
diff --git a/r2/r2/lib/migrate.py b/r2/r2/lib/migrate.py
index 18fec62cc..53a59b6f2 100644
--- a/r2/r2/lib/migrate.py
+++ b/r2/r2/lib/migrate.py
@@ -22,6 +22,7 @@
"""
One-time use functions to migrate from one reddit-version to another
"""
+from r2.lib.promote import *
def add_allow_top_to_srs():
"Add the allow_top property to all stored subreddits"
@@ -33,3 +34,104 @@ def add_allow_top_to_srs():
sort = desc('_date'))
for sr in fetch_things2(q):
sr.allow_top = True; sr._commit()
+
+def convert_promoted():
+ """
+ should only need to be run once to update old style promoted links
+ to the new style.
+ """
+ from r2.lib.utils import fetch_things2
+ from r2.lib import authorize
+
+ q = Link._query(Link.c.promoted == (True, False),
+ sort = desc("_date"))
+ sr_id = PromoteSR._id
+ bid = 100
+ with g.make_lock(promoted_lock_key):
+ promoted = {}
+ set_promoted({})
+ for l in fetch_things2(q):
+ print "updating:", l
+ try:
+ if not l._loaded: l._load()
+ # move the promotion into the promo subreddit
+ l.sr_id = sr_id
+ # set it to accepted (since some of the update functions
+ # check that it is not already promoted)
+ l.promote_status = STATUS.accepted
+ author = Account._byID(l.author_id)
+ l.promote_trans_id = authorize.auth_transaction(bid, author, -1, l)
+ l.promote_bid = bid
+ l.maximum_clicks = None
+ l.maximum_views = None
+ # set the dates
+ start = getattr(l, "promoted_on", l._date)
+ until = getattr(l, "promote_until", None) or \
+ (l._date + timedelta(1))
+ l.promote_until = None
+ update_promo_dates(l, start, until)
+ # mark it as promoted if it was promoted when we got there
+ if l.promoted and l.promote_until > datetime.now(g.tz):
+ l.promote_status = STATUS.pending
+ else:
+ l.promote_status = STATUS.finished
+
+ if not hasattr(l, "disable_comments"):
+ l.disable_comments = False
+ # add it to the auction list
+ if l.promote_status == STATUS.pending and l._fullname not in promoted:
+ promoted[l._fullname] = auction_weight(l)
+ l._commit()
+ except AttributeError:
+ print "BAD THING:", l
+ print promoted
+ set_promoted(promoted)
+ # run what is normally in a cron job to clear out finished promos
+ #promote_promoted()
+
+def store_market():
+
+ """
+ create index ix_promote_date_actual_end on promote_date(actual_end);
+ create index ix_promote_date_actual_start on promote_date(actual_start);
+ create index ix_promote_date_start_date on promote_date(start_date);
+ create index ix_promote_date_end_date on promote_date(end_date);
+
+ alter table promote_date add column account_id bigint;
+ create index ix_promote_date_account_id on promote_date(account_id);
+ alter table promote_date add column bid real;
+ alter table promote_date add column refund real;
+
+ """
+
+ for p in PromoteDates.query().all():
+ l = Link._by_fullname(p.thing_name, True)
+ if hasattr(l, "promote_bid") and hasattr(l, "author_id"):
+ p.account_id = l.author_id
+ p._commit()
+ PromoteDates.update(l, l._date, l.promote_until)
+ PromoteDates.update_bid(l)
+
+def subscribe_to_blog_and_annoucements(filename):
+ import re
+ from time import sleep
+ from r2.models import Account, Subreddit
+
+ r_blog = Subreddit._by_name("blog")
+ r_announcements = Subreddit._by_name("announcements")
+
+ contents = file(filename).read()
+ numbers = [ int(s) for s in re.findall("\d+", contents) ]
+
+# d = Account._byID(numbers, data=True)
+
+# for i, account in enumerate(d.values()):
+ for i, account_id in enumerate(numbers):
+ account = Account._byID(account_id, data=True)
+
+ for sr in r_blog, r_announcements:
+ if sr.add_subscriber(account):
+ sr._incr("_ups", 1)
+ print ("%d: subscribed %s to %s" % (i, account.name, sr.name))
+ else:
+ print ("%d: didn't subscribe %s to %s" % (i, account.name, sr.name))
diff --git a/r2/r2/lib/normalized_hot.py b/r2/r2/lib/normalized_hot.py
index ed86a00d7..699107bf8 100644
--- a/r2/r2/lib/normalized_hot.py
+++ b/r2/r2/lib/normalized_hot.py
@@ -101,7 +101,7 @@ def normalized_hot_cached(sr_ids):
if not items:
continue
- top_score = max(items[0]._hot, 1)
+ top_score = max(max(x._hot for x in items), 1)
if items:
results.extend((l, l._hot / top_score) for l in items)
diff --git a/r2/r2/lib/organic.py b/r2/r2/lib/organic.py
index 8ff386d85..da011bbf0 100644
--- a/r2/r2/lib/organic.py
+++ b/r2/r2/lib/organic.py
@@ -24,7 +24,7 @@ from r2.lib.memoize import memoize
from r2.lib.normalized_hot import get_hot, only_recent
from r2.lib import count
from r2.lib.utils import UniqueIterator, timeago
-from r2.lib.promote import get_promoted
+from r2.lib.promote import random_promoted
from pylons import c
@@ -45,36 +45,28 @@ def insert_promoted(link_names, sr_ids, logged_in):
Inserts promoted links into an existing organic list. Destructive
on `link_names'
"""
- promoted_items = get_promoted()
+ promoted_items = random_promoted()
if not promoted_items:
return
- def my_keepfn(l):
- if l.promoted_subscribersonly and l.sr_id not in sr_ids:
- return False
- else:
- return keep_link(l)
-
# no point in running the builder over more promoted links than
# we'll even use
max_promoted = max(1,len(link_names)/promoted_every_n)
- # in the future, we may want to weight this sorting somehow
- random.shuffle(promoted_items)
-
# remove any that the user has acted on
- builder = IDBuilder(promoted_items,
- skip = True, keep_fn = my_keepfn,
- num = max_promoted)
+ def keep(item):
+ if c.user_is_loggedin and c.user._id == item.author_id:
+ return True
+ else:
+ return item.keep_item(item)
+
+ builder = IDBuilder(promoted_items, keep_fn = keep,
+ skip = True, num = max_promoted)
promoted_items = builder.get_items()[0]
if not promoted_items:
return
-
- #make a copy before we start messing with things
- orig_promoted = list(promoted_items)
-
# don't insert one at the head of the list 50% of the time for
# logged in users, and 50% of the time for logged-off users when
# the pool of promoted links is less than 3 (to avoid showing the
@@ -82,11 +74,6 @@ def insert_promoted(link_names, sr_ids, logged_in):
if (logged_in or len(promoted_items) < 3) and random.choice((True,False)):
promoted_items.insert(0, None)
- #repeat the same promoted links for non logged in users
- if not logged_in:
- while len(promoted_items) * promoted_every_n < len(link_names):
- promoted_items.extend(orig_promoted)
-
# insert one promoted item for every N items
for i, item in enumerate(promoted_items):
pos = i * promoted_every_n + i
@@ -106,11 +93,9 @@ def cached_organic_links(user_id, langs):
sr_ids = Subreddit.user_subreddits(user)
sr_count = count.get_link_counts()
-
#only use links from reddits that you're subscribed to
link_names = filter(lambda n: sr_count[n][1] in sr_ids, sr_count.keys())
link_names.sort(key = lambda n: sr_count[n][0])
-
#potentially add a up and coming link
if random.choice((True, False)) and sr_ids:
sr = Subreddit._byID(random.choice(sr_ids))
@@ -122,6 +107,8 @@ def cached_organic_links(user_id, langs):
new_item = random.choice(items[1:4])
link_names.insert(0, new_item._fullname)
+ insert_promoted(link_names, sr_ids, user_id is not None)
+
# remove any that the user has acted on
builder = IDBuilder(link_names,
skip = True, keep_fn = keep_link,
@@ -133,8 +120,6 @@ def cached_organic_links(user_id, langs):
if user_id:
update_pos(0)
- insert_promoted(link_names, sr_ids, user_id is not None)
-
# remove any duplicates caused by insert_promoted if the user is logged in
if user_id:
link_names = list(UniqueIterator(link_names))
diff --git a/r2/r2/lib/pages/admin_pages.py b/r2/r2/lib/pages/admin_pages.py
index 6d0c6e396..8e05bf987 100644
--- a/r2/r2/lib/pages/admin_pages.py
+++ b/r2/r2/lib/pages/admin_pages.py
@@ -26,6 +26,7 @@ from r2.lib.menus import NamedButton, NavButton, menu, NavMenu
class AdminSidebar(Templated):
def __init__(self, user):
+ Templated.__init__(self)
self.user = user
@@ -46,7 +47,9 @@ class AdminPage(Reddit):
buttons = []
if g.translator:
- buttons.append(NavButton(menu.i18n, ""))
+ buttons.append(NavButton(menu.i18n, "i18n"))
+
+ buttons.append(NavButton(menu.awards, "awards"))
admin_menu = NavMenu(buttons, title='show', base_path = '/admin',
type="lightdrop")
diff --git a/r2/r2/lib/pages/graph.py b/r2/r2/lib/pages/graph.py
index a3184aa25..376002bc1 100644
--- a/r2/r2/lib/pages/graph.py
+++ b/r2/r2/lib/pages/graph.py
@@ -138,9 +138,9 @@ class LineGraph(object):
def __init__(self, xydata, colors = ("FF4500", "336699"),
width = 300, height = 175):
-
+
series = zip(*xydata)
-
+
self.xdata = DataSeries(series[0])
self.ydata = map(DataSeries, series[1:])
self.width = width
@@ -150,13 +150,13 @@ class LineGraph(object):
def google_chart(self, multiy = True, ylabels = [], title = "",
bar_fmt = True):
xdata, ydata = self.xdata, self.ydata
-
+
# Bar format makes the line chart look like it is a series of
# contiguous bars without the boundary line between each bar.
if bar_fmt:
xdata = DataSeries(range(len(self.xdata))).toBarX()
ydata = [y.toBarY() for y in self.ydata]
-
+
# TODO: currently we are only supporting time series. Make general
xaxis = make_date_axis_labels(self.xdata)
diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py
index f78088428..3ce70866a 100644
--- a/r2/r2/lib/pages/pages.py
+++ b/r2/r2/lib/pages/pages.py
@@ -23,29 +23,31 @@ from r2.lib.wrapped import Wrapped, Templated, NoTemplateFound, CachedTemplate
from r2.models import Account, Default
from r2.models import FakeSubreddit, Subreddit
from r2.models import Friends, All, Sub, NotFound, DomainSR
-from r2.models import Link, Printable
+from r2.models import Link, Printable, Trophy, bidding, PromoteDates
from r2.config import cache
+from r2.lib.tracking import AdframeInfo
from r2.lib.jsonresponse import json_respond
from r2.lib.jsontemplates import is_api
from pylons.i18n import _, ungettext
from pylons import c, request, g
from pylons.controllers.util import abort
+from r2.lib import promote
from r2.lib.traffic import load_traffic, load_summary
from r2.lib.captcha import get_iden
-from r2.lib.filters import spaceCompress, _force_unicode, _force_utf8, unsafe
+from r2.lib.filters import spaceCompress, _force_unicode, _force_utf8, unsafe, websafe
from r2.lib.menus import NavButton, NamedButton, NavMenu, PageNameNav, JsButton
from r2.lib.menus import SubredditButton, SubredditMenu
from r2.lib.menus import OffsiteButton, menu, JsNavMenu
from r2.lib.strings import plurals, rand_strings, strings, Score
from r2.lib.utils import title_to_url, query_string, UrlParser, to_js, vote_hash
-from r2.lib.utils import link_duplicates
+from r2.lib.utils import link_duplicates, make_offset_date, to_csv
from r2.lib.template_helpers import add_sr, get_domain
from r2.lib.subreddit_search import popular_searches
from r2.lib.scraper import scrapers
import sys, random, datetime, locale, calendar, simplejson, re
-import graph
+import graph, pycountry
from itertools import chain
from urllib import quote
@@ -128,6 +130,27 @@ class Reddit(Templated):
self.toolbars = self.build_toolbars()
+ def sr_admin_menu(self):
+ buttons = [NamedButton('edit', css_class = 'reddit-edit'),
+ NamedButton('moderators', css_class = 'reddit-moderators')]
+
+ if c.site.type != 'public':
+ buttons.append(NamedButton('contributors',
+ css_class = 'reddit-contributors'))
+
+ buttons.extend([
+ NamedButton('traffic', css_class = 'reddit-traffic'),
+ NamedButton('reports', css_class = 'reddit-reported'),
+ NamedButton('spam', css_class = 'reddit-spam'),
+ NamedButton('banned', css_class = 'reddit-ban'),
+ ])
+ return [NavMenu(buttons, type = "flat_vert", base_path = "/about/",
+ css_class = "icon-menu", separator = '')]
+
+ def sr_moderators(self):
+ accounts = [Account._byID(uid, True) for uid in c.site.moderators]
+ return [WrappedUser(a) for a in accounts if not a._deleted]
+
def rightbox(self):
"""generates content in """
@@ -142,6 +165,16 @@ class Reddit(Templated):
#don't show the subreddit info bar on cnames
if not isinstance(c.site, FakeSubreddit) and not c.cname:
ps.append(SubredditInfoBar())
+ ps.append(SponsorshipBox())
+
+ moderators = self.sr_moderators()
+ if moderators:
+ ps.append(SideContentBox(_('moderators'), moderators))
+
+ if (c.user_is_loggedin and
+ (c.site.is_moderator(c.user) or c.user_is_admin)):
+ ps.append(SideContentBox(_('admin box'), self.sr_admin_menu()))
+
if self.submit_box:
ps.append(SideBox(_('Submit a link'),
@@ -223,10 +256,10 @@ class Reddit(Templated):
if c.user_is_loggedin:
if c.user_is_admin:
- more_buttons.append(NamedButton('admin'))
-
- if c.user_is_sponsor:
- more_buttons.append(NamedButton('promote'))
+ more_buttons.append(NamedButton('admin', False))
+ more_buttons.append(NamedButton('traffic', False))
+ if c.user.pref_show_promote or c.user_is_sponsor:
+ more_buttons.append(NavButton(menu.promote, 'promoted', False))
#if there's only one button in the dropdown, get rid of the dropdown
if len(more_buttons) == 1:
@@ -236,12 +269,12 @@ class Reddit(Templated):
toolbar = [NavMenu(main_buttons, type='tabmenu')]
if more_buttons:
toolbar.append(NavMenu(more_buttons, title=menu.more, type='tabdrop'))
-
+
if c.site != Default and not c.cname:
toolbar.insert(0, PageNameNav('subreddit'))
return toolbar
-
+
def __repr__(self):
return ""
@@ -260,28 +293,31 @@ class RedditHeader(Templated):
class RedditFooter(CachedTemplate):
def cachable_attrs(self):
- return [('path', request.path)]
-
- def nav(self):
- return [NavMenu([NamedButton("toplinks", False),
+ return [('path', request.path),
+ ('buttons', [[(x.title, x.path) for x in y] for y in self.nav])]
+
+ def __init__(self):
+ self.nav = [NavMenu([NamedButton("toplinks", False),
NamedButton("mobile", False, nocname=True),
OffsiteButton("rss", dest = '/.rss'),
NamedButton("store", False, nocname=True),
- NamedButton("stats", False, nocname=True),
+ NamedButton("awards", False, nocname=True),
NamedButton('random', False, nocname=False),
- NamedButton("feedback", False),],
+ ],
title = _('site links'), type = 'flat_vert',
separator = ''),
-
- NavMenu([NamedButton("help", False, nocname=True),
+
+ NavMenu([NamedButton("help", False, nocname=True),
OffsiteButton(_("FAQ"), dest = '/help/faq',
nocname=True),
OffsiteButton(_("reddiquette"), nocname=True,
- dest = '/help/reddiquette')],
+ dest = '/help/reddiquette'),
+ NamedButton("feedback", False),
+ NamedButton("i18n", False),
+ ],
title = _('help'), type = 'flat_vert',
separator = ''),
-
- NavMenu([NamedButton("bookmarklets", False),
+ NavMenu([NamedButton("bookmarklets", False),
NamedButton("buttons", True),
NamedButton("code", False, nocname=True),
NamedButton("socialite", False),
@@ -289,8 +325,7 @@ class RedditFooter(CachedTemplate):
NamedButton("iphone", False),],
title = _('reddit tools'), type = 'flat_vert',
separator = ''),
-
- NavMenu([NamedButton("blog", False, nocname=True),
+ NavMenu([NamedButton("blog", False, nocname=True),
NamedButton("ad_inq", False, nocname=True),
OffsiteButton('reddit.tv', "http://www.reddit.tv"),
OffsiteButton('redditall', "http://www.redditall.com"),
@@ -298,7 +333,7 @@ class RedditFooter(CachedTemplate):
"http://www.redditjobs.com")],
title = _('about us'), type = 'flat_vert',
separator = ''),
- NavMenu([OffsiteButton('BaconBuzz',
+ NavMenu([OffsiteButton('BaconBuzz',
"http://www.baconbuzz.com"),
OffsiteButton('Destructoid reddit',
"http://reddit.destructoid.com"),
@@ -314,7 +349,7 @@ class RedditFooter(CachedTemplate):
"http://www.idealistnews.com"),],
title = _('brothers'), type = 'flat_vert',
separator = ''),
- NavMenu([OffsiteButton('Wired.com',
+ NavMenu([OffsiteButton('Wired.com',
"http://www.wired.com"),
OffsiteButton('Ars Technica',
"http://www.arstechnica.com"),
@@ -327,7 +362,7 @@ class RedditFooter(CachedTemplate):
title = _('sisters'), type = 'flat_vert',
separator = '')
]
-
+ CachedTemplate.__init__(self)
class ClickGadget(Templated):
def __init__(self, links, *a, **kw):
@@ -369,24 +404,13 @@ class SubredditInfoBar(CachedTemplate):
def __init__(self, site = None):
site = site or c.site
- self.spam = site._spam
- self.name = site.name
- self.type = site.type
- self.is_fake = isinstance(site, FakeSubreddit)
- self.is_loggedin = c.user_is_loggedin
- self.is_admin = c.user_is_admin
- self.fullname = site._fullname
- self.is_subscriber = bool(c.user_is_loggedin and \
- site.is_subscriber_defaults(c.user))
- self.is_moderator = bool(c.user_is_loggedin and \
- site.is_moderator(c.user))
- self.is_contributor = bool(site.type in ("private", "restricted") and \
- c.user_is_loggedin and \
- site.is_contributor(c.user))
- self.subscribers = site._ups
- self.date = site._date
- self.banner = getattr(site, "banner", None)
+ #hackity hack. do i need to add all the others props?
+ self.sr = list(wrap_links(site))[0]
+
+ # we want to cache on the number of subscribers
+ self.subscribers = self.sr._ups
+
#so the menus cache properly
self.path = request.path
CachedTemplate.__init__(self)
@@ -407,13 +431,21 @@ class SubredditInfoBar(CachedTemplate):
return [NavMenu(buttons, type = "flat_vert", base_path = "/about/",
separator = '')]
+class SponsorshipBox(Templated):
+ pass
+
+class SideContentBox(Templated):
+ def __init__(self, title, content, helplink=None, extra_class=None):
+ Templated.__init__(self, title=title, helplink=helplink,
+ content=content, extra_class=extra_class)
+
class SideBox(CachedTemplate):
"""
Generic sidebox used to generate the 'submit' and 'create a reddit' boxes.
"""
def __init__(self, title, link, css_class='', subtitles = [],
show_cover = False, nocname=False, sr_path = False):
- Templated.__init__(self, link = link, target = '_top',
+ CachedTemplate.__init__(self, link = link, target = '_top',
title = title, css_class = css_class,
sr_path = sr_path, subtitles = subtitles,
show_cover = show_cover, nocname=nocname)
@@ -421,19 +453,22 @@ class SideBox(CachedTemplate):
class PrefsPage(Reddit):
"""container for pages accessible via /prefs. No extension handling."""
-
+
extension_handling = False
def __init__(self, show_sidebar = False, *a, **kw):
Reddit.__init__(self, show_sidebar = show_sidebar,
- title = "%s (%s)" %(_("preferences"), c.site.name.strip(' ')),
+ title = "%s (%s)" %(_("preferences"),
+ c.site.name.strip(' ')),
*a, **kw)
def build_toolbars(self):
buttons = [NavButton(menu.options, ''),
NamedButton('friends'),
- NamedButton('update'),
- NamedButton('delete')]
+ NamedButton('update')]
+ #if CustomerID.get_id(user):
+ # buttons += [NamedButton('payment')]
+ buttons += [NamedButton('delete')]
return [PageNameNav('nomenu', title = _("preferences")),
NavMenu(buttons, base_path = "/prefs", type="tabmenu")]
@@ -444,7 +479,11 @@ class PrefOptions(Templated):
class PrefUpdate(Templated):
"""Preference form for updating email address and passwords"""
- pass
+ def __init__(self, email = True, password = True, verify = False):
+ self.email = email
+ self.password = password
+ self.verify = verify
+ Templated.__init__(self)
class PrefDelete(Templated):
"""preference form for deleting a user's own account."""
@@ -551,6 +590,23 @@ class SearchPage(BoringPage):
return self.content_stack((self.searchbar, self.infobar,
self.nav_menu, self._content))
+class TakedownPage(BoringPage):
+ def __init__(self, link):
+ BoringPage.__init__(self, getattr(link, "takedown_title", _("bummer")),
+ content = TakedownPane(link))
+
+ def render(self, *a, **kw):
+ response = BoringPage.render(self, *a, **kw)
+ return response
+
+
+class TakedownPane(Templated):
+ def __init__(self, link, *a, **kw):
+ self.link = link
+ self.explanation = getattr(self.link, "explanation",
+ _("this page is no longer available due to a copyright claim."))
+ Templated.__init__(self, *a, **kw)
+
class CommentsPanel(Templated):
"""the side-panel on the reddit toolbar frame that shows the top
comments of a link"""
@@ -578,7 +634,10 @@ class LinkInfoPage(Reddit):
def __init__(self, link = None, comment = None,
link_title = '', subtitle = None, duplicates = None,
*a, **kw):
- wrapper = default_thing_wrapper(expand_children = True)
+
+ expand_children = kw.get("expand_children", not bool(comment))
+
+ wrapper = default_thing_wrapper(expand_children=expand_children)
# link_listing will be the one-element listing at the top
self.link_listing = wrap_links(link, wrapper = wrapper)
@@ -613,24 +672,31 @@ class LinkInfoPage(Reddit):
def build_toolbars(self):
base_path = "/%s/%s/" % (self.link._id36, title_to_url(self.link.title))
base_path = _force_utf8(base_path)
+
+
def info_button(name, **fmt_args):
return NamedButton(name, dest = '/%s%s' % (name, base_path),
aliases = ['/%s/%s' % (name, self.link._id36)],
fmt_args = fmt_args)
+ buttons = []
+ if not getattr(self.link, "disable_comments", False):
+ buttons.extend([info_button('comments'),
+ info_button('related')])
- buttons = [info_button('comments'),
- info_button('related')]
+ if not self.link.is_self and self.duplicates:
+ buttons.append(info_button('duplicates',
+ num = len(self.duplicates)))
+ if len(self.link.title) < 200 and g.spreadshirt_url:
+ buttons += [info_button('shirt')]
- if not self.link.is_self and self.duplicates:
- buttons.append(info_button('duplicates', num = len(self.duplicates)))
if c.user_is_admin:
buttons += [info_button('details')]
- if c.user_is_sponsor:
- if self.link.promoted is not None:
- buttons += [info_button('traffic')]
- if len(self.link.title) < 200 and g.spreadshirt_url:
- buttons += [info_button('shirt')]
-
+
+ # should we show a traffic tab (promoted and author or sponsor)
+ if (self.link.promoted is not None and
+ (c.user_is_sponsor or
+ (c.user_is_loggedin and c.user._id == self.link.author_id))):
+ buttons += [info_button('traffic')]
toolbar = [NavMenu(buttons, base_path = "", type="tabmenu")]
@@ -703,13 +769,12 @@ class SubredditsPage(Reddit):
if c.user_is_admin:
buttons.append(NamedButton("banned"))
- #removing the 'my reddits' listing for now
- #if c.user_is_loggedin:
- # #add the aliases to "my reddits" stays highlighted
- # buttons.append(NamedButton("mine", aliases=['/reddits/mine/subscriber',
- # '/reddits/mine/contributor',
- # '/reddits/mine/moderator']))
-
+ if c.user_is_loggedin:
+ #add the aliases to "my reddits" stays highlighted
+ buttons.append(NamedButton("mine",
+ aliases=['/reddits/mine/subscriber',
+ '/reddits/mine/contributor',
+ '/reddits/mine/moderator']))
return [PageNameNav('reddits'),
NavMenu(buttons, base_path = '/reddits', type="tabmenu")]
@@ -720,7 +785,7 @@ class SubredditsPage(Reddit):
def rightbox(self):
ps = Reddit.rightbox(self)
- ps.append(SubscriptionBox())
+ ps.append(SideContentBox(_("your front page reddits"), [SubscriptionBox()]))
return ps
class MySubredditsPage(SubredditsPage):
@@ -757,7 +822,7 @@ class ProfilePage(Reddit):
def build_toolbars(self):
path = "/user/%s/" % self.user.name
main_buttons = [NavButton(menu.overview, '/', aliases = ['/overview']),
- NavButton(plurals.comments, 'comments'),
+ NamedButton('comments'),
NamedButton('submitted')]
if votes_visible(self.user):
@@ -781,15 +846,30 @@ class ProfilePage(Reddit):
if c.user_is_admin:
from admin_pages import AdminSidebar
rb.append(AdminSidebar(self.user))
+ if g.show_awards:
+ tc = TrophyCase(self.user)
+ helplink = ( "/help/awards", _("what's this?") )
+ scb = SideContentBox(title=_("trophy case"),
+ helplink=helplink, content=[tc],
+ extra_class="trophy-area")
+ rb.append(scb)
return rb
+class TrophyCase(Templated):
+ def __init__(self, user):
+ self.user = user
+ self.trophies = Trophy.by_account(user)
+ self.cup_date = user.should_show_cup()
+ Templated.__init__(self)
+
class ProfileBar(Templated):
"""Draws a right box for info about the user (karma, etc)"""
def __init__(self, user):
Templated.__init__(self, user = user)
- self.isFriend = self.user._id in c.user.friends \
- if c.user_is_loggedin else False
- self.isMe = (self.user == c.user)
+ self.is_friend = None
+ self.my_fullname = c.user_is_loggedin and c.user._fullname
+ if c.user_is_loggedin:
+ self.is_friend = self.user._id in c.user.friends
class MenuArea(Templated):
"""Draws the gray box at the top of a page for sort menus"""
@@ -848,8 +928,10 @@ class SubredditTopBar(Templated):
self.my_reddits = Subreddit.user_subreddits(c.user, ids = False)
- self.pop_reddits = Subreddit.default_subreddits(ids = False,
- limit = Subreddit.sr_limit)
+ p_srs = Subreddit.default_subreddits(ids = False,
+ limit = Subreddit.sr_limit)
+ self.pop_reddits = [ sr for sr in p_srs if sr.name not in g.automatic_reddits ]
+
# This doesn't actually work.
# self.reddits = c.recent_reddits
@@ -869,11 +951,13 @@ class SubredditTopBar(Templated):
type = 'srdrop')
def subscribed_reddits(self):
- return NavMenu([SubredditButton(sr) for sr in
+ srs = [SubredditButton(sr) for sr in
sorted(self.my_reddits,
key = lambda sr: sr._downs,
reverse=True)
- ],
+ if sr.name not in g.automatic_reddits
+ ]
+ return NavMenu(srs,
type='flatlist', separator = '-',
_id = 'sr-bar')
@@ -933,9 +1017,10 @@ class CssError(Templated):
class UploadedImage(Templated):
"The page rendered in the iframe during an upload of a header image"
- def __init__(self,status,img_src, name="", errors = {}):
+ def __init__(self,status,img_src, name="", errors = {}, form_id = ""):
self.errors = list(errors.iteritems())
- Templated.__init__(self, status=status, img_src=img_src, name = name)
+ Templated.__init__(self, status=status, img_src=img_src, name = name,
+ form_id = form_id)
class Password(Templated):
"""Form encountered when 'recover password' is clicked in the LoginFormWide."""
@@ -948,6 +1033,12 @@ class PasswordReset(Templated):
entered their user name in Password.)"""
pass
+class VerifyEmail(Templated):
+ pass
+
+class Promo_Email(Templated):
+ pass
+
class ResetPassword(Templated):
"""Form for actually resetting a lost password, after the user has
clicked on the link provided to them in the Password_Reset email
@@ -1153,28 +1244,6 @@ class OptIn(Templated):
pass
-class UserStats(Templated):
- """For drawing the stats page, which is fetched from the cache."""
- def __init__(self):
- Templated.__init__(self)
- cache_stats = cache.get('stats')
- if cache_stats:
- top_users, top_day, top_week = cache_stats
-
- #lookup user objs
- uids = []
- uids.extend(u for u in top_users)
- uids.extend(u[0] for u in top_day)
- uids.extend(u[0] for u in top_week)
- users = Account._byID(uids, data = True)
-
- self.top_users = (users[u] for u in top_users)
- self.top_day = ((users[u[0]], u[1]) for u in top_day)
- self.top_week = ((users[u[0]], u[1]) for u in top_week)
- else:
- self.top_users = self.top_day = self.top_week = ()
-
-
class ButtonEmbed(Templated):
"""Generates the JS wrapper around the buttons for embedding."""
def __init__(self, button = None, width = 100,
@@ -1182,7 +1251,7 @@ class ButtonEmbed(Templated):
Templated.__init__(self, button = button,
width = width, height = height,
referer=referer, url = url, **kw)
-
+
class Button(Wrapped):
cachable = True
extension_handling = False
@@ -1190,14 +1259,16 @@ class Button(Wrapped):
Wrapped.__init__(self, link, **kw)
if link is None:
self.add_props(c.user, [self])
-
-
+
+
@classmethod
def add_props(cls, user, wrapped):
# unlike most wrappers we can guarantee that there is a link
# that this wrapper is wrapping.
Link.add_props(user, [w for w in wrapped if hasattr(w, "_fullname")])
for w in wrapped:
+ # caching: store the user name since each button has a modhash
+ w.user_name = c.user.name if c.user_is_loggedin else ""
if not hasattr(w, '_fullname'):
w._fullname = None
@@ -1214,6 +1285,9 @@ class ButtonDemoPanel(Templated):
pass
+class SelfServeBlurb(Templated):
+ pass
+
class Feedback(Templated):
"""The feedback and ad inquery form(s)"""
def __init__(self, title, action):
@@ -1259,7 +1333,48 @@ class AdminTranslations(Templated):
from r2.lib.translation import list_translations
Templated.__init__(self)
self.translations = list_translations()
-
+
+class UserAwards(Templated):
+ """For drawing the regular-user awards page."""
+ def __init__(self):
+ from r2.models import Award, Trophy
+ Templated.__init__(self)
+
+ if not g.show_awards:
+ abort(404, "not found");
+
+ self.winners = []
+ for award in Award._all_awards():
+ trophies = Trophy.by_award(award)
+ # Don't show awards that nobody's ever won
+ # (e.g., "9-Year Club")
+ if trophies:
+ winner = trophies[0]._thing1.name
+ self.winners.append( (award, winner, trophies[0]) )
+
+
+class AdminAwards(Templated):
+ """The admin page for editing awards"""
+ def __init__(self):
+ from r2.models import Award
+ Templated.__init__(self)
+ self.awards = Award._all_awards()
+
+class AdminAwardGive(Templated):
+ """The interface for giving an award"""
+ def __init__(self, award):
+ now = datetime.datetime.now(g.display_tz)
+ self.description = "??? -- " + now.strftime("%Y-%m-%d")
+ self.url = ""
+
+ Templated.__init__(self, award = award)
+
+class AdminAwardWinners(Templated):
+ """The list of winners of an award"""
+ def __init__(self, award):
+ trophies = Trophy.by_award(award)
+ Templated.__init__(self, award = award, trophies = trophies)
+
class Embed(Templated):
"""wrapper for embedding /help into reddit as if it were not on a separate wiki."""
@@ -1272,6 +1387,38 @@ class Page_down(Templated):
message = kw.get('message', _("This feature is currently unavailable. Sorry"))
Templated.__init__(self, message = message)
+class WrappedUser(CachedTemplate):
+ def __init__(self, user, attribs = [], context_thing = None, gray = False):
+ attribs.sort()
+ author_cls = 'author'
+
+ if gray:
+ author_cls += ' gray'
+ for tup in attribs:
+ author_cls += " " + tup[2]
+
+ target = None
+ ip_span = None
+ context_deleted = None
+ if context_thing:
+ target = getattr(context_thing, 'target', None)
+ ip_span = getattr(context_thing, 'ip_span', None)
+ context_deleted = context_thing.deleted
+
+ karma = ''
+ if c.user_is_admin:
+ karma = ' (%d)' % user.link_karma
+
+ CachedTemplate.__init__(self,
+ name = user.name,
+ author_cls = author_cls,
+ attribs = attribs,
+ context_thing = context_thing,
+ karma = karma,
+ ip_span = ip_span,
+ context_deleted = context_deleted,
+ user_deleted = user._deleted)
+
# Classes for dealing with friend/moderator/contributor/banned lists
@@ -1281,10 +1428,12 @@ class UserTableItem(Templated):
will determine what order the different columns are rendered in.
Currently, this list can consist of 'user', 'sendmessage' and
'remove'."""
- def __init__(self, user, type, cellnames, container_name, editable):
+ def __init__(self, user, type, cellnames, container_name, editable,
+ remove_action):
self.user, self.type, self.cells = user, type, cellnames
self.container_name = container_name
self.editable = editable
+ self.remove_action = remove_action
Templated.__init__(self)
def __repr__(self):
@@ -1298,6 +1447,8 @@ class UserList(Templated):
container_name = ''
cells = ('user', 'sendmessage', 'remove')
_class = ""
+ destination = "friend"
+ remove_action = "unfriend"
def __init__(self, editable = True):
self.editable = editable
@@ -1308,7 +1459,7 @@ class UserList(Templated):
instance of the user with type, container_name, etc. of this
UserList instance"""
return UserTableItem(user, self.type, self.cells, self.container_name,
- self.editable)
+ self.editable, self.remove_action)
@property
def users(self, site = None):
@@ -1394,6 +1545,32 @@ class BannedList(UserList):
def user_ids(self):
return c.site.banned
+class TrafficViewerList(UserList):
+ """Traffic share list on /traffic/*"""
+ destination = "traffic_viewer"
+ remove_action = "rm_traffic_viewer"
+ type = 'traffic'
+
+ def __init__(self, link, editable = True):
+ self.link = link
+ UserList.__init__(self, editable = editable)
+
+ @property
+ def form_title(self):
+ return _('share traffic')
+
+ @property
+ def table_title(self):
+ return _('current viewers')
+
+ def user_ids(self):
+ return promote.traffic_viewers(self.link)
+
+ @property
+ def container_name(self):
+ return self.link._fullname
+
+
class DetailsPage(LinkInfoPage):
extension_handling= False
@@ -1425,41 +1602,66 @@ class PromotePage(Reddit):
create_reddit_box = False
submit_box = False
extension_handling = False
+ searchbox = False
def __init__(self, title, nav_menus = None, *a, **kw):
- buttons = [NamedButton('current_promos', dest = ''),
- NamedButton('new_promo')]
+ buttons = [NamedButton('new_promo')]
+ if c.user_is_admin:
+ buttons.append(NamedButton('current_promos', dest = ''))
+ else:
+ buttons.append(NamedButton('my_current_promos', dest = ''))
- menu = NavMenu(buttons, base_path = '/promote', type='flatlist')
+ buttons += [NamedButton('future_promos'),
+ NamedButton('unpaid_promos'),
+ NamedButton('pending_promos'),
+ NamedButton('live_promos')]
+
+ if c.user_is_sponsor or c.user_is_paid_sponsor:
+ buttons.append(NamedButton('graph'))
+
+ menu = NavMenu(buttons, base_path = '/promoted',
+ type='flatlist')
if nav_menus:
nav_menus.insert(0, menu)
else:
nav_menus = [menu]
+ kw['show_sidebar'] = False
Reddit.__init__(self, title, nav_menus = nav_menus, *a, **kw)
-
-class PromotedLinks(Templated):
- def __init__(self, current_list, *a, **kw):
- self.things = current_list
-
- self.recent = dict(load_summary("thing"))
-
- if self.recent:
- link_listing = wrap_links(self.recent.keys())
- for t in link_listing:
- self.recent[t._fullname].insert(0, t)
-
- self.recent = self.recent.values()
- self.recent.sort(key = lambda x: x[0]._date)
- Templated.__init__(self, datefmt = datefmt, *a, **kw)
-
class PromoteLinkForm(Templated):
def __init__(self, sr = None, link = None, listing = '',
timedeltatext = '', *a, **kw):
+ bids = []
+ if c.user_is_admin and link:
+ try:
+ bids = bidding.Bid.lookup(thing_id = link._id)
+ bids.sort(key = lambda x: x.date, reverse = True)
+ except NotFound:
+ bids = []
+
+ # reference "now" to what we use for promtions
+ now = promote.promo_datetime_now()
+
+ # min date is the day before the first possible start date.
+ mindate = (make_offset_date(now, g.min_promote_future,
+ business_days = True) -
+ datetime.timedelta(1))
+
+ if link:
+ startdate = link._date
+ enddate = link.promote_until
+ else:
+ startdate = mindate + datetime.timedelta(1)
+ enddate = startdate + datetime.timedelta(1)
+
+ self.startdate = startdate.strftime("%m/%d/%Y")
+ self.enddate = enddate .strftime("%m/%d/%Y")
+ self.mindate = mindate .strftime("%m/%d/%Y")
+
Templated.__init__(self, sr = sr, link = link,
- datefmt = datefmt,
+ datefmt = datefmt, bids = bids,
timedeltatext = timedeltatext,
listing = listing,
*a, **kw)
@@ -1528,7 +1730,8 @@ class UserText(CachedTemplate):
display = True,
post_form = 'editusertext',
cloneable = False,
- extra_css = ''):
+ extra_css = '',
+ name = "text"):
css_class = "usertext"
if cloneable:
@@ -1547,7 +1750,8 @@ class UserText(CachedTemplate):
display = display,
post_form = post_form,
cloneable = cloneable,
- css_class = css_class)
+ css_class = css_class,
+ name = name)
class MediaEmbedBody(CachedTemplate):
"""What's rendered inside the iframe that contains media objects"""
@@ -1567,44 +1771,78 @@ class PromotedTraffic(Traffic):
"""
def __init__(self, thing):
self.thing = thing
- d = thing._date.astimezone(g.tz)
+ d = thing._date.astimezone(g.tz) - promote.timezone_offset
d = d.replace(minute = 0, second = 0, microsecond = 0)
-
- until = thing.promote_until
+ until = thing.promote_until - promote.timezone_offset
now = datetime.datetime.now(g.tz)
- if not until:
- until = d + datetime.timedelta(1)
- if until > now:
- until - now
-
+
+ # the results are preliminary until 1 day after the promotion ends
+ self.preliminary = (until + datetime.timedelta(1) > now)
+
self.traffic = load_traffic('hour', "thing", thing._fullname,
start_time = d, stop_time = until)
+ # load monthly totals if we have them, otherwise use the daily totals
self.totals = load_traffic('month', "thing", thing._fullname)
if not self.totals:
self.totals = load_traffic('day', "thing", thing._fullname)
+ # generate a list of
+ # (uniq impressions, # impressions, uniq clicks, # clicks)
if self.totals:
self.totals = map(sum, zip(*zip(*self.totals)[1]))
-
+
imp = self.slice_traffic(self.traffic, 0, 1)
if len(imp) > 2:
- imp_total = locale.format('%d', sum(x[2] for x in imp), True)
+ imp_total = sum(x[2] for x in imp)
+ # ensure total consistency:
+ if self.totals:
+ self.totals[1] = imp_total
+
+ imp_total = locale.format('%d', imp_total, True)
chart = graph.LineGraph(imp)
self.imp_graph = chart.google_chart(ylabels = ['uniques', 'total'],
title = ("impressions (%s)" %
imp_total))
-
+
cli = self.slice_traffic(self.traffic, 2, 3)
- cli_total = locale.format('%d', sum(x[2] for x in cli), True)
+ cli_total = sum(x[2] for x in cli)
+ # ensure total consistency
+ if self.totals:
+ self.totals[3] = cli_total
+ cli_total = locale.format('%d', cli_total, True)
chart = graph.LineGraph(cli)
self.cli_graph = chart.google_chart(ylabels = ['uniques', 'total'],
title = ("clicks (%s)" %
cli_total))
else:
self.imp_graph = self.cli_graph = None
+
+ editable = c.user_is_sponsor or c.user._id == thing.author_id
+ self.viewers = TrafficViewerList(thing, editable = editable)
Templated.__init__(self)
+ def to_iter(self, localize = True, total = False):
+ def num(x):
+ if localize:
+ return locale.format('%d', x, True)
+ return str(x)
+ def row(label, data):
+ uimp, nimp, ucli, ncli = data
+ return (label,
+ num(uimp), num(nimp), num(ucli), num(ncli),
+ ("%.2f%%" % (float(100*ucli) / uimp)) if nimp else "--.--%",
+ ("%.2f%%" % (float(100*ncli) / nimp)) if nimp else "--.--%")
+
+ for date, data in self.traffic:
+ yield row(date.strftime("%Y-%m-%d %H:%M"), data)
+ if total:
+ yield row("total", self.totals)
+
+
+ def as_csv(self):
+ return to_csv(self.to_iter(localize = False, total = True))
+
class RedditTraffic(Traffic):
"""
fetches hourly and daily traffic for the current reddit. If the
@@ -1679,7 +1917,7 @@ class RedditTraffic(Traffic):
d[0] = name
return data
return res
-
+
def monthly_summary(self):
"""
Convenience method b/c it is bad form to do this much math
@@ -1688,31 +1926,235 @@ class RedditTraffic(Traffic):
res = []
if c.default_sr:
data = self.month_data
+
+ # figure out the mean number of users last month,
+ # unless today is the first and there is no data
+ days = self.day_data
+ now = datetime.datetime.utcnow()
+ if now.day != 1:
+ # project based on traffic so far
+ # totals are going to be up to yesterday
+ month_len = calendar.monthrange(now.year, now.month)[1]
+
+ lastmonth = datetime.datetime.utcnow().month
+ lastmonthyear = datetime.datetime.utcnow().year
+ if lastmonth == 1:
+ lastmonthyear -= 1
+ lastmonth = 1
+ else:
+ lastmonth = (lastmonth - 1) if lastmonth != 1 else 12
+ # length of last month
+ lastmonthlen = calendar.monthrange(lastmonthyear, lastmonth)[1]
+
+ lastdays = filter(lambda x: x[0].month == lastmonth, days)
+ thisdays = filter(lambda x: x[0].month == now.month, days)
+ user_scale = 0
+ if lastdays:
+ last_mean = (sum(u for (d, (u, v)) in lastdays) /
+ float(len(lastdays)))
+ day_mean = (sum(u for (d, (u, v)) in thisdays) /
+ float(len(thisdays)))
+ if last_mean and day_mean:
+ user_scale = ( (day_mean * month_len) /
+ (last_mean * lastmonthlen) )
+ last_month_users = 0
for x, (date, d) in enumerate(data):
res.append([("date", date.strftime("%Y-%m")),
("", locale.format("%d", d[0], True)),
("", locale.format("%d", d[1], True))])
last_d = data[x-1][1] if x else None
for i in range(2):
+ # store last month's users for this month's projection
+ if x == len(data) - 2 and i == 0:
+ last_month_users = d[i]
if x == 0:
res[-1].append(("",""))
- elif x == len(data) - 1:
- # project based on traffic so far
- # totals are going to be up to yesterday
- month_len = calendar.monthrange(date.year,
- date.month)[1]
+ # project, unless today is the first of the month
+ elif x == len(data) - 1 and now.day != 1:
+ # yesterday
yday = (datetime.datetime.utcnow()
-datetime.timedelta(1)).day
- scaled = float(d[i] * month_len) / yday
+ if i == 0:
+ scaled = int(last_month_users * user_scale)
+ else:
+ scaled = float(d[i] * month_len) / yday
res[-1].append(("gray",
locale.format("%d", scaled, True)))
elif last_d and d[i] and last_d[i]:
f = 100 * (float(d[i])/last_d[i] - 1)
-
+
res[-1].append(("up" if f > 0 else "down",
"%5.2f%%" % f))
return res
+class PaymentForm(Templated):
+ def __init__(self, **kw):
+ self.countries = pycountry.countries
+ Templated.__init__(self, **kw)
+
+class Promote_Graph(Templated):
+ def __init__(self):
+ self.now = promote.promo_datetime_now()
+ start_date = (self.now - datetime.timedelta(7)).date()
+ end_date = (self.now + datetime.timedelta(7)).date()
+
+ size = (end_date - start_date).days
+
+ # grab promoted links
+ promos = PromoteDates.for_date_range(start_date, end_date)
+ promos.sort(key = lambda x: x.start_date)
+
+ # wrap the links
+ links = wrap_links([p.thing_name for p in promos])
+ # remove rejected/unpaid promos
+ links = dict((l._fullname, l) for l in links.things
+ if (l.promoted is not None and
+ l.promote_status not in ( promote.STATUS.rejected,
+ promote.STATUS.unpaid)) )
+ # filter promos accordingly
+ promos = filter(lambda p: links.has_key(p.thing_name), promos)
+
+ promote_blocks = []
+ market = {}
+ my_market = {}
+ promo_counter = {}
+ for p in promos:
+ starti = max((p.start_date - start_date).days, 0)
+ endi = min((p.end_date - start_date).days, size)
+ link = links[p.thing_name]
+ bid_day = link.promote_bid/max((p.end_date - p.start_date).days, 1)
+ for i in xrange(starti, endi):
+ market[i] = market.get(i, 0) + bid_day
+ if c.user_is_sponsor or link.author_id == c.user._id:
+ my_market[i] = my_market.get(i, 0) + bid_day
+ promo_counter[i] = promo_counter.get(i, 0) + 1
+ if c.user_is_sponsor or link.author_id == c.user._id:
+ promote_blocks.append( (link, starti, endi) )
+
+ # now sort the promoted_blocks into the most contiguous chuncks we can
+ sorted_blocks = []
+ while promote_blocks:
+ cur = promote_blocks.pop(0)
+ while True:
+ sorted_blocks.append(cur)
+ # get the future items (sort will be preserved)
+ future = filter(lambda x: x[1] >= cur[2], promote_blocks)
+ if future:
+ # resort by date and give precidence to longest promo:
+ cur = min(future, key = lambda x: (x[1], x[1]-x[2]))
+ promote_blocks.remove(cur)
+ else:
+ break
+
+ # load recent traffic as well:
+ self.recent = {}
+ for k, v in load_summary("thing"):
+ if k.startswith('t%d_' % Link._type_id):
+ self.recent[k] = v
+
+ if self.recent:
+ link_listing = wrap_links(self.recent.keys())
+ for t in link_listing:
+ self.recent[t._fullname].insert(0, t)
+
+ self.recent = self.recent.values()
+ self.recent.sort(key = lambda x: x[0]._date)
+
+ # graphs of money
+ history = self.now - datetime.timedelta(60)
+ pool = bidding.PromoteDates.bid_history(history)
+ if pool:
+ # we want to generate a stacked line graph, so store the
+ # bids and the total including refunded amounts
+ chart = graph.LineGraph([(d, b, r) for (d, b, r) in pool],
+ colors = ("008800", "FF0000"))
+ total_sale = sum(b for (d, b, r) in pool)
+ total_refund = sum(r for (d, b, r) in pool)
+ self.money_graph = chart.google_chart(
+ ylabels = ['total ($)'],
+ title = ("monthly sales ($%.2f total, $%.2f credits)" %
+ (total_sale, total_refund)),
+ multiy = False)
+
+ self.top_promoters = bidding.PromoteDates.top_promoters(history)
+ else:
+ self.money_graph = None
+ self.top_promoters = []
+
+ # graphs of impressions and clicks
+ self.promo_traffic = load_traffic('day', 'promos')
+ impressions = [(d, i) for (d, (i, k)) in self.promo_traffic]
+
+ pool = dict((d, b+r) for (d, b, r) in pool)
+
+ if impressions:
+ chart = graph.LineGraph(impressions)
+ self.imp_graph = chart.google_chart(ylabels = ['total'],
+ title = "impressions")
+
+ clicks = [(d, k) for (d, (i, k)) in self.promo_traffic]
+
+ CPM = [(d, (pool.get(d, 0) * 1000. / i) if i else 0)
+ for (d, (i, k)) in self.promo_traffic]
+
+ CPC = [(d, (100 * pool.get(d, 0) / k) if k else 0)
+ for (d, (i, k)) in self.promo_traffic]
+
+ CTR = [(d, (100 * float(k) / i if i else 0))
+ for (d, (i, k)) in self.promo_traffic]
+
+ chart = graph.LineGraph(clicks)
+ self.cli_graph = chart.google_chart(ylabels = ['total'],
+ title = "clicks")
+
+ mean_CPM = sum(x[1] for x in CPM) * 1. / max(len(CPM), 1)
+ chart = graph.LineGraph([(d, min(x, mean_CPM*2)) for d, x in CPM],
+ colors = ["336699"])
+ self.cpm_graph = chart.google_chart(ylabels = ['CPM ($)'],
+ title = "cost per 1k impressions " +
+ "($%.2f average)" % mean_CPM)
+
+ mean_CPC = sum(x[1] for x in CPC) * 1. / max(len(CPC), 1)
+ chart = graph.LineGraph([(d, min(x, mean_CPC*2)) for d, x in CPC],
+ colors = ["336699"])
+ self.cpc_graph = chart.google_chart(ylabels = ['CPC ($0.01)'],
+ title = "cost per click " +
+ "($%.2f average)" % (mean_CPC/100.))
+
+ chart = graph.LineGraph(CTR, colors = ["336699"])
+ self.ctr_graph = chart.google_chart(ylabels = ['CTR (%)'],
+ title = "click through rate")
+
+ else:
+ self.imp_graph = self.cli_graph = None
+ self.cpc_graph = self.cpm_graph = None
+ self.ctr_graph = None
+
+ self.promo_traffic = dict(self.promo_traffic)
+
+ Templated.__init__(self,
+ total_size = size,
+ market = market,
+ my_market = my_market,
+ promo_counter = promo_counter,
+ start_date = start_date,
+ promote_blocks = sorted_blocks)
+
+ def to_iter(self, localize = True):
+ def num(x):
+ if localize:
+ return locale.format('%d', x, True)
+ return str(x)
+ for link, uimp, nimp, ucli, ncli in self.recent:
+ yield (link._date.strftime("%Y-%m-%d"),
+ num(uimp), num(nimp), num(ucli), num(ncli),
+ num(link._ups - link._downs),
+ "$%.2f" % link.promote_bid,
+ _force_unicode(link.title))
+
+ def as_csv(self):
+ return to_csv(self.to_iter(localize = False))
+
class InnerToolbarFrame(Templated):
def __init__(self, link, expanded = False):
Templated.__init__(self, link = link, expanded = expanded)
@@ -1723,3 +2165,10 @@ class RawString(Templated):
def render(self, *a, **kw):
return unsafe(self.s)
+
+class Dart_Ad(Templated):
+ def __init__(self, tag = None):
+ tag = tag or "homepage"
+ tracker_url = AdframeInfo.gen_url(fullname = "dart_" + tag,
+ ip = request.ip)
+ Templated.__init__(self, tag = tag, tracker_url = tracker_url)
diff --git a/r2/r2/lib/pages/things.py b/r2/r2/lib/pages/things.py
index 5784ebd45..42013bdfe 100644
--- a/r2/r2/lib/pages/things.py
+++ b/r2/r2/lib/pages/things.py
@@ -24,7 +24,9 @@ from r2.lib.wrapped import Wrapped
from r2.models import LinkListing, make_wrapper, Link, IDBuilder, PromotedLink, Thing
from r2.lib.utils import tup
from r2.lib.strings import Score
-from pylons import c
+from r2.lib.promote import promo_edit_url, promo_traffic_url
+from datetime import datetime
+from pylons import c, g
class PrintableButtons(Styled):
def __init__(self, style, thing,
@@ -61,6 +63,18 @@ class LinkButtons(PrintableButtons):
show_distinguish = (is_author and thing.can_ban
and getattr(thing, "expand_children", False))
+ kw = {}
+ if thing.promoted is not None:
+ now = datetime.now(g.tz)
+ promotable = (thing._date <= now and thing.promote_until > now)
+ kw = dict(promo_url = promo_edit_url(thing),
+ promote_bid = thing.promote_bid,
+ promote_status = getattr(thing, "promote_status", 0),
+ user_is_sponsor = c.user_is_sponsor,
+ promotable = promotable,
+ traffic_url = promo_traffic_url(thing),
+ is_author = thing.is_author)
+
PrintableButtons.__init__(self, 'linkbuttons', thing,
# user existence and preferences
is_loggedin = c.user_is_loggedin,
@@ -76,7 +90,10 @@ class LinkButtons(PrintableButtons):
show_delete = show_delete,
show_report = show_report,
show_distinguish = show_distinguish,
- show_comments = comments)
+ show_comments = comments,
+ # promotion
+ promoted = thing.promoted,
+ **kw)
class CommentButtons(PrintableButtons):
def __init__(self, thing, delete = True, report = True):
@@ -105,12 +122,13 @@ class MessageButtons(PrintableButtons):
def __init__(self, thing, delete = False, report = True):
was_comment = getattr(thing, 'was_comment', False)
permalink = thing.permalink if was_comment else ""
-
+
PrintableButtons.__init__(self, "messagebuttons", thing,
profilepage = c.profilepage,
permalink = permalink,
- was_comment = was_comment,
+ was_comment = was_comment,
can_reply = c.user_is_loggedin,
+ parent_id = getattr(thing, "parent_id", None),
show_report = True,
show_delete = False)
@@ -120,7 +138,7 @@ def default_thing_wrapper(**params):
w = Wrapped(thing)
style = params.get('style', c.render_style)
if isinstance(thing, Link):
- if thing.promoted:
+ if thing.promoted is not None:
w.render_class = PromotedLink
w.rowstyle = 'promoted link'
elif style == 'htmllite':
diff --git a/r2/r2/lib/promote.py b/r2/r2/lib/promote.py
index 90738ea2a..aea5a463b 100644
--- a/r2/r2/lib/promote.py
+++ b/r2/r2/lib/promote.py
@@ -22,50 +22,426 @@
from __future__ import with_statement
from r2.models import *
+from r2.lib import authorize
+from r2.lib import emailer, filters
from r2.lib.memoize import memoize
-
-from datetime import datetime
+from r2.lib.template_helpers import get_domain
+from r2.lib.utils import Enum
+from pylons import g, c
+from datetime import datetime, timedelta
+import random
promoted_memo_lifetime = 30
-promoted_memo_key = 'cached_promoted_links'
-promoted_lock_key = 'cached_promoted_links_lock'
+promoted_memo_key = 'cached_promoted_links2'
+promoted_lock_key = 'cached_promoted_links_lock2'
-def promote(thing, subscribers_only = False, promote_until = None,
- disable_comments = False):
+STATUS = Enum("unpaid", "unseen", "accepted", "rejected",
+ "pending", "promoted", "finished")
- thing.promoted = True
- thing.promoted_on = datetime.now(g.tz)
+PromoteSR = 'promos'
+try:
+ PromoteSR = Subreddit._new(name = PromoteSR,
+ title = "promoted links",
+ author_id = -1,
+ type = "public",
+ ip = '0.0.0.0')
+except SubredditExists:
+ PromoteSR = Subreddit._by_name(PromoteSR)
- if c.user:
- thing.promoted_by = c.user._id
+def promo_traffic_url(l):
+ domain = get_domain(cname = False, subreddit = False)
+ return "http://%s/traffic/%s/" % (domain, l._id36)
- if promote_until:
- thing.promote_until = promote_until
+def promo_edit_url(l):
+ domain = get_domain(cname = False, subreddit = False)
+ return "http://%s/promoted/edit_promo/%s" % (domain, l._id36)
- if disable_comments:
- thing.disable_comments = True
+# These could be done with relationships, but that seeks overkill as
+# we never query based on user and only check per-thing
+def is_traffic_viewer(thing, user):
+ return (c.user_is_sponsor or user._id == thing.author_id or
+ user._id in getattr(thing, "promo_traffic_viewers", set()))
- if subscribers_only:
- thing.promoted_subscribersonly = True
+def add_traffic_viewer(thing, user):
+ viewers = getattr(thing, "promo_traffic_viewers", set()).copy()
+ if user._id not in viewers:
+ viewers.add(user._id)
+ thing.promo_traffic_viewers = viewers
+ thing._commit()
+ return True
+ return False
+def rm_traffic_viewer(thing, user):
+ viewers = getattr(thing, "promo_traffic_viewers", set()).copy()
+ if user._id in viewers:
+ viewers.remove(user._id)
+ thing.promo_traffic_viewers = viewers
+ thing._commit()
+ return True
+ return False
+
+def traffic_viewers(thing):
+ return sorted(getattr(thing, "promo_traffic_viewers", set()))
+
+# logging routine for keeping track of diffs
+def promotion_log(thing, text, commit = False):
+ """
+ For logging all sorts of things
+ """
+ name = c.user.name if c.user_is_loggedin else ""
+ log = list(getattr(thing, "promotion_log", []))
+ now = datetime.now(g.tz).strftime("%Y-%m-%d %H:%M:%S")
+ text = "[%s: %s] %s" % (name, now, text)
+ log.append(text)
+ # copy (and fix encoding) to make _dirty
+ thing.promotion_log = map(filters._force_utf8, log)
+ if commit:
+ thing._commit()
+ return text
+
+def new_promotion(title, url, user, ip, promote_start, promote_until, bid,
+ disable_comments = False,
+ max_clicks = None, max_views = None):
+ """
+ Creates a new promotion with the provided title, etc, and sets it
+ status to be 'unpaid'.
+ """
+ l = Link._submit(title, url, user, PromoteSR, ip)
+ l.promoted = True
+ l.promote_until = None
+ l.promote_status = STATUS.unpaid
+ l.promote_trans_id = 0
+ l.promote_bid = bid
+ l.maximum_clicks = max_clicks
+ l.maximum_views = max_views
+ l.disable_comments = disable_comments
+ update_promo_dates(l, promote_start, promote_until)
+ promotion_log(l, "promotion created")
+ l._commit()
+ # the user has posted a promotion, so enable the promote menu unless
+ # they have already opted out
+ if user.pref_show_promote is not False:
+ user.pref_show_promote = True
+ user._commit()
+ emailer.new_promo(l)
+ return l
+
+def update_promo_dates(thing, start_date, end_date, commit = True):
+ if thing and thing.promote_status < STATUS.pending or c.user_is_admin:
+ if (thing._date != start_date or
+ thing.promote_until != end_date):
+ promotion_log(thing, "duration updated (was %s -> %s)" %
+ (thing._date, thing.promote_until))
+ thing._date = start_date
+ thing.promote_until = end_date
+ PromoteDates.update(thing, start_date, end_date)
+ if commit:
+ thing._commit()
+ return True
+ return False
+
+def update_promo_data(thing, title, url, commit = True):
+ if thing and (thing.url != url or thing.title != title):
+ if thing.title != title:
+ promotion_log(thing, "title updated (was '%s')" %
+ thing.title)
+ if thing.url != url:
+ promotion_log(thing, "url updated (was '%s')" %
+ thing.url)
+ old_url = thing.url
+ thing.url = url
+ thing.title = title
+ if not c.user_is_sponsor:
+ unapproved_promo(thing)
+ thing.update_url_cache(old_url)
+ if commit:
+ thing._commit()
+ return True
+ return False
+
+def refund_promo(thing, user, refund):
+ cur_refund = getattr(thing, "promo_refund", 0)
+ refund = min(refund, thing.promote_bid - cur_refund)
+ if refund > 0:
+ thing.promo_refund = cur_refund + refund
+ if authorize.refund_transaction(refund, user, thing.promote_trans_id):
+ promotion_log(thing, "payment update: refunded '%.2f'" % refund)
+ else:
+ promotion_log(thing, "payment update: refund failed")
+ if thing.promote_status in (STATUS.promoted, STATUS.finished):
+ PromoteDates.update_bid(thing)
+ thing._commit()
+
+def auth_paid_promo(thing, user, pay_id, bid):
+ """
+ promotes a promotion from 'unpaid' to 'unseen'.
+
+ In the case that bid already exists on the current promotion, the
+ previous transaction is voided and repalced with the new bid.
+ """
+ if thing.promote_status == STATUS.finished:
+ return
+ elif (thing.promote_status > STATUS.unpaid and
+ thing.promote_trans_id):
+ # void the existing transaction
+ authorize.void_transaction(user, thing.promote_trans_id)
+
+ # create a new transaction and update the bid
+ trans_id = authorize.auth_transaction(bid, user, pay_id, thing)
+ thing.promote_bid = bid
+
+ if trans_id is not None:
+ # we won't reset to unseen if already approved and the payment went ok
+ promotion_log(thing, "updated payment and/or bid: SUCCESS")
+ if trans_id < 0:
+ promotion_log(thing, "FREEBIE")
+ thing.promote_status = max(thing.promote_status, STATUS.unseen)
+ thing.promote_trans_id = trans_id
+ else:
+ # something bad happend.
+ promotion_log(thing, "updated payment and/or bid: FAILED")
+ thing.promore_status = STATUS.unpaid
+ thing.promote_trans_id = 0
+ PromoteDates.update_bid(thing)
+ # commit last to guarantee consistency
thing._commit()
+ emailer.promo_bid(thing)
+ return bool(trans_id)
- with g.make_lock(promoted_lock_key):
- promoted = get_promoted_direct()
- promoted.append(thing._fullname)
- set_promoted(promoted)
+
+def unapproved_promo(thing):
+ """
+ revert status of a promoted link to unseen.
-def unpromote(thing):
+ NOTE: if the promotion is live, this has the side effect of
+ bumping it from the live queue pending an admin's intervention to
+ put it back in place.
+ """
+ # only reinforce pending if it hasn't been seen yet.
+ if STATUS.unseen < thing.promote_status < STATUS.finished:
+ promotion_log(thing, "status update: unapproved")
+ unpromote(thing, status = STATUS.unseen)
+
+def accept_promo(thing):
+ """
+ Accept promotion and set its status as accepted if not already
+ charged, else pending.
+ """
+ if thing.promote_status < STATUS.pending:
+ bid = Bid.one(thing.promote_trans_id)
+ if bid.status == Bid.STATUS.CHARGE:
+ thing.promote_status = STATUS.pending
+ # repromote if already promoted before
+ if hasattr(thing, "promoted_on"):
+ promote(thing)
+ else:
+ emailer.queue_promo(thing)
+ else:
+ thing.promote_status = STATUS.accepted
+ promotion_log(thing, "status update: accepted")
+ emailer.accept_promo(thing)
+ thing._commit()
+
+def reject_promo(thing, reason = ""):
+ """
+ Reject promotion and set its status as rejected
+
+ Here, we use unpromote so that we can also remove a promotion from
+ the queue if it has become promoted.
+ """
+ unpromote(thing, status = STATUS.rejected)
+ promotion_log(thing, "status update: rejected. Reason: '%s'" % reason)
+ emailer.reject_promo(thing, reason)
+
+def delete_promo(thing):
+ """
+ deleted promotions have to be specially dealt with. Reject the
+ promo and void any associated transactions.
+ """
thing.promoted = False
- thing.unpromoted_on = datetime.now(g.tz)
- thing.promote_until = None
+ thing._deleted = True
+ reject_promo(thing, reason = "The promotion was deleted by the user")
+ if thing.promote_trans_id > 0:
+ user = Account._byID(thing.author_id)
+ authorize.void_transaction(user, thing.promote_trans_id)
+
+
+
+def pending_promo(thing):
+ """
+ For an accepted promotion within the proper time interval, charge
+ the account of the user and set the new status as pending.
+ """
+ if thing.promote_status == STATUS.accepted and thing.promote_trans_id:
+ user = Account._byID(thing.author_id)
+ # TODO: check for charge failures/recharges, etc
+ if authorize.charge_transaction(user, thing.promote_trans_id):
+ promotion_log(thing, "status update: pending")
+ thing.promote_status = STATUS.pending
+ thing.promote_paid = thing.promote_bid
+ thing._commit()
+ emailer.queue_promo(thing)
+ else:
+ promotion_log(thing, "status update: charge failure")
+ thing._commit()
+ #TODO: email rejection?
+
+
+
+def promote(thing, batch = False):
+ """
+ Given a promotion with pending status, set the status to promoted
+ and move it into the promoted queue.
+ """
+ if thing.promote_status == STATUS.pending:
+ promotion_log(thing, "status update: live")
+ PromoteDates.log_start(thing)
+ thing.promoted_on = datetime.now(g.tz)
+ thing.promote_status = STATUS.promoted
+ thing._commit()
+ emailer.live_promo(thing)
+ if not batch:
+ with g.make_lock(promoted_lock_key):
+ promoted = get_promoted_direct()
+ if thing._fullname not in promoted:
+ promoted[thing._fullname] = auction_weight(thing)
+ set_promoted(promoted)
+
+def unpromote(thing, batch = False, status = STATUS.finished):
+ """
+ unpromote a link with provided status, removing it from the
+ current promotional queue.
+ """
+ if status == STATUS.finished:
+ PromoteDates.log_end(thing)
+ emailer.finished_promo(thing)
+ thing.unpromoted_on = datetime.now(g.tz)
+ promotion_log(thing, "status update: finished")
+ thing.promote_status = status
thing._commit()
+ if not batch:
+ with g.make_lock(promoted_lock_key):
+ promoted = get_promoted_direct()
+ if thing._fullname in promoted:
+ del promoted[thing._fullname]
+ set_promoted(promoted)
+# batch methods for moving promotions into the pending queue, and
+# setting status as pending.
+
+# dates are referenced to UTC, while we want promos to change at (roughly)
+# midnight eastern-US.
+# TODO: make this a config parameter
+timezone_offset = -5 # hours
+timezone_offset = timedelta(0, timezone_offset * 3600)
+
+def promo_datetime_now():
+ return datetime.now(g.tz) + timezone_offset
+
+def generate_pending(date = None, test = False):
+ """
+ Look-up links that are to be promoted on the provided date (the
+ default is now plus one day) and set their status as pending if
+ they have been accepted. This results in credit cards being charged.
+ """
+ date = date or (promo_datetime_now() + timedelta(1))
+ links = Link._by_fullname([p.thing_name for p in
+ PromoteDates.for_date(date)],
+ data = True,
+ return_dict = False)
+ for l in links:
+ if l._deleted and l.promote_status != STATUS.rejected:
+ print "DELETING PROMO", l
+ # deleted promos should never be made pending
+ delete_promo(l)
+ elif l.promote_status == STATUS.accepted:
+ if test:
+ print "Would have made pending: (%s, %s)" % \
+ (l, l.make_permalink(None))
+ else:
+ pending_promo(l)
+
+
+def promote_promoted(test = False):
+ """
+ make promotions that are no longer supposed to be active
+ 'finished' and find all pending promotions that are supposed to be
+ promoted and promote them.
+ """
+ from r2.lib.traffic import load_traffic
with g.make_lock(promoted_lock_key):
- promoted = [ x for x in get_promoted_direct()
- if x != thing._fullname ]
+ now = promo_datetime_now()
- set_promoted(promoted)
+ promoted = Link._by_fullname(get_promoted_direct().keys(),
+ data = True, return_dict = False)
+ promos = {}
+ for l in promoted:
+ keep = True
+ if l.promote_until < now:
+ keep = False
+ maximum_clicks = getattr(l, "maximum_clicks", None)
+ maximum_views = getattr(l, "maximum_views", None)
+ if maximum_clicks or maximum_views:
+ # grab the traffic
+ traffic = load_traffic("day", "thing", l._fullname)
+ if traffic:
+ # (unique impressions, number impressions,
+ # unique clicks, number of clicks)
+ traffic = [y for x, y in traffic]
+ traffic = map(sum, zip(*traffic))
+ uimp, nimp, ucli, ncli = traffic
+ if maximum_clicks and maximum_clicks < ncli:
+ keep = False
+ if maximum_views and maximum_views < nimp:
+ keep = False
+
+ if not keep:
+ if test:
+ print "Would have unpromoted: (%s, %s)" % \
+ (l, l.make_permalink(None))
+ else:
+ unpromote(l, batch = True)
+
+ new_promos = Link._query(Link.c.promote_status == (STATUS.pending,
+ STATUS.promoted),
+ Link.c.promoted == True,
+ data = True)
+ for l in new_promos:
+ if l.promote_until > now and l._date <= now:
+ if test:
+ print "Would have promoted: %s" % l
+ else:
+ promote(l, batch = True)
+ promos[l._fullname] = auction_weight(l)
+ elif l.promote_until <= now:
+ if test:
+ print "Would have unpromoted: (%s, %s)" % \
+ (l, l.make_permalink(None))
+ else:
+ unpromote(l, batch = True)
+
+ # remove unpaid promos that are scheduled to run on today or before
+ unpaid_promos = Link._query(Link.c.promoted == True,
+ Link.c.promote_status == STATUS.unpaid,
+ Link.c._date < now,
+ Link.c._deleted == False,
+ data = True)
+ for l in unpaid_promos:
+ if test:
+ print "Would have rejected: %s" % promo_edit_url(l)
+ else:
+ reject_promo(l, reason = "We're sorry, but this sponsored link was not set up for payment before the appointed date. Please add payment info and move the date into the future if you would like to resubmit. Also please feel free to email us at selfservicesupport@reddit.com if you believe this email is in error.")
+
+
+ if test:
+ print promos
+ else:
+ set_promoted(promos)
+ return promos
+
+def auction_weight(link):
+ duration = (link.promote_until - link._date).days
+ return duration and link.promote_bid / duration
def set_promoted(link_names):
# caller is assumed to execute me inside a lock if necessary
@@ -81,55 +457,60 @@ def get_promoted():
return get_promoted_direct()
def get_promoted_direct():
- return g.permacache.get(promoted_memo_key, [])
+ return g.permacache.get(promoted_memo_key, {})
-def expire_promoted():
- """
- To be called periodically (e.g. by `cron') to clean up
- promoted links past their expiration date
- """
- with g.make_lock(promoted_lock_key):
- link_names = set(get_promoted_direct())
- links = Link._by_fullname(link_names, data=True, return_dict = False)
-
- link_names = []
- expired_names = []
-
- for x in links:
- if (not x.promoted
- or x.promote_until and x.promote_until < datetime.now(g.tz)):
- g.log.info('Unpromoting %s' % x._fullname)
- unpromote(x)
- expired_names.append(x._fullname)
- else:
- link_names.append(x._fullname)
-
- set_promoted(link_names)
-
- return expired_names
def get_promoted_slow():
# to be used only by a human at a terminal
with g.make_lock(promoted_lock_key):
- links = Link._query(Link.c.promoted == True,
+ links = Link._query(Link.c.promote_status == STATUS.promoted,
+ Link.c.promoted == True,
data = True)
- link_names = [ x._fullname for x in links ]
+ link_names = dict((x._fullname, auction_weight(x)) for x in links)
set_promoted(link_names)
return link_names
-#deprecated
-def promote_builder_wrapper(alternative_wrapper):
- def wrapper(thing):
- if isinstance(thing, Link) and thing.promoted:
- w = Wrapped(thing)
- w.render_class = PromotedLink
- w.rowstyle = 'promoted link'
- return w
- else:
- return alternative_wrapper(thing)
- return wrapper
+def random_promoted():
+ """
+ return a list of the currently promoted items, randomly choosing
+ the order of the list based on the bid-weighing.
+ """
+ bids = get_promoted()
+ market = sum(bids.values())
+ if market:
+ # get a list of current promotions, sorted by their bid amount
+ promo_list = bids.keys()
+ # sort by bids and use the thing_id as the tie breaker (for
+ # consistent sorting)
+ promo_list.sort(key = lambda x: (bids[x], x), reverse = True)
+ if len(bids) > 1:
+ # pick a number, any number
+ n = random.uniform(0, 1)
+ for i, p in enumerate(promo_list):
+ n -= bids[p] / market
+ if n < 0:
+ return promo_list[i:] + promo_list[:i]
+ return promo_list
+def test_random_promoted(n = 1000):
+ promos = get_promoted()
+ market = sum(promos.values())
+ if market:
+ res = {}
+ for i in xrange(n):
+ key = random_promoted()[0]
+ res[key] = res.get(key, 0) + 1
+
+ print "%10s expected actual E/A" % "thing"
+ print "------------------------------------"
+ for k, v in promos.iteritems():
+ expected = float(v) / market * 100
+ actual = float(res.get(k, 0)) / n * 100
+
+ print "%10s %6.2f%% %6.2f%% %6.2f" % \
+ (k, expected, actual, expected / actual if actual else 0)
+
diff --git a/r2/r2/lib/services.py b/r2/r2/lib/services.py
index cf429a1fe..7476d3b39 100644
--- a/r2/r2/lib/services.py
+++ b/r2/r2/lib/services.py
@@ -36,7 +36,7 @@ class ShellProcess(object):
self.proc = subprocess.Popen(cmd, shell = True,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
-
+
ntries = int(math.ceil(timeout / sleepcycle))
for n in xrange(ntries):
if self.proc.poll() is not None:
@@ -45,7 +45,7 @@ class ShellProcess(object):
else:
print "Process timeout: '%s'" % cmd
os.kill(self.proc.pid, signal.SIGTERM)
-
+
self.output, self.error = self.proc.communicate()
self.rcode = self.proc.poll()
@@ -56,8 +56,8 @@ class ShellProcess(object):
def read(self):
return self.output
-
-
+
+
class AppServiceMonitor(Templated):
cache_key = "service_datalogger_data_"
cache_key_small = "service_datalogger_db_summary_"
@@ -76,7 +76,7 @@ class AppServiceMonitor(Templated):
"""
- def __init__(self, hosts = None):
+ def __init__(self, hosts = None, queue_length_max = {}):
"""
hosts is a list of machine hostnames to be tracked.
"""
@@ -87,7 +87,7 @@ class AppServiceMonitor(Templated):
dbase, ip = list(g.to_iter(getattr(g, db + "_db")))[:2]
try:
name = socket.gethostbyaddr(ip)[0]
-
+
for host in g.monitored_servers:
if (name == host or
("." in host and name.endswith("." + host)) or
@@ -97,6 +97,13 @@ class AppServiceMonitor(Templated):
print "error resolving host: %s" % ip
self._db_info = db_info
+ q_host = g.amqp_host.split(':')[0]
+ if q_host:
+ # list of machines that have amqp queues
+ self._queue_hosts = set([q_host, socket.gethostbyaddr(q_host)[0]])
+ # dictionary of max lengths for each queue
+ self._queue_length_max = queue_length_max
+
self.hostlogs = []
Templated.__init__(self)
@@ -135,7 +142,7 @@ class AppServiceMonitor(Templated):
def server_load(self, mach_name):
h = self.from_cache(host)
return h.load.most_recent()
-
+
def __iter__(self):
if not self.hostlogs:
self.hostlogs = [self.from_cache(host) for host in self._hosts]
@@ -152,13 +159,16 @@ class AppServiceMonitor(Templated):
h = HostLogger(host, self)
while True:
h.monitor(srvname, *a, **kw)
-
+
self.set_cache(h)
if loop:
time.sleep(loop_time)
else:
break
-
+
+ def is_queue(self, host):
+ name = socket.gethostbyaddr(host)[0]
+ return name in self._queue_hosts or host in self._queue_hosts
def is_db_machine(self, host):
"""
@@ -177,7 +187,7 @@ class DataLogger(object):
of the interval provided or returns the last element if no
interval is provided
"""
-
+
def __init__(self, maxlen = 30):
self._list = []
self.maxlen = maxlen
@@ -186,7 +196,6 @@ class DataLogger(object):
self._list.append((value, datetime.utcnow()))
if len(self._list) > self.maxlen:
self._list = self._list[-self.maxlen:]
-
def __call__(self, average = None):
time = datetime.utcnow()
@@ -208,7 +217,6 @@ class DataLogger(object):
else:
return [0, None]
-
class Service(object):
def __init__(self, name, pid, age):
self.name = name
@@ -221,6 +229,29 @@ class Service(object):
def last_update(self):
return max(x.most_recent()[1] for x in [self.mem, self.cpu])
+class AMQueueP(object):
+
+ default_max_queue = 1000
+
+ def __init__(self, max_lengths = {}):
+ self.queues = {}
+ self.max_lengths = max_lengths
+
+ def track(self, cmd = "rabbitmqctl"):
+ for line in ShellProcess("%s list_queues" % cmd):
+ try:
+ name, length = line.split('\t')
+ length = int(length.strip(' \n'))
+ self.queues.setdefault(name, DataLogger()).add(length)
+ except ValueError:
+ continue
+
+ def max_length(self, name):
+ return self.max_lengths.get(name, self.default_max_queue)
+
+ def __iter__(self):
+ for x in sorted(self.queues.keys()):
+ yield (x, self.queues[x])
class Database(object):
@@ -277,12 +308,14 @@ class HostLogger(object):
self.load = DataLogger()
self.services = {}
db_info = master.is_db_machine(host)
+ is_queue = master.is_queue(host)
self.ini_db_names = db_info.keys()
self.db_names = set(name for name, ip in db_info.itervalues())
self.db_ips = set(ip for name, ip in db_info.itervalues())
-
+
self.database = Database() if self.db_names else None
+ self.queue = AMQueueP(master._queue_length_max) if is_queue else None
self.ncpu = 0
try:
@@ -320,7 +353,8 @@ class HostLogger(object):
def monitor(self, srvname,
- srv_params = {}, top_params = {}, db_params = {}):
+ srv_params = {}, top_params = {}, db_params = {},
+ queue_params = {}):
# (re)populate the service listing
if srvname:
for name, status, pid, t in supervise_list(**srv_params):
@@ -338,6 +372,9 @@ class HostLogger(object):
self.database.track(**check_database(self.db_names,
**db_params))
+ if self.queue:
+ self.queue.track(**queue_params)
+
foo = ShellProcess('/usr/bin/env uptime').read()
foo = foo.split("load average")[1].split(':')[1].strip(' ')
self.load.add(float(foo.split(' ')[0].strip(',')))
@@ -542,6 +579,4 @@ def monitor_cache_lifetime(minutes, retest = 10, ntest = -1,
if [] in keys:
keys = filter(None, keys)
ntest -= 1
-
-
-
+
diff --git a/r2/r2/lib/solrsearch.py b/r2/r2/lib/solrsearch.py
index a6f0d750b..84d2bbe54 100644
--- a/r2/r2/lib/solrsearch.py
+++ b/r2/r2/lib/solrsearch.py
@@ -21,25 +21,28 @@
################################################################################
"""
Module for communication reddit-level communication with
- Solr. Contains functions for indexing (`reindex_all`, `changed`)
+ Solr. Contains functions for indexing (`reindex_all`, `run_changed`)
and searching (`search_things`). Uses pysolr (placed in r2.lib)
for lower-level communication with Solr
"""
from __future__ import with_statement
-from r2.models import *
-from r2.lib.contrib import pysolr
-from r2.lib.contrib.pysolr import SolrError
-from r2.lib.utils import timeago, set_emptying_cache, IteratorChunker
-from r2.lib.utils import psave, pload, unicode_safe, tup
-from r2.lib.cache import SelfEmptyingCache
from Queue import Queue
from threading import Thread
import time
from datetime import datetime, date
from time import strftime
-from pylons import g,config
+
+from pylons import g, config
+
+from r2.models import *
+from r2.lib.contrib import pysolr
+from r2.lib.contrib.pysolr import SolrError
+from r2.lib.utils import timeago
+from r2.lib.utils import unicode_safe, tup
+from r2.lib.cache import SelfEmptyingCache
+from r2.lib import amqp
## Changes to the list of searchable languages will require changes to
## Solr's configuration (specifically, the fields that are searched)
@@ -49,7 +52,8 @@ searchable_langs = set(['dk','nl','en','fi','fr','de','it','no','nn','pt',
## Adding types is a matter of adding the class to indexed_types here,
## adding the fields from that type to search_fields below, and adding
## those fields to Solr's configuration
-indexed_types = (Subreddit, Link)
+indexed_types = (Subreddit, Link)
+
class Field(object):
"""
@@ -402,42 +406,6 @@ def reindex_all(types = None, delete_all_first=False):
q.put(e,timeout=30)
raise e
-def changed(commit=True,optimize=False,delete_old=True):
- """
- Run by `cron` (through `paster run`) on a schedule to update
- all Things that have been created or have changed since the
- last run. Things add themselves to a `thing_changes` table,
- which we read, find the Things, tokenise, and re-submit them
- to Solr
- """
- set_emptying_cache()
- with SolrConnection(commit=commit,optimize=optimize) as s:
- changes = thing_changes.get_changed()
- if changes:
- max_date = max(x[1] for x in changes)
- changed = IteratorChunker(x[0] for x in changes)
-
- while not changed.done:
- chunk = changed.next_chunk(200)
-
- # chunk =:= [(Fullname,Date) | ...]
- chunk = Thing._by_fullname(chunk,
- data=True, return_dict=False)
- chunk = [x for x in chunk if not x._spam and not x._deleted]
- to_delete = [x for x in chunk if x._spam or x._deleted]
-
- # note: anything marked as spam or deleted is not
- # updated in the search database. Since these are
- # filtered out in the UI, that's probably fine.
- if len(chunk) > 0:
- chunk = tokenize_things(chunk)
- s.add(chunk)
-
- for i in to_delete:
- s.delete(id=i._fullname)
-
- if delete_old:
- thing_changes.clear_changes(max_date = max_date)
def combine_searchterms(terms):
"""
@@ -728,3 +696,38 @@ def get_after(fullnames, fullname, num):
return fullnames[i+1:i+num+1]
else:
return fullnames[:num]
+
+
+def run_commit(optimize=False):
+ with SolrConnection(commit=True, optimize=optimize) as s:
+ pass
+
+
+def run_changed(drain=False):
+ """
+ Run by `cron` (through `paster run`) on a schedule to update
+ all Things that have been created or have changed since the
+ last run. Note: unlike many queue-using functions, this one is
+ run from cron and totally drains the queue before terminating
+ """
+
+ def _run_changed(msgs):
+ print "changed: Processing %d items" % len(msgs)
+
+ fullnames = set([x.body for x in msgs])
+ things = Thing._by_fullname(fullnames, data=True, return_dict=False)
+ things = [x for x in things if isinstance(x, indexed_types)]
+
+ update_things = [x for x in things if not x._spam and not x._deleted]
+ delete_things = [x for x in things if x._spam or x._deleted]
+
+ with SolrConnection() as s:
+ if update_things:
+ tokenized = tokenize_things(update_things)
+ s.add(tokenized)
+ if delete_things:
+ for i in delete_things:
+ s.delete(id=i._fullname)
+
+ amqp.handle_items('searchchanges_q', _run_changed, limit=1000,
+ drain=drain)
diff --git a/r2/r2/lib/spreadshirt.py b/r2/r2/lib/spreadshirt.py
index 2687dfa4c..946c4c0a3 100644
--- a/r2/r2/lib/spreadshirt.py
+++ b/r2/r2/lib/spreadshirt.py
@@ -125,7 +125,7 @@ class ShirtPage(LinkInfoPage):
ShirtPane(self.link)))
class ShirtPane(Templated):
- default_color = "white"
+ default_color = "black"
default_size = "large"
default_style = "men"
diff --git a/r2/r2/lib/strings.py b/r2/r2/lib/strings.py
index 8e4046136..d17a48a9d 100644
--- a/r2/r2/lib/strings.py
+++ b/r2/r2/lib/strings.py
@@ -30,7 +30,7 @@ hooks to the UI are the same.
import helpers as h
from pylons import g
from pylons.i18n import _, ungettext
-import random
+import random, locale
__all__ = ['StringHandler', 'strings', 'PluralManager', 'plurals',
'Score', 'rand_strings']
@@ -58,7 +58,7 @@ string_dict = dict(
float_label = _("%(num)5.3f %(thing)s"),
# this is for Japanese which treats people counds differently
- person_label = _("%(num)d %(persons)s"),
+ person_label = _('%(num)s %(persons)s'),
firsttext = _("reddit is a source for what's new and popular online. vote on links that you like or dislike and help decide what's popular, or submit your own!"),
@@ -79,14 +79,16 @@ string_dict = dict(
friend = None,
moderator = _("you have been added as a moderator to [%(title)s](%(url)s)."),
contributor = _("you have been added as a contributor to [%(title)s](%(url)s)."),
- banned = _("you have been banned from posting to [%(title)s](%(url)s).")
+ banned = _("you have been banned from posting to [%(title)s](%(url)s)."),
+ traffic = _('you have been added to the list of users able to see [traffic for the sponsoted link "%(title)s"](%(traffic_url)s).')
),
subj_add_friend = dict(
friend = None,
moderator = _("you are a moderator"),
contributor = _("you are a contributor"),
- banned = _("you've been banned")
+ banned = _("you've been banned"),
+ traffic = _("you can view traffic on a promoted link")
),
sr_messages = dict(
@@ -96,7 +98,7 @@ string_dict = dict(
moderator = _('below are the reddits that you have moderator access to.')
),
- sr_subscribe = _('click the `add` or `remove` buttons to choose which reddits appear on your front page.'),
+ sr_subscribe = _('click the `+frontpage` or `-frontpage` buttons to choose which reddits appear on your front page.'),
searching_a_reddit = _('you\'re searching within the [%(reddit_name)s](%(reddit_link)s) reddit. '+
'you can also search within [all reddits](%(all_reddits_link)s)'),
@@ -125,6 +127,9 @@ string_dict = dict(
submit_link = _("""You are submitting a link. The key to a successful submission is interesting content and a descriptive title."""),
submit_text = _("""You are submitting a text-based post. Speak your mind. A title is required, but expanding further in the text field is not. Beginning your title with "vote up if" is violation of intergalactic law."""),
iphone_first = _("You should consider using [reddit's free iphone app](http://itunes.com/apps/iredditfree)."),
+ verify_email = _("we're going to need to verify your email address for you to proceed."),
+ email_verified = _("your email address has been verfied"),
+ email_verify_failed = _("Verification failed. Please try that again"),
)
class StringHandler(object):
@@ -194,6 +199,7 @@ plurals = PluralManager([P_("comment", "comments"),
P_("subreddit", "subreddits"),
# people
+ P_("reader", "readers"),
P_("subscriber", "subscribers"),
P_("contributor", "contributors"),
P_("moderator", "moderators"),
@@ -225,10 +231,19 @@ class Score(object):
return strings.points_label % dict(num=max(x,0),
point=plurals.N_points(x))
+ @staticmethod
+ def _people(x, label):
+ return strings.person_label % \
+ dict(num = locale.format("%d", x, True),
+ persons = label(x))
+
@staticmethod
def subscribers(x):
- return strings.person_label % \
- dict(num = x, persons = plurals.N_subscribers(x))
+ return Score._people(x, plurals.N_subscribers)
+
+ @staticmethod
+ def readers(x):
+ return Score._people(x, plurals.N_readers)
@staticmethod
def none(x):
diff --git a/r2/r2/lib/template_helpers.py b/r2/r2/lib/template_helpers.py
index ce3d44e6e..4c9cf9e1a 100644
--- a/r2/r2/lib/template_helpers.py
+++ b/r2/r2/lib/template_helpers.py
@@ -76,14 +76,6 @@ def class_dict():
res = ', '.join(classes)
return unsafe('{ %s }' % res)
-def path_info():
- loc = dict(path = request.path,
- params = dict(request.get))
-
- return unsafe(simplejson.dumps(loc))
-
-
-
def replace_render(listing, item, render_func):
def _replace_render(style = None, display = True):
"""
@@ -143,25 +135,31 @@ def replace_render(listing, item, render_func):
com_cls = 'comments'
replacements['numcomments'] = com_label
replacements['commentcls'] = com_cls
-
+
replacements['display'] = "" if display else "style='display:none'"
-
+
if hasattr(item, "render_score"):
# replace the score stub
(replacements['scoredislikes'],
replacements['scoreunvoted'],
replacements['scorelikes']) = item.render_score
-
+
# compute the timesince here so we don't end up caching it
if hasattr(item, "_date"):
- replacements['timesince'] = timesince(item._date)
+ if hasattr(item, "promoted") and item.promoted is not None:
+ from r2.lib import promote
+ # promoted links are special in their date handling
+ replacements['timesince'] = timesince(item._date -
+ promote.timezone_offset)
+ else:
+ replacements['timesince'] = timesince(item._date)
renderer = render_func or item.render
res = renderer(style = style, **replacements)
if isinstance(res, (str, unicode)):
return unsafe(res)
return res
-
+
return _replace_render
def get_domain(cname = False, subreddit = True, no_www = False):
@@ -186,7 +184,7 @@ def get_domain(cname = False, subreddit = True, no_www = False):
"""
# locally cache these lookups as this gets run in a loop in add_props
domain = g.domain
- domain_prefix = g.domain_prefix
+ domain_prefix = c.domain_prefix
site = c.site
ccname = c.cname
if not no_www and domain_prefix:
@@ -308,19 +306,51 @@ def panel_size(state):
"the frame.cols of the reddit-toolbar's inner frame"
return '400px, 100%' if state =='expanded' else '0px, 100%x'
-def find_author_class(thing, attribs, gray):
- #assume attribs is sorted
- author = thing.author
- author_cls = "author"
+# Appends to the list "attrs" a tuple of:
+#
+def add_attr(attrs, code, label=None, link=None):
+ from r2.lib.template_helpers import static
- extra_class = ''
- attribs.sort()
+ img = None
- if gray:
- author_cls += " gray"
+ if code == 'F':
+ priority = 1
+ cssclass = 'friend'
+ if not label:
+ label = _('friend')
+ if not link:
+ link = '/prefs/friends'
+ elif code == 'S':
+ priority = 2
+ cssclass = 'submitter'
+ if not label:
+ label = _('submitter')
+ if not link:
+ raise ValueError ("Need a link")
+ elif code == 'M':
+ priority = 3
+ cssclass = 'moderator'
+ if not label:
+ raise ValueError ("Need a label")
+ if not link:
+ raise ValueError ("Need a link")
+ elif code == 'A':
+ priority = 4
+ cssclass = 'admin'
+ if not label:
+ label = _('reddit admin, speaking officially')
+ if not link:
+ link = '/help/faq#Whomadereddit'
+ elif code == 'trophy':
+ img = (static('award.png'), '!', 11, 8)
+ priority = 99
+ cssclass = 'recent-trophywinner'
+ if not label:
+ raise ValueError ("Need a label")
+ if not link:
+ raise ValueError ("Need a link")
+ else:
+ raise ValueError ("Got weird code [%s]" % code)
- for priority, abbv, css_class, label, attr_link in attribs:
- author_cls += " " + css_class
-
-
- return author_cls
+ attrs.append( (priority, code, cssclass, label, link, img) )
diff --git a/r2/r2/lib/tracking.py b/r2/r2/lib/tracking.py
index 9fc6b5a25..02de1b006 100644
--- a/r2/r2/lib/tracking.py
+++ b/r2/r2/lib/tracking.py
@@ -140,7 +140,7 @@ class UserInfo(Info):
self.site = safe_str(c.site.name if c.site else '')
self.lang = safe_str(c.lang if c.lang else '')
self.cname = safe_str(c.cname)
-
+
class PromotedLinkInfo(Info):
_tracked = []
tracker_url = g.adtracker_url
@@ -174,7 +174,17 @@ class PromotedLinkClickInfo(PromotedLinkInfo):
def tracking_url(self):
s = (PromotedLinkInfo.tracking_url(self) + '&url=' + self.dest)
return s
-
+
+class AdframeInfo(PromotedLinkInfo):
+ tracker_url = g.adframetracker_url
+
+ @classmethod
+ def make_hash(cls, ip, fullname):
+ return sha.new("%s%s" % (fullname,
+ g.tracking_secret)).hexdigest()
+
+
+
def benchmark(n = 10000):
"""on my humble desktop machine, this gives ~150 microseconds per gen_url"""
import time
diff --git a/r2/r2/lib/traffic.py b/r2/r2/lib/traffic.py
index 71bd5477b..46efd296f 100644
--- a/r2/r2/lib/traffic.py
+++ b/r2/r2/lib/traffic.py
@@ -61,9 +61,17 @@ def load_traffic_uncached(interval, what, iden,
return []
@memoize("cached_traffic", time = 60)
-def load_traffic(interval, what, iden,
+def load_traffic(interval, what, iden = '',
start_time = None, stop_time = None,
npoints = None):
+ """
+ interval = (hour, day, month)
+
+ what = (reddit, lang, thing, promos)
+
+ iden is the specific thing (reddit name, language name, thing
+ fullname) that one is seeking traffic for.
+ """
res = load_traffic_uncached(interval, what, iden,
start_time = start_time, stop_time = stop_time,
npoints = npoints)
diff --git a/r2/r2/lib/translation.py b/r2/r2/lib/translation.py
index 5d104d51f..204534159 100644
--- a/r2/r2/lib/translation.py
+++ b/r2/r2/lib/translation.py
@@ -387,11 +387,10 @@ class Translator(LoggedSlots):
message = msg,
locale = self.locale)
key = ts.md5
- if self.enabled.has_key(key):
- ts.enabled = self.enabled[key]
- if ts.enabled:
- indx += 1
- ts.index = indx
+ if not self.enabled.has_key(key) or self.enabled[key]:
+ indx += 1
+ ts.index = indx
+
while msgstr.match(line):
r, translation, line = get_next_str_block(line, handle)
ts.add(translation)
@@ -455,6 +454,7 @@ class Translator(LoggedSlots):
out_file = file + ".mo"
cmd = 'msgfmt -o "%s" "%s"' % (out_file, file)
+ print cmd
with os.popen(cmd) as handle:
x = handle.read()
if include_index:
diff --git a/r2/r2/lib/user_stats.py b/r2/r2/lib/user_stats.py
deleted file mode 100644
index fed56b1ec..000000000
--- a/r2/r2/lib/user_stats.py
+++ /dev/null
@@ -1,72 +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-2009
-# CondeNet, Inc. All Rights Reserved.
-################################################################################
-import sqlalchemy as sa
-from r2.models import Account, Vote, Link
-from r2.lib.db import tdb_sql as tdb
-from r2.lib import utils
-
-from pylons import g
-cache = g.cache
-
-def top_users():
- tt, dt = tdb.get_thing_table(Account._type_id)
-
- karma = dt.alias()
-
- s = sa.select([tt.c.thing_id],
- sa.and_(tt.c.spam == False,
- tt.c.deleted == False,
- karma.c.thing_id == tt.c.thing_id,
- karma.c.key == 'link_karma'),
- order_by = sa.desc(sa.cast(karma.c.value, sa.Integer)),
- limit = 10)
- rows = s.execute().fetchall()
- return [r.thing_id for r in rows]
-
-def top_user_change(period = '1 day'):
- rel = Vote.rel(Account, Link)
- rt, account, link, dt = tdb.get_rel_table(rel._type_id)
-
- author = dt.alias()
-
- date = utils.timeago(period)
-
- s = sa.select([author.c.value, sa.func.sum(sa.cast(rt.c.name, sa.Integer))],
- sa.and_(rt.c.date > date,
- author.c.thing_id == rt.c.rel_id,
- author.c.key == 'author_id'),
- group_by = author.c.value,
- order_by = sa.desc(sa.func.sum(sa.cast(rt.c.name, sa.Integer))),
- limit = 10)
-
- rows = s.execute().fetchall()
-
- return [(int(r.value), r.sum) for r in rows]
-
-def calc_stats():
- top = top_users()
- top_day = top_user_change('1 day')
- top_week = top_user_change('1 week')
- return (top, top_day, top_week)
-
-def set_stats():
- cache.set('stats', calc_stats())
diff --git a/r2/r2/lib/utils/utils.py b/r2/r2/lib/utils/utils.py
index c6c4b322e..625467633 100644
--- a/r2/r2/lib/utils/utils.py
+++ b/r2/r2/lib/utils/utils.py
@@ -23,6 +23,7 @@ from urllib import unquote_plus, quote_plus, urlopen, urlencode
from urlparse import urlparse, urlunparse
from threading import local, Thread
import Queue
+import signal
from copy import deepcopy
import cPickle as pickle
import re, datetime, math, random, string, sha, os
@@ -199,6 +200,17 @@ def strips(text, remove):
"""
return rstrips(lstrips(text, remove), remove)
+class Enum(Storage):
+ def __init__(self, *a):
+ self.name = tuple(a)
+ Storage.__init__(self, ((e, i) for i, e in enumerate(a)))
+ def __contains__(self, item):
+ if isinstance(item, int):
+ return item in self.values()
+ else:
+ return Storage.__contains__(self, item)
+
+
class Results():
def __init__(self, sa_ResultProxy, build_fn, do_batch=False):
self.rp = sa_ResultProxy
@@ -887,7 +899,7 @@ def set_emptying_cache():
from r2.lib.cache import SelfEmptyingCache
g.cache.caches = [SelfEmptyingCache(),] + list(g.cache.caches[1:])
-def find_recent_broken_things(from_time = None, delete = False):
+def find_recent_broken_things(from_time = None, to_time = None, delete = False):
"""
Occasionally (usually during app-server crashes), Things will
be partially written out to the database. Things missing data
@@ -896,11 +908,10 @@ def find_recent_broken_things(from_time = None, delete = False):
them as appropriate.
"""
from r2.models import Link,Comment
+ from pylons import g
- if not from_time:
- from_time = timeago("1 hour")
-
- to_time = timeago("60 seconds")
+ from_time = from_time or timeago('1 hour')
+ to_time = to_time or datetime.now(g.tz)
for (cls,attrs) in ((Link,('author_id','sr_id')),
(Comment,('author_id','sr_id','body','link_id'))):
@@ -921,7 +932,6 @@ def find_broken_things(cls,attrs,from_time,to_time,delete = False):
getattr(t,a)
except AttributeError:
# that failed; let's explicitly load it, and try again
- print "Reloading %s" % t._fullname
t._load()
try:
getattr(t,a)
@@ -943,37 +953,23 @@ def lineno():
import inspect
print "%s\t%s" % (datetime.now(),inspect.currentframe().f_back.f_lineno)
-class IteratorChunker(object):
- def __init__(self,it):
- self.it = it
- self.done=False
-
- def next_chunk(self,size):
- chunk = []
- if not self.done:
- try:
- for i in xrange(size):
- chunk.append(self.it.next())
- except StopIteration:
- self.done=True
- return chunk
-
def IteratorFilter(iterator, fn):
for x in iterator:
if fn(x):
yield x
-def UniqueIterator(iterator):
+def UniqueIterator(iterator, key = lambda x: x):
"""
Takes an iterator and returns an iterator that returns only the
first occurence of each entry
"""
so_far = set()
def no_dups(x):
- if x in so_far:
+ k = key(x)
+ if k in so_far:
return False
else:
- so_far.add(x)
+ so_far.add(k)
return True
return IteratorFilter(iterator, no_dups)
@@ -1087,7 +1083,7 @@ def link_from_url(path, filter_spam = False, multiple = True):
elif a.sr_id not in subs and b.sr_id in subs:
return 1
else:
- return cmp(a._hot, b._hot)
+ return cmp(b._hot, a._hot)
links = sorted(links, cmp = cmp_links)
# among those, show them the hottest one
@@ -1106,3 +1102,62 @@ def link_duplicates(article):
return duplicates
+class TimeoutFunctionException(Exception):
+ pass
+
+class TimeoutFunction:
+ """Force an operation to timeout after N seconds. Works with POSIX
+ signals, so it's not safe to use in a multi-treaded environment"""
+ def __init__(self, function, timeout):
+ self.timeout = timeout
+ self.function = function
+
+ def handle_timeout(self, signum, frame):
+ raise TimeoutFunctionException()
+
+ def __call__(self, *args):
+ # can only be called from the main thread
+ old = signal.signal(signal.SIGALRM, self.handle_timeout)
+ signal.alarm(self.timeout)
+ try:
+ result = self.function(*args)
+ finally:
+ signal.alarm(0)
+ signal.signal(signal.SIGALRM, old)
+ return result
+
+def make_offset_date(start_date, interval, future = True,
+ business_days = False):
+ """
+ Generates a date in the future or past "interval" days from start_date.
+
+ Can optionally give weekends no weight in the calculation if
+ "business_days" is set to true.
+ """
+ if interval is not None:
+ interval = int(interval)
+ if business_days:
+ weeks = interval / 7
+ dow = start_date.weekday()
+ if future:
+ future_dow = (dow + interval) % 7
+ if dow > future_dow or future_dow > 4:
+ weeks += 1
+ else:
+ future_dow = (dow - interval) % 7
+ if dow < future_dow or future_dow > 4:
+ weeks += 1
+ interval += 2 * weeks;
+ if future:
+ return start_date + timedelta(interval)
+ return start_date - timedelta(interval)
+ return start_date
+
+def to_csv(table):
+ # commas and linebreaks must result in a quoted string
+ def quote_commas(x):
+ if ',' in x or '\n' in x:
+ return u'"%s"' % x.replace('"', '""')
+ return x
+ return u"\n".join(u','.join(quote_commas(y) for y in x)
+ for x in table)
diff --git a/r2/r2/lib/workqueue.py b/r2/r2/lib/workqueue.py
index 3d6eb8b5f..65b6454d6 100644
--- a/r2/r2/lib/workqueue.py
+++ b/r2/r2/lib/workqueue.py
@@ -28,9 +28,11 @@ import time
log = g.log
+
class WorkQueue(object):
"""A WorkQueue is a queue that takes a number of functions and runs
them in parallel"""
+ global_env = g._current_obj()
def __init__(self, jobs = [], num_workers = 5, timeout = None):
"""Creates a WorkQueue that will process jobs with num_workers
@@ -54,7 +56,7 @@ class WorkQueue(object):
for worker, start_time in self.workers.items():
if (not worker.isAlive() or
self.timeout
- and datetime.now() - start_time > self.timeout):
+ and datetime.now() - start_time > self.timeout):
self.work_count.get_nowait()
self.jobs.task_done()
@@ -62,13 +64,23 @@ class WorkQueue(object):
time.sleep(1)
+ def _init_thread(self, job, global_env):
+ # make sure that pylons.g is available for the worker thread
+ g._push_object(global_env)
+ try:
+ job()
+ finally:
+ # free it up
+ g._pop_object()
+
def run(self):
"""The main thread for the queue. Pull a job off the job queue and
create a thread for it."""
while True:
job = self.jobs.get()
- work_thread = Thread(target = job)
+ work_thread = Thread(target = self._init_thread,
+ args=(job, self.global_env))
work_thread.setDaemon(True)
self.work_count.put(True)
self.workers[work_thread] = datetime.now()
@@ -117,4 +129,3 @@ def test():
#q.wait()
print 'DONE'
-
diff --git a/r2/r2/lib/wrapped.py b/r2/r2/lib/wrapped.py
index e555bc49d..1683c2f51 100644
--- a/r2/r2/lib/wrapped.py
+++ b/r2/r2/lib/wrapped.py
@@ -147,7 +147,7 @@ class Templated(object):
style, cache = not debug)
except AttributeError:
raise NoTemplateFound, (repr(self), style)
-
+
return template
def cache_key(self, *a):
@@ -209,7 +209,6 @@ class Templated(object):
"""
from pylons import c, g
style = style or c.render_style or 'html'
-
# prepare (and store) the list of cachable items.
primary = False
if not isinstance(c.render_tracker, dict):
@@ -385,7 +384,7 @@ class CachedTemplate(Templated):
# these values are needed to render any link on the site, and
# a menu is just a set of links, so we best cache against
# them.
- keys = [c.user_is_loggedin, c.user_is_admin,
+ keys = [c.user_is_loggedin, c.user_is_admin, c.domain_prefix,
c.render_style, c.cname, c.lang, c.site.path,
template_hash]
keys = [make_cachable(x, *a) for x in keys]
diff --git a/r2/r2/models/__init__.py b/r2/r2/models/__init__.py
index d3b2cab37..925789ad2 100644
--- a/r2/r2/models/__init__.py
+++ b/r2/r2/models/__init__.py
@@ -26,6 +26,8 @@ from builder import *
from vote import *
from report import *
from subreddit import *
+from award import *
+from bidding import *
from mail_queue import Email, has_opted_out, opt_count
from admintools import *
import thing_changes
diff --git a/r2/r2/models/account.py b/r2/r2/models/account.py
index 24805109e..8638ea350 100644
--- a/r2/r2/models/account.py
+++ b/r2/r2/models/account.py
@@ -23,11 +23,12 @@ from r2.lib.db.thing import Thing, Relation, NotFound
from r2.lib.db.operators import lower
from r2.lib.db.userrel import UserRel
from r2.lib.memoize import memoize
-from r2.lib.utils import modhash, valid_hash, randstr
+from r2.lib.utils import modhash, valid_hash, randstr
from pylons import g
import time, sha
from copy import copy
+from datetime import datetime, timedelta
class AccountExists(Exception): pass
@@ -58,12 +59,17 @@ class Account(Thing):
report_made = 0,
report_correct = 0,
report_ignored = 0,
+ cup_date = None,
spammer = 0,
sort_options = {},
has_subscribed = False,
pref_media = 'subreddit',
share = {},
wiki_override = None,
+ email = "",
+ email_verified = None,
+ ignorereports = False,
+ pref_show_promote = None,
)
def karma(self, kind, sr = None):
@@ -143,7 +149,22 @@ class Account(Thing):
self._t.get('comment_karma', 0)))
return karmas
-
+
+ def update_last_visit(self, current_time):
+ from admintools import apply_updates
+
+ apply_updates(self)
+
+ prev_visit = getattr(self, 'last_visit', None)
+
+ if prev_visit and current_time - prev_visit < timedelta(0, 3600):
+ return
+
+ g.log.debug ("Updating last visit for %s" % self.name)
+ self.last_visit = current_time
+
+ self._commit()
+
def make_cookie(self, timestr = None, admin = False):
if not self._loaded:
self._load()
@@ -186,6 +207,14 @@ class Account(Thing):
else:
raise NotFound, 'Account %s' % name
+ # Admins only, since it's not memoized
+ @classmethod
+ def _by_name_multiple(cls, name):
+ q = cls._query(lower(Account.c.name) == name.lower(),
+ Account.c._spam == (True, False),
+ Account.c._deleted == (True, False))
+ return list(q)
+
@property
def friends(self):
return self.friend_ids()
@@ -235,9 +264,30 @@ class Account(Thing):
share['recent'] = emails
self.share = share
-
-
-
+
+ def extend_cup(self, new_expiration):
+ if self.cup_date and self.cup_date > new_expiration:
+ return
+ self.cup_date = new_expiration
+ self._commit()
+
+ def remove_cup(self):
+ if not self.cup_date:
+ return
+ self.cup_date = None
+ self._commit()
+
+ def should_show_cup(self):
+ # FIX ME.
+ # this is being called inside builder (Bad #1) in the
+ # listing loop. On machines that are not allowed to write to
+ # the db, this generates an exception (Bad #2) on every
+ # listing page with users with cups.
+ return False # temporarily disable cups
+ if self.cup_date and self.cup_date < datetime.now(g.tz):
+ self.cup_date = None
+ self._commit()
+ return self.cup_date
class FakeAccount(Account):
_nodb = True
@@ -314,6 +364,7 @@ def register(name, password):
return a
class Friend(Relation(Account, Account)): pass
+
Account.__bases__ += (UserRel('friend', Friend, disable_reverse_ids_fn = True),)
class DeletedUser(FakeAccount):
diff --git a/r2/r2/models/admintools.py b/r2/r2/models/admintools.py
index 60b8cd66e..9a939afdb 100644
--- a/r2/r2/models/admintools.py
+++ b/r2/r2/models/admintools.py
@@ -20,9 +20,9 @@
# CondeNet, Inc. All Rights Reserved.
################################################################################
from r2.lib.utils import tup
+from r2.lib.filters import websafe
from r2.models import Report, Account
from r2.models.thing_changes import changed
-from r2.lib.db import queries
from pylons import g
@@ -30,26 +30,41 @@ from datetime import datetime
from copy import copy
class AdminTools(object):
+
def spam(self, things, auto, moderator_banned, banner, date = None, **kw):
+ from r2.lib.db import queries
+
+ things = [x for x in tup(things) if not x._spam]
Report.accept(things, True)
- things = [ x for x in tup(things) if not x._spam ]
for t in things:
t._spam = True
ban_info = copy(getattr(t, 'ban_info', {}))
ban_info.update(auto = auto,
moderator_banned = moderator_banned,
- banner = banner,
banned_at = date or datetime.now(g.tz),
**kw)
+
+ if isinstance(banner, dict):
+ ban_info['banner'] = banner[t._fullname]
+ else:
+ ban_info['banner'] = banner
+
t.ban_info = ban_info
t._commit()
changed(t)
- self.author_spammer(things, True)
+
+
+ if not auto:
+ self.author_spammer(things, True)
+ self.set_last_sr_ban(things)
+
queries.ban(things)
def unspam(self, things, unbanner = None):
+ from r2.lib.db import queries
+
+ things = [x for x in tup(things) if x._spam]
Report.accept(things, False)
- things = [ x for x in tup(things) if x._spam ]
for t in things:
ban_info = copy(getattr(t, 'ban_info', {}))
ban_info['unbanned_at'] = datetime.now(g.tz)
@@ -59,7 +74,11 @@ class AdminTools(object):
t._spam = False
t._commit()
changed(t)
+
+ # auto is always False for unbans
self.author_spammer(things, False)
+ self.set_last_sr_ban(things)
+
queries.unban(things)
def author_spammer(self, things, spam):
@@ -77,6 +96,24 @@ class AdminTools(object):
author = authors[aid]
author._incr('spammer', len(author_things) if spam else -len(author_things))
+ def set_last_sr_ban(self, things):
+ by_srid = {}
+ for thing in things:
+ if hasattr(thing, 'sr_id'):
+ by_srid.setdefault(thing.sr_id, []).append(thing)
+
+ if by_srid:
+ srs = Subreddit._byID(by_srid.keys(), data=True, return_dict=True)
+ for sr_id, sr_things in by_srid.iteritems():
+ sr = srs[sr_id]
+
+ sr.last_mod_action = datetime.now(g.tz)
+ sr._commit()
+ sr._incr('mod_actions', len(sr_things))
+
+ def admin_queues(self, chan, exchange):
+ pass
+
admintools = AdminTools()
def is_banned_IP(ip):
@@ -91,6 +128,9 @@ def valid_thing(v, karma):
def valid_user(v, sr, karma):
return True
+def apply_updates(user):
+ pass
+
def update_score(obj, up_change, down_change, new_valid_thing, old_valid_thing):
obj._incr('_ups', up_change)
obj._incr('_downs', down_change)
@@ -99,6 +139,9 @@ def compute_votes(wrapper, item):
wrapper.upvotes = item._ups
wrapper.downvotes = item._downs
+def ip_span(ip):
+ ip = websafe(ip)
+ return '' % ip
try:
from r2admin.models.admintools import *
diff --git a/r2/r2/models/award.py b/r2/r2/models/award.py
new file mode 100644
index 000000000..0c3680334
--- /dev/null
+++ b/r2/r2/models/award.py
@@ -0,0 +1,106 @@
+# 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-2008
+# CondeNet, Inc. All Rights Reserved.
+################################################################################
+from r2.lib.db.thing import Thing, Relation, NotFound
+from r2.lib.db.userrel import UserRel
+from r2.lib.db.operators import desc, lower
+from r2.lib.db import queries
+from r2.lib.memoize import memoize
+from r2.models import Account
+from pylons import c, g, request
+
+class Award (Thing):
+ @classmethod
+ @memoize('award.all_awards')
+ def _all_awards_cache(cls):
+ return [ a._id for a in Award._query(limit=100) ]
+
+ @classmethod
+ def _all_awards(cls, _update=False):
+ all = Award._all_awards_cache(_update=_update)
+ return Award._byID(all, data=True).values()
+
+ @classmethod
+ def _new(cls, codename, title, imgurl):
+# print "Creating new award codename=%s title=%s imgurl=%s" % (
+# codename, title, imgurl)
+ a = Award(codename=codename, title=title, imgurl=imgurl)
+ a._commit()
+ Award._all_awards_cache(_update=True)
+
+ @classmethod
+ def _by_codename(cls, codename):
+ q = cls._query(lower(Award.c.codename) == codename.lower())
+ q._limit = 1
+ award = list(q)
+
+ if award:
+ return cls._byID(award[0]._id, True)
+ else:
+ raise NotFound, 'Award %s' % codename
+
+class Trophy(Relation(Account, Award)):
+ @classmethod
+ def _new(cls, recipient, award, description = None,
+ url = None, cup_expiration = None):
+
+ # The "name" column of the relation can't be a constant or else a
+ # given account would not be allowed to win a given award more than
+ # once. So we're setting it to the string form of the timestamp.
+ # Still, we won't have that date just yet, so for a moment we're
+ # setting it to "trophy".
+
+ t = Trophy(recipient, award, "trophy")
+
+ t._name = str(t._date)
+
+ if description:
+ t.description = description
+
+ if url:
+ t.url = url
+
+ if cup_expiration:
+ recipient.extend_cup(cup_expiration)
+
+ t._commit()
+ Trophy.by_account(recipient, _update=True)
+ Trophy.by_award(award, _update=True)
+
+ @classmethod
+ @memoize('trophy.by_account')
+ def by_account(cls, account):
+ q = Trophy._query(Trophy.c._thing1_id == account._id,
+ eager_load = True, thing_data = True,
+ data = True,
+ sort = desc('_date'))
+ q._limit = 50
+ return list(q)
+
+ @classmethod
+ @memoize('trophy.by_award')
+ def by_award(cls, award):
+ q = Trophy._query(Trophy.c._thing2_id == award._id,
+ eager_load = True, thing_data = True,
+ data = True,
+ sort = desc('_date'))
+ q._limit = 500
+ return list(q)
diff --git a/r2/r2/models/bidding.py b/r2/r2/models/bidding.py
new file mode 100644
index 000000000..0498c47c6
--- /dev/null
+++ b/r2/r2/models/bidding.py
@@ -0,0 +1,442 @@
+# 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-2009
+# CondeNet, Inc. All Rights Reserved.
+################################################################################
+from sqlalchemy import Column, String, DateTime, Date, Float, Integer, \
+ func as safunc, and_, or_
+from sqlalchemy.exceptions import IntegrityError
+from sqlalchemy.schema import PrimaryKeyConstraint
+from sqlalchemy.orm import sessionmaker, scoped_session
+from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.databases.postgres import PGBigInteger as BigInteger, \
+ PGInet as Inet
+from sqlalchemy.ext.declarative import declarative_base
+from pylons import g
+from r2.lib.utils import Enum
+from r2.models.account import Account
+from r2.lib.db.thing import Thing, NotFound
+from pylons import request
+from r2.lib.memoize import memoize
+import datetime
+
+
+engine = g.dbm.engines['authorize']
+# Allocate a session maker for communicating object changes with the back end
+Session = sessionmaker(autocommit = True, autoflush = True, bind = engine)
+# allocate a SQLalchemy base class for auto-creation of tables based
+# on class fields.
+# NB: any class that inherits from this class will result in a table
+# being created, and subclassing doesn't work, hence the
+# object-inheriting interface classes.
+Base = declarative_base(bind = engine)
+
+class Sessionized(object):
+ """
+ Interface class for wrapping up the "session" in the 0.5 ORM
+ required for all database communication. This allows subclasses
+ to have a "query" and "commit" method that doesn't require
+ managing of the session.
+ """
+ session = Session()
+
+ def __init__(self, *a, **kw):
+ """
+ Common init used by all other classes in this file. Allows
+ for object-creation based on the __table__ field which is
+ created by Base (further explained in _disambiguate_args).
+ """
+ for k, v in self._disambiguate_args(None, *a, **kw):
+ setattr(self, k.name, v)
+
+ @classmethod
+ def _new(cls, *a, **kw):
+ """
+ Just like __init__, except the new object is committed to the
+ db before being returned.
+ """
+ obj = cls(*a, **kw)
+ obj._commit()
+ return obj
+
+ def _commit(self):
+ """
+ Commits current object to the db.
+ """
+ with self.session.begin():
+ self.session.add(self)
+
+ def _delete(self):
+ """
+ Deletes current object from the db.
+ """
+ with self.session.begin():
+ self.session.delete(self)
+
+ @classmethod
+ def query(cls, **kw):
+ """
+ Ubiquitous class-level query function.
+ """
+ q = cls.session.query(cls)
+ if kw:
+ q = q.filter_by(**kw)
+ return q
+
+ @classmethod
+ def _disambiguate_args(cls, filter_fn, *a, **kw):
+ """
+ Used in _lookup and __init__ to interpret *a as being a list
+ of args to match columns in the same order as __table__.c
+
+ For example, if a class Foo has fields a and b, this function
+ allows the two to work identically:
+
+ >>> foo = Foo(a = 'arg1', b = 'arg2')
+ >>> foo = Foo('arg1', 'arg2')
+
+ Additionally, this function invokes _make_storable on each of
+ the values in the arg list (including *a as well as
+ kw.values())
+
+ """
+ args = []
+ cols = filter(filter_fn, cls.__table__.c)
+ for k, v in zip(cols, a):
+ if not kw.has_key(k.name):
+ args.append((k, cls._make_storable(v)))
+ else:
+ raise TypeError,\
+ "got multiple arguments for '%s'" % k.name
+
+ cols = dict((x.name, x) for x in cls.__table__.c)
+ for k, v in kw.iteritems():
+ if cols.has_key(k):
+ args.append((cols[k], cls._make_storable(v)))
+ return args
+
+ @classmethod
+ def _make_storable(self, val):
+ if isinstance(val, Account):
+ return val._id
+ elif isinstance(val, Thing):
+ return val._fullname
+ else:
+ return val
+
+ @classmethod
+ def _lookup(cls, multiple, *a, **kw):
+ """
+ Generates an executes a query where it matches *a to the
+ primary keys of the current class's table.
+
+ The primary key nature can be overridden by providing an
+ explicit list of columns to search.
+
+ This function is only a convenience function, and is called
+ only by one() and lookup().
+ """
+ args = cls._disambiguate_args(lambda x: x.primary_key, *a, **kw)
+ res = cls.query().filter(and_(*[k == v for k, v in args]))
+ try:
+ res = res.all() if multiple else res.one()
+ # res.one() will raise NoResultFound, while all() will
+ # return an empty list. This will make the response
+ # uniform
+ if not res:
+ raise NoResultFound
+ except NoResultFound:
+ raise NotFound, "%s with %s" % \
+ (cls.__name__,
+ ",".join("%s=%s" % x for x in args))
+ return res
+
+ @classmethod
+ def lookup(cls, *a, **kw):
+ """
+ Returns all objects which match the kw list, or primary keys
+ that match the *a.
+ """
+ return cls._lookup(True, *a, **kw)
+
+ @classmethod
+ def one(cls, *a, **kw):
+ """
+ Same as lookup, but returns only one argument.
+ """
+ return cls._lookup(False, *a, **kw)
+
+ @classmethod
+ def add(cls, key, *a):
+ try:
+ cls.one(key, *a)
+ except NotFound:
+ cls(key, *a)._commit()
+
+ @classmethod
+ def delete(cls, key, *a):
+ try:
+ cls.one(key, *a)._delete()
+ except NotFound:
+ pass
+
+ @classmethod
+ def get(cls, key):
+ try:
+ return cls.lookup(key)
+ except NotFound:
+ return []
+
+class CustomerID(Sessionized, Base):
+ __tablename__ = "authorize_account_id"
+
+ account_id = Column(BigInteger, primary_key = True,
+ autoincrement = False)
+ authorize_id = Column(BigInteger)
+
+ def __repr__(self):
+ return "" % self.authorize_id
+
+ @classmethod
+ def set(cls, user, _id):
+ try:
+ existing = cls.one(user)
+ existing.authorize_id = _id
+ existing._commit()
+ except NotFound:
+ cls(user, _id)._commit()
+
+ @classmethod
+ def get_id(cls, user):
+ try:
+ return cls.one(user).authorize_id
+ except NotFound:
+ return
+
+class PayID(Sessionized, Base):
+ __tablename__ = "authorize_pay_id"
+
+ account_id = Column(BigInteger, primary_key = True,
+ autoincrement = False)
+ pay_id = Column(BigInteger, primary_key = True,
+ autoincrement = False)
+
+ def __repr__(self):
+ return "<%s(%d)>" % (self.__class__.__name__, self.authorize_id)
+
+ @classmethod
+ def get_ids(cls, key):
+ return [int(x.pay_id) for x in cls.get(key)]
+
+class ShippingAddress(Sessionized, Base):
+ __tablename__ = "authorize_ship_id"
+
+ account_id = Column(BigInteger, primary_key = True,
+ autoincrement = False)
+ ship_id = Column(BigInteger, primary_key = True,
+ autoincrement = False)
+
+ def __repr__(self):
+ return "<%s(%d)>" % (self.__class__.__name__, self.authorize_id)
+
+class Bid(Sessionized, Base):
+ __tablename__ = "bids"
+
+ STATUS = Enum("AUTH", "CHARGE", "REFUND", "VOID")
+
+ # will be unique from authorize
+ transaction = Column(BigInteger, primary_key = True,
+ autoincrement = False)
+
+ # identifying characteristics
+ account_id = Column(BigInteger, index = True, nullable = False)
+ pay_id = Column(BigInteger, index = True, nullable = False)
+ thing_id = Column(BigInteger, index = True, nullable = False)
+
+ # breadcrumbs
+ ip = Column(Inet)
+ date = Column(DateTime(timezone = True), default = safunc.now(),
+ nullable = False)
+
+ # bid information:
+ bid = Column(Float, nullable = False)
+ charge = Column(Float)
+
+ status = Column(Integer, nullable = False,
+ default = STATUS.AUTH)
+
+
+ @classmethod
+ def _new(cls, trans_id, user, pay_id, thing_id, bid):
+ bid = Bid(trans_id, user, pay_id,
+ thing_id, getattr(request, 'ip', '0.0.0.0'), bid = bid)
+ bid._commit()
+ return bid
+
+ def set_status(self, status):
+ if self.status != status:
+ self.status = status
+ self._commit()
+
+ def auth(self):
+ self.set_status(self.STATUS.AUTH)
+
+ def void(self):
+ self.set_status(self.STATUS.VOID)
+
+ def charged(self):
+ self.set_status(self.STATUS.CHARGE)
+
+ def refund(self):
+ self.set_status(self.STATUS.REFUND)
+
+class PromoteDates(Sessionized, Base):
+ __tablename__ = "promote_date"
+
+ thing_name = Column(String, primary_key = True, autoincrement = False)
+
+ account_id = Column(BigInteger, index = True, autoincrement = False)
+
+ start_date = Column(Date(), nullable = False, index = True)
+ end_date = Column(Date(), nullable = False, index = True)
+
+ actual_start = Column(DateTime(timezone = True), index = True)
+ actual_end = Column(DateTime(timezone = True), index = True)
+
+ bid = Column(Float)
+ refund = Column(Float)
+
+ @classmethod
+ def update(cls, thing, start_date, end_date):
+ try:
+ promo = cls.one(thing)
+ promo.start_date = start_date.date()
+ promo.end_date = end_date.date()
+ promo._commit()
+ except NotFound:
+ promo = cls._new(thing, thing.author_id, start_date, end_date)
+
+ @classmethod
+ def update_bid(cls, thing):
+ bid = thing.promote_bid
+ refund = 0
+ if thing.promote_trans_id < 0:
+ refund = bid
+ elif hasattr(thing, "promo_refund"):
+ refund = thing.promo_refund
+ promo = cls.one(thing)
+ promo.bid = bid
+ promo.refund = refund
+ promo._commit()
+
+ @classmethod
+ def log_start(cls, thing):
+ promo = cls.one(thing)
+ promo.actual_start = datetime.datetime.now(g.tz)
+ promo._commit()
+ cls.update_bid(thing)
+
+ @classmethod
+ def log_end(cls, thing):
+ promo = cls.one(thing)
+ promo.actual_end = datetime.datetime.now(g.tz)
+ promo._commit()
+ cls.update_bid(thing)
+
+ @classmethod
+ def for_date(cls, date):
+ if isinstance(date, datetime.datetime):
+ date = date.date()
+ q = cls.query().filter(and_(cls.start_date <= date,
+ cls.end_date > date))
+ return q.all()
+
+ @classmethod
+ def for_date_range(cls, start_date, end_date, account_id = None):
+ if isinstance(start_date, datetime.datetime):
+ start_date = start_date.date()
+ if isinstance(end_date, datetime.datetime):
+ end_date = end_date.date()
+ # Three cases to be included:
+ # 1) start date is in the provided interval
+ start_inside = and_(cls.start_date >= start_date,
+ cls.start_date < end_date)
+ # 2) end date is in the provided interval
+ end_inside = and_(cls.end_date >= start_date,
+ cls.end_date < end_date)
+ # 3) interval is a subset of a promoted interval
+ surrounds = and_(cls.start_date <= start_date,
+ cls.end_date >= end_date)
+
+ q = cls.query().filter(or_(start_inside, end_inside, surrounds))
+ if account_id is not None:
+ q = q.filter(cls.account_id == account_id)
+
+ return q.all()
+
+ @classmethod
+ @memoize('promodates.bid_history', time = 10 * 60)
+ def bid_history(cls, start_date, end_date = None, account_id = None):
+
+ end_date = end_date or datetime.datetime.now(g.tz)
+ q = cls.for_date_range(start_date, end_date, account_id = account_id)
+
+ d = start_date.date()
+ end_date = end_date.date()
+ res = []
+ while d < end_date:
+ bid = 0
+ refund = 0
+ for i in q:
+ end = i.actual_end.date() if i.actual_end else i.end_date
+ start = i.actual_start.date() if i.actual_start else None
+ if start and start <= d and end > d:
+ duration = float((end - start).days)
+ bid += i.bid / duration
+ refund += i.refund / duration
+ res.append([d, bid, refund])
+ d += datetime.timedelta(1)
+ return res
+
+ @classmethod
+ @memoize('promodates.top_promoters', time = 10 * 60)
+ def top_promoters(cls, start_date, end_date = None):
+ end_date = end_date or datetime.datetime.now(g.tz)
+ q = cls.for_date_range(start_date, end_date)
+
+ d = start_date
+ res = []
+ accounts = Account._byID([i.account_id for i in q],
+ return_dict = True, data = True)
+ res = {}
+ for i in q:
+ if i.bid is not None and i.actual_start is not None:
+ r = res.setdefault(i.account_id, [0, 0, set()])
+ r[0] += i.bid
+ r[1] += i.refund
+ r[2].add(i.thing_name)
+ res = [ ([accounts[k]] + v) for (k, v) in res.iteritems() ]
+ res.sort(key = lambda x: x[1] - x[2], reverse = True)
+
+ return res
+
+
+# do all the leg work of creating/connecting to tables
+Base.metadata.create_all()
+
diff --git a/r2/r2/models/builder.py b/r2/r2/models/builder.py
index bf3f087b9..4bf2585fd 100644
--- a/r2/r2/models/builder.py
+++ b/r2/r2/models/builder.py
@@ -35,53 +35,15 @@ from r2.lib import utils
from r2.lib.db import operators
from r2.lib.cache import sgm
from r2.lib.comment_tree import link_comments
-
from copy import deepcopy, copy
import time
from datetime import datetime,timedelta
-from admintools import compute_votes, admintools
+from admintools import compute_votes, admintools, ip_span
EXTRA_FACTOR = 1.5
MAX_RECURSION = 10
-# Appends to the list "attrs" a tuple of:
-#
-def add_attr(attrs, code, label=None, link=None):
- if code == 'F':
- priority = 1
- cssclass = 'friend'
- if not label:
- label = _('friend')
- if not link:
- link = '/prefs/friends'
- elif code == 'S':
- priority = 2
- cssclass = 'submitter'
- if not label:
- label = _('submitter')
- if not link:
- raise ValueError ("Need a link")
- elif code == 'M':
- priority = 3
- cssclass = 'moderator'
- if not label:
- raise ValueError ("Need a label")
- if not link:
- raise ValueError ("Need a link")
- elif code == 'A':
- priority = 4
- cssclass = 'admin'
- if not label:
- label = _('reddit admin, speaking officially')
- if not link:
- link = '/help/faq#Whomadereddit'
- else:
- raise ValueError ("Got weird code [%s]" % code)
-
- attrs.append( (priority, code, cssclass, label, link) )
-
class Builder(object):
def __init__(self, wrap = Wrapped, keep_fn = None):
self.wrap = wrap
@@ -94,11 +56,13 @@ class Builder(object):
return item.keep_item(item)
def wrap_items(self, items):
+ from r2.lib.template_helpers import add_attr
user = c.user if c.user_is_loggedin else None
#get authors
#TODO pull the author stuff into add_props for links and
#comments and messages?
+
try:
aids = set(l.author_id for l in items)
except AttributeError:
@@ -151,8 +115,7 @@ class Builder(object):
w.author = None
w.friend = False
- # List of tuples
+ # List of tuples (see add_attr() for details)
w.attribs = []
w.distinguished = None
@@ -181,6 +144,13 @@ class Builder(object):
getattr(item, "author_id", None) in mods):
add_attr(w.attribs, 'M', label=modlabel, link=modlink)
+ if (g.show_awards and w.author
+ and w.author.should_show_cup()):
+ add_attr(w.attribs, 'trophy', label=
+ _("%(user)s recently won a trophy! click here to see it.")
+ % {'user':w.author.name},
+ link = "/user/%s" % w.author.name)
+
if hasattr(item, "sr_id"):
w.subreddit = subreddits[item.sr_id]
@@ -214,6 +184,11 @@ class Builder(object):
count += 1
+ if c.user_is_admin and getattr(item, 'ip', None):
+ w.ip_span = ip_span(item.ip)
+ else:
+ w.ip_span = ""
+
# if the user can ban things on a given subreddit, or an
# admin, then allow them to see that the item is spam, and
# add the other spam-related display attributes
@@ -365,12 +340,12 @@ class QueryBuilder(Builder):
#skip and count
while new_items and (not self.num or num_have < self.num):
i = new_items.pop(0)
- count = count - 1 if self.reverse else count + 1
if not (self.must_skip(i) or self.skip and not self.keep_item(i)):
items.append(i)
num_have += 1
- if self.wrap:
- i.num = count
+ if self.wrap:
+ count = count - 1 if self.reverse else count + 1
+ i.num = count
last_item = i
#unprewrap the last item
diff --git a/r2/r2/models/link.py b/r2/r2/models/link.py
index 15281620a..21a7dffae 100644
--- a/r2/r2/models/link.py
+++ b/r2/r2/models/link.py
@@ -48,9 +48,7 @@ class Link(Thing, Printable):
media_object = None,
has_thumbnail = False,
promoted = None,
- promoted_subscribersonly = False,
- promote_until = None,
- promoted_by = None,
+ pending = False,
disable_comments = False,
selftext = '',
ip = '0.0.0.0')
@@ -211,8 +209,16 @@ class Link(Thing, Printable):
@staticmethod
def wrapped_cache_key(wrapped, style):
s = Printable.wrapped_cache_key(wrapped, style)
+ if wrapped.promoted is not None:
+ s.extend([getattr(wrapped, "promote_status", -1),
+ wrapped.disable_comments,
+ wrapped._date,
+ wrapped.promote_until,
+ c.user_is_sponsor,
+ wrapped.url, repr(wrapped.title)])
if style == "htmllite":
- s.append(request.get.has_key('twocolumn'))
+ s.extend([request.get.has_key('twocolumn'),
+ c.link_target])
elif style == "xml":
s.append(request.GET.has_key("nothumbs"))
s.append(getattr(wrapped, 'media_object', {}))
@@ -221,7 +227,15 @@ class Link(Thing, Printable):
def make_permalink(self, sr, force_domain = False):
from r2.lib.template_helpers import get_domain
p = "comments/%s/%s/" % (self._id36, title_to_url(self.title))
- if not c.cname and not force_domain:
+ # promoted links belong to a separate subreddit and shouldn't
+ # include that in the path
+ if self.promoted is not None:
+ if force_domain:
+ res = "http://%s/%s" % (get_domain(cname = False,
+ subreddit = False), p)
+ else:
+ res = "/%s" % p
+ elif not c.cname and not force_domain:
res = "/r/%s/%s" % (sr.name, p)
elif sr != c.site or force_domain:
res = "http://%s/%s" % (get_domain(cname = (c.cname and
@@ -229,6 +243,11 @@ class Link(Thing, Printable):
subreddit = not c.cname), p)
else:
res = "/%s" % p
+
+ # WARNING: If we ever decide to add any ?foo=bar&blah parameters
+ # here, Comment.make_permalink will need to be updated or else
+ # it will fail.
+
return res
def make_permalink_slow(self, force_domain = False):
@@ -256,6 +275,7 @@ class Link(Thing, Printable):
saved = Link._saved(user, wrapped) if user_is_loggedin else {}
hidden = Link._hidden(user, wrapped) if user_is_loggedin else {}
+
#clicked = Link._clicked(user, wrapped) if user else {}
clicked = {}
@@ -264,17 +284,18 @@ class Link(Thing, Printable):
if not hasattr(item, "score_fmt"):
item.score_fmt = Score.number_only
item.pref_compress = user.pref_compress
- if user.pref_compress:
+ if user.pref_compress and item.promoted is None:
item.render_css_class = "compressed link"
item.score_fmt = Score.points
- elif pref_media == 'on':
+ elif pref_media == 'on' and not user.pref_compress:
show_media = True
elif pref_media == 'subreddit' and item.subreddit.show_media:
show_media = True
- elif (item.promoted
- and item.has_thumbnail
- and pref_media != 'off'):
- show_media = True
+ elif item.promoted and item.has_thumbnail:
+ if user_is_loggedin and item.author_id == user._id:
+ show_media = True
+ elif pref_media != 'off' and not user.pref_compress:
+ show_media = True
if not show_media:
item.thumbnail = ""
@@ -358,7 +379,9 @@ class Link(Thing, Printable):
else:
item.href_url = item.url
- if pref_frame and not item.is_self:
+ # show the toolbar if the preference is set and the link
+ # is neither a promoted link nor a self post
+ if pref_frame and not item.is_self and not item.promoted:
item.mousedown_url = item.tblink
else:
item.mousedown_url = None
@@ -370,6 +393,8 @@ class Link(Thing, Printable):
item._deleted,
item._spam))
+ item.is_author = (user == item.author)
+
# bits that we will render stubs (to make the cached
# version more flexible)
item.num = CachedVariable("num")
@@ -377,7 +402,7 @@ class Link(Thing, Printable):
item.commentcls = CachedVariable("commentcls")
item.midcolmargin = CachedVariable("midcolmargin")
item.comment_label = CachedVariable("numcomments")
-
+
if user_is_loggedin:
incr_counts(wrapped)
@@ -402,32 +427,21 @@ class PromotedLink(Link):
@classmethod
def add_props(cls, user, wrapped):
+ # prevents cyclic dependencies
+ from r2.lib import promote
Link.add_props(user, wrapped)
user_is_sponsor = c.user_is_sponsor
- try:
- if user_is_sponsor:
- promoted_by_ids = set(x.promoted_by
- for x in wrapped
- if hasattr(x,'promoted_by'))
- promoted_by_accounts = Account._byID(promoted_by_ids,
- data=True)
- else:
- promoted_by_accounts = {}
-
- except NotFound:
- # since this is just cosmetic, we can skip it altogether
- # if one isn't found or is broken
- promoted_by_accounts = {}
+ status_dict = dict((v, k) for k, v in promote.STATUS.iteritems())
for item in wrapped:
# these are potentially paid for placement
item.nofollow = True
item.user_is_sponsor = user_is_sponsor
- if item.promoted_by in promoted_by_accounts:
- item.promoted_by_name = promoted_by_accounts[item.promoted_by].name
+ status = getattr(item, "promote_status", -1)
+ if item.is_author or c.user_is_sponsor:
+ item.rowstyle = "link " + promote.STATUS.name[status].lower()
else:
- # keep the template from trying to read it
- item.promoted_by = None
+ item.rowstyle = "link promoted"
# Run this last
Printable.add_props(user, wrapped)
@@ -443,7 +457,7 @@ class Comment(Thing, Printable):
def _delete(self):
link = Link._byID(self.link_id, data = True)
link._incr('num_comments', -1)
-
+
@classmethod
def _new(cls, author, link, parent, body, ip):
c = Comment(body = body,
@@ -462,12 +476,16 @@ class Comment(Thing, Printable):
link._incr('num_comments', 1)
- inbox_rel = None
+ to = None
if parent:
to = Account._byID(parent.author_id)
- # only global admins can be message spammed.
- if not c._spam or to.name in g.admins:
- inbox_rel = Inbox._add(to, c, 'inbox')
+ elif link.is_self:
+ to = Account._byID(link.author_id)
+
+ inbox_rel = None
+ # only global admins can be message spammed.
+ if to and (not c._spam or to.name in g.admins):
+ inbox_rel = Inbox._add(to, c, 'inbox')
return (c, inbox_rel)
@@ -497,16 +515,23 @@ class Comment(Thing, Printable):
s.extend([wrapped.body])
return s
- def make_permalink(self, link, sr=None):
- return link.make_permalink(sr) + self._id36
+ def make_permalink(self, link, sr=None, context=None, anchor=False):
+ url = link.make_permalink(sr) + self._id36
+ if context:
+ url += "?context=%d" % context
+ if anchor:
+ url += "#%s" % self._id36
+ return url
- def make_permalink_slow(self):
+ def make_permalink_slow(self, context=None, anchor=False):
l = Link._byID(self.link_id, data=True)
- return self.make_permalink(l, l.subreddit_slow)
-
+ return self.make_permalink(l, l.subreddit_slow,
+ context=context, anchor=anchor)
+
@classmethod
def add_props(cls, user, wrapped):
- from r2.models.builder import add_attr
+ from r2.lib.template_helpers import add_attr
+ from r2.lib import promote
#fetch parent links
@@ -517,11 +542,13 @@ class Comment(Thing, Printable):
for cm in wrapped:
if not hasattr(cm, 'sr_id'):
cm.sr_id = links[cm.link_id].sr_id
-
+
subreddits = Subreddit._byID(set(cm.sr_id for cm in wrapped),
data=True,return_dict=False)
+
can_reply_srs = set(s._id for s in subreddits if s.can_comment(user)) \
if c.user_is_loggedin else set()
+ can_reply_srs.add(promote.PromoteSR._id)
min_score = user.pref_min_comment_score
@@ -539,7 +566,6 @@ class Comment(Thing, Printable):
if (item.link._score <= 1 or item.score < 3 or
item.link._spam or item._spam or item.author._spam):
-
item.nofollow = True
else:
item.nofollow = False
@@ -651,7 +677,7 @@ class MoreChildren(MoreComments):
pass
class Message(Thing, Printable):
- _defaults = dict(reported = 0,)
+ _defaults = dict(reported = 0, was_comment = False)
_data_int_props = Thing._data_int_props + ('reported', )
cache_ignore = set(["to"]).union(Printable.cache_ignore)
@@ -684,6 +710,14 @@ class Message(Thing, Printable):
#load the "to" field if required
to_ids = set(w.to_id for w in wrapped)
tos = Account._byID(to_ids, True) if to_ids else {}
+ links = Link._byID(set(l.link_id for l in wrapped if l.was_comment),
+ data = True,
+ return_dict = True)
+ subreddits = Subreddit._byID(set(l.sr_id for l in links.values()),
+ data = True, return_dict = True)
+ parents = Comment._byID(set(l.parent_id for l in wrapped
+ if hasattr(l, "parent_id") and l.was_comment),
+ data = True, return_dict = True)
for item in wrapped:
item.to = tos[item.to_id]
@@ -692,6 +726,23 @@ class Message(Thing, Printable):
else:
item.new = False
item.score_fmt = Score.none
+
+ item.message_style = ""
+ if item.was_comment:
+ link = links[item.link_id]
+ sr = subreddits[link.sr_id]
+ item.link_title = link.title
+ item.link_permalink = link.make_permalink(sr)
+ if hasattr(item, "parent_id"):
+ item.subject = _('comment reply')
+ item.message_style = "comment-reply"
+ parent = parents[item.parent_id]
+ item.parent = parent._fullname
+ item.parent_permalink = parent.make_permalink(link, sr)
+ else:
+ item.subject = _('post reply')
+ item.message_style = "post-reply"
+
# Run this last
Printable.add_props(user, wrapped)
diff --git a/r2/r2/models/mail_queue.py b/r2/r2/models/mail_queue.py
index 4953bb79a..606656b90 100644
--- a/r2/r2/models/mail_queue.py
+++ b/r2/r2/models/mail_queue.py
@@ -25,13 +25,13 @@ from email.MIMEText import MIMEText
import sqlalchemy as sa
from sqlalchemy.databases.postgres import PGInet, PGBigInteger
-from r2.lib.db.tdb_sql import make_metadata
-from r2.models.thing_changes import changed, index_str, create_table
-from r2.lib.utils import Storage, timeago
+from r2.lib.db.tdb_sql import make_metadata, index_str, create_table
+from r2.lib.utils import Storage, timeago, Enum, tup
from account import Account
from r2.lib.db.thing import Thing
from r2.lib.memoize import memoize
-from pylons import g
+from pylons import g, request
+from pylons.i18n import _
def mail_queue(metadata):
return sa.Table(g.db_app_name + '_mail_queue', metadata,
@@ -129,11 +129,11 @@ class EmailHandler(object):
self.queue_table = mail_queue(self.metadata)
indices = [index_str(self.queue_table, "date", "date"),
index_str(self.queue_table, 'kind', 'kind')]
- create_table(self.queue_table, indices, force = force)
+ create_table(self.queue_table, indices)
self.opt_table = opt_out(self.metadata)
indices = [index_str(self.opt_table, 'email', 'email')]
- create_table(self.opt_table, indices, force = force)
+ create_table(self.opt_table, indices)
self.track_table = sent_mail_table(self.metadata)
self.reject_table = sent_mail_table(self.metadata, name = "reject_mail")
@@ -148,8 +148,8 @@ class EmailHandler(object):
index_str(tab, 'msg_hash', 'msg_hash'),
]
- create_table(self.track_table, sent_indices(self.track_table), force = force)
- create_table(self.reject_table, sent_indices(self.reject_table), force = force)
+ create_table(self.track_table, sent_indices(self.track_table))
+ create_table(self.reject_table, sent_indices(self.reject_table))
def __repr__(self):
return ""
@@ -202,15 +202,20 @@ class EmailHandler(object):
return res[0][0] if res and res[:1] else None
- def add_to_queue(self, user, thing, emails, from_name, fr_addr, date, ip,
- kind, body = "", reply_to = ""):
+ def add_to_queue(self, user, emails, from_name, fr_addr, kind,
+ date = None, ip = None,
+ body = "", reply_to = "", thing = None):
s = self.queue_table
hashes = []
- for email in emails:
+ if not date:
+ date = datetime.datetime.now(g.tz)
+ if not ip:
+ ip = getattr(request, "ip", "127.0.0.1")
+ for email in tup(emails):
uid = user._id if user else 0
tid = thing._fullname if thing else ""
key = sha.new(str((email, from_name, uid, tid, ip, kind, body,
- datetime.datetime.now()))).hexdigest()
+ datetime.datetime.now(g.tz)))).hexdigest()
s.insert().values({s.c.to_addr : email,
s.c.account_id : uid,
s.c.from_name : from_name,
@@ -285,8 +290,35 @@ class EmailHandler(object):
class Email(object):
handler = EmailHandler()
- Kind = ["SHARE", "FEEDBACK", "ADVERTISE", "OPTOUT", "OPTIN"]
- Kind = Storage((e, i) for i, e in enumerate(Kind))
+ Kind = Enum("SHARE", "FEEDBACK", "ADVERTISE", "OPTOUT", "OPTIN",
+ "VERIFY_EMAIL", "RESET_PASSWORD",
+ "BID_PROMO",
+ "ACCEPT_PROMO",
+ "REJECT_PROMO",
+ "QUEUED_PROMO",
+ "LIVE_PROMO",
+ "FINISHED_PROMO",
+ "NEW_PROMO",
+ "HELP_TRANSLATE",
+ )
+
+ subjects = {
+ Kind.SHARE : _("[reddit] %(user)s has shared a link with you"),
+ Kind.FEEDBACK : _("[feedback] feedback from '%(user)s'"),
+ Kind.ADVERTISE : _("[ad_inq] feedback from '%(user)s'"),
+ Kind.OPTOUT : _("[reddit] email removal notice"),
+ Kind.OPTIN : _("[reddit] email addition notice"),
+ Kind.RESET_PASSWORD : _("[reddit] reset your password"),
+ Kind.VERIFY_EMAIL : _("[reddit] verify your email address"),
+ Kind.BID_PROMO : _("[reddit] your bid has been accepted"),
+ Kind.ACCEPT_PROMO : _("[reddit] your promotion has been accepted"),
+ Kind.REJECT_PROMO : _("[reddit] your promotion has been rejected"),
+ Kind.QUEUED_PROMO : _("[reddit] your promotion has been queued"),
+ Kind.LIVE_PROMO : _("[reddit] your promotion is now live"),
+ Kind.FINISHED_PROMO : _("[reddit] your promotion has finished"),
+ Kind.NEW_PROMO : _("[reddit] your promotion has been created"),
+ Kind.HELP_TRANSLATE : _("[i18n] translation offer from '%(user)s'"),
+ }
def __init__(self, user, thing, email, from_name, date, ip, banned_ip,
kind, msg_hash, body = '', from_addr = '',
@@ -302,9 +334,14 @@ class Email(object):
self.kind = kind
self.sent = False
self.body = body
- self.subject = ''
self.msg_hash = msg_hash
self.reply_to = reply_to
+ self.subject = self.subjects.get(kind, "")
+ try:
+ self.subject = self.subject % dict(user = self.from_name())
+ except UnicodeDecodeError:
+ self.subject = self.subject % dict(user = "a user")
+
def from_name(self):
if not self.user:
diff --git a/r2/r2/models/populatedb.py b/r2/r2/models/populatedb.py
index 0a671e0af..ef04ec09c 100644
--- a/r2/r2/models/populatedb.py
+++ b/r2/r2/models/populatedb.py
@@ -20,7 +20,6 @@
# CondeNet, Inc. All Rights Reserved.
################################################################################
from r2.models import *
-from r2.lib import promote
from r2.lib.utils import fetch_things2
import string
@@ -62,9 +61,6 @@ def create_links(num):
sr = random.choice(subreddits)
l = Link._submit(title, url, user, sr, '127.0.0.1')
- if random.choice(([False] * 50) + [True]):
- promote.promote(l)
-
def by_url_cache():
q = Link._query(Link.c._spam == (True,False),
diff --git a/r2/r2/models/printable.py b/r2/r2/models/printable.py
index 7f26e0bc5..722b21fa5 100644
--- a/r2/r2/models/printable.py
+++ b/r2/r2/models/printable.py
@@ -40,7 +40,7 @@ class Printable(object):
'render_score', 'score', '_score',
'upvotes', '_ups',
'downvotes', '_downs',
- 'subreddit_slow',
+ 'subreddit_slow', '_deleted', '_spam',
'cachable', 'make_permalink', 'permalink',
'timesince', 'votehash'
])
diff --git a/r2/r2/models/subreddit.py b/r2/r2/models/subreddit.py
index a4728de07..c987bcc68 100644
--- a/r2/r2/models/subreddit.py
+++ b/r2/r2/models/subreddit.py
@@ -50,16 +50,24 @@ class Subreddit(Thing, Printable):
description = '',
allow_top = True,
images = {},
+ ad_type = None,
ad_file = os.path.join(g.static_path, 'ad_default.html'),
reported = 0,
valid_votes = 0,
show_media = False,
+ css_on_cname = True,
domain = None,
+ mod_actions = 0,
+ sponsorship_url = None,
+ sponsorship_img = None,
+ sponsorship_name = None,
)
+ _data_int_props = ('mod_actions',)
+
sr_limit = 50
@classmethod
- def _new(self, name, title, author_id, ip, lang = g.lang, type = 'public',
+ def _new(cls, name, title, author_id, ip, lang = g.lang, type = 'public',
over_18 = False, **kw):
with g.make_lock('create_sr_' + name.lower()):
try:
@@ -265,8 +273,9 @@ class Subreddit(Thing, Printable):
else:
item.subscriber = bool(rels.get((item, user, 'subscriber')))
item.moderator = bool(rels.get((item, user, 'moderator')))
- item.contributor = bool(item.moderator or \
- rels.get((item, user, 'contributor')))
+ item.contributor = bool(item.type != 'public' and
+ (item.moderator or
+ rels.get((item, user, 'contributor'))))
item.score = item._ups
# override "voting" score behavior (it will override the use of
# item.score in builder.py to be ups-downs)
@@ -274,6 +283,12 @@ class Subreddit(Thing, Printable):
base_score = item.score - (1 if item.likes else 0)
item.voting_score = [(base_score + x - 1) for x in range(3)]
item.score_fmt = Score.subscribers
+
+ #will seem less horrible when add_props is in pages.py
+ from r2.lib.pages import UserText
+ item.usertext = UserText(item, item.description)
+
+
Printable.add_props(user, wrapped)
#TODO: make this work
cache_ignore = set(["subscribers"]).union(Printable.cache_ignore)
@@ -290,7 +305,7 @@ class Subreddit(Thing, Printable):
pop_reddits = Subreddit._query(Subreddit.c.type == ('public',
'restricted'),
sort=desc('_downs'),
- limit = limit * 1.5 if limit else None,
+ limit = limit,
data = True,
read_cache = True,
write_cache = True,
@@ -301,14 +316,7 @@ class Subreddit(Thing, Printable):
if not c.over18:
pop_reddits._filter(Subreddit.c.over_18 == False)
- # evaluate the query and remove the ones with
- # allow_top==False. Note that because this filtering is done
- # after the query is run, if there are a lot of top reddits
- # with allow_top==False, we may return fewer than `limit`
- # results.
- srs = filter(lambda sr: sr.allow_top, pop_reddits)
-
- return srs[:limit] if limit else srs
+ return list(pop_reddits)
@classmethod
def default_subreddits(cls, ids = True, limit = g.num_default_reddits):
@@ -318,8 +326,26 @@ class Subreddit(Thing, Printable):
An optional kw argument 'limit' is defaulted to g.num_default_reddits
"""
- srs = cls.top_lang_srs(c.content_langs, limit)
- return [s._id for s in srs] if ids else srs
+
+ # If we ever have much more than two of these, we should update
+ # _by_name to support lists of them
+ auto_srs = [ Subreddit._by_name(n) for n in g.automatic_reddits ]
+
+ srs = cls.top_lang_srs(c.content_langs, limit + len(auto_srs))
+ rv = []
+ for i, s in enumerate(srs):
+ if len(rv) >= limit:
+ break
+ if s in auto_srs:
+ continue
+ rv.append(s)
+
+ rv = auto_srs + rv
+
+ if ids:
+ return [ sr._id for sr in rv ]
+ else:
+ return rv
@classmethod
@memoize('random_reddits', time = 1800)
@@ -516,6 +542,7 @@ class AllSR(FakeSubreddit):
title = 'all'
def get_links(self, sort, time):
+ from r2.lib import promote
from r2.models import Link
from r2.lib.db import queries
q = Link._query(sort = queries.db_sort(sort))
diff --git a/r2/r2/models/thing_changes.py b/r2/r2/models/thing_changes.py
index ad8184c02..a3647bd76 100644
--- a/r2/r2/models/thing_changes.py
+++ b/r2/r2/models/thing_changes.py
@@ -21,89 +21,14 @@
################################################################################
import sqlalchemy as sa
-from r2.lib.db.tdb_sql import make_metadata
-from r2.lib.utils import worker
-
from pylons import g
-def index_str(table, name, on, where = None):
- index_str = 'create index idx_%s_' % name
- index_str += table.name
- index_str += ' on '+ table.name + ' (%s)' % on
- if where:
- index_str += ' where %s' % where
- return index_str
-
-def create_table(table, index_commands=None, force = False):
- t = table
- if g.db_create_tables:
- if not t.bind.has_table(t.name) or force:
- try:
- t.create(checkfirst = False)
- except: pass
- if index_commands:
- for i in index_commands:
- try:
- t.bind.execute(i)
- except: pass
+from r2.lib import amqp
+from r2.lib.utils import worker
-def change_table(metadata):
- return sa.Table(g.db_app_name + '_changes', metadata,
- sa.Column('fullname', sa.String, nullable=False,
- primary_key = True),
- sa.Column('thing_type', sa.Integer, nullable=False),
- sa.Column('date',
- sa.DateTime(timezone = True),
- default = sa.func.now(),
- nullable = False)
- )
-
-def make_change_tables(force = False):
- engine = g.dbm.engines['change']
- metadata = make_metadata(engine)
- table = change_table(metadata)
- indices = [
- index_str(table, 'fullname', 'fullname'),
- index_str(table, 'date', 'date')
- ]
- create_table(table, indices, force = force)
- return table
-
-_change_table = make_change_tables()
def changed(thing):
def _changed():
- d = dict(fullname = thing._fullname,
- thing_type = thing._type_id)
- try:
- _change_table.insert().execute(d)
- except sa.exceptions.SQLError:
- t = _change_table
- t.update(t.c.fullname == thing._fullname,
- values = {t.c.date: sa.func.now()}).execute()
- from r2.lib.solrsearch import indexed_types
- if isinstance(thing, indexed_types):
- worker.do(_changed)
-
-
-def _where(cls = None, min_date = None, max_date = None):
- t = _change_table
- where = []
- if cls:
- where.append(t.c.thing_type == cls._type_id)
- if min_date:
- where.append(t.c.date > min_date)
- if max_date:
- where.append(t.c.date <= max_date)
- if where:
- return sa.and_(*where)
-
-def get_changed(cls = None, min_date = None, limit = None):
- t = _change_table
- res = sa.select([t.c.fullname, t.c.date], _where(cls, min_date = min_date),
- order_by = t.c.date, limit = limit).execute()
- return res.fetchall()
-
-def clear_changes(cls = None, min_date=None, max_date=None):
- t = _change_table
- t.delete(_where(cls, min_date = min_date, max_date = max_date)).execute()
+ amqp.add_item('searchchanges_q', thing._fullname,
+ message_id = thing._fullname)
+ worker.do(_changed)
diff --git a/r2/r2/models/vote.py b/r2/r2/models/vote.py
index c9f1666f1..da1634137 100644
--- a/r2/r2/models/vote.py
+++ b/r2/r2/models/vote.py
@@ -64,10 +64,9 @@ class Vote(MultiRelation('vote',
#check for old vote
rel = cls.rel(sub, obj)
- oldvote = list(rel._query(rel.c._thing1_id == sub._id,
- rel.c._thing2_id == obj._id,
- data = True))
-
+ oldvote = rel._fast_query(sub, obj, ['-1', '0', '1']).values()
+ oldvote = filter(None, oldvote)
+
amount = 1 if dir is True else 0 if dir is None else -1
is_new = False
@@ -90,6 +89,7 @@ class Vote(MultiRelation('vote',
oldamount = 0
v = rel(sub, obj, str(amount))
v.author_id = obj.author_id
+ v.sr_id = sr._id
v.ip = ip
old_valid_thing = v.valid_thing = (valid_thing(v, karma))
v.valid_user = (v.valid_thing and valid_user(v, sr, karma)
diff --git a/r2/r2/public/static/alien-clippy.png b/r2/r2/public/static/alien-clippy.png
new file mode 100644
index 000000000..bf82a488e
Binary files /dev/null and b/r2/r2/public/static/alien-clippy.png differ
diff --git a/r2/r2/public/static/award.png b/r2/r2/public/static/award.png
new file mode 100644
index 000000000..312c8a27b
Binary files /dev/null and b/r2/r2/public/static/award.png differ
diff --git a/r2/r2/public/static/bg-button-add.png b/r2/r2/public/static/bg-button-add.png
new file mode 100644
index 000000000..808322290
Binary files /dev/null and b/r2/r2/public/static/bg-button-add.png differ
diff --git a/r2/r2/public/static/bg-button-remove.png b/r2/r2/public/static/bg-button-remove.png
new file mode 100644
index 000000000..e5d396575
Binary files /dev/null and b/r2/r2/public/static/bg-button-remove.png differ
diff --git a/r2/r2/public/static/cclogo.png b/r2/r2/public/static/cclogo.png
new file mode 100644
index 000000000..f337b82d6
Binary files /dev/null and b/r2/r2/public/static/cclogo.png differ
diff --git a/r2/r2/public/static/clippy-bullet.png b/r2/r2/public/static/clippy-bullet.png
new file mode 100644
index 000000000..3c447d0ad
Binary files /dev/null and b/r2/r2/public/static/clippy-bullet.png differ
diff --git a/r2/r2/public/static/css/reddit-ie6-hax.css b/r2/r2/public/static/css/reddit-ie6-hax.css
index daaff143f..77140ccce 100644
--- a/r2/r2/public/static/css/reddit-ie6-hax.css
+++ b/r2/r2/public/static/css/reddit-ie6-hax.css
@@ -144,3 +144,23 @@ div.popup {
.shirt .shirt-container .main.red .caption.big .byline {
background-image: non;
}
+
+.usertext .bottom-area .usertext-buttons {display: inline; }
+
+.arrow.upmod {
+ background-image: url(/static/aupmod.gif);
+ background-position: 0 0;
+}
+.arrow.downmod {
+ background-image: url(/static/adownmod.gif);
+ background-position: 0 0;
+}
+.arrow.up {
+ background-image: url(/static/aupgray.gif);
+ background-position: 0 0;
+}
+.arrow.down {
+ background-image: url(/static/adowngray.gif);
+ background-position: 0 0;
+}
+
diff --git a/r2/r2/public/static/css/reddit-ie7-hax.css b/r2/r2/public/static/css/reddit-ie7-hax.css
index 7a5cb7cc9..676c7b0c8 100644
--- a/r2/r2/public/static/css/reddit-ie7-hax.css
+++ b/r2/r2/public/static/css/reddit-ie7-hax.css
@@ -2,3 +2,11 @@
border: none;
height: 17px;
}
+
+.entry.unvoted .score.unvoted { display: inline; }
+.entry.unvoted div.score.unvoted { display: inline; }
+
+/* Award name font is too big in IE */
+.award-square .award-name {
+ font-size:18px;
+}
diff --git a/r2/r2/public/static/css/reddit.css b/r2/r2/public/static/css/reddit.css
index 8424de02f..f61fb5383 100644
--- a/r2/r2/public/static/css/reddit.css
+++ b/r2/r2/public/static/css/reddit.css
@@ -55,7 +55,7 @@ a:focus { -moz-outline-style: none; }
-webkit-border-radius: 7px;
}
-.rounded .morelink {
+.rounded .morelink {
-webkit-border-top-right-radius: 6px;
-moz-border-radius-topright: 6px;
}
@@ -94,7 +94,7 @@ input[type=checkbox], input[type=radio] { margin-top: .4em; }
.selected { font-weight: bold; }
.flat-list {list-style-type: none; display: inline;}
-.flat-list li {display: inline;}
+.flat-list li {display: inline; }
.flat-list form {display: inline; }
.flat-list .selected a { color: orangered; }
@@ -102,7 +102,7 @@ ul.flat-vert {text-align: left;}
.flat-vert .separator { margin: 0 }
.flat-vert.title {
- font-family:helvetica,arial,verdana,sans-serif;
+ font-family:arial,verdana,helvetica,sans-serif;
color: #777;
font-size: 18px;
font-weight: normal;
@@ -130,11 +130,11 @@ ul.flat-vert {text-align: left;}
right: 5px;
}
-#header-bottom-left {
+#header-bottom-left {
font-size: larger;
}
-#header-bottom-right {
+#header-bottom-right {
position: absolute;
right: 0px;
bottom: 0px;
@@ -163,7 +163,7 @@ ul.flat-vert {text-align: left;}
background-color: #ff9;
}
-.dropdown {
+.dropdown {
cursor: default;
display: inline;
position: relative;
@@ -195,7 +195,8 @@ ul.flat-vert {text-align: left;}
}
.dropdown.heavydrop .selected{
- background: white url(/static/droparrow.gif) no-repeat scroll center right;
+ background: white none no-repeat scroll center right;
+ background-image: url(/static/droparrow.gif);
border: 1px solid gray;
padding: 2px;
padding-right: 23px;
@@ -205,20 +206,22 @@ ul.flat-vert {text-align: left;}
.dropdown.lightdrop .selected {
position: relative;
- background: transparent url(/static/droparrowgray.gif) no-repeat scroll center right;
+ background: transparent none no-repeat scroll center right;
+ background-image: url(/static/droparrowgray.gif);
padding-right: 21px;
text-decoration: underline;
color: gray;
}
-.drop-choices.lightdrop {
+.drop-choices.lightdrop {
margin-top: 2px;
}
/*tab drop*/
.dropdown.tabdrop .selected {
position: relative;
- background: white url(/static/droparrowgray.gif) no-repeat scroll center right;
+ background: white none no-repeat scroll center right;
+ background-image: url(/static/droparrowgray.gif);
padding: 2px 21px 1px 5px;
margin-left: 3px;
border: 1px solid #5f99cf;
@@ -247,12 +250,12 @@ ul.flat-vert {text-align: left;}
margin: 0px 3px;
}
-.tabmenu li a {
+.tabmenu li a {
padding: 2px 6px 0 6px;
background-color: #eff7ff;
}
-.tabmenu li.selected a{
+.tabmenu li.selected a{
color: orangered;
background-color: white;
border: 1px solid #5f99cf;
@@ -279,116 +282,100 @@ ul.flat-vert {text-align: left;}
/* side box menus */
-.side {
+.side {
float: right;
background-color: white;
margin: 0px 5px 0 5px;
width: 300px;
}
-.side .spacer {
- margin: 7px 0;
+.side .spacer {
+ margin: 7px 0 12px 0;
}
.morelink {
- background-color:#FFFFFF;
- color:#369;
display:block;
+ text-align: center;
+ position: relative;
+
+ -moz-border-radius-topleft: 6px;
+ -moz-border-radius-bottomleft: 6px;
+
+ border: 1px solid #c4dbf1;
+
+ background: white none repeat-x scroll center left;
+ background-image: url(/static/gradient-button.png);
+
font-size:150%;
font-weight:bold;
+
letter-spacing:-1px;
- padding:5px 10px;
- text-transform:uppercase;
- border: 1px solid #fff;
+ line-height: 29px;
+ height: 29px;
}
-.morelink.blah:hover {
- background-color: #fff;
- color: #369;
+.morelink:hover, .mlh {
+ border-color: #879eb4;
+ background-image: url(/static/gradient-button-hover.png);
}
-.morelink.blah {
- background-color: #369;
- color: #fff;
- border: 1px solid #fff;
-}
-
-.morelink:hover {
- color: #fff;
- background-color: #369;
- border: 1px solid #369;
+.morelink a {
+ display: block;
+ width: 100%;
+ color:#369;
}
-.sidebox {
+.morelink:hover a {
+ color:white;
+}
+
+.morelink .nub {
+ position: absolute;
+ top: -1px;
+ right: -1px;
+ height: 31px;
+ width: 24px;
+ background: white none no-repeat scroll center left;
+ background-image: url(/static/gradient-nub.png); /* SPRITE */
+}
+
+.morelink:hover .nub, .mlhn {
+ background-image: url(/static/gradient-nub-hover.png); /* SPRITE */
+}
+
+/* raised box */
+
+.raisedbox {
+ padding: 5px;
+ background: #E0E0E0;
border: 1px solid gray;
- padding-left: 44px;
}
-.sidebox .spacer { margin: 0 0 5px 0 }
-.sidebox.create {
- background: url(/static/create-a-reddit.png) no-repeat scroll center left;
+.raisedbox h4 { margin-bottom: 3px }
+.raisedbox li {margin-bottom: 2px;}
+
+.sidebox .spacer {
+ margin-top: 10px;
+ padding: 5px 0 0 44px;
+ min-height: 41px;
+ background: white none no-repeat scroll top left;
}
-.sidebox.submit {background: url(/static/submit-alien.png) no-repeat scroll center left;}
-.sidebox .morelink { text-transform: none; }
+
+.sidebox.create .spacer {
+ background-image: url(/static/create-a-reddit.png); /* SPRITE */
+}
+
+.sidebox.submit .spacer {
+ background-image: url(/static/submit-alien.png); /* SPRITE */
+}
+
.sidebox .subtitle {
margin-left: 10px;
color: dimgray;
font-size: 110%;
}
-/* raised box */
-.raisedbox {
- padding: 5px;
- background: #E0E0E0;
- border: 1px solid gray;
-}
-
-.raisedbox h3 {
- font-size: 160%;
- margin-bottom: 0px;
- color: #333;
-}
-.raisedbox h4 { margin-bottom: 3px }
-
-.raisedbox li {margin-bottom: 2px;}
-
-.subreddit-info {padding-bottom: 3px }
-.subreddit-info .moderate { color: orangered; }
-
-.subreddit-info .subscribe-button {
- margin-right: 5px;
- font-size: larger;
-}
-
-.subreddit-info .label {color: #404040;}
-.subreddit-info .state-button { display:block }
-.subreddit-info .spacer { margin: 10px 0px 0px 0px }
-
-.raisedbox .flat-vert { }
-.raisedbox .flat-vert .separator { display: none; }
-.raisedbox .flat-vert a {font-size: larger;}
-
-/* feature disabled. need to go through this to see what's relevant
-before enabling */
-/*
-.raisedbox .edit {
- color: gray;
- text-decoration: none;
- font-size: x-small;
-}
-
-.raisedbox #avatar { float: left;
- text-align: center; }
-.raisedbox #avatar img {
- width: 64px;
- height: 64px;
- display: block;
- border: 1px solid black;
- margin-right: 10px;
-}
-.raisedbox #avatar a { padding: 0px; }
-*/
.infotable { margin-top: 5px; margin-bottom: 10px; }
.infotable .small { font-size: smaller; }
@@ -407,7 +394,7 @@ before enabling */
.profile-attr .value {color: #404040;
margin-right: 5px; }
-.profile-attr .md {
+.profile-attr .md {
margin-left: 10px;
margin-top: 5px;
border-color: #B2B2B2 #D0D0D0 #D0D0D0 #B2B2B2;
@@ -415,7 +402,7 @@ before enabling */
border-width: 1px;
padding: 10px; }
-.profile-attr .md ul {
+.profile-attr .md ul {
float: none;
list-style-type: disc;
margin-left: 15px;
@@ -429,7 +416,7 @@ before enabling */
/* thing rendering */
-.preload {
+.preload {
position: absolute;
top: -1000px;
left: -1000px;
@@ -443,14 +430,25 @@ before enabling */
cursor: pointer;
background-position: center center;
background-repeat: no-repeat;
+ width: 15px;
+ margin-left: auto;
+ margin-right: auto;
}
-.arrow.upmod { background-image: url(/static/aupmod.gif); }
-.arrow.downmod { background-image: url(/static/adownmod.gif); }
-.arrow.up { background-image: url(/static/aupgray.gif); }
-.arrow.down { background-image: url(/static/adowngray.gif); }
+.arrow.upmod {
+ background-image: url(/static/aupmod.gif); /* SPRITE */
+}
+.arrow.downmod {
+ background-image: url(/static/adownmod.gif); /* SPRITE */
+}
+.arrow.up {
+ background-image: url(/static/aupgray.gif); /* SPRITE */
+}
+.arrow.down {
+ background-image: url(/static/adowngray.gif); /* SPRITE */
+}
-.midcol {
+.midcol {
float: left;
margin-right: 4px;
margin-left: 7px;
@@ -473,13 +471,14 @@ before enabling */
.tagline .friend { color: orangered }
.tagline .submitter { color: #0055df }
.tagline .moderator { color: #228822 }
-.tagline .admin { color: #ff0000; }
+.tagline .admin { color: #ff0011; }
.tagline a.author.admin { font-weight: bold }
.tagline a:hover { text-decoration: underline }
.media-button .option { color: red; }
-.media-button .option.active {
- background: transparent url(/static/reddit-button-play.gif) no-repeat scroll right center;
+.media-button .option.active {
+ background: transparent none no-repeat scroll right center;
+ background-image: url(/static/reddit-button-play.gif); /* SPRITE */
padding-right: 15px;
color: #336699;
}
@@ -489,7 +488,7 @@ before enabling */
.thing .title { color: blue; padding: 0px; overflow: hidden; }
.thing .title:visited { color: #551a8b }
.thing .title.click { color: #551a8b }
-
+
.thing .title.loggedin { color: blue }
.thing .title.loggedin:visited { color: #551a8b }
.thing .title.loggedin.click { color: #551a8b }
@@ -500,12 +499,12 @@ before enabling */
.nextprev { color: gray; font-size: larger; margin-top: 10px;}
/* corner help */
-.help a {
+.help a {
color: #808080;
text-decoration: underline;
}
-.help a.open {
+.help a.open {
margin: 0px 5px 5px 0;
position: absolute;
right: 0px;
@@ -513,7 +512,7 @@ before enabling */
}
-.help.help-cover {
+.help.help-cover {
background-color: #F8F8F8;
border: 1px solid gray;
font-size: 110%;
@@ -530,7 +529,7 @@ before enabling */
}
/* organic listing */
-.organic-listing {
+.organic-listing {
border: solid 1px gray;
padding: 0;
overflow: hidden;
@@ -538,13 +537,16 @@ before enabling */
min-height: 50px;
}
-.organic-listing .link {
+.organic-listing .link {
background-color: #F8F8F8;
+}
+.organic-listing .link,
+.organic-listing .link.promotedlink {
padding: 5px 7em 10px 0;
margin-bottom: 0px;
}
-.organic-listing .nextprev {
+.organic-listing .nextprev {
margin: 0px;
position: absolute;
right: 0px;
@@ -556,14 +558,22 @@ before enabling */
.organic-listing .nextprev img:hover { cursor: pointer; border: solid 1px #336699; }
.organic-listing .nextprev img:active { margin: 6px 4px 1px 1px;}
-.promoted {
- background-color: #EFF7FF;
+.link.promotedlink {
+ /*background-color: lightgreen; */
border: 1px solid gray;
- padding: 5px 0 5px 0;
+ padding: 5px 0 5px 3px;
overflow: hidden;
position: relative;
}
-
+.link.promotedlink.unpaid { background-color: #FFC; }
+.link.promotedlink.unseen { background-color: #FFC; }
+.link.promotedlink.accepted { background-color: #9F9; }
+.link.promotedlink.rejected { background-color: #FF9A9A; }
+.link.promotedlink.accepted { background-color: #9F9; }
+.link.promotedlink.pending { background-color: #BFC; }
+.link.promotedlink.promoted { background-color: #EFF7FF; }
+.link.promotedlink.finished { background-color: #DDD; }
+#promo-form + form #img-preview-container { display: none; }
.promoted-list { font-size: larger; }
.promoted-list .unpromote-button { display: inline }
@@ -580,7 +590,7 @@ before enabling */
right: 6.4em;
}
-.sponsored-tagline {
+.sponsored-tagline {
color: #808080;
bottom: 0;
margin: 0 5px 5px 0;
@@ -600,7 +610,8 @@ before enabling */
.menuarea {
border-bottom: 1px dotted gray;
padding: 5px 10px;
- margin: 5px 310px 5px 5px;
+ margin: 5px;
+ overflow: hidden;
font-size: larger;
}
@@ -619,7 +630,7 @@ before enabling */
color: gray;
}
-.commentarea > .usertext {
+.commentarea > .usertext {
margin: 0 0 10px 10px;
overflow: auto;
}
@@ -637,6 +648,18 @@ before enabling */
vertical-align: middle;
}
+.infobar.red {
+ padding: 5px;
+ background-color: #FFAEAE;
+ border-color: red;
+}
+
+.infobar.red img {
+ float: left;
+ margin-right: 5px;
+}
+
+
/* markdown */
.md { max-width: 60em; overflow: auto; font-size: small; }
.md p, .md h1 { margin: 5px 0}
@@ -664,15 +687,17 @@ a.star { text-decoration: none; color: #ff8b60 }
.even { }
/* buttons on main link style */
-.entry .buttons li {
+.entry .buttons li {
display: inline;
- padding: 0 4px;
border: none;
+ padding-right: 4px;
+}
+.entry .buttons li + li {
+ padding-left: 4px;
}
-.entry .buttons li.first {padding-left: 0px;}
-.entry .buttons li a {
+.entry .buttons li a {
color: #888;
font-weight: bold;
padding: 0 1px;
@@ -698,7 +723,7 @@ a.star { text-decoration: none; color: #ff8b60 }
.link .score {text-align: center; color: #c6c6c6;}
.link .title {font-size:medium; font-weight: normal; margin-bottom: 1px;}
-.link .child h3 {
+.link .child h3 {
margin: 15px;
text-transform: none;
font-size: medium;
@@ -710,7 +735,7 @@ a.star { text-decoration: none; color: #ff8b60 }
.link .score.likes { color: #FF8B60; }
.link .score.dislikes { color: #9494FF; }
-.link .rank {
+.link .rank {
float:left;
margin-top: 15px;
color: #c6c6c6;
@@ -744,14 +769,6 @@ a.star { text-decoration: none; color: #ff8b60 }
/* widget styling */
.gadget {
font-size: x-small;
- border: 1px solid gray;
- padding: 5px;
-}
-
-.gadget h2 {
- padding-left: 49px;
- font-size: 150%;
- margin-bottom: 5px;
}
.gadget .midcol {
@@ -786,12 +803,12 @@ a.star { text-decoration: none; color: #ff8b60 }
padding-left: 17px;
padding-bottom: 10px; }
.comment .collapsed a { color: gray; }
-.comment .expand {
+.comment .expand {
font-style: normal;
margin-left: 5px;
margin-right: 5px;
padding: 1px; }
-.comment .expand:hover {
+.comment .expand:hover {
text-decoration: none;
color: white;
background-color: #369;
@@ -807,9 +824,8 @@ textarea.gray { color: gray; }
.deepthread {
padding-right: 30px;
- background-image: url(/static/continue-thread.png);
- background-repeat: no-repeat;
- background-position: center right;
+ background: transparent none no-repeat scroll center right;
+ background-image: url(/static/continue-thread.png);
}
.deepthread a { font-size: larger; color: #336699 }
.deepthread a:hover { text-decoration: underline}
@@ -819,33 +835,90 @@ textarea.gray { color: gray; }
.morecomments a:hover { text-decoration: underline}
.morecomments .gray {font-weight: normal; color: gray}
-.message {margin: 10px}
+.message {margin: 10px; margin-bottom: 20px;}
+.message .buttons,
+.message .md { margin-left: 15px; }
+.message .entry .parent {
+ border: 1px solid #336699;
+ max-width: 60em;
+ margin: 3px 10px;
+}
+.message .subject .title {
+ font-weight: normal;
+ font-style: italic;
+ margin-left: 10px;
+}
+.message .parent-link {
+ margin-left: 12px;
+ padding: 0 2px;
+ font-weight: bold;
+}
+.message .child { margin-left: 15px; }
+
.message .head.new {color:orangered }
.message .subject { font-weight: bold; font-size: larger; }
+.clippy img {
+ float: left;
+}
+
+.clippy-bubble {
+ background-color:#fffdd7;
+ border: solid black 1px;
+ width: 350px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ margin-left: 5px;
+ margin-bottom: 15px;
+ padding: 7px;
+ float: left;
+}
+
+.clippy-headline {
+ font-weight:bold;
+ margin-bottom: 0.5em;
+}
+
+.clippy-bubble ul {
+ list-style-type: disc;
+ list-style-image: url(/static/clippy-bullet.png);
+ padding-left: 15px;
+}
+
+.clippy-bubble li {
+ margin-top: 0.5em;
+}
+
.subreddit { margin-bottom: 10px; }
.subreddit p { margin-top: 0px; margin-bottom: 1px; }
.subreddit .description {font-size: small; max-width: 60em;}
.subreddit .key {display: block;}
.subreddit .title { font-size: medium; margin-right: 5px; }
-.subreddit .midcol { margin-right: 5px }
+.subreddit .midcol { margin-right: 5px; margin-top: 5px; text-align: right; }
-.sr-toggle-button {
+.fancy-toggle-button {
display: block;
margin-bottom: 5px;
- cursor: pointer;
}
-.sr-toggle-button a.option.active {
- display: block;
- width: 54px;
- height: 18px;
+.fancy-toggle-button .active {
+ border: 1px solid #444;
+ padding: 1px 6px;
+ background: white none repeat-x scroll center left;
+
+ color: white;
+ font-size: 10px;
+ font-weight: bold;
+
+ line-height: 20px;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
}
-.sr-toggle-button .remove { background-image: url(/static/sr-remove-button.png)}
-.sr-toggle-button .add { background-image: url(/static/sr-add-button.png) }
-
-.sr-type-img {
- margin-right: 2px;
+.fancy-toggle-button .remove {
+ background-image: url(/static/bg-button-remove.png);
+}
+.fancy-toggle-button .add {
+ background-image: url(/static/bg-button-add.png);
}
.commentbody.border { background-color: #ffc; padding-left: 5px}
@@ -870,7 +943,7 @@ textarea.gray { color: gray; }
.share-summary { width: 95%; margin-top: 10px; }
.share-summary .head td { width: 50%; font-size: large; text-align: center }
.share-summary td { vertical-align: top;}
-.share-summary > tbody > tr > td {
+.share-summary > tbody > tr > td {
padding-left: 10px;
padding-bottom: 10px;
}
@@ -886,12 +959,6 @@ textarea.gray { color: gray; }
border-right: #E0E0E0 solid 1px;
}
-.sponsored .asterisk {
- width: 15px;
- background: url(/static/asterisk.png);
- background-repeat: no-repeat }
-
-
/* footer */
.footer-parent {
padding-top: 40px;
@@ -927,7 +994,7 @@ textarea.gray { color: gray; }
}
.server-status { width: 300px; }
-.server-status table {
+.server-status table {
font-size: xx-small;
margin-left: 5px;
border-top: #BCBCBC solid 1px;
@@ -935,6 +1002,7 @@ textarea.gray { color: gray; }
border-bottom: #E0E0E0 solid 1px;
border-right: #E0E0E0 solid 1px;
margin-bottom: 5px;
+ width: 290px;
}
.server-status td { padding-right: 2px; padding-left: 2px; }
.server-status .bar { height: 5px; background-color: blue; }
@@ -948,7 +1016,7 @@ textarea.gray { color: gray; }
.server-status .load7 { background-color: #ffdb81; }
.server-status .load8 { background-color: #FF9191; }
.server-status .load9 { background-color: #FF0000; color: #FFFFFF }
-.server-status tr.down > * {
+.server-status tr.down > * {
background-color: #C0C0C0;
text-decoration: line-through;
}
@@ -963,29 +1031,29 @@ textarea.gray { color: gray; }
.server-status tr.title-region.empty:hover > th { text-decoration: none; }
-.server-status .pegged {
+.server-status .pegged {
background-color: red;
font-weight: bold;
color: #FFFFFF;
}
-.server-status .membar {
+.server-status .membar {
height:11px;
border:1px solid white;
background-color:#6699FF;
position: relative;
}
-.server-status .membar span {
+.server-status .membar span {
position: absolute;
font-size: smaller;
}
-.server-status .cpu50 {
+.server-status .cpu50 {
height: 5px;
background-color:green;
border:1px solid white;
border-bottom: none;
}
-.server-status .cpu300 {
+.server-status .cpu300 {
height: 5px;
background-color:red;
border:1px solid white;
@@ -997,11 +1065,11 @@ textarea.gray { color: gray; }
.orangered { color: orangered; }
.logout { display: inline; }
-.login-form-side {
+.login-form-side {
border: 1px solid gray;
}
-.login-form-side input {
+.login-form-side input {
border: 1px solid gray;
width: 138px;
height: 17px;
@@ -1010,11 +1078,11 @@ textarea.gray { color: gray; }
padding: 1px;
}
-.login-form-side .error {
+.login-form-side .error {
margin: 5px;
}
-#remember-me {
+#remember-me {
margin: 5px;
}
@@ -1075,23 +1143,18 @@ textarea.gray { color: gray; }
margin-left: 10px; }
-/*.searchpane { margin-left: 20px }
-.searchpane h2 { margin-bottom: 3px }
-.searchpane p { margin-bottom: 5px; margin-top:3px; }
-.searchpane a { color: #369 }*/
-
-.searchpane {
- margin: 5px 310px 5px 0px;
+.searchpane {
+ margin: 5px 305px 5px 0px;
}
.searchpane #search input[type=text] { }
-.searchpane .summary {
+.searchpane .summary {
font-weight: bold;
float: right;
}
-.searchpane .clearleft {
+.searchpane .clearleft {
margin-bottom: 10px;
}
@@ -1104,14 +1167,14 @@ textarea.gray { color: gray; }
.divide { border-right: 2px solid #D3D3D3; }
-.loginform {
+.loginform {
float: left;
width: 45%;
padding-left: 15px;
padding-right: 15px;
}
-.loginform h3 {
+.loginform h3 {
margin-bottom: 0;
margin-top: 10px;
font-size: large;
@@ -1119,7 +1182,7 @@ textarea.gray { color: gray; }
font-variant: small-caps;
color: #404040;
}
-.loginform p {
+.loginform p {
text-align: left;
margin-bottom: 10px;
color: #606060;
@@ -1138,7 +1201,7 @@ textarea.gray { color: gray; }
.loginform input.logtxt { width: 125px; }
.loginform input[type=text],
-.loginform input[type=password] {
+.loginform input[type=password] {
width: 125px;
border: 1px solid #A0A0A0;
margin-top: 2px;
@@ -1146,7 +1209,7 @@ textarea.gray { color: gray; }
padding: 1px;
}
-.loginform #captcha {
+.loginform #captcha {
width: 250px;
}
@@ -1180,14 +1243,14 @@ textarea.gray { color: gray; }
border-width: 1px;
}
-.popup h1 {
+.popup h1 {
text-align: center;
font-size: large;
font-weight: normal;
color: orangered;
}
-.popup h2 {
+.popup h2 {
text-align: center;
font-size: small;
margin-top: 0px;
@@ -1211,18 +1274,18 @@ textarea.gray { color: gray; }
.oldbylink a { background-color: #F0F0F0; margin: 2px; color: gray}
-.details {
+.details {
font-size: x-small;
margin-bottom: 10px;
}
.details span { margin: 0 5px 0 5px; }
-.details th {
+.details th {
text-align: right;
padding-right: 5px;
font-weight: bold;
}
-.details td {
+.details td {
vertical-align: top;
}
@@ -1262,14 +1325,14 @@ textarea.gray { color: gray; }
/* Buttons specific */
-.button {
+.button {
border-collapse: collapse;
color: gray;
text-align: center;
margin: 1px;
}
-.button #cover {
+.button #cover {
position: relative;
}
@@ -1277,7 +1340,7 @@ textarea.gray { color: gray; }
background: white;
}
-.button #popup {
+.button #popup {
position: absolute;
width: 80%;
z-index: 1001;
@@ -1315,19 +1378,19 @@ textarea.gray { color: gray; }
width: 18px;
float: left;
}
-.button .blog1 .score {
+.button .blog1 .score {
float: center;
margin-top: 2px;
margin-right: 5px;
}
.button .blog2 { font-size: small; }
-.button .blog2 .arrow { width: 100% }
+.button .blog2 .arrow { width: 15px; margin-left: auto; margin-right: auto; }
.button .blog2 .bottomreddit { color: black; background-color: #c7def7; font-size: small; }
.button .blog3 { font-size: small; border: none; }
.button .blog3 .left { float: left; width: 50%; }
-.button .blog3 .arrow { width: 100% }
+.button .blog2 .arrow { width: 15px; margin-left: auto; margin-right: auto; }
.button .blog3 .right { float: right; margin-top: 5px; }
@@ -1347,13 +1410,13 @@ textarea.gray { color: gray; }
border-width: 1px;
}
-.blog5 .votes {
+.blog5 .votes {
height: 25px;
background-color: #F8F8F1;
border: 1px solid #CCC;
padding-top: 5px;
}
-.blog5 .arrow {
+.blog5 .arrow {
margin-right: 15px;
margin-left: 5px;
color: black;
@@ -1389,7 +1452,7 @@ textarea.gray { color: gray; }
.instructions .buttons li { margin-top: 1em;
border-bottom: 1px solid #e0e0e0;
padding-bottom: 1em;}
-.instructions code {
+.instructions code {
display: block;
font-family: monospace;
font-size: small;
@@ -1532,10 +1595,18 @@ textarea.gray { color: gray; }
padding-left: 16px;
}
-.toolbar .arrow.upmod { background-image: url(/static/aminiupmod.gif); }
-.toolbar .arrow.downmod { background-image: url(/static/aminidownmod.gif); }
-.toolbar .arrow.up { background-image: url(/static/aminiupgray.gif); }
-.toolbar .arrow.down { background-image: url(/static/aminidowngray.gif); }
+.toolbar .arrow.upmod {
+ background-image: url(/static/aminiupmod.gif);
+}
+.toolbar .arrow.downmod {
+ background-image: url(/static/aminidownmod.gif);
+}
+.toolbar .arrow.up {
+ background-image: url(/static/aminiupgray.gif);
+}
+.toolbar .arrow.down {
+ background-image: url(/static/aminidowngray.gif);
+}
.toolbar-status-bar {
border-top: solid #336699 1px;
@@ -1611,7 +1682,7 @@ form input[type=checkbox],
form input[type=radio] {margin: 2px .5em 0 0; }
-.pretty-form {
+.pretty-form {
font-size: larger;
vertical-align: top;
}
@@ -1628,7 +1699,7 @@ form input[type=radio] {margin: 2px .5em 0 0; }
padding: 2px;
}
-.pretty-form .infobar {
+.pretty-form .infobar {
width: 285px;
margin: 5px;
}
@@ -1643,11 +1714,15 @@ form input[type=radio] {margin: 2px .5em 0 0; }
.pretty-form th { text-align: right }
/* delete page */
-.delete-field {
+.delete-field {
background-color: white;
padding: 10px;
}
+.delete-field td {
+ vertical-align: top;
+}
+
/*pref page boxes*/
.pretty-form.short-text input[type=text],
.pretty-form.short-text textarea,
@@ -1663,7 +1738,7 @@ form input[type=radio] {margin: 2px .5em 0 0; }
.opt-form form { display: inline; }
/* pref table - used for preferences and edit subreddit pages */
-.preftable th {
+.preftable th {
padding: 10px;
font-weight: bold;
vertical-align: top;
@@ -1700,7 +1775,7 @@ form input[type=radio] {margin: 2px .5em 0 0; }
color: #369; font-weight: bold;}
.stats td.ri { padding-left: 20px; text-align: right}
-.thumbnail {
+.thumbnail {
float: left;
margin: 0px 5px;
overflow: hidden;
@@ -1717,11 +1792,11 @@ form input[type=radio] {margin: 2px .5em 0 0; }
.image-upload span { padding-left: 5px; }
-ul#image-preview-list {
+ul#image-preview-list {
margin: 20px 320px 20px 20px;
font-size:larger;
}
-ul#image-preview-list li {
+ul#image-preview-list li {
padding-bottom: 10px;
margin-bottom: 20px;
vertical-align: top;
@@ -1731,7 +1806,7 @@ ul#image-preview-list li {
position: relative;
}
-ul#image-preview-list .preview {
+ul#image-preview-list .preview {
width: 100px;
float: left;
display: block;
@@ -1739,15 +1814,15 @@ ul#image-preview-list .preview {
max-height: 100px;
overflow: hidden;
}
-ul#image-preview-list .preview img {
+ul#image-preview-list .preview img {
max-width: 100px;
padding: auto;
}
-ul#image-preview-list .description {
+ul#image-preview-list .description {
vertical-align: top;
margin-left: 105px;
}
-ul#image-preview-list .description pre {
+ul#image-preview-list .description pre {
display: inline;
padding: 5px;
}
@@ -1762,7 +1837,7 @@ ul#image-preview-list .description pre {
.sheets .btn.right { float: right; margin-right: 3px;}
-#validation-errors {
+#validation-errors {
margin-left: 40px;
margin-top: 10px;
list-style-type: disc;
@@ -1775,7 +1850,7 @@ ul#image-preview-list .description pre {
#validation-errors a:hover { text-decoration: underline; }
#validation-errors pre { padding: 10px; color: black; }
-#preview-table {
+#preview-table {
padding-right: 15px;
}
#preview-table > table {
@@ -1789,7 +1864,7 @@ ul#image-preview-list .description pre {
#preview-table > table > tbody > tr { padding-bottom: 10px; }
#preview-table > table > tbody > tr > td { padding: 5px; padding-right: 15px;}
-#preview-table > table > tbody > tr > th {
+#preview-table > table > tbody > tr > th {
padding: 5px; padding-right: 15px;
font-weight: bold;
vertical-align: top;
@@ -1842,7 +1917,7 @@ ul#image-preview-list .description pre {
clear: left;
}
-.socialite.instructions .features {
+.socialite.instructions .features {
padding-left: 15px;
max-width: 60em;
}
@@ -1856,7 +1931,8 @@ ul#image-preview-list .description pre {
}
.socialite a.installbutton {
- background: transparent url(/static/socialite/installbutton-end.png) no-repeat scroll top right;
+ background: transparent none no-repeat scroll top right;
+ background-image: url(/static/socialite/installbutton-end.png); /* SPRITE */
color: #FFF;
display: block;
float: left;
@@ -1868,7 +1944,8 @@ ul#image-preview-list .description pre {
}
.socialite a.installbutton span {
- background: transparent url(/static/socialite/installbutton.png) no-repeat;
+ background: transparent none no-repeat;
+ background-image: url(/static/socialite/installbutton.png); /* SPRITE */
display: block;
line-height: 30px;
padding: 10px 0 10px 17px;
@@ -1882,7 +1959,7 @@ ul#image-preview-list .description pre {
background-position: bottom left;
}
-#sr-header-area {
+#sr-header-area {
padding: 3px 0px 3px 5px;
background-color: #f0f0f0;
white-space: nowrap;
@@ -1896,8 +1973,9 @@ ul#image-preview-list .description pre {
color: orangered;
}
-.dropdown.srdrop .selected {
- background: transparent url(/static/droparrowgray.gif) no-repeat scroll center right;
+.dropdown.srdrop .selected {
+ background: transparent none no-repeat scroll center right;
+ background-image: url(/static/droparrowgray.gif);
display: inline-block;
vertical-align: bottom;
padding-right: 21px;
@@ -1938,22 +2016,17 @@ ul#image-preview-list .description pre {
#sr-more-link:hover {text-decoration: underline;}
-.subscription-box {
- border: 1px solid gray;
- padding: 0 10px;
- }
-
-.subscription-box li {
+.subscription-box li {
clear: left;
margin-bottom: 10px;
}
-.subscription-box .sr-toggle-button {
+.subscription-box .fancy-toggle-button {
margin-right: 5px;
float: left;
}
-.subscription-box .title {
+.subscription-box .title {
font-size: medium;
color: blue;
margin-right: 5px;
@@ -1967,7 +2040,7 @@ ul#image-preview-list .description pre {
#sr { margin-left: 0px }
-#sr-list-wrapper {
+#sr-list-wrapper {
width: 454px;
height: 200px;
border: 1px solid gray;
@@ -1977,9 +2050,10 @@ ul#image-preview-list .description pre {
position: relative;
}
-#sr-list-cover {
+#sr-list-cover {
position: absolute;
- background: gray url(/static/throbber.gif) no-repeat scroll center center;
+ background: gray none no-repeat scroll center center;
+ background-color: url(/static/throbber.gif);
height: 100%;
width: 100%;
opacity: .7;
@@ -1988,7 +2062,7 @@ ul#image-preview-list .description pre {
display: none;
}
-#sr-list {
+#sr-list {
overflow: auto;
position: absolute;
height: 100%;
@@ -2004,29 +2078,30 @@ ul#image-preview-list .description pre {
padding: 3px 3px 3px 0;
}
-.sr-description {
+.sr-description {
padding: 3px
}
-.sr-row {
+.sr-row {
cursor: default;
}
-.sr-row.sr-selected {
- background: #EFF7FF url(/static/rightarrow.png) no-repeat scroll 0px 5px;
+.sr-row.sr-selected {
+ background: #EFF7FF none no-repeat scroll 0px 5px;
+ background-image: url(/static/rightarrow.png); /* SPRITE */
}
-.sr-arrow {
+.sr-arrow {
width: 10px;
height: 12px;
}
-#sr-autocomplete-area {
+#sr-autocomplete-area {
position: relative;
z-index: 100;
}
-#sr-drop-down {
+#sr-drop-down {
position: absolute;
width: 498px;
border: 1px solid gray;
@@ -2035,15 +2110,15 @@ ul#image-preview-list .description pre {
left: 0;
}
-#sr-drop-down table {
+#sr-drop-down table {
width: 100%;
}
-.sr-name-row {
+.sr-name-row {
cursor: default;
}
-.sr-name-row.sr-selected {
+.sr-name-row.sr-selected {
background-color: #369;
color: white;
}
@@ -2058,7 +2133,7 @@ ul#image-preview-list .description pre {
font-size: small;
}
-#suggested-reddits ul {
+#suggested-reddits ul {
}
@@ -2070,28 +2145,28 @@ ul#image-preview-list .description pre {
/*** new menu shit ***/
-.formtabs-content {
+.formtabs-content {
width: 520px;
border-top: 4px solid #5f99cf;
padding-top: 10px;
}
-.formtabs-content .infobar {
+.formtabs-content .infobar {
margin: 0;
padding: 5px;
}
-ul.tabmenu.formtab {
+ul.tabmenu.formtab {
display: block;
padding-left: 10px;
font-size: larger;
}
-.tabmenu.formtab li {
+.tabmenu.formtab li {
margin: 0;
}
-.tabmenu.formtab a {
+.tabmenu.formtab a {
font-weight: normal;
outline: none;
padding: 0px 12px;
@@ -2101,7 +2176,7 @@ ul.tabmenu.formtab {
border-bottom: none;
}
-.tabmenu.formtab .selected a {
+.tabmenu.formtab .selected a {
color:white;
font-size: 130%;
background-color: #5f99cf;
@@ -2115,12 +2190,12 @@ ul.tabmenu.formtab {
margin: 5px 0 5px 0;
}
-.expando-content {
+.expando-content {
display: none;
}
-.expando-button {
+.expando-button {
float: left;
height: 23px;
width: 23px;
@@ -2128,22 +2203,45 @@ ul.tabmenu.formtab {
background: white none no-repeat scroll center center;
}
-.expando-button.selftext.collapsed {background-image: url(/static/blog-collapsed.png);}
-.expando-button.selftext.collapsed:hover, .eb-sch {background-image: url(/static/blog-collapsed-hover.png);}
+.expando-button.selftext.collapsed {
+ background-image: url(/static/blog-collapsed.png); /* SPRITE */
+}
+.expando-button.selftext.collapsed:hover, .eb-sch {
+ background-image: url(/static/blog-collapsed-hover.png); /* SPRITE */
+}
.expando-button.selftext.expanded, .eb-se {
margin-bottom: 5px;
- background-image: url(/static/blog-expanded.png);
+ background-image: url(/static/blog-expanded.png); /* SPRITE */
+}
+.expando-button.selftext.expanded:hover, .eb-seh {
+ background-image: url(/static/blog-expanded-hover.png); /* SPRITE */
}
-.expando-button.selftext.expanded:hover, .eb-seh {background-image: url(/static/blog-expanded-hover.png);}
-.expando-button.video.collapsed {background-image: url(/static/vid-collapsed.png);}
+.expando-button.video.collapsed {
+ background-image: url(/static/vid-collapsed.png); /* SPRITE */
+}
-.expando-button.video.collapsed:hover, .eb-vch {background-image: url(/static/vid-collapsed-hover.png);}
-.expando-button.video.expanded, .eb-ve {background-image: url(/static/vid-expanded.png);}
-.expando-button.video.expanded:hover, .eb-veh {background-image: url(/static/vid-expanded-hover.png);}
+.expando-button.video.collapsed:hover, .eb-vch {
+ background-image: url(/static/vid-collapsed-hover.png); /* SPRITE */
+}
+
+.expando-button.video.expanded, .eb-ve {
+ background-image: url(/static/vid-expanded.png); /* SPRITE */
+}
+.expando-button.video.expanded:hover, .eb-veh {
+ background-image: url(/static/vid-expanded-hover.png); /* SPRITE */
+}
/******** self text stuff ****/
+.subreddit .usertext .md {
+ padding: 2px 5px;
+ background-color: #fafafa;
+ border: 1px solid #CCC;
+ -moz-border-radius: 7px;
+ -webkit-border-radius: 7px;
+}
+
.link .usertext .md {
padding: 0 5px;
background-color: #fafafa;
@@ -2152,18 +2250,19 @@ ul.tabmenu.formtab {
-webkit-border-radius: 7px;
}
-.usertext {
+
+.usertext {
font-size: small;
position: relative;
}
-.usertext-edit {
+.usertext-edit {
margin-top: 5px;
padding: 0 1px; /* so the border of help/textbox don't get chopped off */
width: 500px;
}
-.usertext-edit textarea {
+.usertext-edit textarea {
width: 500px;
height: 100px;
}
@@ -2181,23 +2280,23 @@ ul.tabmenu.formtab {
display: inline-block;
}
-.usertext button {
+.usertext button {
margin: 5px 5px 10px 0;
}
-.usertext .help-toggle {
+.usertext .help-toggle {
font-size: smaller;
float:right;
margin-top: 5px;
}
-.usertext .bottom-area {
+.usertext .bottom-area {
/* this restricts children floats to the container */
overflow: hidden;
width: 100%;
}
-.usertext table.markhelp {
+.usertext table.markhelp {
background-color: white;
margin: 5px 0px;
width: 100%;
@@ -2232,7 +2331,7 @@ ul.tabmenu.formtab {
vertical-align: top;
}
-.roundfield .usertext-edit {
+.roundfield .usertext-edit {
width: 500px;
}
@@ -2246,9 +2345,104 @@ ul.tabmenu.formtab {
border: 1px solid gray;
}
-.roundfield.captcha .capimage {
+.roundfield.captcha .capimage {
margin-bottom: 10px;
}
+.roundfield label { font-size: smaller; padding-right: 2px; }
+
+
+
+/*** linefield stuff *****/
+.linefield {
+ width: 514px;
+ padding: 7px 5px;
+ font-size: large;
+}
+
+.linefield .title {
+ background-color:#CEE3F8;
+ /*background-color:#EFF7FF;*/
+ color: #336699;
+ font-variant:small-caps;
+ font-weight:bold;
+ letter-spacing:-0.02em;
+ margin:0 10px;
+ padding:1px 10px;
+}
+.linefield .title + .gray {
+ font-size: x-small;
+}
+.linefield .delete-field {
+ padding: 0;
+ font-size: smaller;
+}
+
+.linefield span + span {
+ margin-left: 10px;
+}
+.linefield .info {
+ font-style: italic;
+ color: red;
+ font-size: small;
+}
+
+.linefield .linefield-content {
+ border-color:#CEE3F8;
+ /*border-color:#EFF7FE;*/
+ border-style:solid none none;
+ border-width:4px medium medium;
+ padding:5px 7px;
+ vertical-align:top;
+}
+
+.linefield.usertext .usertext-edit {
+ font-size: small;
+}
+
+.linefield.usertext .edit-usertext {
+ font-size: x-small;
+ float: right;
+}
+
+.linefield .upload {
+ font-size: small;
+}
+.linefield .upload label {
+ font-size: small;
+}
+
+.linefield.usertext .infobar {
+ width: 100%;
+}
+
+.linefield.usertext .usertext-buttons {
+ display: none;
+}
+
+.linefield textarea,
+.linefield input[type=text],
+.linefield input[type=password] {
+ font-size: 100%;
+ width: 492px;
+ padding: 3px;
+ margin: 0;
+ border: 1px solid gray;
+}
+
+.linefield select { margin: 0; }
+
+.linefield
+
+.linefield.captcha .capimage {
+ margin-bottom: 10px;
+}
+.linefield label { font-size: smaller; padding-right: 2px; }
+.linefield span{ font-size: smaller; }
+
+.linefield input[type="text"].small-text {
+ font-size: smaller;
+ width: 100%;
+}
/***traffic stuff***/
.traffic-table {margin: 10px 20px; }
@@ -2267,11 +2461,601 @@ ul.tabmenu.formtab {
.traffic-table tr.odd { background-color: #E0E0E0; }
.traffic-table tr.mean { font-style: italic; border-top: 1px solid; }
+.traffic-table .prelim { font-style: italic; }
+.traffic-table .totals { font-style: italic; border-top: 1px solid black; }
+
.traffic-graph {
padding: 10px;
border: 1px solid #B0B0B0;
margin-left: 10px;
- margin-bottom: 10px; }
+ margin-bottom: 10px;
+}
+
+.promoted-traffic h1 {
+ border: none;
+ margin-bottom: 10px;
+}
+
+.promoted-traffic .usertable { margin-left: 0px; }
+
+.promoted-traffic h1 a {
+ font-size: small;
+ margin-left: 10px;
+}
+
+.award-square-container {
+ max-width: 1000px;
+ overflow: hidden;
+}
+
+.award-square {
+ float: left;
+ padding: 25px 0px 15px 40px;
+ white-space: nowrap;
+ width: 300px;
+}
+
+.award-square img {
+ float: left;
+ margin: 0 10px;
+ width: 70px;
+ height: 70px;
+}
+
+.award-square .award-name {
+ color: black;
+ font-size: 22px;
+ font-family: verdana, arial, helvetica, sans-serif;
+ font-weight: bold;
+ line-height: 1em;
+}
+
+.award-square .winner-info {
+ line-height: 15px;
+ margin-top: 15px;
+ color: gray;
+}
+
+.award-square .winner-name {
+ font-size: 18px;
+ color: #336699;
+}
+
+.award-table {
+ margin: 5px;
+}
+
+table.award-table {
+ margin: 5px 3px;
+}
+
+.award-table th, .award-table td {
+ border: solid #cdcdcd 1px;
+ padding: 3px;
+}
+
+.award-table th {
+ text-align: center;
+ font-weight: bold;
+}
+
+.sponsorshipbox {
+ max-width: 300px;
+}
+
+.sponsorshipbox span {
+ color: gray;
+}
+
+.sponsorshipbox div {
+ border: 1px solid #D0D0D0;
+ width: 300px;
+}
+
+/* otherwise the pixel will cause a horizontal scrollbar in firefox */
+.sponsorshipbox .promote-pixel {
+ right:0;
+}
+
+.sidecontentbox a.helplink {
+ float: right;
+ font-size: x-small;
+ margin-top: 4px;
+}
+
+.trophy-table {
+ width: 100%;
+}
+
+.trophy-area .content {
+ background-color: #f5f5f5;
+}
+
+.trophy-info {
+ text-align: center;
+ vertical-align: top;
+}
+
+.trophy-info div {
+ margin-left: auto;
+ margin-right: auto;
+ width: 130px;
+ vertical-align: top;
+ padding: 15px 0 15px;
+}
+
+.trophy-icon {
+ margin-bottom: 2px;
+ width: 40px;
+ height: 40px;
+}
+
+.trophy-info.left {
+ margin-right: 10px;
+}
+
+.trophy-info.right {
+}
+
+.trophy-name {
+ color: black !important;
+}
+
+.trophy-description {
+ color: #555555;
+ font-size: x-small;
+}
+
+.dust {
+ text-align: center;
+ margin: 45px auto;
+ color: #d0d0d0;
+}
+
+.removecup-button {
+ display: inline;
+}
+
+/* Datepicker
+----------------------------------*/
+.datepicker {
+ display: none;
+ -moz-border-radius: 6px;
+ -webkit-border-radius: 6px;
+ }
+.datepicker.inuse { display: block; }
+
+.ui-datepicker-inline {
+ font-size: x-small;
+ padding: 5px;
+}
+.ui-datepicker-inline .ui-datepicker-prev {float: left; }
+.ui-datepicker-inline .ui-datepicker-next {float: right; }
+
+.ui-datepicker-inline .ui-datepicker-prev span,
+.ui-datepicker-inline .ui-datepicker-next span {
+ display: block;
+ height: 1.5em;
+ width: 1.5em;
+ text-align: center;
+ color: black;
+ border: 1px solid #369;
+ margin-right: 1px;
+ margin-bottom: 1px;
+}
+.ui-datepicker-inline .ui-datepicker-prev:active,
+.ui-datepicker-inline .ui-datepicker-next:active {
+ padding: 6px 4px 4px 6px;
+}
+.ui-datepicker-inline .ui-datepicker-prev.ui-state-disabled,
+.ui-datepicker-inline .ui-datepicker-next.ui-state-disabled {
+ display: none;
+}
+
+.ui-datepicker-inline .ui-datepicker-prev,
+.ui-datepicker-inline .ui-datepicker-next {
+ display: block;
+ cursor: pointer;
+ padding: 5px;
+}
+
+.ui-datepicker-inline .ui-datepicker-title {text-align: center; padding: 5px; }
+.ui-datepicker-inline table {
+ clear: right;
+}
+
+.ui-datepicker-inline .ui-datepicker-calendar th,
+.ui-datepicker-inline .ui-datepicker-calendar td {
+ padding: 0px;}
+
+.ui-datepicker-inline .ui-datepicker-calendar th span,
+.ui-datepicker-inline .ui-datepicker-calendar td span,
+.ui-datepicker-inline .ui-datepicker-calendar td a {
+ border: 1px outset #888;
+ margin: 1px;
+ padding: 2px;
+ display: block;
+ width: 2em;
+ height: 2em;
+ text-align: right;
+ vertical-align: middle;
+ padding-right: 4px;
+ color: black;
+}
+
+.ui-datepicker-inline .ui-datepicker-calendar th span {
+ text-align: center;
+ border: none;
+}
+
+.ui-datepicker-inline .ui-datepicker-calendar td.ui-datepicker-today a,
+.ui-datepicker-inline .ui-datepicker-calendar td.ui-datepicker-today span
+ {
+ border: 1px solid #DB8;
+ background-color: #FF8;
+ color: #888;
+}
+
+.ui-datepicker-inline .ui-datepicker-calendar td span {
+ border-style: solid;
+ color: #888;
+ background-color: #EEE;
+}
+
+.ui-datepicker-inline .ui-datepicker-calendar td a.ui-state-hover {
+ border-color: red;
+}
+
+.ui-datepicker-inline .ui-datepicker-calendar td a.ui-state-active {
+ border: 1px solid red;
+ background-color: #FCC;
+ font-weight: bold;
+}
+
+.date-input {
+ display: inline;
+ position: relative;
+}
+.date-input input {
+ border: 1px solid #888;
+ padding: 2px;
+ text-align: center;
+ margin: 0 2px;
+}
+.date-input .drop-choices {
+ position: absolute;
+ border: 1px solid #666;
+ background-color: white;
+ margin: 10px 3px;
+}
+
+
+.payment-setup input[name=bid] { width: 6em; text-align: right; }
+.payment-setup form { margin: 20px; }
+.payment-setup p { margin-bottom: 10px; }
+
+.pay-form textarea[disabled] {
+ font-size:smaller;
+ padding: 0;
+}
+.pay-form *[disabled],
+.pay-form input[disabled]
+ {
+ border: none;
+ color: black;
+ font-weight: bold;
+ background-color: white;
+}
+
+.bid-table { margin: 5px 10px; }
+.bid-table td,
+.bid-table th
+{
+ padding: 2px 5px;
+ text-align: right;
+}
+
+.bid-table th
+{
+ text-align: center;
+ font-weight: bold;
+}
+
+.create-promo { float: left; width: 520px; margin-right: 20px;}
+.create-promo .infobar {
+ margin-right: 0;
+ border-color: red;
+ color: black;
+ background: none;
+}
+.create-promo h2 { margin-top: 10px; color: black; }
+.create-promo ol { margin: 0px 30px 10px 30px; }
+.create-promo ol > li {
+ list-style-type: disc; margin:
+}
+.create-promo .rules { text-align: right; }
+
+.create-reddit h1,
+.create-promotion h1 { font-size: 200%; color: #999; xmargin:10px 0 0 5px; }
+.create-promotion .sitetable { margin: 5px; }
+.create-promotion .infobar { margin-left: 5px; }
+.create-reddit h1 b { color: #666; }
+
+.create-promotion .create-promo .save-button { float:right; }
+
+.bidding-history { padding-top: 10px; }
+.bidding-history .linefield {
+ width: auto;
+ overflow: hidden;
+ padding-left: 10px;
+ border-left: 1px #DDD dashed; }
+.bidding-history .linefield .bid-table,
+.bidding-history .linefield .notes { font-size: x-small; }
+.bidding-history .linefield .notes { margin-top: 10px; }
+.bidding-history .linefield .notes p {
+ text-indent: -20px;
+ padding-left: 20px;
+ margin-bottom: 2px;
+ font-family: courier;
+}
+
+
+
+
+.pay-form tr.input-error th {
+ color: red;
+ font-weight: bold;
+ font-style: italic;
+}
+.pay-form th { padding: 0px }
+
+.pay-form tr.input-error input,
+.pay-form tr.input-error textarea,
+.pay-form tr.input-error select { border: 1px solid red; }
+
+.pay-form input[name=expirationDate],
+.pay-form input[name=cardCode] { width: 10ex; }
+
+.pay-form .optional { font-size: smaller; }
+.pay-form .disabled .optional { display: none; }
+.pay-form p.info { color: red; }
+.pay-link { font-size: smaller; margin-left: 10px; }
+
+dt { margin-left: 10px; font-weight: bold; }
+dd { margin-left: 20px; }
+
+.calendar {
+ white-space: nowrap;
+ overflow: hidden;
+ width: 100%;
+ position: relative;
+ padding-top: 120px;
+ padding-bottom: 100px;
+ margin: 20px 0;
+}
+
+.calendar div.grid {
+ position: absolute;
+ top: 0px;
+ bottom: 0px;
+}
+
+.calendar div.grid.today {
+ background-color: yellow;
+}
+
+.calendar div.grid div.header {
+ font-weight: bold;
+ border-bottom: 2px solid gray;
+ text-align: center;
+}
+
+.calendar div.grid + div.grid {
+ border-left: 1px dashed gray;
+}
+
+.calendar .blob {
+ margin: 0;
+ padding: 0px;
+ z-index: 10;
+ float: left;
+ cursor: pointer;
+}
+
+.calendar .blob.link:hover {
+ border: 1px solid red;
+ box-shadow: 2px 2px 2px #000;
+ -moz-box-shadow: 2px 2px 2px #000;
+ z-index: 100;
+}
+
+.calendar .blob .bid {
+ text-align: right;
+ font-weight: bold;
+ padding: 5px 5px 0px 5px; ;
+}
+
+.calendar .blob.link {
+ margin: -1px -2px 0px -2px;
+ border: 1px solid black;
+}
+
+.calendar .blob.link .title{
+ font-size: small;
+ padding: 0 5px 5px 5px;
+ display: block;
+}
+
+.borderless td {
+ border: none;
+}
+
+/* title box */
+.titlebox {
+ font-size: larger;
+}
+
+.titlebox h1 {
+ font-family:arial,verdana,helvetica,sans-serif;
+ margin: 0px;
+ margin-bottom: 5px;
+ font-weight: bold;
+ font-size: 19px;
+}
+
+.titlebox .karma {
+ font-size: 18px;
+ font-weight: bold;
+}
+
+.titlebox .fancy-toggle-button {
+ display: inline-block;
+ margin-right: 5px;
+}
+
+.titlebox .bottom {
+ border-top: 1px solid gray;
+ padding-top: 2px;
+ font-size: 80%;
+ color: gray;
+}
+
+.titlebox .age {float: right;}
+.titlebox .md { font-size: 90%; }
+.titlebox .account-notes {
+ font-weight: normal;
+ font-size: small;
+ margin-left: 5px;
+}
+
+.titlebox .account-notes .unusual {
+ background-color: #ffdddd;
+ border: solid red 1px;
+ padding: 1px 2px 2px;
+ margin-left: 5px;
+}
+
+.sidecontentbox {
+ font-size: normal;
+ }
+
+.sidecontentbox .content {
+ margin: 0;
+ padding: 5px;
+ border: 1px solid gray;
+ font-size: larger;
+}
+
+.sidecontentbox h1 {
+ text-transform:uppercase;
+ margin: 0;
+ color: gray;
+ font-size: 130%;
+}
+
+.sidecontentbox .author {
+ display: block;
+}
+
+.titlebox form.toggle {
+ margin: 5px 0;
+ padding-left: 20px;
+ font-size: smaller;
+ color: gray;
+ background: white none no-repeat scroll center left;
+}
+
+.titlebox form.leavemoderator-button {
+ background-image: url(/static/star.png); /* SPRITE */
+}
+.titlebox form.leavecontributor-button {
+ background-image: url(/static/pencil.png); /* SPRITE */
+}
+
+.icon-menu a {
+ padding-left: 20px;
+ background: white none no-repeat scroll center left;
+}
+.icon-menu li {margin: 5px 0;}
+
+.icon-menu .reddit-edit {
+ background-image: url(/static/reddit_edit.png); /* SPRITE */
+}
+.icon-menu .reddit-traffic {
+ background-image: url(/static/reddit_traffic.png); /* SPRITE */
+}
+.icon-menu .reddit-reported {
+ background-image: url(/static/reddit_reported.png); /* SPRITE */
+}
+.icon-menu .reddit-spam {
+ background-image: url(/static/reddit_spam.png); /* SPRITE */
+}
+.icon-menu .reddit-ban {
+ background-image: url(/static/reddit_ban.png); /* SPRITE */
+}
+.icon-menu .reddit-moderators {
+ background-image: url(/static/star.png); /* SPRITE */
+}
+.icon-menu .reddit-contributors {
+ background-image: url(/static/pencil.png); /* SPRITE */
+}
+
+.linkinfo {
+ padding: 5px;
+ border: 1px solid #5f99cf;
+ background-color: #EFF7FF;
+ font-family:arial,helvetica,sans-serif;
+ font-size: larger;
+ -moz-border-radius:3px;
+ -webkit-border-radius:3px;
+}
+
+.linkinfo .score .number {
+ font-size: 22px;
+ font-weight: bold;
+ }
+
+.linkinfo .score .word {
+ font-size: 15px;
+ font-weight: bold;
+ }
+
+
+.linkinfo .upvotes {font-size: 80%; color: orangered;}
+.linkinfo .downvotes {font-size: 80%; color: #5f99cf; }
+
+.linkinfo table {margin-top: 5px;}
+
+.linkinfo td, .linkinfo th {
+ padding: 2px;
+ font-size: smaller;
+ border: 1px solid gray;
+}
+
+a.ip {
+ border: solid 1px #eeeeee;
+ color: #cdcdcd;
+ font-family: monospace;
+ text-size: x-small;
+}
+
+a.ip:hover {
+ text-decoration: none;
+ color: orangered;
+ border: solid 1px orangered;
+}
+
+.lined-table, .lined-table th, .lined-table td {
+ border: solid #cdcdcd 1px;
+ border-collapse: collapse;
+ padding: 2px;
+ margin-bottom: 10px;
+}
+
+.lined-table th {
+ font-weight: bold;
+}
+
diff --git a/r2/r2/public/static/css/spreadshirt.css b/r2/r2/public/static/css/spreadshirt.css
index 736ae1f44..e8d53cd04 100644
--- a/r2/r2/public/static/css/spreadshirt.css
+++ b/r2/r2/public/static/css/spreadshirt.css
@@ -1,12 +1,16 @@
.shirt {
margin-left: 30px;
- width: 600px;
}
-.shirt h2 {
- margin: 30px;
- text-align: center;
- font-size: large;
- color: gray;
+.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 {
diff --git a/r2/r2/public/static/dragonage/bgfinal.jpg b/r2/r2/public/static/dragonage/bgfinal.jpg
new file mode 100644
index 000000000..db962d2a8
Binary files /dev/null and b/r2/r2/public/static/dragonage/bgfinal.jpg differ
diff --git a/r2/r2/public/static/dragonage/topb.jpg b/r2/r2/public/static/dragonage/topb.jpg
new file mode 100644
index 000000000..48944e10f
Binary files /dev/null and b/r2/r2/public/static/dragonage/topb.jpg differ
diff --git a/r2/r2/public/static/gagged-alien.png b/r2/r2/public/static/gagged-alien.png
new file mode 100644
index 000000000..6f144eac0
Binary files /dev/null and b/r2/r2/public/static/gagged-alien.png differ
diff --git a/r2/r2/public/static/gradient-button-hover.png b/r2/r2/public/static/gradient-button-hover.png
new file mode 100644
index 000000000..6b93d8a65
Binary files /dev/null and b/r2/r2/public/static/gradient-button-hover.png differ
diff --git a/r2/r2/public/static/gradient-button.png b/r2/r2/public/static/gradient-button.png
new file mode 100644
index 000000000..4274d8c5e
Binary files /dev/null and b/r2/r2/public/static/gradient-button.png differ
diff --git a/r2/r2/public/static/gradient-nub-hover.png b/r2/r2/public/static/gradient-nub-hover.png
new file mode 100644
index 000000000..c446faa08
Binary files /dev/null and b/r2/r2/public/static/gradient-nub-hover.png differ
diff --git a/r2/r2/public/static/gradient-nub.png b/r2/r2/public/static/gradient-nub.png
new file mode 100644
index 000000000..b271adab0
Binary files /dev/null and b/r2/r2/public/static/gradient-nub.png differ
diff --git a/r2/r2/public/static/js/jquery-1.3.1.js b/r2/r2/public/static/js/jquery-1.3.1.js
new file mode 100644
index 000000000..94e9c1755
--- /dev/null
+++ b/r2/r2/public/static/js/jquery-1.3.1.js
@@ -0,0 +1,4241 @@
+/*!
+ * jQuery JavaScript Library v1.3.1
+ * http://jquery.com/
+ *
+ * Copyright (c) 2009 John Resig
+ * Dual licensed under the MIT and GPL licenses.
+ * http://docs.jquery.com/License
+ *
+ * Date: 2009-01-21 20:42:16 -0500 (Wed, 21 Jan 2009)
+ * Revision: 6158
+ */
+(function(){
+
+var
+ // Will speed up references to window, and allows munging its name.
+ window = this,
+ // Will speed up references to undefined, and allows munging its name.
+ undefined,
+ // Map over jQuery in case of overwrite
+ _jQuery = window.jQuery,
+ // Map over the $ in case of overwrite
+ _$ = window.$,
+
+ jQuery = window.jQuery = window.$ = function( selector, context ) {
+ // The jQuery object is actually just the init constructor 'enhanced'
+ return new jQuery.fn.init( selector, context );
+ },
+
+ // A simple way to check for HTML strings or ID strings
+ // (both of which we optimize for)
+ quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,
+ // Is it a simple selector
+ isSimple = /^.[^:#\[\.,]*$/;
+
+jQuery.fn = jQuery.prototype = {
+ init: function( selector, context ) {
+ // Make sure that a selection was provided
+ selector = selector || document;
+
+ // Handle $(DOMElement)
+ if ( selector.nodeType ) {
+ this[0] = selector;
+ this.length = 1;
+ this.context = selector;
+ return this;
+ }
+ // Handle HTML strings
+ if ( typeof selector === "string" ) {
+ // Are we dealing with HTML string or an ID?
+ var match = quickExpr.exec( selector );
+
+ // Verify a match, and that no context was specified for #id
+ if ( match && (match[1] || !context) ) {
+
+ // HANDLE: $(html) -> $(array)
+ if ( match[1] )
+ selector = jQuery.clean( [ match[1] ], context );
+
+ // HANDLE: $("#id")
+ else {
+ var elem = document.getElementById( match[3] );
+
+ // Handle the case where IE and Opera return items
+ // by name instead of ID
+ if ( elem && elem.id != match[3] )
+ return jQuery().find( selector );
+
+ // Otherwise, we inject the element directly into the jQuery object
+ var ret = jQuery( elem || [] );
+ ret.context = document;
+ ret.selector = selector;
+ return ret;
+ }
+
+ // HANDLE: $(expr, [context])
+ // (which is just equivalent to: $(content).find(expr)
+ } else
+ return jQuery( context ).find( selector );
+
+ // HANDLE: $(function)
+ // Shortcut for document ready
+ } else if ( jQuery.isFunction( selector ) )
+ return jQuery( document ).ready( selector );
+
+ // Make sure that old selector state is passed along
+ if ( selector.selector && selector.context ) {
+ this.selector = selector.selector;
+ this.context = selector.context;
+ }
+
+ return this.setArray(jQuery.makeArray(selector));
+ },
+
+ // Start with an empty selector
+ selector: "",
+
+ // The current version of jQuery being used
+ jquery: "1.3.1",
+
+ // The number of elements contained in the matched element set
+ size: function() {
+ return this.length;
+ },
+
+ // Get the Nth element in the matched element set OR
+ // Get the whole matched element set as a clean array
+ get: function( num ) {
+ return num === undefined ?
+
+ // Return a 'clean' array
+ jQuery.makeArray( this ) :
+
+ // Return just the object
+ this[ num ];
+ },
+
+ // Take an array of elements and push it onto the stack
+ // (returning the new matched element set)
+ pushStack: function( elems, name, selector ) {
+ // Build a new jQuery matched element set
+ var ret = jQuery( elems );
+
+ // Add the old object onto the stack (as a reference)
+ ret.prevObject = this;
+
+ ret.context = this.context;
+
+ if ( name === "find" )
+ ret.selector = this.selector + (this.selector ? " " : "") + selector;
+ else if ( name )
+ ret.selector = this.selector + "." + name + "(" + selector + ")";
+
+ // Return the newly-formed element set
+ return ret;
+ },
+
+ // Force the current matched set of elements to become
+ // the specified array of elements (destroying the stack in the process)
+ // You should use pushStack() in order to do this, but maintain the stack
+ setArray: function( elems ) {
+ // Resetting the length to 0, then using the native Array push
+ // is a super-fast way to populate an object with array-like properties
+ this.length = 0;
+ Array.prototype.push.apply( this, elems );
+
+ return this;
+ },
+
+ // Execute a callback for every element in the matched set.
+ // (You can seed the arguments with an array of args, but this is
+ // only used internally.)
+ each: function( callback, args ) {
+ return jQuery.each( this, callback, args );
+ },
+
+ // Determine the position of an element within
+ // the matched set of elements
+ index: function( elem ) {
+ // Locate the position of the desired element
+ return jQuery.inArray(
+ // If it receives a jQuery object, the first element is used
+ elem && elem.jquery ? elem[0] : elem
+ , this );
+ },
+
+ attr: function( name, value, type ) {
+ var options = name;
+
+ // Look for the case where we're accessing a style value
+ if ( typeof name === "string" )
+ if ( value === undefined )
+ return this[0] && jQuery[ type || "attr" ]( this[0], name );
+
+ else {
+ options = {};
+ options[ name ] = value;
+ }
+
+ // Check to see if we're setting style values
+ return this.each(function(i){
+ // Set all the styles
+ for ( name in options )
+ jQuery.attr(
+ type ?
+ this.style :
+ this,
+ name, jQuery.prop( this, options[ name ], type, i, name )
+ );
+ });
+ },
+
+ css: function( key, value ) {
+ // ignore negative width and height values
+ if ( (key == 'width' || key == 'height') && parseFloat(value) < 0 )
+ value = undefined;
+ return this.attr( key, value, "curCSS" );
+ },
+
+ text: function( text ) {
+ if ( typeof text !== "object" && text != null )
+ return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
+
+ var ret = "";
+
+ jQuery.each( text || this, function(){
+ jQuery.each( this.childNodes, function(){
+ if ( this.nodeType != 8 )
+ ret += this.nodeType != 1 ?
+ this.nodeValue :
+ jQuery.fn.text( [ this ] );
+ });
+ });
+
+ return ret;
+ },
+
+ wrapAll: function( html ) {
+ if ( this[0] ) {
+ // The elements to wrap the target around
+ var wrap = jQuery( html, this[0].ownerDocument ).clone();
+
+ if ( this[0].parentNode )
+ wrap.insertBefore( this[0] );
+
+ wrap.map(function(){
+ var elem = this;
+
+ while ( elem.firstChild )
+ elem = elem.firstChild;
+
+ return elem;
+ }).append(this);
+ }
+
+ return this;
+ },
+
+ wrapInner: function( html ) {
+ return this.each(function(){
+ jQuery( this ).contents().wrapAll( html );
+ });
+ },
+
+ wrap: function( html ) {
+ return this.each(function(){
+ jQuery( this ).wrapAll( html );
+ });
+ },
+
+ append: function() {
+ return this.domManip(arguments, true, function(elem){
+ if (this.nodeType == 1)
+ this.appendChild( elem );
+ });
+ },
+
+ prepend: function() {
+ return this.domManip(arguments, true, function(elem){
+ if (this.nodeType == 1)
+ this.insertBefore( elem, this.firstChild );
+ });
+ },
+
+ before: function() {
+ return this.domManip(arguments, false, function(elem){
+ this.parentNode.insertBefore( elem, this );
+ });
+ },
+
+ after: function() {
+ return this.domManip(arguments, false, function(elem){
+ this.parentNode.insertBefore( elem, this.nextSibling );
+ });
+ },
+
+ end: function() {
+ return this.prevObject || jQuery( [] );
+ },
+
+ // For internal use only.
+ // Behaves like an Array's .push method, not like a jQuery method.
+ push: [].push,
+
+ find: function( selector ) {
+ if ( this.length === 1 && !/,/.test(selector) ) {
+ var ret = this.pushStack( [], "find", selector );
+ ret.length = 0;
+ jQuery.find( selector, this[0], ret );
+ return ret;
+ } else {
+ var elems = jQuery.map(this, function(elem){
+ return jQuery.find( selector, elem );
+ });
+
+ return this.pushStack( /[^+>] [^+>]/.test( selector ) ?
+ jQuery.unique( elems ) :
+ elems, "find", selector );
+ }
+ },
+
+ clone: function( events ) {
+ // Do the clone
+ var ret = this.map(function(){
+ if ( !jQuery.support.noCloneEvent && !jQuery.isXMLDoc(this) ) {
+ // IE copies events bound via attachEvent when
+ // using cloneNode. Calling detachEvent on the
+ // clone will also remove the events from the orignal
+ // In order to get around this, we use innerHTML.
+ // Unfortunately, this means some modifications to
+ // attributes in IE that are actually only stored
+ // as properties will not be copied (such as the
+ // the name attribute on an input).
+ var clone = this.cloneNode(true),
+ container = document.createElement("div");
+ container.appendChild(clone);
+ return jQuery.clean([container.innerHTML])[0];
+ } else
+ return this.cloneNode(true);
+ });
+
+ // Need to set the expando to null on the cloned set if it exists
+ // removeData doesn't work here, IE removes it from the original as well
+ // this is primarily for IE but the data expando shouldn't be copied over in any browser
+ var clone = ret.find("*").andSelf().each(function(){
+ if ( this[ expando ] !== undefined )
+ this[ expando ] = null;
+ });
+
+ // Copy the events from the original to the clone
+ if ( events === true )
+ this.find("*").andSelf().each(function(i){
+ if (this.nodeType == 3)
+ return;
+ var events = jQuery.data( this, "events" );
+
+ for ( var type in events )
+ for ( var handler in events[ type ] )
+ jQuery.event.add( clone[ i ], type, events[ type ][ handler ], events[ type ][ handler ].data );
+ });
+
+ // Return the cloned set
+ return ret;
+ },
+
+ filter: function( selector ) {
+ return this.pushStack(
+ jQuery.isFunction( selector ) &&
+ jQuery.grep(this, function(elem, i){
+ return selector.call( elem, i );
+ }) ||
+
+ jQuery.multiFilter( selector, jQuery.grep(this, function(elem){
+ return elem.nodeType === 1;
+ }) ), "filter", selector );
+ },
+
+ closest: function( selector ) {
+ var pos = jQuery.expr.match.POS.test( selector ) ? jQuery(selector) : null;
+
+ return this.map(function(){
+ var cur = this;
+ while ( cur && cur.ownerDocument ) {
+ if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selector) )
+ return cur;
+ cur = cur.parentNode;
+ }
+ });
+ },
+
+ not: function( selector ) {
+ if ( typeof selector === "string" )
+ // test special case where just one selector is passed in
+ if ( isSimple.test( selector ) )
+ return this.pushStack( jQuery.multiFilter( selector, this, true ), "not", selector );
+ else
+ selector = jQuery.multiFilter( selector, this );
+
+ var isArrayLike = selector.length && selector[selector.length - 1] !== undefined && !selector.nodeType;
+ return this.filter(function() {
+ return isArrayLike ? jQuery.inArray( this, selector ) < 0 : this != selector;
+ });
+ },
+
+ add: function( selector ) {
+ return this.pushStack( jQuery.unique( jQuery.merge(
+ this.get(),
+ typeof selector === "string" ?
+ jQuery( selector ) :
+ jQuery.makeArray( selector )
+ )));
+ },
+
+ is: function( selector ) {
+ return !!selector && jQuery.multiFilter( selector, this ).length > 0;
+ },
+
+ hasClass: function( selector ) {
+ return !!selector && this.is( "." + selector );
+ },
+
+ val: function( value ) {
+ if ( value === undefined ) {
+ var elem = this[0];
+
+ if ( elem ) {
+ if( jQuery.nodeName( elem, 'option' ) )
+ return (elem.attributes.value || {}).specified ? elem.value : elem.text;
+
+ // We need to handle select boxes special
+ if ( jQuery.nodeName( elem, "select" ) ) {
+ var index = elem.selectedIndex,
+ values = [],
+ options = elem.options,
+ one = elem.type == "select-one";
+
+ // Nothing was selected
+ if ( index < 0 )
+ return null;
+
+ // Loop through all the selected options
+ for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
+ var option = options[ i ];
+
+ if ( option.selected ) {
+ // Get the specifc value for the option
+ value = jQuery(option).val();
+
+ // We don't need an array for one selects
+ if ( one )
+ return value;
+
+ // Multi-Selects return an array
+ values.push( value );
+ }
+ }
+
+ return values;
+ }
+
+ // Everything else, we just grab the value
+ return (elem.value || "").replace(/\r/g, "");
+
+ }
+
+ return undefined;
+ }
+
+ if ( typeof value === "number" )
+ value += '';
+
+ return this.each(function(){
+ if ( this.nodeType != 1 )
+ return;
+
+ if ( jQuery.isArray(value) && /radio|checkbox/.test( this.type ) )
+ this.checked = (jQuery.inArray(this.value, value) >= 0 ||
+ jQuery.inArray(this.name, value) >= 0);
+
+ else if ( jQuery.nodeName( this, "select" ) ) {
+ var values = jQuery.makeArray(value);
+
+ jQuery( "option", this ).each(function(){
+ this.selected = (jQuery.inArray( this.value, values ) >= 0 ||
+ jQuery.inArray( this.text, values ) >= 0);
+ });
+
+ if ( !values.length )
+ this.selectedIndex = -1;
+
+ } else
+ this.value = value;
+ });
+ },
+
+ html: function( value ) {
+ return value === undefined ?
+ (this[0] ?
+ this[0].innerHTML :
+ null) :
+ this.empty().append( value );
+ },
+
+ replaceWith: function( value ) {
+ return this.after( value ).remove();
+ },
+
+ eq: function( i ) {
+ return this.slice( i, +i + 1 );
+ },
+
+ slice: function() {
+ return this.pushStack( Array.prototype.slice.apply( this, arguments ),
+ "slice", Array.prototype.slice.call(arguments).join(",") );
+ },
+
+ map: function( callback ) {
+ return this.pushStack( jQuery.map(this, function(elem, i){
+ return callback.call( elem, i, elem );
+ }));
+ },
+
+ andSelf: function() {
+ return this.add( this.prevObject );
+ },
+
+ domManip: function( args, table, callback ) {
+ if ( this[0] ) {
+ var fragment = (this[0].ownerDocument || this[0]).createDocumentFragment(),
+ scripts = jQuery.clean( args, (this[0].ownerDocument || this[0]), fragment ),
+ first = fragment.firstChild,
+ extra = this.length > 1 ? fragment.cloneNode(true) : fragment;
+
+ if ( first )
+ for ( var i = 0, l = this.length; i < l; i++ )
+ callback.call( root(this[i], first), i > 0 ? extra.cloneNode(true) : fragment );
+
+ if ( scripts )
+ jQuery.each( scripts, evalScript );
+ }
+
+ return this;
+
+ function root( elem, cur ) {
+ return table && jQuery.nodeName(elem, "table") && jQuery.nodeName(cur, "tr") ?
+ (elem.getElementsByTagName("tbody")[0] ||
+ elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
+ elem;
+ }
+ }
+};
+
+// Give the init function the jQuery prototype for later instantiation
+jQuery.fn.init.prototype = jQuery.fn;
+
+function evalScript( i, elem ) {
+ if ( elem.src )
+ jQuery.ajax({
+ url: elem.src,
+ async: false,
+ dataType: "script"
+ });
+
+ else
+ jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
+
+ if ( elem.parentNode )
+ elem.parentNode.removeChild( elem );
+}
+
+function now(){
+ return +new Date;
+}
+
+jQuery.extend = jQuery.fn.extend = function() {
+ // copy reference to target object
+ var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options;
+
+ // Handle a deep copy situation
+ if ( typeof target === "boolean" ) {
+ deep = target;
+ target = arguments[1] || {};
+ // skip the boolean and the target
+ i = 2;
+ }
+
+ // Handle case when target is a string or something (possible in deep copy)
+ if ( typeof target !== "object" && !jQuery.isFunction(target) )
+ target = {};
+
+ // extend jQuery itself if only one argument is passed
+ if ( length == i ) {
+ target = this;
+ --i;
+ }
+
+ for ( ; i < length; i++ )
+ // Only deal with non-null/undefined values
+ if ( (options = arguments[ i ]) != null )
+ // Extend the base object
+ for ( var name in options ) {
+ var src = target[ name ], copy = options[ name ];
+
+ // Prevent never-ending loop
+ if ( target === copy )
+ continue;
+
+ // Recurse if we're merging object values
+ if ( deep && copy && typeof copy === "object" && !copy.nodeType )
+ target[ name ] = jQuery.extend( deep,
+ // Never move original objects, clone them
+ src || ( copy.length != null ? [ ] : { } )
+ , copy );
+
+ // Don't bring in undefined values
+ else if ( copy !== undefined )
+ target[ name ] = copy;
+
+ }
+
+ // Return the modified object
+ return target;
+};
+
+// exclude the following css properties to add px
+var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
+ // cache defaultView
+ defaultView = document.defaultView || {},
+ toString = Object.prototype.toString;
+
+jQuery.extend({
+ noConflict: function( deep ) {
+ window.$ = _$;
+
+ if ( deep )
+ window.jQuery = _jQuery;
+
+ return jQuery;
+ },
+
+ // See test/unit/core.js for details concerning isFunction.
+ // Since version 1.3, DOM methods and functions like alert
+ // aren't supported. They return false on IE (#2968).
+ isFunction: function( obj ) {
+ return toString.call(obj) === "[object Function]";
+ },
+
+ isArray: function( obj ) {
+ return toString.call(obj) === "[object Array]";
+ },
+
+ // check if an element is in a (or is an) XML document
+ isXMLDoc: function( elem ) {
+ return elem.nodeType === 9 && elem.documentElement.nodeName !== "HTML" ||
+ !!elem.ownerDocument && jQuery.isXMLDoc( elem.ownerDocument );
+ },
+
+ // Evalulates a script in a global context
+ globalEval: function( data ) {
+ data = jQuery.trim( data );
+
+ if ( data ) {
+ // Inspired by code by Andrea Giammarchi
+ // http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
+ var head = document.getElementsByTagName("head")[0] || document.documentElement,
+ script = document.createElement("script");
+
+ script.type = "text/javascript";
+ if ( jQuery.support.scriptEval )
+ script.appendChild( document.createTextNode( data ) );
+ else
+ script.text = data;
+
+ // Use insertBefore instead of appendChild to circumvent an IE6 bug.
+ // This arises when a base node is used (#2709).
+ head.insertBefore( script, head.firstChild );
+ head.removeChild( script );
+ }
+ },
+
+ nodeName: function( elem, name ) {
+ return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
+ },
+
+ // args is for internal usage only
+ each: function( object, callback, args ) {
+ var name, i = 0, length = object.length;
+
+ if ( args ) {
+ if ( length === undefined ) {
+ for ( name in object )
+ if ( callback.apply( object[ name ], args ) === false )
+ break;
+ } else
+ for ( ; i < length; )
+ if ( callback.apply( object[ i++ ], args ) === false )
+ break;
+
+ // A special, fast, case for the most common use of each
+ } else {
+ if ( length === undefined ) {
+ for ( name in object )
+ if ( callback.call( object[ name ], name, object[ name ] ) === false )
+ break;
+ } else
+ for ( var value = object[0];
+ i < length && callback.call( value, i, value ) !== false; value = object[++i] ){}
+ }
+
+ return object;
+ },
+
+ prop: function( elem, value, type, i, name ) {
+ // Handle executable functions
+ if ( jQuery.isFunction( value ) )
+ value = value.call( elem, i );
+
+ // Handle passing in a number to a CSS property
+ return typeof value === "number" && type == "curCSS" && !exclude.test( name ) ?
+ value + "px" :
+ value;
+ },
+
+ className: {
+ // internal only, use addClass("class")
+ add: function( elem, classNames ) {
+ jQuery.each((classNames || "").split(/\s+/), function(i, className){
+ if ( elem.nodeType == 1 && !jQuery.className.has( elem.className, className ) )
+ elem.className += (elem.className ? " " : "") + className;
+ });
+ },
+
+ // internal only, use removeClass("class")
+ remove: function( elem, classNames ) {
+ if (elem.nodeType == 1)
+ elem.className = classNames !== undefined ?
+ jQuery.grep(elem.className.split(/\s+/), function(className){
+ return !jQuery.className.has( classNames, className );
+ }).join(" ") :
+ "";
+ },
+
+ // internal only, use hasClass("class")
+ has: function( elem, className ) {
+ return elem && jQuery.inArray( className, (elem.className || elem).toString().split(/\s+/) ) > -1;
+ }
+ },
+
+ // A method for quickly swapping in/out CSS properties to get correct calculations
+ swap: function( elem, options, callback ) {
+ var old = {};
+ // Remember the old values, and insert the new ones
+ for ( var name in options ) {
+ old[ name ] = elem.style[ name ];
+ elem.style[ name ] = options[ name ];
+ }
+
+ callback.call( elem );
+
+ // Revert the old values
+ for ( var name in options )
+ elem.style[ name ] = old[ name ];
+ },
+
+ css: function( elem, name, force ) {
+ if ( name == "width" || name == "height" ) {
+ var val, props = { position: "absolute", visibility: "hidden", display:"block" }, which = name == "width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ];
+
+ function getWH() {
+ val = name == "width" ? elem.offsetWidth : elem.offsetHeight;
+ var padding = 0, border = 0;
+ jQuery.each( which, function() {
+ padding += parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0;
+ border += parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0;
+ });
+ val -= Math.round(padding + border);
+ }
+
+ if ( jQuery(elem).is(":visible") )
+ getWH();
+ else
+ jQuery.swap( elem, props, getWH );
+
+ return Math.max(0, val);
+ }
+
+ return jQuery.curCSS( elem, name, force );
+ },
+
+ curCSS: function( elem, name, force ) {
+ var ret, style = elem.style;
+
+ // We need to handle opacity special in IE
+ if ( name == "opacity" && !jQuery.support.opacity ) {
+ ret = jQuery.attr( style, "opacity" );
+
+ return ret == "" ?
+ "1" :
+ ret;
+ }
+
+ // Make sure we're using the right name for getting the float value
+ if ( name.match( /float/i ) )
+ name = styleFloat;
+
+ if ( !force && style && style[ name ] )
+ ret = style[ name ];
+
+ else if ( defaultView.getComputedStyle ) {
+
+ // Only "float" is needed here
+ if ( name.match( /float/i ) )
+ name = "float";
+
+ name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase();
+
+ var computedStyle = defaultView.getComputedStyle( elem, null );
+
+ if ( computedStyle )
+ ret = computedStyle.getPropertyValue( name );
+
+ // We should always get a number back from opacity
+ if ( name == "opacity" && ret == "" )
+ ret = "1";
+
+ } else if ( elem.currentStyle ) {
+ var camelCase = name.replace(/\-(\w)/g, function(all, letter){
+ return letter.toUpperCase();
+ });
+
+ ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ];
+
+ // From the awesome hack by Dean Edwards
+ // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+
+ // If we're not dealing with a regular pixel number
+ // but a number that has a weird ending, we need to convert it to pixels
+ if ( !/^\d+(px)?$/i.test( ret ) && /^\d/.test( ret ) ) {
+ // Remember the original values
+ var left = style.left, rsLeft = elem.runtimeStyle.left;
+
+ // Put in the new values to get a computed value out
+ elem.runtimeStyle.left = elem.currentStyle.left;
+ style.left = ret || 0;
+ ret = style.pixelLeft + "px";
+
+ // Revert the changed values
+ style.left = left;
+ elem.runtimeStyle.left = rsLeft;
+ }
+ }
+
+ return ret;
+ },
+
+ clean: function( elems, context, fragment ) {
+ context = context || document;
+
+ // !context.createElement fails in IE with an error but returns typeof 'object'
+ if ( typeof context.createElement === "undefined" )
+ context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
+
+ // If a single string is passed in and it's a single tag
+ // just do a createElement and skip the rest
+ if ( !fragment && elems.length === 1 && typeof elems[0] === "string" ) {
+ var match = /^<(\w+)\s*\/?>$/.exec(elems[0]);
+ if ( match )
+ return [ context.createElement( match[1] ) ];
+ }
+
+ var ret = [], scripts = [], div = context.createElement("div");
+
+ jQuery.each(elems, function(i, elem){
+ if ( typeof elem === "number" )
+ elem += '';
+
+ if ( !elem )
+ return;
+
+ // Convert html string into DOM nodes
+ if ( typeof elem === "string" ) {
+ // Fix "XHTML"-style tags in all browsers
+ elem = elem.replace(/(<(\w+)[^>]*?)\/>/g, function(all, front, tag){
+ return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i) ?
+ all :
+ front + ">";
+ });
+
+ // Trim whitespace, otherwise indexOf won't work as expected
+ var tags = jQuery.trim( elem ).toLowerCase();
+
+ var wrap =
+ // option or optgroup
+ !tags.indexOf("", "" ] ||
+
+ !tags.indexOf("", "" ] ||
+
+ tags.match(/^<(thead|tbody|tfoot|colg|cap)/) &&
+ [ 1, "", "
" ] ||
+
+ !tags.indexOf("", "" ] ||
+
+ // matched above
+ (!tags.indexOf("", " " ] ||
+
+ !tags.indexOf("", " " ] ||
+
+ // IE can't serialize and
+
+
+
+
+
+ Socialite
+
+
+
+
+
+
+
+
+
+
+${awardedit("NEW")}
diff --git a/r2/r2/templates/userstats.html b/r2/r2/templates/adminawardwinners.html
similarity index 51%
rename from r2/r2/templates/userstats.html
rename to r2/r2/templates/adminawardwinners.html
index 22d36da5a..348b97a82 100644
--- a/r2/r2/templates/userstats.html
+++ b/r2/r2/templates/adminawardwinners.html
@@ -20,45 +20,46 @@
## CondeNet, Inc. All Rights Reserved.
################################################################################
-<%namespace file="utils.html" import="plain_link"/>
-
-##
-##
-###end if
-
-
-
+
-
-
-
-
+
+
%for t in thing.translations:
<%
name = Translator.get_name(t)
diff --git a/r2/r2/templates/ads.html b/r2/r2/templates/ads.html
index 8cfe770da..31bc4629e 100644
--- a/r2/r2/templates/ads.html
+++ b/r2/r2/templates/ads.html
@@ -21,13 +21,33 @@
################################################################################
<%!
from r2.lib.template_helpers import get_domain, static
+ from r2.lib.tracking import AdframeInfo
import random
%>
-
-##
-
+%if c.site.ad_type == "custom" or c.site.ad_file != c.site._defaults.get("ad_file"):
+
+%elif c.site.ad_type == "basic":
+ <% name = c.site.name if not c.default_sr else '' %>
+
+%else:
+
+%endif
+
diff --git a/r2/r2/templates/appservicemonitor.html b/r2/r2/templates/appservicemonitor.html
index cb04d84fa..a9a68206f 100644
--- a/r2/r2/templates/appservicemonitor.html
+++ b/r2/r2/templates/appservicemonitor.html
@@ -30,8 +30,10 @@
# default number of cpus shall be 1
ncpus = getattr(host, "ncpu", 1)
# color code in nlevel levels
- return min(max(int(nlevels*host.load()/ncpus+0.4), 0),nlevels+1)
-
+ return _load_int(host.load(), ncpus, nlevels = 8)
+ def _load_int(current, max_val, nlevels = 8):
+ return min(max(int(nlevels*current/max_val+0.4), 0),nlevels+1)
+
%>
+ %if any(getattr(h, "queue", None) for h in thing.hostlogs):
+
+
+ %endif
%if any(h.database for h in thing.hostlogs):
-
+
+
+
+
+
+
-<%call expr="image_upload('/api/upload_sr_img', thing.site.header,
- tabular=True,
- label = _('upload header image'))">
-
-
-
-
-
-
-
-
-
+ %if c.user_is_admin:
+ <%
+ ad_type = "default"
+ if thing.site.ad_type == "custom" or thing.site.ad_file != thing.site._defaults.get("ad_file"):
+ ad_type = "custom"
+ elif thing.site.ad_type == "basic":
+ ad_type = "basic"
+ %>
+ <%utils:line_field title="${_('ad frame')}">
+
+
+
+
+ <%utils:line_field title="${_('sponsorship')}">
+ ${thing.num}
- ${thing.title}
+ ${thing.title}
(${thing.domain})
${thing.score} ${ungettext("point", "points", thing.score)}
diff --git a/r2/r2/templates/linkinfobar.html b/r2/r2/templates/linkinfobar.html
index 6fa85fd80..d7972d1ef 100644
--- a/r2/r2/templates/linkinfobar.html
+++ b/r2/r2/templates/linkinfobar.html
@@ -19,26 +19,47 @@
## All portions of the code written by CondeNet are Copyright (c) 2006-2009
## CondeNet, Inc. All Rights Reserved.
################################################################################
+<%!
+ import locale
+ from r2.lib.strings import strings
+ %>
+
+
<%namespace file="printablebuttons.html" import="state_button" />
<%namespace file="printable.html" import="thing_css_class" />
-
+
+ RedditAddict
+
+
+ Monitor your karma and get mail notifications right on your desktop
+
+
+
+ Socialite
+
+
+ A reddit Firefox extension that enhances your reddit experience
+
+
+
+ 
+
+ Apps
+
+
+
+ Apps
+
+
+
+
+
+
+
diff --git a/r2/r2/public/static/socialite/appsbar/barbg.png b/r2/r2/public/static/socialite/appsbar/barbg.png
new file mode 100755
index 000000000..f65ccc7ae
Binary files /dev/null and b/r2/r2/public/static/socialite/appsbar/barbg.png differ
diff --git a/r2/r2/public/static/socialite/appsbar/buttonbg.png b/r2/r2/public/static/socialite/appsbar/buttonbg.png
new file mode 100755
index 000000000..f6792c4c7
Binary files /dev/null and b/r2/r2/public/static/socialite/appsbar/buttonbg.png differ
diff --git a/r2/r2/public/static/socialite/appsbar/nub.png b/r2/r2/public/static/socialite/appsbar/nub.png
new file mode 100755
index 000000000..91125f94a
Binary files /dev/null and b/r2/r2/public/static/socialite/appsbar/nub.png differ
diff --git a/r2/r2/public/static/socialite/index.html b/r2/r2/public/static/socialite/index.html
index 1c9b05ecb..dad709e59 100644
--- a/r2/r2/public/static/socialite/index.html
+++ b/r2/r2/public/static/socialite/index.html
@@ -1,113 +1,329 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+ -
+
- Supports Windows, OSX, and Linux +
- New message alerts for reddit mail +
- Color it to your tastes, or leave it semi-transparent +
- Sound notifications with multiple sound packs +
- Minimizes to your tray or dock +
+
+
+
+
+
+
+
+
+
+
+
+ Karma graphs the whole world can enjoy
+ Track it like your stock portfolio (hopefully with better results)
Pretty charts are a great addition to any resume.
+
+ Pretty charts are a great addition to any resume.
+ 
+
+
+
+
+
+
+
+
+
+
+ -
+
- Shows up to 10 hours of your karma history +
- Export the graph as a PNG to preserve the moment +
- Customize the line colors to suit your style +
- Created by a redditor, for redditors +
- Be the envy of all your reddit friends +
+ Want to get in on the reddit development scene like tritelife?
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Install it for free!
-
-
-
-If you like it, why not thank chromakode, the redditor who made it, with some cash so he can buy some bacon. -
-
-
-
-
-
-
-What does it do?
--
-
- reddit functionally unobtrusively integrated into Firefox! -
- magically appears when you click a reddit link to let you vote, save, and hide links right there! -
- unlock the digital fairy dust that is the serendipity button! -
- achieve the notoriety you feel has long been wasted on your inferior peers! -
- enhance your reddit experience so much that you start using exclamation points! -
-
How to use it
- -- Although Socialite appears auto-magically, you can also open the bar manually by clicking on the reddit - icon on the right side of your location bar: -
- --
- If the page is not submitted to reddit, or you click again, a submit - bar will appear: -
- --
- (PRO-TIP: if you want to skip straight to the submit bar, - middle-click on the reddit icon.) -
- - -Configuration
- -- Like a Mr. Potato Head, you can change its appearance -- choose what buttons are displayed in the toolbar in the - extensions preferences: -
- --
Activate for other reddit sites
-- Our toolbar gets around. Since reddit lets you - - host reddits from other domains - like - the Cute List - Socialite will also let you edit the list of domains that it works for. -
--
-Want to get in on the reddit development scene like chromakode?
Click here to dive in.
-
-Click here to dive in.
+
+ RedditAddict
+
+
+ Monitor your karma and get mail notifications right on your desktop
+
+
+
+ Socialite
+
+
+ A reddit Firefox extension that enhances your reddit experience
+
+
+
+
+
+ Apps
+
+
+
+ Apps
+
+
+
+
diff --git a/r2/r2/public/static/socialite/socialitelogo.png b/r2/r2/public/static/socialite/socialitelogo.png
old mode 100644
new mode 100755
index 2e149b0fa..daf73c698
Binary files a/r2/r2/public/static/socialite/socialitelogo.png and b/r2/r2/public/static/socialite/socialitelogo.png differ
diff --git a/r2/r2/templates/adminawardgive.html b/r2/r2/templates/adminawardgive.html
new file mode 100644
index 000000000..0e12b7f57
--- /dev/null
+++ b/r2/r2/templates/adminawardgive.html
@@ -0,0 +1,84 @@
+## 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-2009
+## CondeNet, Inc. All Rights Reserved.
+################################################################################
+
+<%namespace file="utils.html" import="error_field"/>
+
+
+
diff --git a/r2/r2/templates/adminawards.html b/r2/r2/templates/adminawards.html
new file mode 100644
index 000000000..8edd74e9b
--- /dev/null
+++ b/r2/r2/templates/adminawards.html
@@ -0,0 +1,96 @@
+## 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-2009
+## CondeNet, Inc. All Rights Reserved.
+################################################################################
+
+<%namespace file="utils.html" import="error_field"/>
+
+<%def name="awardbuttons(codename)">
+
+
+
+<%def name="awardedit(fullname, title='', codename='', imgurl='')">
+
+
+
+
+
+
+
+
+
+ Install it for free!
+
+ If you like it, why not thank chromakode, the redditor who made it, with some cash so he can buy some bacon.
+
+
+
+
+ If the page is not submitted to reddit, or you click again, a submit bar will appear:
+
+
+ (PRO-TIP: if you want to skip straight to the submit bar, middle-click on the reddit icon.)
+
+
+
+
+
+
+
+
+
+
+
+
+ What does it do?
+-
+
- reddit functionally unobtrusively integrated into Firefox! +
- magically appears when you click a reddit link to let you vote, save, and hide links right there! +
- unlock the digital fairy dust that is the serendipity button! +
- achieve the notoriety you feel has long been wasted on your inferior peers! +
- enhance your reddit experience so much that you start using exclamation points! +
How to use it
+ Although Socialite appears auto-magically, you can also open the bar manually by clicking on the reddit icon on the right side of your location bar: + +Configuration
+ Like a Mr. Potato Head, you can change its appearance -- choose what buttons are displayed in the toolbar in the extensions preferences: + +Activate for other reddit sites
+ Our toolbar gets around. Since reddit lets you + host reddits from other domains - like + the Cute List - Socialite will also let you edit the list of domains that it works for. + +
+
+
+
+ Want to get in on the reddit development scene like chromakode?
Click here to dive in.
+
+ Click here to dive in.
| fn | +cn | +img | +title | +buttons | +
|---|---|---|---|---|
| ${award._fullname} | +${award.codename} | + |
+ ${award.title} | ++ ${awardbuttons(award.codename)} + ${awardedit(award._fullname, award.title, award.codename, award.imgurl)} + | +
awards
-##| today | |
|---|---|
| $a['award'] | ${plain_link(u.name, "/user/%s" % u.name)} ($sanekarma($u.pop)) |
${_("biggest karma gainers")}
- -| ${_("today")} | |||||
|---|---|---|---|---|---|
| ${plain_link(user.name, "/user/%s" % user.name)} (${user.link_karma}) | -+${change} | ++ ${trophy._thing1.name} + | ++ ${trophy._name} + | ++ ${getattr(trophy, "description", "")} + | ++ %if hasattr(trophy, "url"): + ${trophy.url} + %endif + |
| ${_("this week")} | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| ${plain_link(user.name, "/user/%s" % user.name)} (${user.link_karma}) | -+${change} | +
+ 
+ |
+
+ ${thing.award.title}+ |
+ + description + | ++ url + |
|---|
| ${_("all-time")} | |
|---|---|
| ${plain_link(user.name, "/user/%s" % user.name)} (${user.link_karma}) | -|
+ back to awards +
+ diff --git a/r2/r2/templates/admintranslations.html b/r2/r2/templates/admintranslations.html index 32e43b3e9..8ab0899d4 100644 --- a/r2/r2/templates/admintranslations.html +++ b/r2/r2/templates/admintranslations.html @@ -40,7 +40,7 @@-
| queue | +length | +
|---|---|
| + | |
| ${name} | +${length} / ${max_len} | +
+
+
-
+
+
+
+
+
+
+ ${_("Use the default customized (subreddit-specific) DART ad frame")}
+
+
+
+
+
+
+
+
+ ${_("specify the location of the ad frame:")}
+
+
+
+
+
| + + + | ++ ${_("Use the same ad frame as on the front page.")} + + |
-
+
- + + +
- + + +
- + <%utils:image_upload post_target="/api/upload_sr_img" + current_image="${thing.site.sponsorship_img}" + label="${_('upload sponsorship image')}" + form_id="sponsor-upload"> + + + + + + + +
+
+
+ 
+
+
+
+
+
diff --git a/r2/r2/templates/link.html b/r2/r2/templates/link.html
index b1cdaa244..a05a7f328 100644
--- a/r2/r2/templates/link.html
+++ b/r2/r2/templates/link.html
@@ -23,6 +23,7 @@
<%!
from r2.lib.template_helpers import get_domain
from r2.lib.pages.things import LinkButtons
+ from r2.lib.pages import WrappedUser
%>
<%inherit file="printable.html"/>
@@ -175,7 +176,7 @@
${unsafe(taglinetext % dict(reddit = self.subreddit(),
when = thing.timesince,
- author= self.author(attribs = thing.attribs)))}
+ author= WrappedUser(thing.author, thing.attribs, thing).render()))}
<%def name="child()">
diff --git a/r2/r2/templates/link.htmllite b/r2/r2/templates/link.htmllite
index 339cfdf26..0722e4021 100644
--- a/r2/r2/templates/link.htmllite
+++ b/r2/r2/templates/link.htmllite
@@ -20,7 +20,6 @@
## CondeNet, Inc. All Rights Reserved.
################################################################################
<%namespace file="utils.html" import="optionalstyle"/>
-<%namespace file="printable.html" import="score"/>
<%!
from pylons.i18n import _, ungettext
@@ -46,7 +45,12 @@
>
%if not expanded:
- ${score(thing, thing.likes, tag='span')}
+ <%
+ if thing.likes is False:
+ score, cls = thing.display_score[0], "dislikes"
+ elif thing.likes is None:
+ score, cls = thing.display_score[1], "unvoted"
+ else:
+ score, cls = thing.display_score[2], "likes"
+ %>
+
+ ${score}
+
|
%endif
${thing.comment_label}
diff --git a/r2/r2/templates/link.mobile b/r2/r2/templates/link.mobile
index c8a2636f5..c0e3c1bd5 100644
--- a/r2/r2/templates/link.mobile
+++ b/r2/r2/templates/link.mobile
@@ -39,7 +39,11 @@
# generates "comment" the imperative verb
com_label = _("comment")
%>
-
+
diff --git a/r2/r2/templates/link.wired b/r2/r2/templates/link.wired
index 0fba14d6b..70a2c7ef4 100644
--- a/r2/r2/templates/link.wired
+++ b/r2/r2/templates/link.wired
@@ -29,7 +29,7 @@
<%def name="entry()">
-
- %if not thing.a.is_self:
-
| ${_("toolbar link")} | -${thing.a.tblink} | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| ${_("submitted on")} | -${thing.a._date.strftime(thing.datefmt)} | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| ${ungettext('point', 'points', 5)} | -${thing.a.score} | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| ${_("up votes")} | -${thing.a.upvotes} | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| ${_("down votes")} | -${thing.a.downvotes} | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| ${_('promoted on')} | -- ${thing.a.promoted_on.strftime(thing.datefmt)} - | -||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| ${_('promoted by')} | +${_('promoted on')} | - ${thing.a.promoted_by_name} + ${thing.a.promoted_on.strftime(thing.datefmt)} | -|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| ${_('unpromoted on')} | ++ ${thing.a.unpromoted_on.strftime(thing.datefmt)} + | +||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| - | ${(_('shown only to subscribers of %(subreddit)s') - % dict(subreddit = c.site.name))} | -||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+ | + | + %if field == "address": + + %elif field == "country": + ## TODO: pycountry does country name i18n + + %else: + + %endif + %if optional: + ${optional} + %endif + | ++ ${error_field(error_name, field)} + | +
|---|---|---|
| + | + + %if disabled and profile: + + %endif + | +|
| + | + + | +
+ ${checkbox(_("show promote tab on front page"), + "show_promote")} + %endif
${_("update your email or password")}
++%if thing.email and thing.password: + ${_("update your email or password")} +%elif thing.email: + %if thing.verify: + ${_("verify your email")} + %else: + ${_("update your email")} + %endif +%else: + ${_("update your password")} +%endif +
diff --git a/r2/r2/templates/printable.html b/r2/r2/templates/printable.html index 82c9a5044..9cead8440 100644 --- a/r2/r2/templates/printable.html +++ b/r2/r2/templates/printable.html @@ -21,7 +21,7 @@ ################################################################################ <%! - from r2.lib.template_helpers import add_sr, find_author_class + from r2.lib.template_helpers import add_sr from r2.lib.strings import strings from r2.lib.pages.things import BanButtons %> @@ -115,57 +115,6 @@ thing id-${what._fullname} -<%def name="author(attribs = None, gray = False)" buffered="True"> - %if thing.deleted and not c.user_is_admin: - [deleted] - %else: - <% - attribs.sort() - author_cls = find_author_class(thing, attribs, gray) - - target = getattr(thing, "target", None) - - disp_name = websafe(thing.author.name) - karma = "" - if c.user_is_admin: - karma = " (%d)" % (thing.author.link_karma) - %> - - %if thing.author._deleted: - [deleted] - %else: - ${plain_link(disp_name + karma, "/user/%s" % disp_name, - _class = author_cls, _sr_path = False, target=target)} - %if attribs: - - [ - %for priority, abbv, css_class, label, attr_link in attribs: - %if attr_link: - ${abbv} - %else: - ${abbv} - %endif - ## this is a hack to print a comma after all but the final attr - %if priority != attribs[-1][0]: - , - %endif - %endfor - ] - - %endif - %endif - %endif - - %if c.user_is_admin and hasattr(thing, 'ip') and thing.ip: - - %endif - - - <%def name="arrow(this, dir, mod)"> <% _type = "up" if dir > 0 else "down" diff --git a/r2/r2/templates/printablebuttons.html b/r2/r2/templates/printablebuttons.html index c71ffd3f9..1dec1bf3a 100644 --- a/r2/r2/templates/printablebuttons.html +++ b/r2/r2/templates/printablebuttons.html @@ -22,6 +22,7 @@ <%namespace file="utils.html" import="plain_link" /> <%! from r2.lib.strings import strings + from r2.lib.promote import STATUS %> <%def name="banbuttons()"> @@ -104,7 +105,7 @@ %endif %if thing.editable:
-
${thing.user.name}
--
+
- (banned) - %endif -
-
-
- <% - karmas = thing.user.all_karmas() - %> - %for i, (label, lc, cc) in enumerate(karmas): -
- %if i >= 5: - - show karma for all ${len(karmas)} reddits - - %endif -- - %endfor -${label}: -${lc} -/ -${cc} -
- %else:
- - - ${_("karma:")} ${thing.user.safe_karma} - -
- - ${_("comment karma:")} ${thing.user.comment_karma} - - %endif -
- - ${_("user for %(time)s") % dict(time=timesince(thing.user._date))} - + + #${thing.user._id} - %if c.user_is_loggedin and not thing.isMe: -
- - ${plain_link(_("send message"), "/message/compose/?to=%s" % thing.user.name)} - -
- - ${toggle_button("", _("add to friends"), _("remove from friends"), - "friend('%s', '%s', 'friend')" % (thing.user.name, c.user._fullname), - "unfriend('%s', '%s', 'friend')" % (thing.user.name, c.user._fullname), - reverse = thing.isFriend)} - + %if thing.user._deleted: + (deleted) + %endif + + %if thing.user._spam: + (banned) + %endif + + %endif + + + + %if c.user != thing.user: +
- Count: +
- Total number of sponsored links which either ran or are scheduled to run (site-wide). +
- CPM: +
- Cost per thousand impressions (site-wide). Note that today's CPM is estimated. +
- CPC: +
- Cost per click, also site-wide and with the same caveat about today's value +
- your commit: +
- Total amount you have spent or have scheduled to spend on a given day +
- - ${plain_link(_('edit'),'/promote/edit_promo/%s' % to36(thing._id), - _sr_path = False)} - -
- - ${ynbutton(_("unpromote"), _("unpromoted"), "unpromote")} - - %endif - - -<%def name="buttons()"> - ${parent.buttons(comments=not thing.disable_comments, - report=False, - additional=unpromote_button())} +<%def name="buttons(comments=True, delete=True, report=True, additional='')"> + ${LinkButtons(thing, + comments = not getattr(thing, "disable_comments", False), + delete = delete, + report = report)} <%def name="entry()"> ${parent.entry()}
- - ${plain_link(t.title,'/promote/edit_promo/%s' % to36(t._id))} - %if t.promote_until: - ${(_("(until %(until)s)") - % dict(until = t.promote_until.strftime(thing.datefmt)))} - - %endif - - - %endfor -
+
+ <%
+ karmas = thing.user.all_karmas()
+ %>
+ %for i, (label, lc, cc) in enumerate(karmas):
+
+ %if i >= 5:
+
+ show karma for all ${len(karmas)} reddits
+
+ %endif
+ %else:
+ ${locale.format("%d", thing.user.safe_karma, True)}
+
+ ${_("link karma")}
+
+
+ ${locale.format("%d", thing.user.comment_karma, True)} + + ${_("comment karma")} + %endif + +
-
-%endif
diff --git a/r2/r2/templates/promo_email.email b/r2/r2/templates/promo_email.email
new file mode 100644
index 000000000..2f761059d
--- /dev/null
+++ b/r2/r2/templates/promo_email.email
@@ -0,0 +1,118 @@
+## 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-2009
+## CondeNet, Inc. All Rights Reserved.
+################################################################################
+<%!
+ from datetime import datetime, timedelta
+ from r2.models import Email
+ from r2.lib import promote
+ from r2.lib.template_helpers import get_domain
+ %>
+<%
+ edit_url = promote.promo_edit_url(thing.link)
+ %>
+
+%if thing.kind == Email.Kind.NEW_PROMO:
+This email is to confirm reddit.com's receipt of your submitted self-serve ad. To set up payment for your ad, please go here:
+
+${g.payment_domain}promoted/pay/${thing.link._id36}
+
+Please note that we can't approve your ad until you have set up payment, and that your ad must be approved before it goes live on your selected dates.
+
+Your credit card will not be charged until 24 hours prior to your ad going live on reddit.
+
+If your ad is rejected your credit card will not be charged. Don't take it personally if it happens, it's because of these guidelines:
+
+http://www.reddit.com/help/selfservicepromotion
+
+%elif thing.kind == Email.Kind.BID_PROMO:
+This email is to confirm that your bid of $${"%.2f" % thing.link.promote_bid} for a self-serve ad on reddit.com has been accepted. The credit card number you provided will be charged 24 hours prior to the date your self-serve ad is set to run.
+
+Having second thoughts about your bid? Want to be sure you're outbidding the competition? You'll have until ${(thing.link._date - timedelta(1)).strftime("%Y-%m-%d")} to change your bid here:
+
+ ${edit_url}
+%elif thing.kind == Email.Kind.ACCEPT_PROMO:
+This email is to confirm that your self-serve reddit.com ad has been approved by reddit! The credit card you provided will not be charged until 24 hours prior to the date you have set your ad to run. If you make any changes to your ad, they will have to be re-approved. Keep in mind that after we have charged your credit card you will not be able to change your ad.
+
+It won't be long now until your ad is being displayed to hundreds of thousands of the Internet's finest surfers.
+
+%elif thing.kind == Email.Kind.REJECT_PROMO:
+This email is to inform you that the self-serve ad you submitted to reddit.com has been rejected. :( Please view the included explanation, and consult reddit's Terms of Service for information on conditions for approval. If you have any questions please reply to this email.
+
+%if thing.body:
+Your promotion has been rejected for the following reason:
+ ${thing.body}
+%endif:
+
+To update your promotion please go to:
+ ${edit_url}
+and we'll reconsider it for sumbission.
+%elif thing.kind == Email.Kind.QUEUED_PROMO:
+This email is to inform you that your self-serve ad on reddit.com is about to go live. Feel free to reply to this email if you have any questions.
+
+%if thing.link.promote_trans_id > 0:
+ Your credit card has been successfully charged by reddit for the amount you bid. Please use this email as your receipt.
+
+
+================================================================================
+TRANSACTION #${thing.link.promote_trans_id}
+DATE: ${datetime.now(g.tz).strftime("%Y-%m-%d")}
+................................................................................
+
+AMOUNT CHARGED: $${"%.2f" % thing.link.promote_bid}
+SPONSORSHIP PERMALINK: ${thing.link.make_permalink_slow(force_domain = True)}
+
+================================================================================
+%else:
+Your promotion was a freebie in the amount of $${"%.2f" % thing.link.promote_bid}.
+%endif
+%elif thing.kind == Email.Kind.LIVE_PROMO:
+This email is to inform you that your self-serve ad on reddit.com is now live and can be found at the following link:
+
+ ${thing.link.make_permalink_slow(force_domain = True)}
+
+Thank you for your business! You can track your promotion's traffic here:
+
+ ${promote.promo_traffic_url(thing.link)}
+
+Note that there is a 2 hour delay on tracking so at first you make not see any data, and completed traffic will be 2-3 hours behind.
+
+Remember to log in to reddit.com using the username and password you used when you bought this self-serve ad. Please let us know if you have any questions.
+%elif thing.kind == Email.Kind.FINISHED_PROMO:
+This email is to inform you that your self-serve ad on reddit.com has concluded. Please visit the following link for traffic results for your ad, and note that complete results will not appear until 24 hours after receipt of this email.
+
+ ${promote.promo_traffic_url(thing.link)}
+
+Remember to log in to reddit.com using the username and password you used when you bought this self-serve ad.
+
+Thank you again for advertising on reddit, we hope you'll come back and do business with us again. We'd love to know how your experience with reddit's self-serve ad was, feel free to reply to this email to let us know. We've also set up a community just for self-serve advertisers like yourself:
+
+ http://www.reddit.com/r/selfserve
+
+We're hoping to create a place for you to exchange tips and tricks for getting the most out of your sponsored links, as well as to provide support for new users.
+%endif
+
+Thank you,
+
+The Reddit Team
+selfservicepromotion@reddit.com
+
+_____
+http://www.reddit.com/help/selfservicepromotion
\ No newline at end of file
diff --git a/r2/r2/templates/promote_graph.html b/r2/r2/templates/promote_graph.html
new file mode 100644
index 000000000..a640c5e6d
--- /dev/null
+++ b/r2/r2/templates/promote_graph.html
@@ -0,0 +1,276 @@
+## 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-2009
+## CondeNet, Inc. All Rights Reserved.
+################################################################################
+<%!
+ import datetime, locale
+ def num(x):
+ return locale.format('%d', x, True)
+ def money(x):
+ return "$%.2f" % x
+ %>
++ ${thing.user.name} + %if c.user_is_admin: - %if thing.user._spam: -
+ ${toggle_button("fancy-toggle-button", _("+ friends"), _("- friends"),
+ "friend('%s', '%s', 'friend')" % (thing.user.name, thing.my_fullname),
+ "unfriend('%s', '%s', 'friend')" % (thing.user.name, thing.my_fullname),
+ css_class = "add", alt_css_class = "remove",
+ reverse = thing.is_friend)}
+
%endif
-
-
+ %if c.user_is_admin:
+ | ${label}: | +${lc} | +/ | +${cc} | +
|---|
+ ${locale.format("%d", thing.user.comment_karma, True)} + + ${_("comment karma")} + %endif + +
+ %if thing.user != c.user:
+ })
+
+ ${plain_link(_("send message"), "/message/compose/?to=%s" % thing.user.name)}
+ %endif
+
+
+ ${_("redditor for %(time)s") % dict(time=timesince(thing.user._date))}
+
+
+
+
+
+ ${plain_link(_("send message"), "/message/compose/?to=%s" % thing.user.name)}
+ %endif
+
+
+ ${_("redditor for %(time)s") % dict(time=timesince(thing.user._date))}
+
+ Sponsored link calendar
+ +%if not c.user_is_sponsor: +
+
+
+%endif
+
+<% max_percent = 97. %>
+
+Below is a calendar of your scheduled and completed promotions (if you have any, of course), along with some site-wide averages to use as a guide for setting up future promotions. These values are:
+-
+
+ <%
+ today = thing.now.date()
+ %>
+
+
+
+%if c.user_is_sponsor:
+
+
+ %for i in xrange(thing.total_size):
+ <%
+ left = "%.2f" % (max_percent*float(i+1)/(thing.total_size+1))
+ right = "%.2f" % (100 - max_percent*float(i+2)/(thing.total_size+1))
+ day = thing.start_date + datetime.timedelta(i)
+ CPC = CPM = imp_traffic = cli_traffic = "---"
+ if thing.promo_traffic.has_key(day):
+ imp_traffic, cli_traffic = thing.promo_traffic[day]
+ if thing.market.has_key(i):
+ CPM = "$%.2f" % (thing.market[i] * 1000./max(imp_traffic, 1))
+ CPC = "$%.2f" % (thing.market[i] * 1./max(cli_traffic, 1))
+ imp_traffic = num(imp_traffic)
+ cli_traffic = num(cli_traffic)
+ if day == today:
+ imp_traffic = "(%s)" % imp_traffic
+ cli_traffic = "(%s)" % cli_traffic
+ %>
+
+ DATE
+
+
+ COUNT
+
+
+ %if c.user_is_sponsor:
+ IMPRESSIONS
+ %endif + CPM +
+ + %endif + CPM +
+ %if c.user_is_sponsor:
+ CLICKS
+ %endif + CPC +
+ + %endif + CPC +
+ %if c.user_is_sponsor:
+ TOTAL COMMIT
+ %else:
+ YOUR COMMIT
+ %endif
+
+
+
+ %endfor
+
+<%
+ prev_end = 0
+ %>
+%for link, start, end in thing.promote_blocks:
+ <%
+ start += 1
+ end += 1
+ %>
+ %if start != end:
+ %if prev_end > start:
+ <% prev_end = 0 %>
+
+ %endif
+ <%
+ margin = "%.2f" % (float(max_percent*(start-prev_end))/(thing.total_size+1))
+ width = "%.2f" % (float(max_percent*(end-start))/(thing.total_size+1))
+ prev_end = end
+ %>
+
+ ${day}
+
+
+ ${thing.promo_counter.get(i, unsafe(" "))}
+
+
+ %if c.user_is_sponsor:
+ ${imp_traffic}
+ %endif + ${CPM} +
+ + %endif + ${CPM} +
+ %if c.user_is_sponsor:
+ ${cli_traffic}
+ %endif + ${CPC} +
+ + %endif + ${CPC} +
+ ${"$%.2f" % thing.my_market[i] if thing.my_market.has_key(i) else "---"}
+
+
+
+ %endif
+%endfor
+
+ $${int(link.promote_bid)}
+
+
+ ${link.author.name}
+
+ ${_("total promotion traffic")}
+
+ %if thing.imp_graph:
+ 
+ %endif
+ %if thing.cli_graph:
+ 
+ %endif
+ %if thing.money_graph:
+ 
+ %endif
+
+%endif
+
+${_("historical site performance")}
+
+%if thing.cpm_graph:
+ 
+%endif
+%if thing.cpc_graph:
+ 
+%endif
+%if thing.cpc_graph and c.user_is_sponsor:
+ 
+%endif
+
+
+%if c.user_is_sponsor:
+
+ %if thing.top_promoters:
+ ${_('top promoters this month')}
+ +| user | +promos | +bids | +credits | +total | +per promo | +
|---|---|---|---|---|---|
| ${account.name} | +${len(promos)} | +${money(bid)} | +${money(refund)} | +${money(bid - refund)} | +${money((bid - refund)/len(promos))} | +
| Total | +${total_promos} | +${money(total_bid)} | +${money(total_refund)} | +${money(total_bid - total_refund)} | +${money((total_bid - total_refund)/total_promos)} | +
${_('promotions this month')} [CSV]
+ +| Impresions | +Clicks | ++ | + | ||||
|---|---|---|---|---|---|---|---|
| date | +unique | +total | +unique | +total | +price | +points | +title | +
| + ${link._date.strftime("%Y-%m-%d")} + | +${num(uimp)} | +${num(nimp)} | +${num(ucli)} | +${num(ncli)} | +${money(link.promote_bid)} | +${link._ups - link._downs} | ++ ${link.title} + | +
- ${_('sponsored link')} + %if thing.is_author or c.user_is_sponsor: + %if thing.promote_status == STATUS.unpaid: + ${_('unpaid sponsored link')} + %elif thing.promote_status == STATUS.unseen: + ${_('unapproved sponsored link')} + %elif thing.promote_status == STATUS.accepted: + ${_('accepted sponsored link')} + %elif thing.promote_status == STATUS.rejected: + ${_('rejected sponsored link')} + %elif thing.promote_status == STATUS.pending: + ${_('pending sponsored link')} + %elif thing.promote_status == STATUS.promoted: + ${_('sponsored link')} + %else: + ${_('finished sponsored link')} + %endif + %if c.user_is_sponsor: + <% days = (thing.promote_until - thing._date).days %> + | $${thing.promote_bid} | ${days} ${ungettext("day", "days", days)} + %endif + %else: + ${_('sponsored link')} + %endif
-
-
+ %if thing.promote_status == STATUS.promoted:
+
+
+ %endif
diff --git a/r2/r2/templates/promotedlinks.html b/r2/r2/templates/promotedlinks.html
deleted file mode 100644
index 3253928c5..000000000
--- a/r2/r2/templates/promotedlinks.html
+++ /dev/null
@@ -1,83 +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-2009
-## CondeNet, Inc. All Rights Reserved.
-################################################################################
-<%!
- from r2.lib.utils import to36
-%>
-<%namespace file="utils.html" import="plain_link"/>
-<%namespace file="printablebuttons.html" import="ynbutton"/>
-
-
-
-
-
- %endif
-
diff --git a/r2/r2/templates/promotedtraffic.html b/r2/r2/templates/promotedtraffic.html
index 79fdfabe4..e2bcc6413 100644
--- a/r2/r2/templates/promotedtraffic.html
+++ b/r2/r2/templates/promotedtraffic.html
@@ -25,8 +25,26 @@
def num(x):
return locale.format('%d', x, True)
%>
+${_('current promotions')}
- --
- %for t in thing.things:
-
${_('promotions this month')}
- -| Impresions | -Clicks | -- | - | ||
|---|---|---|---|---|---|
| unique | -total | -unique | -total | -points | -title | -
| ${uimp} | -${nimp} | -${ucli} | -${ncli} | -${link._ups - link._downs} | -- ${link.title} - | -
+
+
@@ -51,31 +69,43 @@
unique
total
+
+
+${thing.viewers}
%if thing.traffic:
+ + Below you will see your promotion's impression and click traffic per hour of promotion. Please note that these traffic totals will lag behind by two to three hours, and that daily totals will be preliminary till 24 hours after the link has finished its run. +
++ Also below is a form which can be used to share traffic results with another user. +
++ ${_("Promotion Traffic")} + + ${_("(download as .csv)")} + +
%if thing.imp_graph:
+
+
+
+
+
+
+
+
+
+<%
+ title = _("create a promotion") if not thing.link else _("edit promotion")
+ %>
+})
+ %endif
+
%endif
+## provide a way to give refunds, but only if the link isn't already a freebie
+<%
+ cur_bid = getattr(thing.link, "promote_bid", g.min_promote_bid)
+ cur_refund = cur_bid - getattr(thing.link, "promo_refund", 0)
+%>
+%if c.user_is_sponsor and getattr(thing.link, "promote_paid", False) and \
+ getattr(thing.link, "promote_trans_id", -1) > 0 and cur_refund > 0:
+ <%utils:line_field title="${_('refund')}" id="bid-field">
+
+
+%endif
+
+%if not thing.link or thing.link.promote_status != STATUS.finished:
+ %if thing.link:
+ <%
+ thumb = None if not thing.link.has_thumbnail else thumbnail_url(thing.link) %>
+ <%utils:line_field title="${_('look and feel')}">
+
+
+%if thing.link and c.user_is_sponsor:
+ ${title}
%if thing.link: ${thing.listing} %endif +
+
+%if thing.link and not c.user_is_sponsor:
+ %if thing.link.promote_status == STATUS.unpaid:
+
+
+
+%if not thing.link or (c.user_is_sponsor and thing.link.promote_status < STATUS.pending):
+ <%utils:line_field title="${_('bid amount')}" id="bid-field"
+ description="${_('(total for the duration provided)')}">
+ $
+ %if getattr(thing.link, "promote_trans_id", 0) < 0:
+
+ ${_("This link is currently a freebie.")}
+
+ %endif
+ ${error_field("BAD_BID", "bid")}
+
+%else:
-%if thing.link:
- <% thumb = None if not thing.link.has_thumbnail else thumbnail_url(thing.link) %>
-<%call expr="image_upload('/api/link_thumb', thumb, tabular=True, label=_('thumbnail'))">
-
-
-
+
+
+ <%utils:line_field title="${_('bid amount')}" id="bid-field"
+ description="${_('(total for the duration provided)')}">
+ $${"%.2f" % thing.link.promote_bid}
+ <%
+ trans_id = getattr(thing.link, "promote_trans_id", None)
+ %>
+ %if trans_id and trans_id < 0:
+
+ ${_("This link is currently a freebie. Enjoy")}
+
+ %elif thing.link.promote_status >= STATUS.pending:
+
+ ${_("this amount has already been charged")}
+
+ %else:
+ %if thing.link.promote_status == STATUS.unpaid:
+
+ ${_("unpaid")}
+
+ %endif
+
+
+
+
+ %elif thing.link.promote_status == STATUS.rejected:
+
+
+
+ %elif thing.link.promote_status == STATUS.unseen:
+
+
+ %elif thing.link.promote_status < STATUS.finished:
+
+ ${_("Your bid has been registered and your submission is awaiting review. We will notify you by email of status updates.")}
+
+
+
+
+ %else:
+
+
+
+ %endif
+%endif
+
+ %endif
+
%endif
+## provide a way to give refunds, but only if the link isn't already a freebie
+<%
+ cur_bid = getattr(thing.link, "promote_bid", g.min_promote_bid)
+ cur_refund = cur_bid - getattr(thing.link, "promo_refund", 0)
+%>
+%if c.user_is_sponsor and getattr(thing.link, "promote_paid", False) and \
+ getattr(thing.link, "promote_trans_id", -1) > 0 and cur_refund > 0:
+ <%utils:line_field title="${_('refund')}" id="bid-field">
+
+
+%endif
+
+%if not thing.link or thing.link.promote_status != STATUS.finished:
+ %if thing.link:
+ <%
+ thumb = None if not thing.link.has_thumbnail else thumbnail_url(thing.link) %>
+ <%utils:line_field title="${_('look and feel')}">
+
+ <%utils:image_upload post_target="/api/link_thumb"
+ current_image="${thumb}"
+ label="${_('upload header image:')}">
+
+ ## overwrite the completed image function
+
+
+
+
+
+ %else:
+
+
+
+
+
+ %endif
+%endif
+
+
+
+ By clicking "agree" you agree to the Self Serve Advertising Rules.
+
+
+ %if thing.bids:
+ <%utils:line_field title="${_('bidding history')}">
+ <%
+ from r2.models import Account, bidding
+ accounts = Account._byID(set(x.account_id for x in thing.bids), True)
+ %>
+
+
+
+ %endif
+
+
+
+
+%endif
+
diff --git a/r2/r2/templates/reddit.html b/r2/r2/templates/reddit.html
index de00cbcba..52fc86aba 100644
--- a/r2/r2/templates/reddit.html
+++ b/r2/r2/templates/reddit.html
@@ -21,8 +21,8 @@
################################################################################
<%!
- from r2.lib.template_helpers import add_sr, static, join_urls, class_dict, path_info, get_domain
- from r2.lib.pages import SearchForm, ClickGadget
+ from r2.lib.template_helpers import add_sr, static, join_urls, class_dict, get_domain
+ from r2.lib.pages import SearchForm, ClickGadget, SideContentBox
from r2.lib import tracking
from pylons import request
from r2.lib.strings import strings
@@ -54,18 +54,17 @@
%else:
- %if c.allow_styles:
%if c.site.stylesheet:
%endif
- %if c.site.stylesheet_contents:
-
- %endif
- %endif
+ %endif
+
+ %if c.allow_styles and c.site.stylesheet_contents:
+
%endif
%if getattr(thing, "additional_css", None):
<%def name="javascript_run()">
- reddit.where = ${path_info()};
reddit.cur_site = "${c.site._fullname if hasattr(c.site, '_fullname') else ''}";
@@ -166,12 +164,14 @@
%if c.user_is_admin:
<%include file="admin_rightbox.html"/>
- %else:
- <%include file="ads.html"/>
%endif
+ <%include file="ads.html"/>
+
##cheating... we should move ads into a template of its own
- ${ClickGadget(c.recent_clicks)}
+ %if c.user.pref_clickgadget and c.recent_clicks:
+ ${SideContentBox(_("Recently viewed links"), [ClickGadget(c.recent_clicks)])}
+ %endif
diff --git a/r2/r2/templates/redditfooter.html b/r2/r2/templates/redditfooter.html
index d435aeb6a..d01bfd81f 100644
--- a/r2/r2/templates/redditfooter.html
+++ b/r2/r2/templates/redditfooter.html
@@ -28,7 +28,7 @@
| date | +user | +transaction id | +pay id | +amount | +status | +
|---|---|---|---|---|---|
| ${bid.date} | +${accounts[bid.account_id].name} | +${bid.transaction} | +${bid.pay_id} | +$${"%.2f" % bid.bid} | +${status} | +
diff --git a/r2/r2/templates/reddittraffic.html b/r2/r2/templates/reddittraffic.html
index 260721f43..91f650afc 100644
--- a/r2/r2/templates/reddittraffic.html
+++ b/r2/r2/templates/reddittraffic.html
@@ -217,8 +217,8 @@
<%def name="bars(uni, imp)">
<%
- wid_uni = int(50 * min(2, float(uni)/thing.uniques_mean))
- wid_imp = int(50 * min(2, float(imp)/thing.impressions_mean))
+ wid_uni = int(50 * min(2, float(uni)/max(thing.uniques_mean, 1)))
+ wid_imp = int(50 * min(2, float(imp)/max(thing.impressions_mean,1)))
%>
diff --git a/r2/r2/templates/selfserveblurb.html b/r2/r2/templates/selfserveblurb.html
new file mode 100644
index 000000000..ecd823bdc
--- /dev/null
+++ b/r2/r2/templates/selfserveblurb.html
@@ -0,0 +1,35 @@
+## 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-2009
+## CondeNet, Inc. All Rights Reserved.
+################################################################################
+
+%if c.user_is_sponsor or c.user_is_paid_sponsor:
+
+
+%endif
diff --git a/r2/r2/templates/share.email b/r2/r2/templates/share.email
index be288b248..522e43f87 100644
--- a/r2/r2/templates/share.email
+++ b/r2/r2/templates/share.email
@@ -19,14 +19,15 @@
## All portions of the code written by CondeNet are Copyright (c) 2006-2009
## CondeNet, Inc. All Rights Reserved.
################################################################################
+<%! from r2.lib.template_helpers import get_domain%>
%if not thing.body:
-<% from r2.lib.template_helpers import get_domain%>${thing.username} from http://${get_domain(cname = c.cname, subreddit = False)}/ has shared a link with you.
+${thing.username} from http://${get_domain(cname = c.cname, subreddit = False)}/ has shared a link with you.
%else:
${thing.body}
%endif
"${thing.link.title}"
-http://${g.domain}/goto?share=true&id=${thing.link._fullname}
+http://${get_domain(cname = c.cname, subreddit = False)}/tb/${thing.link._id36}
<% from r2.lib.strings import strings, plurals %>${ungettext("There is currently %(num_comments)s on this link. You can view it here:", "There are currently %(num_comments)s on this link. You can view them here:", thing.link.num_comments) % dict(num_comments = strings.number_label % dict(num=thing.link.num_comments, thing=plurals.N_comments(thing.link.num_comments)))}
diff --git a/r2/r2/templates/shirtpane.html b/r2/r2/templates/shirtpane.html
index b70038fbc..b82e4517a 100644
--- a/r2/r2/templates/shirtpane.html
+++ b/r2/r2/templates/shirtpane.html
@@ -36,6 +36,17 @@
use our self-serve advertising tool
+ ++ + reddit has created a system where you can buy sponsored links on the + front page using our self-serve tool. + +
+ +${_("Your reddit headline shirt")}
++ For $21.99, this custom design will be printed on a 100% cotton + American Apparel + shirt (comfy like all + reddit schwag). +
++ You'll quickly be the envy of your peers and win the affection of + whomever you desire. +
+${_("Color")}
diff --git a/r2/r2/templates/sidebox.html b/r2/r2/templates/sidebox.html index 798636b9a..01ed17f13 100644 --- a/r2/r2/templates/sidebox.html +++ b/r2/r2/templates/sidebox.html @@ -31,7 +31,13 @@ nocname = thing.nocname %> - ${plain_link(thing.title,thing.link, _sr_path = thing.sr_path, _class="morelink", onclick=onclick, nocname=nocname)} + +
+ ${plain_link(thing.title,thing.link, _sr_path = thing.sr_path,
+ onclick=onclick, nocname=nocname)}
+
+
+
%if thing.subtitles:
%for subtitle in thing.subtitles:
diff --git a/r2/r2/templates/sidecontentbox.html b/r2/r2/templates/sidecontentbox.html
new file mode 100644
index 000000000..b9e26cab7
--- /dev/null
+++ b/r2/r2/templates/sidecontentbox.html
@@ -0,0 +1,35 @@
+## 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-2009
+## CondeNet, Inc. All Rights Reserved.
+################################################################################
+
+
-
-
-
-
-
- ${error_field("BAD_CSS_NAME", "name")}
-
- - ${_("(image names should consist of alphanumeric characters and '-' only)")} - -
-
+
+ + + ${error_field("BAD_CSS_NAME", "name")} +
+ + ${_("(image names should consist of alphanumeric characters and '-' only)")} +
+ %if thing.helplink:
+
+ ${thing.helplink[1]}
+
+ %endif
+
diff --git a/r2/r2/templates/sponsorshipbox.html b/r2/r2/templates/sponsorshipbox.html
new file mode 100644
index 000000000..c55736369
--- /dev/null
+++ b/r2/r2/templates/sponsorshipbox.html
@@ -0,0 +1,41 @@
+## 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-2009
+## CondeNet, Inc. All Rights Reserved.
+################################################################################
+
+%if c.site.sponsorship_url and c.site.sponsorship_img:
+<%
+ name = c.site._fullname
+%>
+
+%endif
diff --git a/r2/r2/templates/subreddit.html b/r2/r2/templates/subreddit.html
index 3e2541c16..52e0d04e7 100644
--- a/r2/r2/templates/subreddit.html
+++ b/r2/r2/templates/subreddit.html
@@ -42,9 +42,9 @@
%endif
%if thing.description:
- ${thing.title.upper()}
+
+ %for c in thing.content:
+ ${c}
+ %endfor
+
+- ${thing.description} -
+
+ ${thing.usertext}
+
%endif
${self.tagline()} @@ -61,7 +61,7 @@ ##this function is used by subscriptionbox.html <%def name="addremove_button(sr)"> - ${toggle_button("sr-toggle-button", "", "", + ${toggle_button("fancy-toggle-button", _("+ frontpage"), _("- frontpage"), "subscribe('%s')" % sr._fullname, "unsubscribe('%s')" % sr._fullname, css_class = "add", alt_css_class = "remove", diff --git a/r2/r2/templates/subredditinfobar.html b/r2/r2/templates/subredditinfobar.html index 453016354..68846fc6a 100644 --- a/r2/r2/templates/subredditinfobar.html +++ b/r2/r2/templates/subredditinfobar.html @@ -20,71 +20,76 @@ ## CondeNet, Inc. All Rights Reserved. ################################################################################ -<%! +<%! + import locale from r2.lib.utils import timesince - from r2.lib.strings import strings - %> -<%namespace file="printablebuttons.html" - import="ynbutton, toggle_button, state_button"/> -<%namespace file="printable.html" import="thing_css_class" /> - -%if not thing.is_fake: -
-
-%endif
+ from r2.lib.strings import strings, Score
+ from r2.lib.pages import WrappedUser
+ %>
+<%namespace file="subreddit.html" import="addremove_button" />
+<%namespace file="printablebuttons.html" import="ynbutton, state_button" />
<%def name="moderate_button(location, fmt, question, left)">
${ynbutton(_("leave"), left, location,
- question = question, format = fmt, format_arg = "leave")}
+ question = question, format = fmt, format_arg = "leave",
+ hidden_data = dict(id = thing.sr._fullname))}
+
+${thing.name}
- %if thing.is_loggedin: - ${toggle_button("subscribe-button", - _("subscribe"), _("unsubscribe"), - 'subscribe("%s")' % thing.fullname, - 'unsubscribe("%s")' % thing.fullname, - reverse = thing.is_subscriber)} - %endif - - (${strings.person_label % dict(num = thing.subscribers, - persons = ungettext('subscriber', 'subscribers', - thing.subscribers))}) - -- ${_("a community for %(time)s") % dict(time=timesince(thing.date))} -
- -
- %if thing.is_contributor:
- ${moderate_button("leave_contributor",
- _("you are a contributor of this reddit. (%(leave)s)"),
- _("stop being a contributor?"),
- _("you are no longer a contributor"))}
- %endif
-
- %if thing.is_moderator:
- ${moderate_button("leave_moderator",
- _("you are a moderator of this reddit. (%(leave)s)"),
- _("stop being a moderator?"),
- _("you are no longer a moderator"))}
-
- %endif
-
- %if thing.is_admin:
- %if thing.spam:
- ${state_button("unban", _("unban"),
- "return change_state(this, 'unban');", _("unbanned"))}
- %if thing.banner:
- ${strings.banned_by % thing.banner}
- %endif
- %else:
- ${state_button("ban", _("ban"),
- "return change_state(this, 'ban');", _("banned"))}
- %endif
- %endif
-
- %for n in thing.nav():
- ${n}
- %endfor
-
-
+
+
+
+
+
diff --git a/r2/r2/templates/subredditstylesheet.html b/r2/r2/templates/subredditstylesheet.html
index 924dfd139..bd59788eb 100644
--- a/r2/r2/templates/subredditstylesheet.html
+++ b/r2/r2/templates/subredditstylesheet.html
@@ -97,24 +97,18 @@
${thing.sr.name}
+ + ${addremove_button(thing.sr)} + ${unsafe(Score.readers(thing.subscribers))} + + %if thing.sr.moderator: + ${moderate_button("leavemoderator", + _("you are a moderator of this reddit. (%(leave)s)"), + _("stop being a moderator?"), + _("you are no longer a moderator"))} + + %endif + + %if thing.sr.contributor: + ${moderate_button("leavecontributor", + _("you are a contributor of this reddit. (%(leave)s)"), + _("stop being a contributor?"), + _("you are no longer a contributor"))} + %endif + + %if thing.sr.description: + ${thing.sr.usertext} + %endif + +
+ %if thing.sr.author:
+ created by
+ ${WrappedUser(thing.sr.author).render()}
+ %endif
+
+
+ ${_("a community for %(time)s") % dict(time=timesince(thing.sr._date))}
+
+
+
+ %if c.user_is_admin:
+ %if thing.sr._spam:
+ ${state_button("unban", _("unban this reddit"),
+ "return change_state(this, 'unban');", _("unbanned"),
+ hidden_data = dict(id = thing.sr._fullname))}
+ %if thing.sr._spam and hasattr(thing.sr, "banner"):
+ (${strings.banned_by % thing.sr.banner})
+ %endif
+
+ %else:
+ ${state_button("ban", _("ban this reddit"),
+ "return change_state(this, 'ban');", _("banned"),
+ hidden_data = dict(id = thing.sr._fullname))}
+ %endif
+ %endif
+
+ ${_("images")}
- <%call expr="image_upload('/api/upload_sr_img', thing.site.header, - tabular=True, + <%call expr="image_upload('/api/upload_sr_img', '', onchange='return file_changed(this)', label = _('image file'))"> -- - ${_("(image names should consist of alphanumeric characters and '-' only)")} - -
+ + + ${error_field("BAD_CSS_NAME", "name")} +
+ + ${_("(image names should consist of alphanumeric characters and '-' only)")} +
${_("Note: any changes to images here will be reflected immediately on reload and cannot be undone.")} diff --git a/r2/r2/templates/subscriptionbox.html b/r2/r2/templates/subscriptionbox.html index 3c497c958..3c742a182 100644 --- a/r2/r2/templates/subscriptionbox.html +++ b/r2/r2/templates/subscriptionbox.html @@ -23,7 +23,6 @@ <%namespace file="subreddit.html" import="addremove_button, permission_icons"/>
-
your front page reddits
-
%for sr in thing.reddits:
-
diff --git a/r2/r2/templates/takedownpane.html b/r2/r2/templates/takedownpane.html
new file mode 100644
index 000000000..30112e3af
--- /dev/null
+++ b/r2/r2/templates/takedownpane.html
@@ -0,0 +1,35 @@
+## 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-2009
+## CondeNet, Inc. All Rights Reserved.
+################################################################################
+
+<%!
+ from r2.lib.filters import unsafe, safemarkdown, keep_space
+%>
+
++%if getattr(thing.link, "takedown_img", True): +diff --git a/r2/r2/templates/translatedstring.html b/r2/r2/templates/translatedstring.html index 053b851f3..5ff89bc20 100644 --- a/r2/r2/templates/translatedstring.html +++ b/r2/r2/templates/translatedstring.html @@ -22,8 +22,8 @@ <% highlight = lambda x: ("" + x + "") - singular = thing._singular(highlight) - plural = thing._plural(highlight) + singular = thing._singular(highlight).replace("\\n", "
+%else:
+ 
+%endif
+${unsafe(safemarkdown(thing.explanation, nofollow=True))}
+
+
") + plural = thing._plural(highlight).replace("\\n", "
") # downplay explanation strings singular = singular.replace(" {", " (").replace("}", ")") plural = plural.replace(" {", " (").replace("}", ")") @@ -33,7 +33,7 @@ %> %if (singular and thing.enabled) or c.user_is_admin: -+ (${thing.index}) diff --git a/r2/r2/templates/trophycase.html b/r2/r2/templates/trophycase.html new file mode 100644 index 000000000..53899f072 --- /dev/null +++ b/r2/r2/templates/trophycase.html @@ -0,0 +1,85 @@ +## 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-2009 +## CondeNet, Inc. All Rights Reserved. +############################################################################### + +<%namespace file="printablebuttons.html" import="ynbutton" /> + +<%def name="trophy_info(trophy, center)"> ++ + + +%if c.user_is_admin and thing.cup_date: ++ %if hasattr(trophy, "url"): + + %endif +++
+ ${trophy._thing2.title} +
+ %if hasattr(trophy, "description"): + ${trophy.description} +
+ %endif + %if hasattr(trophy, "url"): + + %endif + %if c.user_is_admin: + ${ynbutton(_("remove"), _("removed"), "removetrophy", "hide_thing", + hidden_data=dict(trophy_fn=trophy._id36))} + %endif ++ show cup until: + ${thing.cup_date.astimezone(g.display_tz).strftime("%Y-%m-%d %H:%M:%S %Z")} + + ${ynbutton(_("remove"), _("removed"), "removecup", "hide_thing", + hidden_data=dict(account=thing.user.name))} ++%endif + +## for now +%if not thing.trophies: +${_("dust")}+%endif + ++ %for i, trophy in enumerate(thing.trophies): + %if i % 2 == 0: +
diff --git a/r2/r2/templates/uploadedimage.html b/r2/r2/templates/uploadedimage.html index c8ad66399..e49ba36df 100644 --- a/r2/r2/templates/uploadedimage.html +++ b/r2/r2/templates/uploadedimage.html @@ -29,7 +29,8 @@ errors = simplejson.dumps(thing.errors) %> parent.completedUploadImage('${thing.status}','${thing.img_src or ""}', - '${thing.name or ""}', ${unsafe(errors)}); + '${thing.name or ""}', ${unsafe(errors)}, + '${thing.form_id}'); diff --git a/r2/r2/templates/userawards.html b/r2/r2/templates/userawards.html new file mode 100644 index 000000000..71dcc2acb --- /dev/null +++ b/r2/r2/templates/userawards.html @@ -0,0 +1,62 @@ +## 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-2009 +## CondeNet, Inc. All Rights Reserved. +################################################################################ + ++ %endif + + ${trophy_info(trophy, i == len(thing.trophies) - 1)} + + %if i % 2 == 1: + + %endif + %endfor + + %if len(thing.trophies) % 2 == 1: + + %endif ++ + %for i, (award, winner, trophy) in enumerate(thing.winners): + +diff --git a/r2/r2/templates/userlist.html b/r2/r2/templates/userlist.html index 8e49c2461..6ea6341ef 100644 --- a/r2/r2/templates/userlist.html +++ b/r2/r2/templates/userlist.html @@ -24,8 +24,10 @@ <% from r2.lib.template_helpers import static %>+ ++ %endfor ++ ${award.title} + + +
+ %if hasattr(trophy, "description"): + ${_("won by")} + %else: ++ +
+ ${_("recently won by")} + %endif + + + ${winner} + + +
+ + %if hasattr(trophy, "description"): + on + ${trophy.description} + %endif + + %if hasattr(trophy, "url"): + + + ${_("for this")} + + %endif +%if thing.editable: - %endif -diff --git a/r2/r2/templates/usertableitem.html b/r2/r2/templates/usertableitem.html index a09dffea1..010eb2f2e 100644 --- a/r2/r2/templates/usertableitem.html +++ b/r2/r2/templates/usertableitem.html @@ -47,7 +47,7 @@ "/message/compose?to=%s" % (thing.user.name))} %elif thing.name == "remove" and thing.editable: - ${ynbutton(_("remove"), "removed", "unfriend", + ${ynbutton(_("remove"), "removed", thing.remove_action, callback="deleteRow", hidden_data = dict(type = thing.type, id = thing.user._fullname, diff --git a/r2/r2/templates/usertext.html b/r2/r2/templates/usertext.html index 1eab4fb5a..7d38c950b 100644 --- a/r2/r2/templates/usertext.html +++ b/r2/r2/templates/usertext.html @@ -44,7 +44,7 @@ %endif ##this is set for both editting selftext and creating new comments - + %if not thing.creating:${thing.table_title}
+++ ${thing.table_title} +
-- %if thing.users: - %for item in thing.users: - ${item} - %endfor - %else: -
++ %if thing.users: + %for item in thing.users: + ${item} + %endfor + %else: +
+