fix / cleanup html
authorStefan Kögl <stefan@skoegl.net>
Thu, 6 Jun 2013 19:46:32 +0000 (6 21:46 +0200)
committerStefan Kögl <stefan@skoegl.net>
Thu, 6 Jun 2013 19:46:32 +0000 (6 21:46 +0200)
mygpo/web/templates/base.html
mygpo/web/templates/home.html
mygpo/web/templates/privacy_policy.html

dissimilarity index 97%
index 7d883d8..8914b8c 100644 (file)
-{% load i18n %}
-{% load menu %}
-
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <title>{% block title %}{% endblock %} (gpodder.net)</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="">
-    <meta name="author" content="">
-
-    <!-- Le styles -->
-    <link href="/media/css/bootstrap.css" rel="stylesheet">
-    <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
-      }
-      .sidebar-nav {
-        padding: 9px 0;
-      }
-    </style>
-    <link href="/media/css/bootstrap-responsive.css" rel="stylesheet">
-    <link href="/media/css/font-awesome.css" rel="stylesheet">
-    <link rel="stylesheet" href="/media/screen.css" type="text/css" />
-    <link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700' rel='stylesheet' type='text/css'>
-
-    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
-    <!--[if lt IE 9]>
-      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <!-- Le fav and touch icons -->
-    <link rel="shortcut icon" href="/favicon.png">
-
-    {% block head %}{% endblock %}
-
-    {% if google_analytics_property_id %}
-      {% load googleanalytics %}
-      {{ google_analytics_property_id|google_analytics_async }}
-    {% endif %}
-
-  </head>
-
-  <body>
-
-   <div id="logo">
-    <a href="/">
-     <img class="visible-desktop" src="/media/gpoddernet_64.png" />
-    </a>
-   </div>
-
-    <div class="navbar navbar-fixed-top">
-      <div class="navbar-inner">
-        <div class="container">
-          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </a>
-          <a class="brand" href="/"><img id="inline_logo" src="/media/gpoddernet_25.png" /><span style="padding-left: 65px; padding-right: 10px;" >gpodder.net</span></span></a>
-          <div class="btn-group pull-right">
-           {% if user.is_authenticated %}
-            <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
-              <i class="icon-user"></i> {{ user.username }}
-              <span class="caret"></span>
-            </a>
-            <ul class="dropdown-menu">
-              <li><a href="{% url "account" %}">{% trans "Account" %}</a></li>
-              <li class="divider"></li>
-              <li><a href="{% url "logout" %}">Sign Out</a></li>
-            </ul>
-           {% else %}
-            <a class="btn dropdown-toggle" data-toggle="dropdown" href="">
-              <i class="icon-user"></i> {% trans "Login" %}
-              <span class="caret"></span>
-            </a>
-            <ul class="dropdown-menu">
-              <li><a href="{% url "login" %}">{% trans "Login" %}</a></li>
-              <li><a href="{% url "login-google" %}">{% trans "Login with Google" %}</a></li>
-              <li><a href="{% url "register" %}">{% trans "Register" %}</a></li>
-            </ul>
-           {% endif %}
-          </div>
-          <div class="nav-collapse">
-            <ul class="nav">
-              {% block mainmenu %}
-               {{ "/"|main_menu }}
-              {% endblock %}
-             </ul>
-          </div><!--/.nav-collapse -->
-        </div>
-      </div>
-    </div>
-
-    <div class="container">
-      <div class="row-fluid">
-        <div class="span2">
-          <div class="well sidebar-nav">
-            <ul class="nav nav-list">
-              {% block sectionmenu %}
-              {% endblock %}
-            </ul>
-          </div><!--/.well -->
-        </div><!--/span-->
-        <div class="span10">
-
-    <div class="row-fluid">
-     <div class="span12">
-      {% block header %}
-       <h1>Block "header" not defined for this template</h1>
-      {% endblock %}
-     </div>
-    </div>
-
-    {% if messages %}
-     {% for message in messages %}
-      <div {% if message.tags %} class="alert alert-{{ message.tags }}"{% endif %}>
-       {{ message }}
-      </div>
-     {% endfor %}
-    {% endif %}
-
-    <div class="row-fluid">
-     <div class="span8" id="content">
-      {% block content %}
-      {% endblock %}
-     </div>
-
-
-     <div class="span4" id="sidebar">
-      {% block sidebar %}
-      {% endblock %}
-     </div>
-    </div>
-
-
-      <footer class="row-fluid">
-
- {% block ads %}
-  {% if adsense_client %}
-   <hr />
-
-   <script type="text/javascript"><!--
-    google_ad_client = "{{ adsense_client }}";
-    /* "Bottom" slot */
-    google_ad_slot = "{{ adsense_slot_bottom }}";
-    google_ad_width = 728;
-    google_ad_height = 90;
-    //-->
-   </script>
-   <script type="text/javascript"
-    src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-   </script>
-  {% endif %}
- {% endblock %}
-
-       <hr />
-
-       <div class="span1">
-       <ul>
-        <li><strong>{% trans "Discover" %}</strong></li>
-        <li><a href="{% url "directory-home" %}">{% trans "Directory" %}</a></li>
-        <li><a href="{% url "toplist" %}">{% trans "Podcasts" %}</a></li>
-        <li><a href="{% url "search" %}">{% trans "Search" %}</a></li>
-       </ul>
-       </div>
-
-       <div class="span1">
-        <ul>
-         <li><strong>{% trans "Support" %}</strong></li>
-         <li><a href="{% url "help" %}">{% trans "Docs" %}</a></li>
-         <li><a href="http://wiki.gpodder.org/wiki/Mailing_List">{% trans "Mailing&nbsp;List" %}</a></li>
-         <li><a href="https://getsatisfaction.com/gpoddernet">{%trans "Questions" %}</a></li>
-        </ul>
-       </div>
-
-       <div class="span1">
-        <ul>
-         <li><strong>{% trans "Support&nbsp;Us" %}</strong></li>
-         <li><a href="http://flattr.com/thing/2304/gpodder-net">{% trans "Flattr" %}</a></li>
-         <li><a href="{% url "contribute" %}">{% trans "Donate" %}</a></li>
-         <li><a href="{% url "advertise" %}">{% trans "Advertise" %}</a></li>
-        </ul>
-       </div>
-
-       <div class="span1">
-        <ul>
-         <li><strong>{% trans "Follow" %}</strong></li>
-         <li><a href="https://twitter.com/gpoddernet">{% trans "Twitter" %}</a></li>
-         <li><a href="http://blog.gpodder.org/">{% trans "Blog" %}</a></li>
-         <li><a href="http://blog.gpodder.org/feeds/posts/default">{% trans "Blog&nbsp;(RSS)" %}</a></li>
-        </ul>
-       </div>
-
-       <div class="span1">
-        <ul>
-         <li><strong>{% trans "Develop" %}</strong></li>
-         <li><a href="http://wiki.gpodder.org/wiki/Web_Services/API_2">{% trans "API" %}</a></li>
-         <li><a href="http://wiki.gpodder.org/wiki/Web_Services/Libraries">{% trans "Libraries" %}</a></li>
-         <li><a href="http://wiki.gpodder.org/wiki/Web_Services/Clients">{% trans "Clients" %}</a></li>
-        </ul>
-       </div>
-
-       <div class="span1">
-        <ul>
-         <li><strong>{% trans "Publish" %}</strong></li>
-         <li><a href="{% url "publisher" %}">{% trans "Get&nbsp;Access" %}</a></li>
-         <li><a href="{% url "link-here" %}">{% trans "Link&nbsp;To&nbsp;Us" %}</a></li>
-         <li><a href="{% url "advertise" %}">{% trans "Advertise" %}</a></li>
-        </ul>
-       </div>
-
-      </footer>
-
-    </div><!--/.fluid-container-->
-
-    <!-- Le javascript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="/media/js/jquery.js"></script>
-    <script src="/media/js/bootstrap.js"></script>
-
-    {% block javascript %}{% endblock javascript %}
-
-    <!-- getsatisfaction.com feedback tab -- >
-    <script type="text/javascript">
-     var is_ssl = ("https:" == document.location.protocol);
-     var asset_host = is_ssl ? "https://s3.amazonaws.com/getsatisfaction.com/" : "http://s3.amazonaws.com/getsatisfaction.com/";
-     document.write(unescape("%3Cscript src='" + asset_host + "javascripts/feedback-v2.js' type='text/javascript'%3E%3C/script%3E"));
-    </script>
-    <script type="text/javascript">
-     var feedback_widget_options = {};
-     feedback_widget_options.display = "overlay";
-     feedback_widget_options.company = "gpoddernet";
-     feedback_widget_options.placement = "left";
-     feedback_widget_options.color = "#222";
-     feedback_widget_options.style = "idea";
-     var feedback_widget = new GSFN.feedback_widget(feedback_widget_options);
-    </script>
-
-  </body>
-
-
-
-
-
-</html>
+{% load i18n %}
+{% load menu %}
+
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8">
+        <title>{% block title %}{% endblock %} (gpodder.net)</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta name="description" content="">
+        <meta name="author" content="">
+
+        <!-- Le styles -->
+        <link href="/media/css/bootstrap.css" rel="stylesheet">
+        <style type="text/css">
+            body {
+                padding-top: 60px;
+                padding-bottom: 40px;
+            }
+            .sidebar-nav {
+                padding: 9px 0;
+            }
+        </style>
+        <link href="/media/css/bootstrap-responsive.css" rel="stylesheet">
+        <link href="/media/css/font-awesome.css" rel="stylesheet">
+        <link rel="stylesheet" href="/media/screen.css" type="text/css" />
+        <link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700' rel='stylesheet' type='text/css'>
+
+        <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+        <!--[if lt IE 9]>
+        <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+
+        <!-- Le fav and touch icons -->
+        <link rel="shortcut icon" href="/favicon.png">
+
+        {% block head %}{% endblock %}
+
+        {% if google_analytics_property_id %}
+        {% load googleanalytics %}
+        {{ google_analytics_property_id|google_analytics_async }}
+        {% endif %}
+
+    </head>
+
+    <body>
+
+        <div id="logo">
+            <a href="/">
+                <img class="visible-desktop" src="/media/gpoddernet_64.png" alt="gpodder.net" />
+            </a>
+        </div>
+
+        <div class="navbar navbar-fixed-top">
+            <div class="navbar-inner">
+                <div class="container">
+                    <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                    </a>
+                    <a class="brand" href="/"><img id="inline_logo" src="/media/gpoddernet_25.png" alt="gpodder.net" /><span style="padding-left: 65px; padding-right: 10px;" >gpodder.net</span></a>
+                    <div class="btn-group pull-right">
+                        {% if user.is_authenticated %}
+                        <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+                            <i class="icon-user"></i> {{ user.username }}
+                            <span class="caret"></span>
+                        </a>
+                        <ul class="dropdown-menu">
+                            <li><a href="{% url "account" %}">{% trans "Account" %}</a></li>
+                            <li class="divider"></li>
+                            <li><a href="{% url "logout" %}">Sign Out</a></li>
+                        </ul>
+                        {% else %}
+                        <a class="btn dropdown-toggle" data-toggle="dropdown" href="">
+                            <i class="icon-user"></i> {% trans "Login" %}
+                            <span class="caret"></span>
+                        </a>
+                        <ul class="dropdown-menu">
+                            <li><a href="{% url "login" %}">{% trans "Login" %}</a></li>
+                            <li><a href="{% url "login-google" %}">{% trans "Login with Google" %}</a></li>
+                            <li><a href="{% url "register" %}">{% trans "Register" %}</a></li>
+                        </ul>
+                        {% endif %}
+                    </div>
+                    <div class="nav-collapse">
+                        <ul class="nav">
+                            {% block mainmenu %}
+                            {{ "/"|main_menu }}
+                            {% endblock %}
+                        </ul>
+                    </div><!--/.nav-collapse -->
+                </div>
+            </div>
+        </div>
+
+        <div class="container">
+            <div class="row-fluid">
+                <div class="span2">
+                    <div class="well sidebar-nav">
+                        <ul class="nav nav-list">
+                            {% block sectionmenu %}
+                            {% endblock %}
+                        </ul>
+                    </div><!--/.well -->
+                </div><!--/span-->
+                <div class="span10">
+
+                    <div class="row-fluid">
+                        <div class="span12">
+                            {% block header %}
+                            <h1>Block "header" not defined for this template</h1>
+                            {% endblock %}
+                        </div>
+                    </div>
+
+                    {% if messages %}
+                    {% for message in messages %}
+                    <div {% if message.tags %} class="alert alert-{{ message.tags }}"{% endif %}>
+                        {{ message }}
+                    </div>
+                    {% endfor %}
+                    {% endif %}
+
+                    <div class="row-fluid">
+                        <div class="span8" id="content">
+                            {% block content %}
+                            {% endblock %}
+                        </div>
+
+
+                        <div class="span4" id="sidebar">
+                            {% block sidebar %}
+                            {% endblock %}
+                        </div>
+                    </div>
+
+
+                    <footer class="row-fluid">
+
                       {% block ads %}
+                        {% if adsense_client %}
+                        <hr />
+
+                        <script type="text/javascript"><!--
+                            google_ad_client = "{{ adsense_client }}";
+                            /* "Bottom" slot */
+                            google_ad_slot = "{{ adsense_slot_bottom }}";
+                            google_ad_width = 728;
+                            google_ad_height = 90;
+                            //-->
+                        </script>
+                        <script type="text/javascript"
+                            src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+                        </script>
+                        {% endif %}
                       {% endblock %}
+
+                        <hr />
+
+                        <div class="span1">
+                            <ul>
+                                <li><strong>{% trans "Discover" %}</strong></li>
+                                <li><a href="{% url "directory-home" %}">{% trans "Directory" %}</a></li>
+                                <li><a href="{% url "toplist" %}">{% trans "Podcasts" %}</a></li>
+                                <li><a href="{% url "search" %}">{% trans "Search" %}</a></li>
+                            </ul>
+                        </div>
+
+                        <div class="span1">
+                            <ul>
+                                <li><strong>{% trans "Support" %}</strong></li>
+                                <li><a href="{% url "help" %}">{% trans "Docs" %}</a></li>
+                                <li><a href="http://wiki.gpodder.org/wiki/Mailing_List">{% trans "Mailing&nbsp;List" %}</a></li>
+                                <li><a href="https://getsatisfaction.com/gpoddernet">{%trans "Questions" %}</a></li>
+                            </ul>
+                        </div>
+
+                        <div class="span1">
+                            <ul>
+                                <li><strong>{% trans "Support&nbsp;Us" %}</strong></li>
+                                <li><a href="http://flattr.com/thing/2304/gpodder-net">{% trans "Flattr" %}</a></li>
+                                <li><a href="{% url "contribute" %}">{% trans "Donate" %}</a></li>
+                                <li><a href="{% url "advertise" %}">{% trans "Advertise" %}</a></li>
+                            </ul>
+                        </div>
+
+                        <div class="span1">
+                            <ul>
+                                <li><strong>{% trans "Follow" %}</strong></li>
+                                <li><a href="https://twitter.com/gpoddernet">{% trans "Twitter" %}</a></li>
+                                <li><a href="http://blog.gpodder.org/">{% trans "Blog" %}</a></li>
+                                <li><a href="http://blog.gpodder.org/feeds/posts/default">{% trans "Blog&nbsp;(RSS)" %}</a></li>
+                            </ul>
+                        </div>
+
+                        <div class="span1">
+                            <ul>
+                                <li><strong>{% trans "Develop" %}</strong></li>
+                                <li><a href="http://wiki.gpodder.org/wiki/Web_Services/API_2">{% trans "API" %}</a></li>
+                                <li><a href="http://wiki.gpodder.org/wiki/Web_Services/Libraries">{% trans "Libraries" %}</a></li>
+                                <li><a href="http://wiki.gpodder.org/wiki/Web_Services/Clients">{% trans "Clients" %}</a></li>
+                            </ul>
+                        </div>
+
+                        <div class="span1">
+                            <ul>
+                                <li><strong>{% trans "Publish" %}</strong></li>
+                                <li><a href="{% url "publisher" %}">{% trans "Get&nbsp;Access" %}</a></li>
+                                <li><a href="{% url "link-here" %}">{% trans "Link&nbsp;To&nbsp;Us" %}</a></li>
+                                <li><a href="{% url "advertise" %}">{% trans "Advertise" %}</a></li>
+                            </ul>
+                        </div>
+
+                    </footer>
+
+                </div><!--/.fluid-container-->
+
+            </div>
+
+        </div>
+
+        <!-- Le javascript
+        ================================================== -->
+        <!-- Placed at the end of the document so the pages load faster -->
+        <script src="/media/js/jquery.js"></script>
+        <script src="/media/js/bootstrap.js"></script>
+
+        {% block javascript %}{% endblock javascript %}
+
+        <!-- getsatisfaction.com feedback tab -->
+        <script type="text/javascript">
+            var is_ssl = ("https:" == document.location.protocol);
+            var asset_host = is_ssl ? "https://s3.amazonaws.com/getsatisfaction.com/" : "http://s3.amazonaws.com/getsatisfaction.com/";
+            document.write(unescape("%3Cscript src='" + asset_host + "javascripts/feedback-v2.js' type='text/javascript'%3E%3C/script%3E"));
+        </script>
+        <script type="text/javascript">
+            var feedback_widget_options = {};
+            feedback_widget_options.display = "overlay";
+            feedback_widget_options.company = "gpoddernet";
+            feedback_widget_options.placement = "left";
+            feedback_widget_options.color = "#222";
+            feedback_widget_options.style = "idea";
+            var feedback_widget = new GSFN.feedback_widget(feedback_widget_options);
+        </script>
+
+  </body>
+
+</html>
dissimilarity index 98%
index 6b0b628..3816b0f 100644 (file)
-{% load i18n %}
-{% load menu %}
-
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <title>{% trans "gpodder.net &mdash; discover and track your podcasts" %}</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="">
-    <meta name="author" content="">
-
-    <!-- Le styles -->
-    <link href="/media/css/bootstrap.css" rel="stylesheet">
-    <style type="text/css">
-      body {
-        padding-top: 60px;
-        padding-bottom: 40px;
-      }
-      .sidebar-nav {
-        padding: 9px 0;
-      }
-    </style>
-    <link href="/media/css/bootstrap-responsive.css" rel="stylesheet">
-    <link href="/media/css/font-awesome.css" rel="stylesheet">
-    <link rel="stylesheet" href="/media/screen.css" type="text/css" />
-    <link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700' rel='stylesheet' type='text/css'>
-
-    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
-    <!--[if lt IE 9]>
-      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <!-- Le fav and touch icons -->
-    <link rel="shortcut icon" href="/favicon.png">
-
-    {% block head %}{% endblock %}
-
-    {% if google_analytics_property_id %}
-      {% load googleanalytics %}
-      {{ google_analytics_property_id|google_analytics_async }}
-    {% endif %}
-
-  </head>
-
-  <body>
-
-    <div class="navbar navbar-fixed-top">
-      <div class="navbar-inner">
-        <div class="container">
-          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </a>
-          <a class="brand" href="/"><img id="inline_logo" src="/media/gpoddernet_25.png" /><span style="padding-left: 65px; padding-right: 10px;" >gpodder.net</span></span></a>
-          <div class="btn-group pull-right">
-           {% if user.is_authenticated %}
-            <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
-              <i class="icon-user"></i> {{ user.username }}
-              <span class="caret"></span>
-            </a>
-            <ul class="dropdown-menu">
-              <li><a href="{% url "account" %}">Profile</a></li>
-              <li class="divider"></li>
-              <li><a href="{% url "logout" %}">Sign Out</a></li>
-            </ul>
-           {% else %}
-            <a class="btn dropdown-toggle" data-toggle="dropdown" href="">
-              <i class="icon-user"></i> {% trans "Login" %}
-              <span class="caret"></span>
-            </a>
-            <ul class="dropdown-menu">
-              <li><a href="{% url "login" %}">{% trans "Login" %}</a></li>
-              <li><a href="{% url "login-google" %}">{% trans "Login with Google" %}</a></li>
-              <li><a href="{% url "register" %}">{% trans "Register" %}</a></li>
-            </ul>
-           {% endif %}
-          </div>
-          <div class="nav-collapse">
-            <ul class="nav">
-              {% block mainmenu %}
-               {{ "/"|main_menu }}
-              {% endblock %}
-             </ul>
-          </div><!--/.nav-collapse -->
-        </div>
-      </div>
-    </div>
-
-    <div class="container">
-      <div class="row-fluid">
-        <div class="span2">
-        </div><!--/span-->
-        <div class="span10">
-
-    {% if messages %}
-     {% for message in messages %}
-      <div {% if message.tags %} class="{{ message.tags }}"{% endif %}>
-       {{ message }}
-      </div>
-     {% endfor %}
-    {% endif %}
-
-
-    <div class="row-fluid">
-     <div class="span12">
-      {% block header %}
-       <h1>Discover and track your podcasts</h1>
-      {% endblock %}
-     </div>
-    </div>
-
-
-    <div class="row-fluid">
-     <div class="span8" id="content">
-      {% block content %}
-
-       <img style="float: right;" src="/media/gpoddernet_228.png" />
-       <p>
-        gpodder.net is a libre web service that allows you to manage your
-        podcast subscriptions and discover new content. If you use multiple
-        devices, you can synchronize subscriptions and your listening progress.
-       </p>
-
-       <p>
-        It works best with the <a href="http://gpodder.org/">gPodder</a>
-        application, but you can also use it with
-        <a href="http://amarok.kde.org/">Amarok</a>,
-        <a href="http://wiki.gpodder.org/wiki/Web_Services/Clients">other
-        supported clients</a> or as standalone web application without
-        any client app.
-       </p>
-
-       <div class="well">
-        <div style="width: 12em; margin-left: auto; margin-right: auto;">
-         <a class="btn btn-primary" href="{% url "login" %}">{% trans "Login" %}</a>
-         <a class="btn btn-primary" href="{% url "register" %}">{% trans "Register" %}</a>
-        </div>
-       </div>
-
-       <h3>Features</h3>
-
-       <ul>
-        <li>Share your favorite content with others</li>
-        <li>Keep track of your playback progress</li>
-        <li>Back up your subscriptions</li>
-        <li>Discover new content, based on your listening habits</li>
-        <li>Create and share lists of related podcasts</li>
-        <li><em>For publishers:</em> Find out which parts
-         of your content are popular</li>
-       </ul>
-
-     {% endblock %}
-     </div>
-
-
-     <div class="span4" id="sidebar">
-      {% block sidebar %}
-      {% endblock %}
-     </div>
-    </div>
-
-
-      <footer class="row-fluid">
-
- {% block ads %}
-  {% if adsense_client %}
-   <hr />
-
-   <script type="text/javascript"><!--
-    google_ad_client = "{{ adsense_client }}";
-    /* "Bottom" slot */
-    google_ad_slot = "{{ adsense_slot_bottom }}";
-    google_ad_width = 728;
-    google_ad_height = 90;
-    //-->
-   </script>
-   <script type="text/javascript"
-    src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-   </script>
-  {% endif %}
- {% endblock %}
-
-       <hr />
-
-       <div class="span1">
-       <ul>
-        <li><strong>{% trans "Discover" %}</strong></li>
-        <li><a href="{% url "directory-home" %}">{% trans "Directory" %}</a></li>
-        <li><a href="{% url "toplist" %}">{% trans "Podcasts" %}</a></li>
-        <li><a href="{% url "search" %}">{% trans "Search" %}</a></li>
-       </ul>
-       </div>
-
-       <div class="span1">
-        <ul>
-         <li><strong>{% trans "Support" %}</strong></li>
-         <li><a href="{% url "help" %}">{% trans "Docs" %}</a></li>
-         <li><a href="http://wiki.gpodder.org/wiki/Mailing_List">{% trans "Mailing&nbsp;List" %}</a></li>
-         <li><a href="https://getsatisfaction.com/gpoddernet">{%trans "Questions" %}</a></li>
-        </ul>
-       </div>
-
-       <div class="span1">
-        <ul>
-         <li><strong>{% trans "Support&nbsp;Us" %}</strong></li>
-         <li><a href="http://flattr.com/thing/2304/gpodder-net">{% trans "Flattr" %}</a></li>
-         <li><a href="{% url "contribute" %}">{% trans "Donate" %}</a></li>
-         <li><a href="{% url "advertise" %}">{% trans "Advertise" %}</a></li>
-        </ul>
-       </div>
-
-       <div class="span1">
-        <ul>
-         <li><strong>{% trans "Follow" %}</strong></li>
-         <li><a href="https://twitter.com/gpoddernet">{% trans "Twitter" %}</a></li>
-         <li><a href="http://blog.gpodder.org/">{% trans "Blog" %}</a></li>
-         <li><a href="http://blog.gpodder.org/feeds/posts/default">{% trans "Blog&nbsp;(RSS)" %}</a></li>
-        </ul>
-       </div>
-
-       <div class="span1">
-        <ul>
-         <li><strong>{% trans "Develop" %}</strong></li>
-         <li><a href="http://wiki.gpodder.org/wiki/Web_Services/API_2">{% trans "API" %}</a></li>
-         <li><a href="http://wiki.gpodder.org/wiki/Web_Services/Libraries">{% trans "Libraries" %}</a></li>
-         <li><a href="http://wiki.gpodder.org/wiki/Web_Services/Clients">{% trans "Clients" %}</a></li>
-        </ul>
-       </div>
-
-       <div class="span1">
-        <ul>
-         <li><strong>{% trans "Publish" %}</strong></li>
-         <li><a href="{% url "publisher" %}">{% trans "Get&nbsp;Access" %}</a></li>
-         <li><a href="{% url "link-here" %}">{% trans "Link&nbsp;To&nbsp;Us" %}</a></li>
-         <li><a href="{% url "advertise" %}">{% trans "Advertise" %}</a></li>
-        </ul>
-       </div>
-
-      </footer>
-
-    </div><!--/.fluid-container-->
-
-    <!-- Le javascript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="/media/js/jquery.js"></script>
-    <script src="/media/js/bootstrap-dropdown.js"></script>
-
-    {% block javascript %}{% endblock javascript %}
-
-    <!-- getsatisfaction.com feedback tab -- >
-    <script type="text/javascript">
-     var is_ssl = ("https:" == document.location.protocol);
-     var asset_host = is_ssl ? "https://s3.amazonaws.com/getsatisfaction.com/" : "http://s3.amazonaws.com/getsatisfaction.com/";
-     document.write(unescape("%3Cscript src='" + asset_host + "javascripts/feedback-v2.js' type='text/javascript'%3E%3C/script%3E"));
-    </script>
-    <script type="text/javascript">
-     var feedback_widget_options = {};
-     feedback_widget_options.display = "overlay";
-     feedback_widget_options.company = "gpoddernet";
-     feedback_widget_options.placement = "left";
-     feedback_widget_options.color = "#222";
-     feedback_widget_options.style = "idea";
-     var feedback_widget = new GSFN.feedback_widget(feedback_widget_options);
-    </script>
-
-  </body>
-
-
-
-
-
-</html>
+{% load i18n %}
+{% load menu %}
+
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8">
+        <title>{% trans "gpodder.net &mdash; discover and track your podcasts" %}</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta name="description" content="">
+        <meta name="author" content="">
+
+        <!-- Le styles -->
+        <link href="/media/css/bootstrap.css" rel="stylesheet">
+        <style type="text/css">
+            body {
+                padding-top: 60px;
+                padding-bottom: 40px;
+            }
+            .sidebar-nav {
+                padding: 9px 0;
+            }
+        </style>
+        <link href="/media/css/bootstrap-responsive.css" rel="stylesheet">
+        <link href="/media/css/font-awesome.css" rel="stylesheet">
+        <link rel="stylesheet" href="/media/screen.css" type="text/css" />
+        <link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700' rel='stylesheet' type='text/css'>
+
+        <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+        <!--[if lt IE 9]>
+        <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+
+        <!-- Le fav and touch icons -->
+        <link rel="shortcut icon" href="/favicon.png">
+
+        {% block head %}{% endblock %}
+
+        {% if google_analytics_property_id %}
+        {% load googleanalytics %}
+        {{ google_analytics_property_id|google_analytics_async }}
+        {% endif %}
+
+    </head>
+
+    <body>
+
+        <div class="navbar navbar-fixed-top">
+            <div class="navbar-inner">
+                <div class="container">
+                    <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                    </a>
+                    <a class="brand" href="/"><img id="inline_logo" src="/media/gpoddernet_25.png" alt="gpodder.net" /><span style="padding-left: 65px; padding-right: 10px;" >gpodder.net</span></a>
+                <div class="btn-group pull-right">
+                    {% if user.is_authenticated %}
+                    <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+                        <i class="icon-user"></i> {{ user.username }}
+                        <span class="caret"></span>
+                    </a>
+                    <ul class="dropdown-menu">
+                        <li><a href="{% url "account" %}">Profile</a></li>
+                        <li class="divider"></li>
+                        <li><a href="{% url "logout" %}">Sign Out</a></li>
+                    </ul>
+                    {% else %}
+                    <a class="btn dropdown-toggle" data-toggle="dropdown" href="">
+                        <i class="icon-user"></i> {% trans "Login" %}
+                        <span class="caret"></span>
+                    </a>
+                    <ul class="dropdown-menu">
+                        <li><a href="{% url "login" %}">{% trans "Login" %}</a></li>
+                        <li><a href="{% url "login-google" %}">{% trans "Login with Google" %}</a></li>
+                        <li><a href="{% url "register" %}">{% trans "Register" %}</a></li>
+                    </ul>
+                    {% endif %}
+                </div>
+                <div class="nav-collapse">
+                    <ul class="nav">
+                        {% block mainmenu %}
+                        {{ "/"|main_menu }}
+                        {% endblock %}
+                    </ul>
+                </div><!--/.nav-collapse -->
+            </div>
+        </div>
+    </div>
+
+    <div class="container">
+        <div class="row-fluid">
+            <div class="span2">
+            </div><!--/span-->
+            <div class="span10">
+
+                {% if messages %}
+                {% for message in messages %}
+                <div {% if message.tags %} class="{{ message.tags }}"{% endif %}>
+                    {{ message }}
+                </div>
+                {% endfor %}
+                {% endif %}
+
+
+                <div class="row-fluid">
+                    <div class="span12">
+                        {% block header %}
+                        <h1>Discover and track your podcasts</h1>
+                        {% endblock %}
+                    </div>
+                </div>
+
+
+                <div class="row-fluid">
+                    <div class="span8" id="content">
+                        {% block content %}
+
+                        <img style="float: right;" src="/media/gpoddernet_228.png" alt="gpodder.net" />
+                        <p>
+                        gpodder.net is a libre web service that allows you to manage your
+                        podcast subscriptions and discover new content. If you use multiple
+                        devices, you can synchronize subscriptions and your listening progress.
+                        </p>
+
+                        <p>
+                        It works best with the <a href="http://gpodder.org/">gPodder</a>
+                        application, but you can also use it with
+                        <a href="http://amarok.kde.org/">Amarok</a>,
+                        <a href="http://wiki.gpodder.org/wiki/Web_Services/Clients">other
+                            supported clients</a> or as standalone web application without
+                        any client app.
+                        </p>
+
+                        <div class="well">
+                            <div style="width: 12em; margin-left: auto; margin-right: auto;">
+                                <a class="btn btn-primary" href="{% url "login" %}">{% trans "Login" %}</a>
+                                <a class="btn btn-primary" href="{% url "register" %}">{% trans "Register" %}</a>
+                            </div>
+                        </div>
+
+                        <h3>Features</h3>
+
+                        <ul>
+                            <li>Share your favorite content with others</li>
+                            <li>Keep track of your playback progress</li>
+                            <li>Back up your subscriptions</li>
+                            <li>Discover new content, based on your listening habits</li>
+                            <li>Create and share lists of related podcasts</li>
+                            <li><em>For publishers:</em> Find out which parts
+                            of your content are popular</li>
+                        </ul>
+
+                        {% endblock %}
+                    </div>
+
+
+                    <div class="span4" id="sidebar">
+                        {% block sidebar %}
+                        {% endblock %}
+                    </div>
+                </div>
+
+
+                <footer class="row-fluid">
+
               {% block ads %}
+                {% if adsense_client %}
+                <hr />
+
+                <script type="text/javascript"><!--
+                    google_ad_client = "{{ adsense_client }}";
+                    /* "Bottom" slot */
+                    google_ad_slot = "{{ adsense_slot_bottom }}";
+                    google_ad_width = 728;
+                    google_ad_height = 90;
+                    //-->
+                    </script>
+                    <script type="text/javascript"
+                        src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+                        </script>
+                        {% endif %}
                       {% endblock %}
+
+                        <hr />
+
+                        <div class="span1">
+                            <ul>
+                                <li><strong>{% trans "Discover" %}</strong></li>
+                                <li><a href="{% url "directory-home" %}">{% trans "Directory" %}</a></li>
+                                <li><a href="{% url "toplist" %}">{% trans "Podcasts" %}</a></li>
+                                <li><a href="{% url "search" %}">{% trans "Search" %}</a></li>
+                            </ul>
+                        </div>
+
+                        <div class="span1">
+                            <ul>
+                                <li><strong>{% trans "Support" %}</strong></li>
+                                <li><a href="{% url "help" %}">{% trans "Docs" %}</a></li>
+                                <li><a href="http://wiki.gpodder.org/wiki/Mailing_List">{% trans "Mailing&nbsp;List" %}</a></li>
+                                <li><a href="https://getsatisfaction.com/gpoddernet">{%trans "Questions" %}</a></li>
+                            </ul>
+                        </div>
+
+                        <div class="span1">
+                            <ul>
+                                <li><strong>{% trans "Support&nbsp;Us" %}</strong></li>
+                                <li><a href="http://flattr.com/thing/2304/gpodder-net">{% trans "Flattr" %}</a></li>
+                                <li><a href="{% url "contribute" %}">{% trans "Donate" %}</a></li>
+                                <li><a href="{% url "advertise" %}">{% trans "Advertise" %}</a></li>
+                            </ul>
+                        </div>
+
+                        <div class="span1">
+                            <ul>
+                                <li><strong>{% trans "Follow" %}</strong></li>
+                                <li><a href="https://twitter.com/gpoddernet">{% trans "Twitter" %}</a></li>
+                                <li><a href="http://blog.gpodder.org/">{% trans "Blog" %}</a></li>
+                                <li><a href="http://blog.gpodder.org/feeds/posts/default">{% trans "Blog&nbsp;(RSS)" %}</a></li>
+                            </ul>
+                        </div>
+
+                        <div class="span1">
+                            <ul>
+                                <li><strong>{% trans "Develop" %}</strong></li>
+                                <li><a href="http://wiki.gpodder.org/wiki/Web_Services/API_2">{% trans "API" %}</a></li>
+                                <li><a href="http://wiki.gpodder.org/wiki/Web_Services/Libraries">{% trans "Libraries" %}</a></li>
+                                <li><a href="http://wiki.gpodder.org/wiki/Web_Services/Clients">{% trans "Clients" %}</a></li>
+                            </ul>
+                        </div>
+
+                        <div class="span1">
+                            <ul>
+                                <li><strong>{% trans "Publish" %}</strong></li>
+                                <li><a href="{% url "publisher" %}">{% trans "Get&nbsp;Access" %}</a></li>
+                                <li><a href="{% url "link-here" %}">{% trans "Link&nbsp;To&nbsp;Us" %}</a></li>
+                                <li><a href="{% url "advertise" %}">{% trans "Advertise" %}</a></li>
+                            </ul>
+                        </div>
+
+                        </footer>
+
+                    </div><!--/.fluid-container-->
+
+                </div>
+
+            </div>
+
+            <!-- Le javascript
+            ================================================== -->
+            <!-- Placed at the end of the document so the pages load faster -->
+            <script src="/media/js/jquery.js"></script>
+            <script src="/media/js/bootstrap-dropdown.js"></script>
+
+            {% block javascript %}{% endblock javascript %}
+
+            <!-- getsatisfaction.com feedback tab -->
+            <script type="text/javascript">
+                var is_ssl = ("https:" == document.location.protocol);
+                var asset_host = is_ssl ? "https://s3.amazonaws.com/getsatisfaction.com/" : "http://s3.amazonaws.com/getsatisfaction.com/";
+                document.write(unescape("%3Cscript src='" + asset_host + "javascripts/feedback-v2.js' type='text/javascript'%3E%3C/script%3E"));
+            </script>
+            <script type="text/javascript">
+                var feedback_widget_options = {};
+                feedback_widget_options.display = "overlay";
+                feedback_widget_options.company = "gpoddernet";
+                feedback_widget_options.placement = "left";
+                feedback_widget_options.color = "#222";
+                feedback_widget_options.style = "idea";
+                var feedback_widget = new GSFN.feedback_widget(feedback_widget_options);
+            </script>
+
+      </body>
+
+</html>
index 010cc72..1afe0cb 100644 (file)
@@ -38,12 +38,12 @@ application-specific data:
     <li>Episode actions (e.g. play, download, delete) as sent by the client</li>
     <li>User-generated content when created inside the client application</li>
 </ul>
-</p>
+<p>
 Depending on the client application you use, we might only store a subset of
 this data.
 </p>
 
-<h3>Why do we collect this data?</h2>
+<h2>Why do we collect this data?</h2>
 <p>
 We need to store your e-mail address so that we can inform you about news
 regarding the gpodder.net service. The e-mail address is also used to check