# HG changeset patch # User Thierry Florac # Date 1558344616 -7200 # Node ID 7196e51819fe2e2896fb741df66ccfd28a139ae3 # Parent d643d60aa09664ba33bb8ff02936b3c5e2d8472b Removed deprecated Youtube "showinfo" videos setting diff -r d643d60aa096 -r 7196e51819fe src/pyams_content/component/video/provider/__init__.py --- a/src/pyams_content/component/video/provider/__init__.py Mon May 20 11:29:41 2019 +0200 +++ b/src/pyams_content/component/video/provider/__init__.py Mon May 20 11:30:16 2019 +0200 @@ -68,7 +68,7 @@ @adapter_config(context=IExternalVideo, provides=ICustomVideoSettings) def custom_video_settings_factory(context): - """Customp video settings factory""" + """Custom video settings factory""" if context.provider_name != 'custom': return None return external_video_settings_factory(context) diff -r d643d60aa096 -r 7196e51819fe src/pyams_content/component/video/provider/interfaces.py --- a/src/pyams_content/component/video/provider/interfaces.py Mon May 20 11:29:41 2019 +0200 +++ b/src/pyams_content/component/video/provider/interfaces.py Mon May 20 11:30:16 2019 +0200 @@ -12,15 +12,10 @@ __docformat__ = 'restructuredtext' +from zope.schema import Bool, Choice, Int, Text, TextLine -# import standard library - -# import interfaces from pyams_content.component.video import IExternalVideoSettings - -# import packages from pyams_utils.schema import ColorField -from zope.schema import Text, TextLine, Bool, Int, Choice from pyams_content import _ @@ -61,11 +56,6 @@ required=True, default=False) - show_info = Bool(title=_("Show video info?"), - description=_("If 'no', video title and information won't be displayed"), - required=True, - default=True) - show_commands = Bool(title=_("Show commands?"), description=_("Show video player commands"), required=True, diff -r d643d60aa096 -r 7196e51819fe src/pyams_content/component/video/provider/youtube.py --- a/src/pyams_content/component/video/provider/youtube.py Mon May 20 11:29:41 2019 +0200 +++ b/src/pyams_content/component/video/provider/youtube.py Mon May 20 11:30:16 2019 +0200 @@ -18,7 +18,6 @@ from zope.interface import implementer from zope.schema.fieldproperty import FieldProperty -from pyams_content import _ from pyams_content.component.video import external_video_settings_factory from pyams_content.component.video.interfaces import IExternalVideo, IExternalVideoProvider, IExternalVideoSettings from pyams_content.component.video.provider.interfaces import IYoutubeVideoSettings @@ -27,6 +26,8 @@ from pyams_utils.adapter import adapter_config from pyams_utils.registry import utility_config +from pyams_content import _ + YOUTUBE_BASE_URL = re.compile(r'https://youtu.be/(.*)') YOUTUBE_EXTENDED_URL = re.compile(r'https://(?:www\.)?youtube.com/watch\?v=(.*)') @@ -41,7 +42,6 @@ stop_at = FieldProperty(IYoutubeVideoSettings['stop_at']) autoplay = FieldProperty(IYoutubeVideoSettings['autoplay']) loop = FieldProperty(IYoutubeVideoSettings['loop']) - show_info = FieldProperty(IYoutubeVideoSettings['show_info']) show_commands = FieldProperty(IYoutubeVideoSettings['show_commands']) hide_branding = FieldProperty(IYoutubeVideoSettings['hide_branding']) show_related = FieldProperty(IYoutubeVideoSettings['show_related']) diff -r d643d60aa096 -r 7196e51819fe src/pyams_content/component/video/provider/zmi/__init__.py --- a/src/pyams_content/component/video/provider/zmi/__init__.py Mon May 20 11:29:41 2019 +0200 +++ b/src/pyams_content/component/video/provider/zmi/__init__.py Mon May 20 11:30:16 2019 +0200 @@ -12,22 +12,17 @@ __docformat__ = 'restructuredtext' - -# import standard library +from pyramid.encode import urlencode -# import interfaces from pyams_content.component.video.interfaces import IExternalVideoRenderer -from pyams_skin.layer import IPyAMSLayer - -# import packages from pyams_content.component.video.provider import CustomVideoSettings from pyams_content.component.video.provider.dailymotion import DailymotionVideoSettings from pyams_content.component.video.provider.vimeo import VimeoVideoSettings from pyams_content.component.video.provider.youtube import YoutubeVideoSettings +from pyams_skin.layer import IPyAMSLayer from pyams_template.template import template_config from pyams_utils.adapter import adapter_config from pyams_viewlet.viewlet import BaseContentProvider -from pyramid.encode import urlencode def time_to_seconds(value): @@ -44,7 +39,6 @@ ('stop_at', 'end', time_to_seconds), ('autoplay', 'autoplay', int), ('loop', 'loop', int), - ('show_info', 'showinfo', int), ('show_commands', 'controls', int), ('hide_branding', 'modestbranding', int), ('show_related', 'rel', int),