Merge pull request #628 from ZeitOnline/ZO-4651

 ZO-4651: remove podcast block and header (everything podigee related)

core/docs/changelog/ZO-4651.change

@@ -0,0 +1 @@
+ZO-4651: remove podcast block and header (everything podigee related)

core/src/zeit/cms/content/sources.py

@@ -500,8 +500,6 @@ def __init__(
         kind=None,
         video=False,
         fallback_image=False,
-        podigee_id=None,
-        podigee_url=None,
         zonaudioapp_id=None,
         color=None,
         available=None,
@@ -516,8 +514,6 @@ def __init__(
         self.kind = kind
         self.video = video
         self.fallback_image = fallback_image
-        self.podigee_url = podigee_url
-        self.podigee_id = podigee_id
         self.zonaudioapp_id = zonaudioapp_id
         self.color = color
 
@@ -549,8 +545,6 @@ def _values(self):
                 unicode_or_none(node.get('kind')),
                 node.get('video') == 'yes',
                 node.get('fallback_image') == 'yes',
-                unicode_or_none(node.get('podigee-id')),
-                unicode_or_none(node.get('podigee-url')),
                 unicode_or_none(node.get('zonaudioapp-id')),
                 unicode_or_none(node.get('color')),
                 unicode_or_none(node.get('available')),

core/src/zeit/content/article/edit/browser/configure.zcml

@@ -585,27 +585,6 @@
     weight="10"
     />
 
-  <!-- podcast -->
-
-  <browser:page
-    for="zeit.content.article.edit.interfaces.IPodcast"
-    layer="zeit.cms.browser.interfaces.ICMSLayer"
-    name="edit-podcast"
-    class=".edit.EditPodcast"
-    permission="zope.View"
-    />
-
-  <browser:viewlet
-    for="zeit.content.article.edit.interfaces.IPodcast"
-    layer="zeit.cms.browser.interfaces.ICMSLayer"
-    view="zope.interface.Interface"
-    manager="zeit.edit.interfaces.IContentViewletManager"
-    name="edit-podcast"
-    class="zeit.edit.browser.form.FormLoader"
-    permission="zope.View"
-    weight="10"
-    />
-
   <!-- jobticker -->
 
    <browser:viewlet
@@ -872,10 +851,6 @@
     <implements interface="zeit.edit.interfaces.IFoldable" />
   </class>
 
-  <class class="..podcast.Podcast">
-    <implements interface="zeit.edit.interfaces.IFoldable" />
-  </class>
-
   <class class="..jobticker.JobTicker">
     <implements interface="zeit.edit.interfaces.IFoldable" />
   </class>

core/src/zeit/content/article/edit/browser/edit.py

@@ -398,17 +398,6 @@ def prefix(self):
         return 'quiz.{0}'.format(self.context.__name__)
 
 
-class EditPodcast(zeit.edit.browser.form.InlineForm):
-    legend = None
-    form_fields = zope.formlib.form.FormFields(zeit.content.article.edit.interfaces.IPodcast).omit(
-        *list(zeit.edit.interfaces.IBlock)
-    )
-
-    @property
-    def prefix(self):
-        return 'podcast.{0}'.format(self.context.__name__)
-
-
 class EditBox(zeit.edit.browser.form.InlineForm):
     legend = None
     _form_fields = zope.formlib.form.FormFields(

core/src/zeit/content/article/edit/browser/resources/editor.css

@@ -1063,8 +1063,7 @@
   background: url("/fanstatic/zeit.cms/icons/icons_sprites.png") no-repeat scroll 20px -835px transparent;
 }
 
-.type-article .module-icon-audio,
-.type-article .module-icon-podcast {
+.type-article .module-icon-audio {
   background: url("/fanstatic/zeit.cms/icons/icons_sprites.png") no-repeat scroll 20px -776px transparent;
 }
 
@@ -2106,10 +2105,6 @@
     height: 180px;
 }
 
-.type-article .block.type-podcast .block-inner {
-    height: 130px;
-}
-
 .type-article .block.type-portraitbox .block-inner {
     height: 300px;
 }

core/src/zeit/content/article/edit/configure.zcml

@@ -327,17 +327,6 @@
       />
   </class>
 
-  <class class=".podcast.Podcast">
-    <require
-      interface=".interfaces.IPodcast"
-      permission="zope.View"
-      />
-    <require
-      set_schema=".interfaces.IPodcast"
-      permission="zeit.EditContent"
-      />
-  </class>
-
   <class class=".adplace.Adplace">
     <require
       interface=".interfaces.IAdplace"

core/src/zeit/content/article/edit/interfaces.py

@@ -439,10 +439,6 @@ class IQuiz(IBlock, zeit.content.modules.interfaces.IQuiz):
     pass
 
 
-class IPodcast(IBlock, zeit.content.modules.interfaces.PodcastBase):
-    pass
-
-
 class IBox(IBlock):
     """
     This box is a first step to generalizing other boxes

core/src/zeit/content/article/edit/tests/modules.xml

@@ -18,7 +18,6 @@
   <module id="tickaroo_liveblog">Tickaroo Liveblog</module>
   <module id="mail">Mail-Formular</module>
   <module id="newslettersignup">Newsletter Signup Modul</module>
-  <module id="podcast">Podcast-Block</module>
   <module id="portraitbox">Porträtbox</module>
   <module id="puzzleform">Rätselformular</module>
   <module id="quiz">Quiz</module>

core/src/zeit/content/article/tests/article-templates.xml

@@ -7,7 +7,7 @@
     <header name="embed" allow_header_module="true">
       <title>Header-Modul oben</title>
     </header>
-    <header name="podcast" allow_header_module="true">
+    <header name="podcast">
       <title>Podcast</title>
     </header>
     <header name="narrow">

core/src/zeit/content/audio/interfaces.py

@@ -48,7 +48,6 @@ class IPodcast(zope.interface.Interface):
     image = zope.schema.URI(title=_('show art'))
     distribution_channels = zope.interface.Attribute('distribution_channels')
     feed = zope.schema.URI(title=_('feed'))
-    podigee_id = zope.interface.Attribute('podigee_id')
 
 
 class Podcast(zeit.cms.content.sources.AllowedBase):
@@ -62,7 +61,6 @@ def __init__(
         image=None,
         distribution_channels=None,
         feed=None,
-        podigee_id=None,
     ):
         super().__init__(id, title, available=None)
         self.external_id = external_id
@@ -73,7 +71,6 @@ def __init__(
         self.distribution_channels = distribution_channels
         # For parallel use of podcast hosts
         self.feed = feed
-        self.podigee_id = podigee_id
 
     def __eq__(self, other):
         return (
@@ -86,7 +83,6 @@ def __eq__(self, other):
             and self.image == other.image
             and self.distribution_channels == other.distribution_channels
             and self.feed == other.feed
-            and self.podigee_id == other.podigee_id
         )
 
 
@@ -117,7 +113,6 @@ def _create_podcast(self, node):
             node.get('image'),
             distribution_channels,
             node.get('feed'),
-            node.get('podigee_id'),
         )
         return podcast
 

core/src/zeit/content/audio/tests/fixtures/podcasts.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <podcasts>
-    <podcast id="cat-jokes-pawdcast" title="Cat Jokes Pawdcast" external_id="1234" subtitle="A podcast of cat jokes" color='e5ded8' image='http://xml.zeit.de/2006/DSC00109_2.JPG' podigee_id="podigee-1234" feed='https://feeds.example.com/aRDC72E_'>
+    <podcast id="cat-jokes-pawdcast" title="Cat Jokes Pawdcast" external_id="1234" subtitle="A podcast of cat jokes" color='e5ded8' image='http://xml.zeit.de/2006/DSC00109_2.JPG' feed='https://feeds.example.com/aRDC72E_'>
         <distribution_channel id="itunes" href="http://example.com/itunes">Apple Podcasts</distribution_channel>
         <distribution_channel id="google" href="http://example.com/google">Google Podcasts</distribution_channel>
     </podcast>

core/src/zeit/content/audio/tests/test_audio.py

@@ -34,7 +34,6 @@ def test_podcast_source(self):
             'http://xml.zeit.de/2006/DSC00109_2.JPG',
             distribution_channels,
             'https://feeds.example.com/aRDC72E_',
-            'podigee-1234',
         )
         assert values[0] == podcast
 

core/src/zeit/content/cp/blocks/configure.zcml

@@ -82,15 +82,6 @@
       permission="zeit.EditContent"/>
   </class>
 
-  <class class=".podcast.PodcastBlock">
-    <require
-      interface="..interfaces.IPodcastBlock"
-      permission="zope.View" />
-    <require
-      set_schema="..interfaces.IPodcastBlock"
-      permission="zeit.EditContent"/>
-  </class>
-
   <class class=".cpextra.CPExtraBlock">
     <require
       interface="..interfaces.ICPExtraBlock"

core/src/zeit/content/cp/browser/blocks/configure.zcml

@@ -96,7 +96,6 @@
   <include file="xml.zcml" />
   <include file="cpextra.zcml" />
   <include file="playlist.zcml" />
-  <include file="podcast.zcml" />
   <include file="quiz.zcml" />
   <include file="headerimage.zcml" />
   <include file="rawtext.zcml" />

core/src/zeit/content/cp/interfaces.py

@@ -734,12 +734,6 @@ class IJobTickerBlock(zeit.content.modules.interfaces.IJobTicker, IBlock):
     feed = zope.schema.Choice(title=_('Jobbox Ticker'), required=True, source=JOBTICKER_SOURCE)
 
 
-class IPodcastBlock(IBlock, zeit.content.modules.interfaces.PodcastBase):
-    """The Podcast block with a reference to a podcast."""
-
-    pass
-
-
 class IMailBlock(zeit.content.modules.interfaces.IMail, IBlock):
     pass
 

core/src/zeit/content/cp/tests/fixtures/blocks.xml

@@ -4,7 +4,6 @@
   <module id="headerimage" title="Headerbild"/>
   <module id="markup" title="HTML-Block"/>
   <module id="playlist" title="Video-Riegel"/>
-  <module id="podcast" title="Podcast"/>
   <module id="quiz" title="Quiz-Block"/>
   <module id="jobbox_ticker" title="Jobbox Ticker"/>
   <module id="teaser" title="Teaser"/>