diff --git a/core/src/zeit/content/video/browser/tests/test_form.py b/core/src/zeit/content/video/browser/tests/test_form.py index a463ed27b2..acbb93c099 100644 --- a/core/src/zeit/content/video/browser/tests/test_form.py +++ b/core/src/zeit/content/video/browser/tests/test_form.py @@ -38,8 +38,10 @@ def test_add_video(self): b.getControl('Title').value = 'myvid' b.getControl('External ID').value = '1234' b.getControl('Ressort').displayValue = ['Deutschland'] + b.getControl('Markdown content').value = '# my title' b.getControl(name='form.actions.add').click() self.assertEllipsis('...Edit Video...', b.contents) b.getLink('Checkin').click() self.assertEllipsis('..."myvideo" has been checked in...', b.contents) self.assertEllipsis('...External ID...1234...', b.contents) + self.assertEllipsis('...

my title

...', b.contents) diff --git a/core/src/zeit/content/video/browser/video.py b/core/src/zeit/content/video/browser/video.py index 4169511e6d..47fc92cdb4 100644 --- a/core/src/zeit/content/video/browser/video.py +++ b/core/src/zeit/content/video/browser/video.py @@ -35,6 +35,7 @@ class Base(zeit.push.browser.form.SocialBase, zeit.push.browser.form.MobileBase) 'title', ) + FormFields(zeit.content.video.interfaces.IVideo).select( + 'body', 'duration', 'expires', 'external_id', @@ -83,6 +84,11 @@ class Base(zeit.push.browser.form.SocialBase, zeit.push.browser.form.MobileBase) gocept.form.grouped.Fields( _('Video-Thumbnail'), ('image',), css_class='wide-widgets column-left' ), + gocept.form.grouped.Fields( + _('Texts'), + ('body',), + css_class='wide-widgets column-left', + ), gocept.form.grouped.RemainingFields('', css_class='column-left'), ) diff --git a/core/src/zeit/content/video/interfaces.py b/core/src/zeit/content/video/interfaces.py index 44a34499ee..791db18f74 100644 --- a/core/src/zeit/content/video/interfaces.py +++ b/core/src/zeit/content/video/interfaces.py @@ -63,6 +63,8 @@ class IVideo( width = zope.schema.Int(title=_('Width of the Frame'), required=False) url = zope.schema.URI(title=_('URI of the rendition'), required=False) + body = zeit.cms.content.field.Markdown(title=_('Markdown content'), required=False) + class VideoSource(zeit.cms.content.contentsource.CMSContentSource): name = 'video' diff --git a/core/src/zeit/content/video/video.py b/core/src/zeit/content/video/video.py index 1d899ca926..7c04014947 100644 --- a/core/src/zeit/content/video/video.py +++ b/core/src/zeit/content/video/video.py @@ -85,6 +85,8 @@ class Video(zeit.cms.content.metadata.CommonMetadata): ('duration', 'width', 'url'), ) + body = zeit.cms.content.property.Structure('.body.text') + @property def renditions(self): return self._player_data['renditions']