From c2a4268f7098a7d72d939ef4b370e2e19e7b8413 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Stefan=20K=C3=B6gl?= <stefan@skoegl.net>
Date: Sat, 17 Nov 2012 18:04:35 +0100
Subject: [PATCH] redesign podcast, episode subtitle line

---
 htdocs/media/screen.css                           |  8 ++++++
 mygpo/publisher/templates/publisher/episode.html  | 28 +++++++++++++++-----
 mygpo/publisher/templates/publisher/episodes.html |  2 +-
 mygpo/publisher/templates/publisher/podcast.html  | 23 +++++++++++++----
 mygpo/web/templates/episode.html                  | 21 +++++++++------
 mygpo/web/templates/podcast.html                  | 31 ++++++++++++++++-------
 6 files changed, 83 insertions(+), 30 deletions(-)

diff --git a/htdocs/media/screen.css b/htdocs/media/screen.css
index cd740fdf..fe177b13 100644
--- a/htdocs/media/screen.css
+++ b/htdocs/media/screen.css
@@ -28,6 +28,8 @@ h1
     font-size: 16pt;
     font-family: 'Source Sans Pro', sans-serif;
     font-weight: 700;
+    margin-bottom: 0;
+    line-height: 25px;
 }
 
 h2
@@ -196,6 +198,12 @@ table form
     color: #666;
 }
 
+
+div.description
+{
+    margin-top: 1em;
+}
+
 /* don't show images in the description of the podcast page */
 .first-episode img
 {
diff --git a/mygpo/publisher/templates/publisher/episode.html b/mygpo/publisher/templates/publisher/episode.html
index f7749a8f..4bef3f07 100644
--- a/mygpo/publisher/templates/publisher/episode.html
+++ b/mygpo/publisher/templates/publisher/episode.html
@@ -28,16 +28,30 @@
    </div>
   {% endif %}
 
-  <h1>{% trans "Publisher Pages:" %} {% if episode.title %}{{ episode.title|striptags }}{% else %}{% trans "Unnamed Episode" %}{%endif%}</h1>
+  <h1>{% if episode.title %}{{ episode.title|striptags }}{% else %}{% trans "Unnamed Episode" %}{%endif%} <small>{% trans "Publisher Pages" %}</small></h1>
   <small class="description">
-      {% trans "from" %} {% podcast_group_link podcast %}{% if episode.timestamp %}, {% trans "released" %} {{episode.timestamp}}{% endif %},
-      {% trans "links" %}:
-      <a href="{{episode.url}}">{% trans "download" %}</a>{% if episode.link and episode.link != episode.url %}, <a href="{{episode.link}}">{% trans "website" %}</a>
-      {% endif %},
-      {% trans "stats:" %} {% blocktrans with episode.listener_count as listener_count %}{{listener_count}} listeners{% endblocktrans %}
+      {% trans "from" %} {% podcast_group_link podcast %}&middot;
+       {% if not episode.outdated or "hide-outdated-urls" not in podcast.restrictions %}
+        <a href="{{episode.url}}" title="{% trans "Download" %}">
+         <i class="icon-download"></i>
+        </a>
+       {% endif %}
+       {% if episode.link and episode.link != episode.url %}&middot;
+        <a href="{{episode.link}}" title="{% trans "Website" %}">
+         <i class="icon-external-link"></i>
+        </a>
+      {% endif %}
+      {% if episode.listeners %}&middot;
+       {{ episode.listeners }} {% trans "listeners" %}
+      {% endif %}
   </small>
 
-  <p><a href="{% podcast_link_target podcast "podcast-publisher-episodes" %}">{% trans "Return to the episode list" %}</a></p>
+  <p>
+   <ul>
+    <li><a href="{% podcast_link_target podcast "podcast-publisher-episodes" %}">{% trans "Return to the episode list" %}</a></li>
+    <li><a href="{% podcast_link_target podcast "podcast-publisher-detail" %}">{% trans "Return to podcast page" %}</a></li>
+   </ul>
+  </p>
 {% endblock %}
 
 
diff --git a/mygpo/publisher/templates/publisher/episodes.html b/mygpo/publisher/templates/publisher/episodes.html
index 9e193096..d16742e7 100644
--- a/mygpo/publisher/templates/publisher/episodes.html
+++ b/mygpo/publisher/templates/publisher/episodes.html
@@ -20,7 +20,7 @@
   </div>
   {% endif %}
 
-  <h1>{% trans "Publisher Pages:" %} {% if podcast.title %}{{ podcast.title|striptags }}{% else %}{% trans "Unnamed Podcast" %}{%endif%}</h1>
+  <h1>{% if podcast.title %}{{ podcast.title|striptags }}{% else %}{% trans "Unnamed Podcast" %}{%endif%} <small>{% trans "Publisher Pages" %}</small></h1>
   <p><a href="{% podcast_link_target podcast "podcast-publisher-detail" %}">{% trans "Return to Podcast Page" %}</a></p>
 {% endblock %}
 
diff --git a/mygpo/publisher/templates/publisher/podcast.html b/mygpo/publisher/templates/publisher/podcast.html
index 97f6deeb..1f6dcfff 100644
--- a/mygpo/publisher/templates/publisher/podcast.html
+++ b/mygpo/publisher/templates/publisher/podcast.html
@@ -22,12 +22,25 @@
   <div id="podcastlogo">{{ podcast|podcast_logo_big }}</div>
   {% endif %}
 
-  <h1>{% trans "Publisher Pages:" %} {% if podcast.title %}{{ podcast.title|striptags }}{% else %}{% trans "Unnamed Podcast" %}{%endif%}</h1>
+  <h1>{% if podcast.title %}{{ podcast.title|striptags }}{% else %}{% trans "Unnamed Podcast" %}{%endif%} <small>{% trans "Publisher Pages" %}</small></h1>
   <small class="description">
-      {% trans "links" %}:
-      <a href="{{podcast.url}}">{% trans "feed" %}</a>{% if podcast.link %}, <a href="{{podcast.link}}">{% trans "website" %}</a>
-      {% endif %},
-      {% trans "stats:" %} {% blocktrans with podcast.subscriber_count as subscriber_count and podcast.listener_count as listener_count %}{{subscriber_count}} subscribers, {{listener_count}} listeners{% endblocktrans %}
+    {% if podcast.author %}{% trans "by" %}
+     {{ podcast.author|striptags }}
+    {% endif %}
+    {% if podcast.twitter %}
+     <a href="https://twitter.com/{{ podcast.twitter|striptags }}"><i class="icon-twitter"></i></a>
+    {% endif %}&middot;
+    <a href="{{podcast.url}}" title="{% trans "Feed" %}">
+     <i class="icon-rss"></i>
+    </a>
+    {% if podcast.link %}&middot;
+     <a href="{{podcast.link}}" title="{% trans "Website" %}">
+      <i class="icon-external-link"></i>
+     </a>
+    {% endif %}
+    {% if podcast.subscriber_count %}&middot;
+     {{ podcast.subscriber_count }} {% trans "subscribers" %}
+    {% endif %}
   </small>
 {% endblock %}
 
diff --git a/mygpo/web/templates/episode.html b/mygpo/web/templates/episode.html
index 3f8f46c1..a9b4a21f 100644
--- a/mygpo/web/templates/episode.html
+++ b/mygpo/web/templates/episode.html
@@ -47,15 +47,20 @@
    <small>{{ episode.released|naturalday }}</small>
   </h1>
   <small class="description">
-      {% trans "from" %} {% podcast_group_link podcast %},
-      {% trans "links" %}:
+      {% trans "from" %} {% podcast_group_link podcast %}&middot;
        {% if not episode.outdated or "hide-outdated-urls" not in podcast.restrictions %}
-        <a href="{{episode.url}}">{% trans "download" %}</a>
+        <a href="{{episode.url}}" title="{% trans "Download" %}">
+         <i class="icon-download"></i>
+        </a>
        {% endif %}
-       {% if episode.link and episode.link != episode.url %}
-        <a href="{{episode.link}}">{% trans "website" %}</a>
-      {% endif %},
-      {% trans "stats:" %} {% blocktrans with episode.listener_count as listener_count %}{{listener_count}} listeners{% endblocktrans %}
+       {% if episode.link and episode.link != episode.url %}&middot;
+        <a href="{{episode.link}}" title="{% trans "Website" %}">
+         <i class="icon-external-link"></i>
+        </a>
+      {% endif %}
+      {% if episode.listeners %}&middot;
+       {{ episode.listeners }} {% trans "listeners" %}
+      {% endif %}
   </small>
 
 {% endblock %}
@@ -116,7 +121,7 @@
      </li>
     {% endif %}
     <li>
-     <a href="{% podcast_link_target podcast %}#episodes">{% trans "Episode-List" %}</a>
+     <a href="{% podcast_link_target podcast %}#episodes">{% trans "..." %}</a>
     </li>
     {% if next %}
      <li>
diff --git a/mygpo/web/templates/podcast.html b/mygpo/web/templates/podcast.html
index de535836..5ed15ea1 100755
--- a/mygpo/web/templates/podcast.html
+++ b/mygpo/web/templates/podcast.html
@@ -42,27 +42,40 @@
    </h1>
 
    <small class="description">
-    {% trans "links" %}:
-    <a href="{{podcast.url}}">
-     {% trans "feed" %}
+    {% if podcast.author %}{% trans "by" %}
+     {{ podcast.author|striptags }}
+    {% endif %}
+    {% if podcast.twitter %}
+     <a href="https://twitter.com/{{ podcast.twitter|striptags }}"><i class="icon-twitter"></i></a>
+    {% endif %}&middot;
+    <a href="{{podcast.url}}" title="{% trans "Feed" %}">
+     <i class="icon-rss"></i>
     </a>
-    {% if podcast.link %},
-     <a href="{{podcast.link}}">{% trans "website" %}</a>
-    {% endif %},
-    {% blocktrans with podcast.subscriber_count as subscriber_count and podcast.listener_count as listener_count %}{{subscriber_count}} subscribers, {{listener_count}} listeners{% endblocktrans %}
+    {% if podcast.link %}&middot;
+     <a href="{{podcast.link}}" title="{% trans "Website" %}">
+      <i class="icon-external-link"></i>
+     </a>
+    {% endif %}
+    {% if podcast.subscriber_count %}&middot;
+     {{ podcast.subscriber_count }} {% trans "subscribers" %}
+    {% endif %}
    </small>
 
    {% if related_podcasts %}
     <div class="related-podcasts">
      <strong>{% trans "Also available" %}</strong>
      {% for p in related_podcasts %}
-      {% podcast_group_link p p.group_member_name %}
+      {% if p.group_member_name != podcast.group_member_name %}
+       {% podcast_group_link p p.group_member_name %}
+      {% endif %}
      {% endfor %}
     </div>
    {% endif %}
 
    {% if podcast.description %}
-    <div class="description">{{ podcast.description|markdown }}</div>
+    <div class="description">
+     {{ podcast.description|markdown }}
+    </div>
    {% endif %}
 
 {% endblock %}
-- 
2.11.4.GIT