Merge remote-tracking branch 'origin/master' into radio-esperanzah-2020

diff --cc panikweb/settings.py
Simple merge

diff --cc panikweb/views.py
index 966e77fb1992beb85b1f6884925ed0664dcbe28a,e42fd1d01aaa2019b6fd5a5c1ac0732d4107b18b..de64ffc2d1bc5fbf2705f924b74e7ae0d7fdf691
--- 1/panikweb/views.py
--- 2/panikweb/views.py
+++ b/panikweb/views.py
@@@ -144,13 -124,10 +144,14 @@@ class EmissionDetailView(DetailView, Em
          return context
  emission = EmissionDetailView.as_view()
  
- class EpisodeDetailView(DetailView, EmissionMixin):
+ 
+ class EpisodeDetailView(EmissionEpisodeMixin, DetailView, EmissionMixin):
      model = Episode
  
 +    def get_queryset(self, *args, **kwargs):
 +        queryset = super(EpisodeDetailView, self).get_queryset(*args, **kwargs)
 +        return queryset.filter(emission__slug=self.kwargs['emission_slug'])
 +
      def get_context_data(self, **kwargs):
          context = super(EpisodeDetailView, self).get_context_data(**kwargs)
          context['diffusions'] = Diffusion.objects.select_related().filter(
@@@ -801,10 -749,12 +802,12 @@@ class PodcastsFeed(Feed)
  
      def item_title(self, item):
          if item.fragment:
 -            return '[%s] %s - %s' % (item.episode.emission.title, item.title, item.episode.title)
 -        return '[%s] %s' % (item.episode.emission.title, item.episode.title)
 +            return '%s - %s - %s' % (item.episode.emission.title, item.title, item.episode.title)
 +        return '%s - %s' % (item.episode.emission.title, item.episode.title)
  
      def item_link(self, item):
+         if item.fragment:
+             return item.episode.get_absolute_url() + '#%s' % item.id
          return item.episode.get_absolute_url()
  
      def item_enclosure_url(self, item):

diff --cc panikweb_templates/static/css/_specifics.scss
Simple merge