From d502cd03f27b9fdd1c096919a549b8805123dd65 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stefan=20K=C3=B6gl?= Date: Sat, 12 Oct 2013 19:57:27 +0200 Subject: [PATCH] adapt templates to Bootstrap 3 --- htdocs/media/screen.css | 7 +- .../templates/directory/license-podcasts.html | 4 +- mygpo/directory/templates/episode_toplist.html | 9 +- mygpo/directory/templates/flattr-podcasts.html | 4 +- mygpo/directory/templates/missing.html | 11 +- mygpo/directory/templates/podcast_lists.html | 4 +- mygpo/directory/templates/search.html | 8 +- mygpo/directory/templates/toplist.html | 8 +- mygpo/publisher/templates/publisher/episode.html | 25 +- mygpo/publisher/templates/publisher/home.html | 128 +++--- mygpo/publisher/templates/publisher/podcast.html | 172 ++++---- mygpo/share/templates/lists.html | 9 +- mygpo/share/templates/share/favorites.html | 12 +- mygpo/web/forms.py | 68 ++- mygpo/web/templates/account.html | 477 ++++++++++----------- mygpo/web/templates/base.html | 5 +- mygpo/web/templates/device-edit.html | 74 ++-- mygpo/web/templates/device.html | 12 +- mygpo/web/templates/devicelist.html | 4 +- mygpo/web/templates/episode.html | 16 +- mygpo/web/templates/favorites.html | 2 +- mygpo/web/templates/home.html | 29 +- mygpo/web/templates/login.html | 59 +-- mygpo/web/templates/podcast.html | 32 +- mygpo/web/templates/subscriptions.html | 12 +- 25 files changed, 640 insertions(+), 551 deletions(-) rewrite mygpo/publisher/templates/publisher/home.html (74%) rewrite mygpo/web/templates/account.html (70%) diff --git a/htdocs/media/screen.css b/htdocs/media/screen.css index d1c7459b..4a557ec2 100644 --- a/htdocs/media/screen.css +++ b/htdocs/media/screen.css @@ -526,7 +526,7 @@ div.first-episode div.episode div.header a .nav-list > .active > a:hover, .nav-list > .active > a:focus { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #222; + background-color: #888; color: #eee; } @@ -612,3 +612,8 @@ div.podcasts div.podcast:hover div.actions button.btn font-weight: bold; text-transform: uppercase; } + +.tab-pane +{ + padding-top: 1em; +} diff --git a/mygpo/directory/templates/directory/license-podcasts.html b/mygpo/directory/templates/directory/license-podcasts.html index 3c244cd8..c9b85b5f 100644 --- a/mygpo/directory/templates/directory/license-podcasts.html +++ b/mygpo/directory/templates/directory/license-podcasts.html @@ -52,8 +52,7 @@ {% endfor %} - {% endblock %} diff --git a/mygpo/directory/templates/episode_toplist.html b/mygpo/directory/templates/episode_toplist.html index ef8e7bfc..6d468f01 100644 --- a/mygpo/directory/templates/episode_toplist.html +++ b/mygpo/directory/templates/episode_toplist.html @@ -52,7 +52,11 @@

{% trans "Language" %}

- + {% if language == "" %} {% else %} @@ -67,7 +71,8 @@ {% endif %} {% endfor %} - +
+ diff --git a/mygpo/directory/templates/flattr-podcasts.html b/mygpo/directory/templates/flattr-podcasts.html index a681135b..2dd1c6fa 100644 --- a/mygpo/directory/templates/flattr-podcasts.html +++ b/mygpo/directory/templates/flattr-podcasts.html @@ -41,8 +41,7 @@ {% endfor %} - {% endblock %} diff --git a/mygpo/directory/templates/missing.html b/mygpo/directory/templates/missing.html index ddadab4e..33723e42 100644 --- a/mygpo/directory/templates/missing.html +++ b/mygpo/directory/templates/missing.html @@ -19,10 +19,13 @@

{% blocktrans with site as sitename %}If you're missing a podcast on {{ sitename }}, please enter its feed URL here{% endblocktrans %}

- -
-
- + +
+ + + + +
diff --git a/mygpo/directory/templates/podcast_lists.html b/mygpo/directory/templates/podcast_lists.html index a2352cc2..8eff5b56 100644 --- a/mygpo/directory/templates/podcast_lists.html +++ b/mygpo/directory/templates/podcast_lists.html @@ -40,8 +40,7 @@ {% endfor %} - {% endblock %} diff --git a/mygpo/directory/templates/search.html b/mygpo/directory/templates/search.html index 57ade093..4bf45e03 100644 --- a/mygpo/directory/templates/search.html +++ b/mygpo/directory/templates/search.html @@ -18,8 +18,12 @@ {% block content %}
-
- +
+ + + + +
diff --git a/mygpo/directory/templates/toplist.html b/mygpo/directory/templates/toplist.html index 84ee70e8..e4b1d62f 100644 --- a/mygpo/directory/templates/toplist.html +++ b/mygpo/directory/templates/toplist.html @@ -66,7 +66,10 @@

{% trans "Language" %}

- {% if language == "" %} @@ -83,7 +86,8 @@ {% endif %} {% endfor %} - +
+
diff --git a/mygpo/publisher/templates/publisher/episode.html b/mygpo/publisher/templates/publisher/episode.html index 2166dc42..814bda21 100644 --- a/mygpo/publisher/templates/publisher/episode.html +++ b/mygpo/publisher/templates/publisher/episode.html @@ -46,25 +46,30 @@ {% endif %} -

-

-

{% endblock %} {% block content %} +
+ {% trans "Episode List" %} + {% trans "Podcast Page" %} +
+ +

{% trans "URL" %}

{% trans "You can configure the URL of this episode. Previous keys will automatically be added to the alternative keys and always redirect to the current URL." %}

-
+ {% csrf_token %} - 
http{% if is_secure %}s{% endif %}://{{ domain }}/podcast/{{ podcast.slug }}/
- - +
+ + +
+ +
Alternative Keys diff --git a/mygpo/publisher/templates/publisher/home.html b/mygpo/publisher/templates/publisher/home.html dissimilarity index 74% index 6b5e9c02..e1e87db6 100644 --- a/mygpo/publisher/templates/publisher/home.html +++ b/mygpo/publisher/templates/publisher/home.html @@ -1,53 +1,75 @@ -{% extends "base.html" %} -{% load i18n %} -{% load podcasts %} - -{% load menu %} -{% block mainmenu %}{{ "/publisher/"|main_menu }}{% endblock %} -{% block sectionmenu %}{{ "/publisher/"|section_menu }}{% endblock %} - -{% block title %}{% trans "Podcasts Published by Me" %}{% endblock %} - -{% block header %} -

{% trans "Podcasts Published by Me" %}

-{% endblock %} - - -{% block content %} - - {% if not podcasts|length_is:"0" %} - - - {% for s in podcasts %} - - - - - {% endfor %} -
{{ s|podcast_logo }}{{ s.display_title|striptags }}
- {% endif %} - -

{% trans "Update your podcasts" %}

-

{% trans "To update all of your published podcasts automatically, you can request the following URL" %}

- 
http://{{ site }}{% url "publisher-update" user.username %}?token={{ update_token }}
-
- {% csrf_token %} - -
- - {% if user.is_staff %} -
-

Staff Only

-

{% trans "Go to the publisher page of any podcast by entering its feed URL" %}

-
- {% csrf_token %} -
- - -
-
-
- {% endif %} - -{% endblock %} - +{% extends "base.html" %} +{% load i18n %} +{% load podcasts %} + +{% load menu %} +{% block mainmenu %}{{ "/publisher/"|main_menu }}{% endblock %} +{% block sectionmenu %}{{ "/publisher/"|section_menu }}{% endblock %} + +{% block title %}{% trans "Podcasts Published by Me" %}{% endblock %} + +{% block header %} +

{% trans "Publisher Area" %}

+{% endblock %} + + +{% block content %} + + {% if not podcasts|length_is:"0" %} + +
+
+

{% trans "Published Podcasts" %}

+
+
+

{% trans "You have publisher permissions for the following podcasts." %}

+ + {% for s in podcasts %} + + + + + {% endfor %} +
{{ s|podcast_logo }}{{ s.display_title|striptags }}
+
+
+ {% endif %} + + +
+
+

{% trans "Update podcasts" %}

+
+
+

{% trans "To update all of your published podcasts automatically, you can request the following URL" %}

+ 
http://{{ site }}{% url "publisher-update" user.username %}?token={{ update_token }}
+
+ {% csrf_token %} + +
+
+
+ + {% if user.is_staff %} +
+
+

{% trans "Staff only" %}

+
+
+

{% trans "Go to the publisher page of any podcast by entering its feed URL" %}

+
+ {% csrf_token %} +
+ + + + + +
+
+
+
+ {% endif %} + +{% endblock %} + diff --git a/mygpo/publisher/templates/publisher/podcast.html b/mygpo/publisher/templates/publisher/podcast.html index 1a625d7b..1006691e 100644 --- a/mygpo/publisher/templates/publisher/podcast.html +++ b/mygpo/publisher/templates/publisher/podcast.html @@ -45,7 +45,7 @@
{% blocktrans with podcast.title as ptitle %}This is the publisher page of {{ ptitle }}. You can see some stats and provide additional data for the podcast page.{% endblocktrans %} - {% trans "Go to Podcast Page" %} + {% trans "Go to Podcast Page" %}
{% endblock %} @@ -56,122 +56,132 @@ 
{{ podcast.url }}

{% trans "Last update: " %}{{ podcast.last_update|naturaltime }}

-
+ {% csrf_token %} - +
+

Additional Data

{% csrf_token %} -
-