# HG changeset patch # User Thierry Florac # Date 1537973768 -7200 # Node ID 9921b2813e664a100907f165ebcadf460f1da6b9 # Parent 659d729e027bc03b3566e83e4d6e12bc6ae47078 Added login logo to back-office configuration diff -r 659d729e027b -r 9921b2813e66 src/pyams_skin/configuration.py --- a/src/pyams_skin/configuration.py Wed Sep 26 16:55:49 2018 +0200 +++ b/src/pyams_skin/configuration.py Wed Sep 26 16:56:08 2018 +0200 @@ -12,30 +12,25 @@ __docformat__ = 'restructuredtext' - -# import standard library - -# import interfaces -from pyams_skin.interfaces import IContextTitlePrefix -from pyams_skin.interfaces.configuration import IConfiguration, SKIN_CONFIGURATION_KEY, \ - IBackOfficeConfiguration, SKIN_BACK_CONFIGURATION_KEY -from pyams_utils.interfaces.site import IConfigurationManager -from pyams_utils.interfaces.tales import ITALESExtension -from zope.traversing.interfaces import ITraversable - -# import packages from persistent import Persistent -from pyams_file.property import FileProperty -from pyams_file.views.file import FileView -from pyams_utils.adapter import ContextRequestViewAdapter, ContextAdapter, adapter_config, get_annotation_adapter -from pyams_utils.factory import factory_config -from pyams_utils.registry import get_global_registry -from pyams_utils.traversing import get_parent from pyramid.httpexceptions import HTTPNotFound from pyramid.view import view_config from zope.container.contained import Contained -from zope.interface import implementer, Interface +from zope.interface import Interface, implementer from zope.schema.fieldproperty import FieldProperty +from zope.traversing.interfaces import ITraversable + +from pyams_file.property import FileProperty +from pyams_file.views.file import FileView +from pyams_skin.interfaces import IContextTitlePrefix +from pyams_skin.interfaces.configuration import IBackOfficeConfiguration, IConfiguration, SKIN_BACK_CONFIGURATION_KEY, \ + SKIN_CONFIGURATION_KEY +from pyams_utils.adapter import ContextAdapter, ContextRequestViewAdapter, adapter_config, get_annotation_adapter +from pyams_utils.factory import factory_config +from pyams_utils.interfaces.site import IConfigurationManager +from pyams_utils.interfaces.tales import ITALESExtension +from pyams_utils.registry import get_global_registry +from pyams_utils.traversing import get_parent # @@ -115,6 +110,7 @@ login_footer = FieldProperty(IBackOfficeConfiguration['login_footer']) icon = FileProperty(IBackOfficeConfiguration['icon']) logo = FileProperty(IBackOfficeConfiguration['logo']) + login_logo = FileProperty(IBackOfficeConfiguration['login_logo']) display_content_icon = FieldProperty(IBackOfficeConfiguration['display_content_icon']) display_shared_tool_title = FieldProperty(IBackOfficeConfiguration['display_shared_tool_title']) diff -r 659d729e027b -r 9921b2813e66 src/pyams_skin/interfaces/configuration.py --- a/src/pyams_skin/interfaces/configuration.py Wed Sep 26 16:55:49 2018 +0200 +++ b/src/pyams_skin/interfaces/configuration.py Wed Sep 26 16:56:08 2018 +0200 @@ -12,17 +12,14 @@ __docformat__ = 'restructuredtext' - -# import standard library +from zope.location.interfaces import IContained +from zope.schema import Bool, Text, TextLine -# import interfaces -from zope.location.interfaces import IContained -from zope.schema import TextLine, Text, Bool +from pyams_file.schema import ImageField -# import packages -from pyams_file.schema import ImageField from pyams_skin import _ + SKIN_CONFIGURATION_KEY = 'pyams_skin.configuration' @@ -94,6 +91,10 @@ description=_("Image containing application logo"), required=False) + login_logo = ImageField(title=_("Login logo"), + description=_("Image containing application logo for login form"), + required=False) + display_content_icon = Bool(title=_("Display title icon?"), description=_("Should icons be displayed into content's title area ?"), required=True,