From bb0f5b552c3a52abfac1e2147144eef8f2e7dfab Mon Sep 17 00:00:00 2001 From: Jordan Milne Date: Thu, 15 Jan 2015 14:39:12 -0800 Subject: [PATCH] Replace ad-hoc HTML templating with `format_html()` and `_wsf()` Conflicts: r2/r2/templates/prefoptions.html --- r2/r2/controllers/api.py | 14 +++++----- r2/r2/controllers/promotecontroller.py | 3 ++- r2/r2/models/link.py | 21 +++++++-------- r2/r2/templates/base.htmllite | 12 ++++----- r2/r2/templates/comment.compact | 4 +-- r2/r2/templates/exploreitemlisting.html | 6 ++--- r2/r2/templates/frametoolbar.html | 10 +++---- r2/r2/templates/listing.html | 6 ++--- r2/r2/templates/message.compact | 11 ++++---- r2/r2/templates/message.html | 16 +++++------ r2/r2/templates/message.xml | 6 ++--- r2/r2/templates/multiinfobar.html | 5 ++-- r2/r2/templates/newlink.html | 10 +++---- r2/r2/templates/oauth2authorization.html | 16 +++++------ r2/r2/templates/prefoptions.html | 34 +++++++++++------------- r2/r2/templates/promotedlinktraffic.html | 6 ++--- r2/r2/templates/spotlightlisting.html | 4 +-- r2/r2/templates/subreddittopbar.html | 4 +-- r2/r2/templates/tablelisting.html | 6 ++--- r2/r2/templates/userlisting.html | 6 ++--- r2/r2/templates/utils.html | 4 +-- r2/r2/templates/widgetdemopanel.html | 10 +++---- 22 files changed, 107 insertions(+), 107 deletions(-) diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py index 23b158fd6..58f1aa9c2 100644 --- a/r2/r2/controllers/api.py +++ b/r2/r2/controllers/api.py @@ -82,6 +82,7 @@ from r2.lib.menus import CommentSortMenu from r2.lib.captcha import get_iden from r2.lib.strings import strings from r2.lib.filters import _force_unicode, websafe_json, websafe, spaceCompress +from r2.lib.template_helpers import format_html from r2.lib.db import queries from r2.lib.db.queries import changed from r2.lib import media @@ -1858,9 +1859,9 @@ class ApiController(RedditController): else: emails, users = emails jquery.things(link._fullname).set_text(".share", _("shared")) - shareform.html("
" - "

%s

" % - websafe(_("your link has been shared."))) + shareform.html(format_html("
" + "

%s

", + _("your link has been shared."))) if getattr(link, "promoted", None) and link.disable_comments: message = message + "\n\n" if message else "" @@ -3679,9 +3680,10 @@ class ApiController(RedditController): # TODO: move this to a template if flair_template: - flair = '%s' % ( - ' '.join('linkflair-' + c for c in css_class.split()), - websafe(text)) + classes = ' '.join('linkflair-' + c for c in css_class.split()) + flair = format_html('%s', + classes, text) + if site.link_flair_position == 'left': jquery(title_path).before(flair) elif site.link_flair_position == 'right': diff --git a/r2/r2/controllers/promotecontroller.py b/r2/r2/controllers/promotecontroller.py index 76c31ab11..87c241e2f 100644 --- a/r2/r2/controllers/promotecontroller.py +++ b/r2/r2/controllers/promotecontroller.py @@ -39,6 +39,7 @@ from r2.lib.base import abort from r2.lib.db import queries from r2.lib.errors import errors from r2.lib.filters import websafe +from r2.lib.template_helpers import format_html from r2.lib.media import force_thumbnail, thumbnail_url, _scrape_media from r2.lib.memoize import memoize from r2.lib.menus import NamedButton, NavButton, NavMenu, QueryButton @@ -554,7 +555,7 @@ class PromoteApiController(ApiController): if promote.is_promo(link): text = PromotionLog.add(link, note) form.find(".notes").children(":last").after( - "

" + websafe(text) + "

") + format_html("

%s

", text)) @validatedForm( VSponsorAdmin(), diff --git a/r2/r2/models/link.py b/r2/r2/models/link.py index af9c460ba..849fd6265 100644 --- a/r2/r2/models/link.py +++ b/r2/r2/models/link.py @@ -368,7 +368,7 @@ class Link(Thing, Printable): from r2.lib.count import incr_counts from r2.lib import media from r2.lib.utils import timeago - from r2.lib.template_helpers import get_domain, _ws, unsafe + from r2.lib.template_helpers import get_domain, unsafe, format_html from r2.models.report import Report from r2.models.subreddit import FakeSubreddit from r2.lib.wrapped import CachedVariable @@ -655,16 +655,16 @@ class Link(Thing, Printable): taglinetext = '' if item.different_sr: - author_text = (" " + _ws("by %(author)s to %(reddit)s") + - "") + author_text = format_html(" %s", + _("by %(author)s to %(reddit)s")) else: - author_text = " " + _ws("by %(author)s") + "" + author_text = format_html(" %s", + _("by %(author)s")) if item.editted: if item.score_fmt in (Score.points, Score.safepoints): - taglinetext = ("" + - _ws("%(score)s submitted %(when)s " - "%(lastedited)s") + - "") + taglinetext = format_html("%s", + _("%(score)s submitted %(when)s " + "%(lastedited)s")) taglinetext = unsafe(taglinetext + author_text) elif item.different_sr: taglinetext = _("submitted %(when)s %(lastedited)s " @@ -674,9 +674,8 @@ class Link(Thing, Printable): "by %(author)s") else: if item.score_fmt in (Score.points, Score.safepoints): - taglinetext = ("" + - _ws("%(score)s submitted %(when)s") + - "") + taglinetext = format_html("%s", + _("%(score)s submitted %(when)s")) taglinetext = unsafe(taglinetext + author_text) elif item.different_sr: taglinetext = _("submitted %(when)s by %(author)s " diff --git a/r2/r2/templates/base.htmllite b/r2/r2/templates/base.htmllite index 43a3982a1..4c391c165 100644 --- a/r2/r2/templates/base.htmllite +++ b/r2/r2/templates/base.htmllite @@ -24,7 +24,7 @@ <%! from pylons.i18n import _ - from r2.lib.template_helpers import get_domain, style_line, _ws + from r2.lib.template_helpers import get_domain, style_line, format_html, _ws from r2.models.subreddit import FakeSubreddit, DefaultSR %> @@ -49,16 +49,16 @@ ${optionalstyle("border:none")} /> <% - style = capture(optionalstyle, "text-decoration:none;color:#336699") + style = unsafe(capture(optionalstyle, "text-decoration:none;color:#336699")) name = c.site.name if not isinstance(c.site, FakeSubreddit): name += ".%s" % g.domain if c.link_target: - link = ('%s' % - (style, get_domain(), c.link_target, name)) + link = format_html('%s', + style, get_domain(), c.link_target, name) else: - link = ('%s' % - (style, get_domain(), name)) + link = format_html('%s', + style, get_domain(), name) %> ${self.titlebar(link)} diff --git a/r2/r2/templates/comment.compact b/r2/r2/templates/comment.compact index 8eda0c90e..c130a32e3 100644 --- a/r2/r2/templates/comment.compact +++ b/r2/r2/templates/comment.compact @@ -22,7 +22,7 @@ <%! from r2.lib.pages import WrappedUser - from r2.lib.template_helpers import add_sr, _ws + from r2.lib.template_helpers import add_sr, _wsf %> <%namespace file="printable.compact" import="delete_report_buttons"/> <%namespace file="printable.html" import="arrow, score, thing_css_rowclass"/> @@ -67,7 +67,7 @@ %endif ## thing.timesince is a cache stub - ${unsafe(_ws("%(timeago)s") % dict(timeago=thing.timesince))} + ${_wsf("%(timeago)s", timeago=thing.timesince)} % if thing.gilded_message: % if thing.gildings > 1: diff --git a/r2/r2/templates/exploreitemlisting.html b/r2/r2/templates/exploreitemlisting.html index ff66630b5..980eb1b51 100644 --- a/r2/r2/templates/exploreitemlisting.html +++ b/r2/r2/templates/exploreitemlisting.html @@ -21,7 +21,7 @@ ############################################################################### <%! - from r2.lib.template_helpers import _ws + from r2.lib.template_helpers import format_html %> <%namespace file="utils.html" import="plain_link" /> <% @@ -63,7 +63,7 @@ %endfor
${_("view more:")} - ${plain_link(unsafe(_ws("reload suggestions") + " ›"), request.url, _sr_path=False, nocname=True)} + ${plain_link(format_html("%s ›", _("reload suggestions")), request.url, _sr_path=False, nocname=True)}
%else: @@ -74,7 +74,7 @@
- ${plain_link(unsafe(_ws("try again") + " ›"), "/explore", _sr_path=False, nocname=True)} + ${plain_link(format_html("%s ›", _("try again")), "/explore", _sr_path=False, nocname=True)}
%endif diff --git a/r2/r2/templates/frametoolbar.html b/r2/r2/templates/frametoolbar.html index 59c124b3b..90efef708 100644 --- a/r2/r2/templates/frametoolbar.html +++ b/r2/r2/templates/frametoolbar.html @@ -21,7 +21,7 @@ ############################################################################### <%! - from r2.lib.template_helpers import static, get_domain, add_sr, _ws + from r2.lib.template_helpers import static, get_domain, add_sr, format_html from r2.lib.strings import Score %> @@ -188,21 +188,21 @@ %if thing.saved: ${state_button("unsave", _("unsave"), - "return change_state(this, 'unsave');", "%s" % _ws("unsaved"), + "return change_state(this, 'unsave');", format_html("%s", _("unsaved")), a_class="clickable")} %else: ${state_button("save", _("save"), - "return change_state(this, 'save');", "%s" % _ws("saved"), + "return change_state(this, 'save');", format_html("%s", _("saved")), a_class="clickable")} %endif %if thing.hidden: ${state_button("unhide", _("unhide"), - "return change_state(this, 'unhide');", "%s" % _ws("unhidden"), + "return change_state(this, 'unhide');", format_html("%s", _("unhidden")), a_class="clickable")} %else: ${state_button("hide", _("hide"), - "return change_state(this, 'hide');", "%s" % _ws("hide"), + "return change_state(this, 'hide');", format_html("%s", _("hide")), a_class="clickable")} %endif diff --git a/r2/r2/templates/listing.html b/r2/r2/templates/listing.html index 87b37ad6b..d731241f4 100644 --- a/r2/r2/templates/listing.html +++ b/r2/r2/templates/listing.html @@ -21,7 +21,7 @@ ############################################################################### <%! - from r2.lib.template_helpers import _ws + from r2.lib.template_helpers import format_html from r2.models import Sub %> <%namespace file="utils.html" import="plain_link" /> @@ -39,13 +39,13 @@
${_("view more:")} %if thing.prev: - ${plain_link(unsafe("‹ " + _ws("prev")), thing.prev, _sr_path = (c.site != Sub), rel="nofollow prev")} + ${plain_link(format_html("‹ %s", _("prev")), thing.prev, _sr_path = (c.site != Sub), rel="nofollow prev")} %endif %if thing.prev and thing.next: %endif %if thing.next: - ${plain_link(unsafe(_ws("next") + " ›"), thing.next, _sr_path = (c.site != Sub), rel="nofollow next")} + ${plain_link(format_html("%s ›", _("next")), thing.next, _sr_path = (c.site != Sub), rel="nofollow next")} %endif %if thing.next_suggestions: diff --git a/r2/r2/templates/message.compact b/r2/r2/templates/message.compact index ab95d9030..184925c68 100644 --- a/r2/r2/templates/message.compact +++ b/r2/r2/templates/message.compact @@ -24,6 +24,7 @@ from r2.lib.pages import WrappedUser from r2.lib.filters import safemarkdown, websafe, conditional_websafe from r2.models import Account + from r2.lib.template_helpers import format_html %> <%namespace file="printable.html" import="arrow, score"/> <%namespace file="utils.html" import="plain_link" /> @@ -59,23 +60,23 @@ substitutions = {} if thing.sr_id: - substitutions['subreddit'] = u' %(path)s ' % dict(path=thing.subreddit.path) + substitutions['subreddit'] = format_html(u' %(path)s ', path=thing.subreddit.path) - substitutions['author'] = u"%s" % WrappedUser(thing.author, thing.attribs, thing).render() + substitutions['author'] = format_html(u"%s", WrappedUser(thing.author, thing.attribs, thing)) if isinstance(thing.to, Account): - substitutions['dest'] = u"%s" % WrappedUser(thing.to, [], thing).render() + substitutions['dest'] = format_html(u"%s", WrappedUser(thing.to, [], thing)) elif thing.sr_id: substitutions['dest'] = substitutions['subreddit'] substitutions['when'] = thing.timesince taglinetext = conditional_websafe(thing.taglinetext).replace(' ', ' ') - taglinetext %= substitutions + taglinetext = format_html(taglinetext, **substitutions) %>
- ${unsafe(taglinetext)} + ${taglinetext}
${unsafe(safemarkdown(thing.body))} diff --git a/r2/r2/templates/message.html b/r2/r2/templates/message.html index 7e9052e48..ea11f693f 100644 --- a/r2/r2/templates/message.html +++ b/r2/r2/templates/message.html @@ -24,7 +24,7 @@ from r2.lib.filters import safemarkdown, websafe, conditional_websafe from r2.lib.pages.things import MessageButtons from r2.lib.pages import WrappedUser - from r2.lib.template_helpers import static, add_attr + from r2.lib.template_helpers import static, add_attr, format_html from r2.models import Account %> @@ -53,9 +53,9 @@ ${parent.thing_css_class(what)} ${"new" if thing.new else ""} ${"was-comment" if substitutions = {} if thing.sr_id: - substitutions['subreddit'] = u'%(path)s' % dict(path=thing.subreddit.path) + substitutions['subreddit'] = format_html(u'%(path)s', path=thing.subreddit.path) - substitutions['author'] = u'%s' % WrappedUser(thing.author, thing.attribs, thing).render() + substitutions['author'] = format_html(u'%s', WrappedUser(thing.author, thing.attribs, thing)) if isinstance(thing.to, Account): to_attribs = [] @@ -68,18 +68,18 @@ ${parent.thing_css_class(what)} ${"new" if thing.new else ""} ${"was-comment" if label = _('moderator of /r/%(reddit)s, speaking officially') label %= {'reddit': thing.subreddit.name} add_attr(to_attribs, 'M', label=label, link=link) - substitutions['dest'] = u'%s' % WrappedUser(thing.to, to_attribs, thing).render() + substitutions['dest'] = format_html(u'%s', WrappedUser(thing.to, to_attribs, thing)) elif thing.sr_id: - substitutions['dest'] = u'%(path)s' % dict(path=thing.subreddit.path) + substitutions['dest'] = format_html(u'%(path)s', path=thing.subreddit.path) - substitutions['when'] = capture(thing_timestamp, thing, thing.timesince, include_tense=True) + substitutions['when'] = unsafe(capture(thing_timestamp, thing, thing.timesince, include_tense=True)) taglinetext = conditional_websafe(thing.taglinetext).replace(' ', ' ') - taglinetext %= substitutions + taglinetext = format_html(taglinetext, **substitutions) %> - ${unsafe(taglinetext)} + ${taglinetext} %if c.user_is_admin: diff --git a/r2/r2/templates/message.xml b/r2/r2/templates/message.xml index 81db668af..651204407 100644 --- a/r2/r2/templates/message.xml +++ b/r2/r2/templates/message.xml @@ -22,7 +22,7 @@ <%! from r2.lib.filters import safemarkdown, websafe, conditional_websafe - from r2.lib.template_helpers import add_sr + from r2.lib.template_helpers import add_sr, format_html from r2.models.account import DeletedUser, Account %> @@ -49,9 +49,9 @@ substitutions['when'] = thing.timesince taglinetext = conditional_websafe(thing.taglinetext) - taglinetext %= substitutions + taglinetext = format_html(taglinetext, **substitutions) %> - ${thing.subject} : ${unsafe(taglinetext)} + ${thing.subject} : ${taglinetext} ${thing._date.strftime('%a, %d %b %Y %H:%M:%S %z')} ${thing._date.isoformat()} diff --git a/r2/r2/templates/multiinfobar.html b/r2/r2/templates/multiinfobar.html index ecddaf585..f0d948ad5 100644 --- a/r2/r2/templates/multiinfobar.html +++ b/r2/r2/templates/multiinfobar.html @@ -23,7 +23,7 @@ <%! from r2.lib.strings import strings, Score from r2.lib.pages import WrappedUser, UserText - from r2.lib.template_helpers import _ws + from r2.lib.template_helpers import _ws, _wsf, format_html %> <%namespace file="utils.html" import="plain_link, thing_timestamp, text_with_links"/> @@ -84,7 +84,8 @@ %endif
-

${unsafe(_ws('%(count)s subreddits in this multi:') % dict(count='%d ' % len(thing.srs)))}

+ <% sr_count = format_html('%s ', len(thing.srs)) %> +

${_wsf('%(count)s subreddits in this multi:', count=sr_count)}