From db6939a567a6401acc02aad1ccf1815e41905d17 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Stefan=20K=C3=B6gl?= <stefan@skoegl.net>
Date: Sun, 3 Jun 2012 11:42:34 +0200
Subject: [PATCH] fix some problems with bootstrap

---
 htdocs/media/screen.css                |   6 +-
 mygpo/web/templates/base.html          |   5 +-
 mygpo/web/templates/podcast.html       | 434 +++++++++++++++++----------------
 mygpo/web/templates/subscriptions.html |  26 +-
 4 files changed, 241 insertions(+), 230 deletions(-)
 rewrite mygpo/web/templates/podcast.html (60%)

diff --git a/htdocs/media/screen.css b/htdocs/media/screen.css
index 9afed5c1..8d6d1abc 100644
--- a/htdocs/media/screen.css
+++ b/htdocs/media/screen.css
@@ -582,6 +582,7 @@ button img, div.button img{
     padding-right: 2em;
 }
 
+/*
 .podcast-state
 {
     clear: both;
@@ -605,7 +606,8 @@ button img, div.button img{
     margin-bottom: -2000px;
     padding-bottom: 2000px;
 }
-
+*/
+/*
 .podcast-state > div.tags > div,
 .podcast-state > div.share > div
 {
@@ -615,6 +617,8 @@ button img, div.button img{
     width: 96% !important;
 }
 
+*/
+
 .tag-list span.other
 {
     color: #888;
diff --git a/mygpo/web/templates/base.html b/mygpo/web/templates/base.html
index 67a0eda8..554de5ba 100644
--- a/mygpo/web/templates/base.html
+++ b/mygpo/web/templates/base.html
@@ -108,9 +108,8 @@
             <h1>Hello, world!</h1>
             <p>This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.</p>
             <p><a class="btn btn-primary btn-large">Learn more &raquo;</a></p>
-          </div>
+          </div>-->
           <div class="row-fluid">
--->
 
     {% if messages %}
      {% for message in messages %}
@@ -131,7 +130,7 @@
 
        <hr />
 
-       <div class="span3">
+       <div class="span1">
        </div>
        <div class="span1">
        <ul>
diff --git a/mygpo/web/templates/podcast.html b/mygpo/web/templates/podcast.html
dissimilarity index 60%
index 09d23f91..62758787 100755
--- a/mygpo/web/templates/podcast.html
+++ b/mygpo/web/templates/podcast.html
@@ -1,209 +1,225 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% load humanize %}
-{% load episodes %}
-{% load podcasts %}
-{% load devices %}
-{% load charts %}
-{% load facebook %}
-{% load google %}
-
-{% load menu %}
-{% block mainmenu %}{{ "/podcast/"|main_menu }}{% endblock %}
-{% block sectionmenu %}
- {% if podcast.title %}
-  {{ "/podcast/"|section_menu:podcast.title }}
- {% else %}
-  {{ "/podcast/"|section_menu:"Unnamed Podcast" }}
- {% endif %}
-{% endblock %}
-
-{% block head %}
- {{ podcast|opengraph_podcast }}
- {% google_plus_one_head %}
-{% endblock %}
-
-{% block title %}{{ podcast.title|default:"Unnamed Podcast"|striptags }}{% endblock %}
-
-{% block content %}
- {% if podcast.logo_url %}
-  <div id="podcastlogo">{{ podcast|podcast_logo_big }}</div>
- {% endif %}
-
- <h1>{% if podcast.title %}{{ podcast.title|striptags }}{% else %}{% trans "Unnamed Podcast" %}{%endif%}</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 %}
- </small>
-
-  <!--hr style="clear: none;"/-->
-
- {% 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 %}
-   {% endfor %}
-  </div>
- {% endif %}
-
- {% if podcast.description %}
-  <p class="description">{{ podcast.description|striptags }}</p>
- {% endif %}
-
-
-
-
- <div class="row">
-
-  <div class="span3">
-
-    <h2>{% trans "Subscriptions" %}</h2>
-
-    {% if not user.is_authenticated %}
-     <div class="subscribe"><a href="{% podcast_link_target podcast "subscribe" %}"><img src="/media/subscribe.png" style="vertical-align: middle;" alt=""/> {% trans "Subscribe to this podcast" %}</a></div>
-    {% endif %}
-
-    {% if devices or can_subscribe %}
-     <table class="list">
-       {% for device in devices %}
-        <tr>
-         <td>
-          {{ device|device_icon }}
-          <a href="{% url device device.uid %}">{{ device.name|striptags }}</a>
-         </td>
-         <td style="text-align: center;">
-          <form class="form-inline" method="post" action="{% podcast_link_target podcast "unsubscribe" device.uid %}?return_to={% podcast_link_target podcast %}">
-           <button class="btn btn-danger icon-remove" type="submit">
-           </button>
-          </form>
-         </td>
-        </tr>
-       {% endfor %}
-       {% if can_subscribe %}
-        <tr>
-         <form action="{% podcast_link_target podcast "subscribe" %}" method="post">
-          {% csrf_token %}
-          <td>{{ subscribe_form.as_p }}</td>
-          <td style="text-align: center;">
-           <button class="btn btn-success icon-ok" type="submit">
-           </button>
-          </td>
-         </form>
-        </tr>
-       {% endif %}
-      </table>
-    {% endif %}
-   </div>
-
-   <div class="span3">
-     <h2>Tags</h2>
-
-     <div class="tag-list">
-     {% for tag in tags %}{% spaceless %}
-       {% if tag.is_own %}
-        <span class="own">{{ tag.tag }} <a class="remove" href="{% podcast_link_target podcast "remove-tag" %}?tag={{ tag.tag }}">X</a></span>
-       {% else %}
-        <span class="other">{{ tag.tag }}</span>
-       {% endif %}
-       {% if not forloop.last %}<span class="seperator">,</span>{% endif %}
-      {% endspaceless %}
-     {% endfor %}
-     {% if user.is_authenticated %}
-      <form class="form-inline" action="{% podcast_link_target podcast "add-tag" %}">
-       <div class="input-prepend">
-        <span class="add-on"><i class="icon-tag"></i></span><input class="" type="text" name="tag" />
-       </div>
-       <button class="btn btn-success icon-plus" type="submit">
-       </button>
-      </form>
-     {% endif %}
-    </div>
-   </div>
-
-   <div class="span3">
-    <h2>{% trans "Share" %}</h2>
-    <div>
-     {% google_plus_one_button %}
-     {{ podcast|fb_like_podcast }}
-
-     {% if user.is_authenticated and devices %}
-     {% if is_public %}
-       <form action="{% podcast_link_target podcast "podcast-private" %}" method="POST">
-         {% csrf_token %}
-         <button type="submit" class="btn icon-eye-open" name="public">
-           {% trans "Public. Make Private" %}
-         </button>
-       </form>
-
-     {% else %}
-       <form action="{% podcast_link_target podcast "podcast-public" %}" method="POST">
-         {% csrf_token %}
-         <button type="submit" class="btn icon-eye-close" name="private">
-           {% trans "Private. Make Public" %}
-         </button>
-       </form>
-
-     {% endif %}
-     {% endif %}
-    </div>
-   </div>
-
-  </div>
-
-
-  {% if episodes %}
-   <table class="list episode_list" id="episodes">
-    <tr>
-     <th></th>
-     <th>{% trans "Episode" %}</th>
-     <th>{% trans "Released" %}</th>
-     <th>{% trans "Listeners" %}</th>
-    </tr>
-
-    {% for episode in episodes %}
-     <tr>
-      <td>{{ episode.action|episode_status_icon }}</td>
-      <td>
-          <p class="title">{% episode_link episode podcast %}</p>
-          <p class="description short">{{ episode.description|default:""|striptags }}</p>
-      </td>
-      <td>{{ episode.released|default:""|date:"Y-m-d" }}</td>
-      <td>
-       {% if episode.listeners %}
-        {{ episode.listeners|vertical_bar:max_listeners }}
-       {% endif %}
-      </td>
-     </tr>
-    {% endfor %}
-   </table>
-  {% endif %}
-
-  {% if history %}
-   <h2>{% trans "Subscription History" %}</h2>
-   <table class="list">
-    <tr>
-     <th>{% trans "Timestamp" %}</th>
-     <th>{% trans "Action" %}</th>
-     <th>{% trans "Devices" %}</th>
-    </tr>
-    {% for s in history %}
-     <tr>
-      <td><abbr title="{{ s.timestamp }}">{{ s.timestamp|naturalday }}</abbr></td>
-      <td>{{ s|podcast_status_icon }}</td>
-      <td>
-       <a href="{% url device s.device.uid %}">{{ s.device|device_icon }} {{ s.device.name|striptags }}</a>
-      </td>
-     </tr>
-    {% endfor %}
-   </table>
-  {% endif %}
-
-  {% if not podcast.title %}
-   <div class="info"><strong>{% trans "Why Unnamed Podcast?" %}</strong> {% trans "Because we display names after we have fetched the information form the feed -- and this may take some time. Until this is completed, the podcast will simply be called this way." %}</div>
-  {% endif %}
-
-{% endblock %}
-
+{% extends "base.html" %}
+{% load i18n %}
+{% load humanize %}
+{% load episodes %}
+{% load podcasts %}
+{% load devices %}
+{% load charts %}
+{% load facebook %}
+{% load google %}
+
+{% load menu %}
+{% block mainmenu %}{{ "/podcast/"|main_menu }}{% endblock %}
+{% block sectionmenu %}
+ {% if podcast.title %}
+  {{ "/podcast/"|section_menu:podcast.title }}
+ {% else %}
+  {{ "/podcast/"|section_menu:"Unnamed Podcast" }}
+ {% endif %}
+{% endblock %}
+
+{% block head %}
+ {{ podcast|opengraph_podcast }}
+ {% google_plus_one_head %}
+{% endblock %}
+
+{% block title %}{{ podcast.title|default:"Unnamed Podcast"|striptags }}{% endblock %}
+
+{% block content %}
+
+ <div class="row-fluid">
+
+  <span class="span12">
+
+   {% if podcast.logo_url %}
+    <div id="podcastlogo">{{ podcast|podcast_logo_big }}</div>
+   {% endif %}
+
+   <h1>
+    {% if podcast.title %}
+     {{ podcast.title|striptags }}
+    {% else %}
+     {% trans "Unnamed Podcast" %}
+    {%endif%}
+   </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 %}
+   </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 %}
+     {% endfor %}
+    </div>
+   {% endif %}
+
+   {% if podcast.description %}
+    <p class="description">{{ podcast.description|striptags }}</p>
+   {% endif %}
+
+  </div>
+ </div>
+
+
+ <div class="row-fluid">
+
+
+  <div class="span4">
+   <h2>{% trans "Subscriptions" %}</h2>
+   {% if not user.is_authenticated %}
+    <div class="subscribe">
+     <a href="{% podcast_link_target podcast "subscribe" %}">
+      <img src="/media/subscribe.png" style="vertical-align: middle;" alt=""/>
+      {% trans "Subscribe to this podcast" %}
+     </a>
+    </div>
+   {% endif %}
+
+   {% if devices or can_subscribe %}
+    <table class="list">
+      {% for device in devices %}
+       <tr>
+        <td>
+         {{ device|device_icon }}
+         <a href="{% url device device.uid %}">{{ device.name|striptags }}</a>
+        </td>
+        <td style="text-align: center;">
+         <form class="form-inline" method="post" action="{% podcast_link_target podcast "unsubscribe" device.uid %}?return_to={% podcast_link_target podcast %}">
+          <button class="btn btn-danger icon-remove" type="submit">
+          </button>
+         </form>
+        </td>
+       </tr>
+      {% endfor %}
+      {% if can_subscribe %}
+       <tr>
+        <form action="{% podcast_link_target podcast "subscribe" %}" method="post">
+         {% csrf_token %}
+         <td>{{ subscribe_form.as_p }}</td>
+         <td style="text-align: center;">
+          <button class="btn btn-success icon-ok" type="submit">
+          </button>
+         </td>
+        </form>
+       </tr>
+      {% endif %}
+     </table>
+   {% endif %}
+  </div>
+
+  <div class="span4">
+   <h2>Tags</h2>
+
+   {% for tag in tags %}
+    {% spaceless %}
+     {% if tag.is_own %}
+      <span class="own">{{ tag.tag }} <a class="remove" href="{% podcast_link_target podcast "remove-tag" %}?tag={{ tag.tag }}">X</a></span>
+     {% else %}
+       <span class="other">{{ tag.tag }}</span>
+     {% endif %}
+     {% if not forloop.last %}
+      <span class="seperator">,</span>
+     {% endif %}
+    {% endspaceless %}
+   {% endfor %}
+
+   {% if user.is_authenticated %}
+    <form class="form-inline" action="{% podcast_link_target podcast "add-tag" %}">
+     <div class="input-prepend">
+      <span class="add-on"><i class="icon-tag"></i></span><input class="input-small" type="text" name="tag" />
+     </div>
+     <button class="btn btn-success icon-plus" type="submit"></button>
+    </form>
+   {% endif %}
+  </div>
+
+  <div class="span4">
+   <h2>{% trans "Share" %}</h2>
+   {% google_plus_one_button %}
+   {{ podcast|fb_like_podcast }}
+
+   {% if user.is_authenticated and devices %}
+    {% if is_public %}
+     <form action="{% podcast_link_target podcast "podcast-private" %}" method="POST">
+      {% csrf_token %}
+      <button type="submit" class="btn icon-eye-open" name="public">
+       {% trans "Public. Make Private" %}
+      </button>
+     </form>
+
+    {% else %}
+     <form action="{% podcast_link_target podcast "podcast-public" %}" method="POST">
+      {% csrf_token %}
+      <button type="submit" class="btn icon-eye-close" name="private">
+       {% trans "Private. Make Public" %}
+      </button>
+     </form>
+
+    {% endif %}
+   {% endif %}
+  </div>
+
+
+  {% if episodes %}
+   <table class="list episode_list" id="episodes">
+    <tr>
+     <th></th>
+     <th>{% trans "Episode" %}</th>
+     <th>{% trans "Released" %}</th>
+     <th>{% trans "Listeners" %}</th>
+    </tr>
+
+    {% for episode in episodes %}
+     <tr>
+      <td>{{ episode.action|episode_status_icon }}</td>
+      <td>
+          <p class="title">{% episode_link episode podcast %}</p>
+          <p class="description short">{{ episode.description|default:""|striptags }}</p>
+      </td>
+      <td>{{ episode.released|default:""|date:"Y-m-d" }}</td>
+      <td>
+       {% if episode.listeners %}
+        {{ episode.listeners|vertical_bar:max_listeners }}
+       {% endif %}
+      </td>
+     </tr>
+    {% endfor %}
+   </table>
+  {% endif %}
+
+  {% if history %}
+   <h2>{% trans "Subscription History" %}</h2>
+   <table class="list">
+    <tr>
+     <th>{% trans "Timestamp" %}</th>
+     <th>{% trans "Action" %}</th>
+     <th>{% trans "Devices" %}</th>
+    </tr>
+    {% for s in history %}
+     <tr>
+      <td><abbr title="{{ s.timestamp }}">{{ s.timestamp|naturalday }}</abbr></td>
+      <td>{{ s|podcast_status_icon }}</td>
+      <td>
+       <a href="{% url device s.device.uid %}">{{ s.device|device_icon }} {{ s.device.name|striptags }}</a>
+      </td>
+     </tr>
+    {% endfor %}
+   </table>
+  {% endif %}
+
+  {% if not podcast.title %}
+   <div class="info"><strong>{% trans "Why Unnamed Podcast?" %}</strong> {% trans "Because we display names after we have fetched the information form the feed -- and this may take some time. Until this is completed, the podcast will simply be called this way." %}</div>
+  {% endif %}
+
+{% endblock %}
+
diff --git a/mygpo/web/templates/subscriptions.html b/mygpo/web/templates/subscriptions.html
index aa4b775d..1ac8e717 100644
--- a/mygpo/web/templates/subscriptions.html
+++ b/mygpo/web/templates/subscriptions.html
@@ -32,21 +32,13 @@
   {% endfor %}
   </table>
 
-  <div class="action-buttons">
+  <a class="btn" href="{% url subscriptions-download %}">
+   <img src="/media/24x24/opml-icon.png" /> {% trans "Download Subscriptions as OPML" %}
+  </a>
 
-   <div class="button">
-    <a href="{% url subscriptions-download %}">
-     <img src="/media/24x24/opml-icon.png" /> {% trans "Download Subscriptions as OPML" %}
-    </a>
-   </div>
-
-   <div class="button">
-    <a href="{% url share %}">
-     <img src="/media/24x24/openshareicon.png" /> {% trans "Share" %}
-    </a>
-   </div>
-
-  </div>
+  <a class="btn" href="{% url share %}">
+   <img src="/media/24x24/openshareicon.png" /> {% trans "Share" %}
+  </a>
 
  {% else %}
 
@@ -61,10 +53,10 @@
   {% url search as search-url %}
   {% url suggestions as suggestions-url %}
   {% blocktrans %}Browse the <a href="{{ toplist-url }}">toplist</a> and your <a href="{{ suggestions-url }}">personal suggestions</a>, <a href="{{ search-url }}">search</a> or simply copy and paste the podcast's URL here{% endblocktrans %}
-  <form method="get" action="{% url subscribe-by-url %}">
+  <form class="form-inline" method="get" action="{% url subscribe-by-url %}">
    <input class="url" name="url" type="text" />
-   <button type="submit">
-    <img src="/media/subscribe.png" />{% trans "Subscribe" %}
+   <button class="btn btn-success icon-ok" type="submit">
+    {% trans "Subscribe" %}
    </button>
   </form>
  </div>
-- 
2.11.4.GIT