diff -r 61775c0158f3 -r d1477fa29943 src/pyams_media/zmi/video.py --- a/src/pyams_media/zmi/video.py Wed Sep 09 11:51:38 2015 +0200 +++ b/src/pyams_media/zmi/video.py Thu Oct 08 12:28:57 2015 +0200 @@ -9,12 +9,6 @@ # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS # FOR A PARTICULAR PURPOSE. # -from pyams_form.interfaces.form import IWidgetsPrefixViewletsManager -from pyams_skin.help import ContentHelp -from pyams_skin.interfaces import IContentHelp -from pyams_template.template import template_config -from pyams_utils.adapter import adapter_config -from pyams_zmi.layer import IAdminLayer __docformat__ = 'restructuredtext' @@ -24,15 +18,21 @@ # import interfaces from pyams_file.interfaces import IVideo, IThumbnail +from pyams_form.interfaces.form import IWidgetsPrefixViewletsManager, IFormHelp from pyams_skin.interfaces.viewlet import IContextActions +from pyams_utils.interfaces import MANAGE_PERMISSION +from pyams_zmi.layer import IAdminLayer from z3c.form.interfaces import HIDDEN_MODE # import packages from pyams_form.form import AJAXAddForm +from pyams_form.help import FormHelp from pyams_form.schema import CloseButton from pyams_pagelet.pagelet import pagelet_config from pyams_skin.layer import IPyAMSLayer from pyams_skin.viewlet.toolbar import ToolbarMenuDivider, ToolbarMenuItem +from pyams_template.template import template_config +from pyams_utils.adapter import adapter_config from pyams_utils.schema import DottedDecimalField from pyams_viewlet.viewlet import viewlet_config, Viewlet from pyams_zmi.form import AdminDialogAddForm @@ -44,7 +44,7 @@ @viewlet_config(name='video.thumbnail.divider', context=IVideo, layer=IPyAMSLayer, view=Interface, - manager=IContextActions, permission='manage', weight=19) + manager=IContextActions, permission=MANAGE_PERMISSION, weight=19) class VideoDividerAction(ToolbarMenuDivider): """Video divider action""" @@ -54,7 +54,7 @@ # @viewlet_config(name='video.thumbnail.action', context=IVideo, layer=IPyAMSLayer, view=Interface, - manager=IContextActions, permission='manage', weight=20) + manager=IContextActions, permission=MANAGE_PERMISSION, weight=20) class VideoThumbnailAction(ToolbarMenuItem): """Video thumbnail selection action""" @@ -80,7 +80,7 @@ default=Decimal(5)) -@pagelet_config(name='video-thumbnail.html', context=IVideo, layer=IPyAMSLayer, permission='manage') +@pagelet_config(name='video-thumbnail.html', context=IVideo, layer=IPyAMSLayer, permission=MANAGE_PERMISSION) class VideoThumbnailEditForm(AdminDialogAddForm): """Video thumbnail selection form""" @@ -116,7 +116,7 @@ @view_config(name='video-thumbnail.json', context=IVideo, request_type=IPyAMSLayer, - permission='manage', renderer='json', xhr=True) + permission=MANAGE_PERMISSION, renderer='json', xhr=True) class VideoThumbnailAJAXEditForm(AJAXAddForm, VideoThumbnailEditForm): """Video thumbnail selection form, JSON renderer""" @@ -137,8 +137,8 @@ """Video thumbnail edit form viewlets prefix""" -@adapter_config(context=(IVideo, IAdminLayer, VideoThumbnailEditForm), provides=IContentHelp) -class VideoThumbnailEditFormHelpAdapter(ContentHelp): +@adapter_config(context=(IVideo, IAdminLayer, VideoThumbnailEditForm), provides=IFormHelp) +class VideoThumbnailEditFormHelpAdapter(FormHelp): """Video thumbnail selection form help adapter""" message = _("""You can play the video until you display the image you want.