tools (common/template), jp: refactoring to handle multiple sites:
- site can now be specified in template header before theme, for instance: (some_site/some_theme)path/to/template.ext - absolute template paths are now implemented, but Renderer must be instanciated with trusted to True for security reason (it's the case for jp) - a new "front_url_filter" callable can be given to Renderer, which will convert template path to URL seen by end-user (default to real path). - the "front_url_filter" can be used in templates with… "front_url" filter - template_data is a new named tuple available in templates, which give site, theme and template relative URL - search order is site/theme, site/default_theme, and default/default_theme where default link to sat_pubsub templates - when loading CSS files, files with _noscript suffixes are now loaded, and used when javascript is not available - "styles_extra.css" is also loaded before "styles.css", useful when a theme want to reuse default style, and just override some rules - new site can be specified in sat.conf [DEFAULT] section, using sites_path_public_dict or sites_path_private_dict (where sites_path_private_dict won't be used in public frontends, like Libervia) - "private" argument of Renderer tells the renderer to load private sites or not - templates are now loaded from "templates" subdirectory, to differenciate them from other data like i18n - jp template output has been updated to handle those changes, and to manage absolute templates
This commit is contained in:
parent
1a770a48ee
commit
e70405cfc2
2 changed files with 507 additions and 249 deletions
|
|
@ -225,6 +225,7 @@ class Const(object):
|
|||
]
|
||||
|
||||
## Templates ##
|
||||
TEMPLATE_TPL_DIR = u"templates"
|
||||
TEMPLATE_THEME_DEFAULT = u"default"
|
||||
TEMPLATE_STATIC_DIR = u"static"
|
||||
|
||||
|
|
|
|||
|
|
@ -158,13 +158,16 @@ class FilterName(object):
|
|||
|
||||
class ConfigureBase(object):
|
||||
LOGGER_CLASS = Logger
|
||||
_color_location = False # True if color location is specified in fmt (with COLOR_START)
|
||||
# True if color location is specified in fmt (with COLOR_START)
|
||||
_color_location = False
|
||||
|
||||
def __init__(self, level=None, fmt=None, output=None, logger=None, colors=False, levels_taints_dict=None, force_colors=False, backend_data=None):
|
||||
def __init__(self, level=None, fmt=None, output=None, logger=None, colors=False,
|
||||
levels_taints_dict=None, force_colors=False, backend_data=None):
|
||||
"""Configure a backend
|
||||
|
||||
@param level: one of C.LOG_LEVELS
|
||||
@param fmt: format string, pretty much as in std logging. Accept the following keywords (maybe more depending on backend):
|
||||
@param fmt: format string, pretty much as in std logging.
|
||||
Accept the following keywords (maybe more depending on backend):
|
||||
- "message"
|
||||
- "levelname"
|
||||
- "name" (logger name)
|
||||
|
|
|
|||
Loading…
Reference in a new issue