Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: cms/converters.py

Issue 5148261828526080: Issue 2119 - Add get_page_content template function. (Closed)
Left Patch Set: get_page_content needs to return page title as well. Created April 7, 2015, 8:40 p.m.
Right Patch Set: Use .iterkeys() instead of .keys() Created April 8, 2015, 9:31 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | cms/utils.py » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 # coding: utf-8 1 # coding: utf-8
2 2
3 # This file is part of the Adblock Plus web scripts, 3 # This file is part of the Adblock Plus web scripts,
4 # Copyright (C) 2006-2015 Eyeo GmbH 4 # Copyright (C) 2006-2015 Eyeo GmbH
5 # 5 #
6 # Adblock Plus is free software: you can redistribute it and/or modify 6 # Adblock Plus is free software: you can redistribute it and/or modify
7 # it under the terms of the GNU General Public License version 3 as 7 # it under the terms of the GNU General Public License version 3 as
8 # published by the Free Software Foundation. 8 # published by the Free Software Foundation.
9 # 9 #
10 # Adblock Plus is distributed in the hope that it will be useful, 10 # Adblock Plus is distributed in the hope that it will be useful,
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 def get_string(self, name, page): 341 def get_string(self, name, page):
342 localedata = self._params["source"].read_locale(self._params["locale"], page ) 342 localedata = self._params["source"].read_locale(self._params["locale"], page )
343 default = localedata[name] 343 default = localedata[name]
344 return jinja2.Markup(self.localize_string(name, default, localedata, html_es capes)) 344 return jinja2.Markup(self.localize_string(name, default, localedata, html_es capes))
345 345
346 def get_page_content(self, page, locale=None): 346 def get_page_content(self, page, locale=None):
347 from cms.utils import get_page_params 347 from cms.utils import get_page_params
348 348
349 if locale is None: 349 if locale is None:
350 locale = self._params["locale"] 350 locale = self._params["locale"]
351 params = get_page_params(self._params["source"], locale, page) 351 return get_page_params(self._params["source"], locale, page)
352 return {k: params[k] for k in ("head", "body", "title")}
Wladimir Palant 2015/04/07 21:17:11 The CMS doesn't know about the title variable - it
kzar 2015/04/08 08:15:24 Done.
353 352
354 def linkify(self, page, locale=None, **attrs): 353 def linkify(self, page, locale=None, **attrs):
355 if locale is None: 354 if locale is None:
356 locale = self._params["locale"] 355 locale = self._params["locale"]
357 356
358 locale, url = self._params["source"].resolve_link(page, locale) 357 locale, url = self._params["source"].resolve_link(page, locale)
359 return jinja2.Markup('<a%s>' % ''.join( 358 return jinja2.Markup('<a%s>' % ''.join(
360 ' %s="%s"' % (name, jinja2.escape(value)) for name, value in [ 359 ' %s="%s"' % (name, jinja2.escape(value)) for name, value in [
361 ('href', url), 360 ('href', url),
362 ('hreflang', locale) 361 ('hreflang', locale)
(...skipping 17 matching lines...) Expand all
380 stack.pop() 379 stack.pop()
381 stack[-1]["subitems"].append(item) 380 stack[-1]["subitems"].append(item)
382 stack.append(item) 381 stack.append(item)
383 return structured 382 return structured
384 383
385 converters = { 384 converters = {
386 "html": RawConverter, 385 "html": RawConverter,
387 "md": MarkdownConverter, 386 "md": MarkdownConverter,
388 "tmpl": TemplateConverter, 387 "tmpl": TemplateConverter,
389 } 388 }
LEFTRIGHT
« no previous file | cms/utils.py » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld