# HG changeset patch # User Thierry Florac # Date 1544606225 -3600 # Node ID 40135dd78b5b0f6c0086859e26779b16c940ddce # Parent c140b4b0d9184e783f1d670b79e039ac750ea29e Updated resources diff -r c140b4b0d918 -r 40135dd78b5b src/pyams_default_theme/__init__.py --- a/src/pyams_default_theme/__init__.py Wed Dec 12 10:16:30 2018 +0100 +++ b/src/pyams_default_theme/__init__.py Wed Dec 12 10:17:05 2018 +0100 @@ -15,7 +15,7 @@ from fanstatic import Resource, Library from pyramid.i18n import TranslationStringFactory -from pyams_skin import bootstrap_css, bootstrap, bootstrap_modal_css, myams_js_core +from pyams_skin import bootstrap_css, bootstrap, bootstrap_modal_css, myams_js_require from pyams_utils.fanstatic import ExternalResource _ = TranslationStringFactory('pyams_default_theme') @@ -33,7 +33,7 @@ pyams_default_theme = Resource(library, 'js/pyams-default.js', minified='js/pyams-default.min.js', - depends=(bootstrap, myams_js_core, pyams_default_theme_css), + depends=(bootstrap, myams_js_require, pyams_default_theme_css), bottom=True) # diff -r c140b4b0d918 -r 40135dd78b5b src/pyams_default_theme/skin.py --- a/src/pyams_default_theme/skin.py Wed Dec 12 10:16:30 2018 +0100 +++ b/src/pyams_default_theme/skin.py Wed Dec 12 10:17:05 2018 +0100 @@ -12,20 +12,16 @@ __docformat__ = 'restructuredtext' +from zope.interface import Interface -# import standard library - -# import interfaces +from pyams_default_theme import pyams_default_theme from pyams_default_theme.layer import IPyAMSDefaultLayer from pyams_skin.interfaces import ISkin from pyams_skin.interfaces.resources import IResources - -# import packages -from pyams_utils.adapter import adapter_config, ContextRequestViewAdapter +from pyams_utils.adapter import ContextRequestViewAdapter, adapter_config from pyams_utils.registry import utility_config -from zope.interface import Interface -from pyams_default_theme import _, pyams_default_theme +from pyams_default_theme import _ @utility_config(name='PyAMS default skin', provides=ISkin) @@ -40,5 +36,4 @@ class ResourcesAdapter(ContextRequestViewAdapter): """PyAMS default skin resources""" - def get_resources(self): - pyams_default_theme.need() + resources = (pyams_default_theme,)