Browse files

Markdownify goldvertisements.

  • Loading branch information...
1 parent 91a34e5 commit 4024dd5e8a76ecdee2d869fe8a9e82997a4e85f1 @chromakode chromakode committed Dec 7, 2012
Showing with 7 additions and 16 deletions.
  1. +2 −3 r2/example.ini
  2. +1 −1 r2/r2/lib/configparse.py
  3. +2 −2 r2/r2/lib/pages/pages.py
  4. +2 −10 r2/r2/templates/goldvertisement.html
View
5 r2/example.ini
@@ -557,7 +557,6 @@ spotlight_interest_nosub_p = .1
# map of comment tree version to how frequently it should be chosen relative to
# the others
comment_tree_version_weights = 1:1, 2:0
-# message blurbs for the front page sidebar gold ad.
-# use a '|' character to separate the title line from the smaller aside.
-# in the title line, '%(reddit_gold)s' will be replaced by a link.
+# markdown message blurbs for the front page sidebar gold ad.
+# use **strong** markup for a larger font, and " \n" (<br>) to separate lines.
goldvertisement_blurbs = "Make reddit better. Try %(reddit_gold)." "This year, give the gift of %(reddit_gold)s.|(and you should probably also give some other, better gifts)"
View
2 r2/r2/lib/configparse.py
@@ -73,7 +73,7 @@ def days(v, key=None, data=None):
messages_re = re.compile(r'"([^"]+)"')
@staticmethod
def messages(v, key=None, data=None):
- return ConfigValue.messages_re.findall(v)
+ return ConfigValue.messages_re.findall(v.decode("string_escape"))
class ConfigValueParser(dict):
View
4 r2/r2/lib/pages/pages.py
@@ -3713,5 +3713,5 @@ class Goldvertisement(Templated):
def __init__(self):
Templated.__init__(self)
blurbs = g.live_config["goldvertisement_blurbs"]
- blurb = random.choice(blurbs)
- self.blurb_title, sep, self.blurb_aside = blurb.partition("|")
+ self.blurb = random.choice(blurbs)
+
View
12 r2/r2/templates/goldvertisement.html
@@ -20,18 +20,10 @@
## reddit Inc. All Rights Reserved.
###############################################################################
-<%namespace file="utils.html" import="tags, text_with_links"/>
+<%namespace file="utils.html" import="text_with_links, md"/>
<div class="goldvertisement">
<div class="inner">
- <p>
- <strong>
- ${text_with_links(thing.blurb_title,
- reddit_gold=dict(link_text="reddit gold", path="/gold/about"))}
- </strong>
- % if thing.blurb_aside:
- <br><i>${thing.blurb_aside}</i>
- % endif
- </p>
+ ${md(thing.blurb)}
</div>
</div>

0 comments on commit 4024dd5

Please sign in to comment.