fix titles

diff --git a/telemeta/templates/telemeta_default/collection_detail_dc.html b/telemeta/templates/telemeta_default/collection_detail_dc.html
index e100ffde78374ff9849c90f8cbdd5b3b0b2232bf..ea7c7af326e4d98edb355cf58bd020141f416069 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_detail_dc.html
+++ b/telemeta/templates/telemeta_default/collection_detail_dc.html
@@ -6,7 +6,7 @@
 
 {% if collection %}
 {% block title %}
-    Collection: {{ collection }}
+<h1>Collection: {{ collection }}</h1>
 {% endblock %}
 {% block title_buttons %}
     <a class="component_icon button icon_previous" href="{% url telemeta-collection-detail collection.public_id %}">{% trans "Normal View" %}</a>

diff --git a/telemeta/templates/telemeta_default/home.html b/telemeta/templates/telemeta_default/home.html
index a9c0d25f0c56195af9a27101dac4fb551a3d6f0e..2eb6be1478fb6a1c88595e8016baf42cbaa4fcd3 100644 (file)
--- a/telemeta/templates/telemeta_default/home.html
+++ b/telemeta/templates/telemeta_default/home.html
@@ -63,7 +63,7 @@
 </div>
 
 <div class="home-description">
-<h1>{% trans "Playlists" %}</h1>
+<h1><img src="{% url telemeta-images "playlist_title.png" %}" style="vertical-align:middle" /> {% trans "Playlists" %}</h1>
 <a href=# id="_new_playlist" style="float:right" class="component_icon button icon_add">
 {% trans "Add" %}</a>
   {% for playlist in playlists %}

diff --git a/telemeta/templates/telemeta_default/inc/collection_list.html b/telemeta/templates/telemeta_default/inc/collection_list.html
index eb5ad62700f6bebd207ba6a415376885a0c4dfb4..6f8a6eb986c536f589a00896d2aac8fa5e798395 100644 (file)
--- a/telemeta/templates/telemeta_default/inc/collection_list.html
+++ b/telemeta/templates/telemeta_default/inc/collection_list.html
@@ -4,7 +4,7 @@
 {% if hits %}
 <p class="pagination">
 {% blocktrans %}Collections {{ first_on_page }} to {{ last_on_page }} on {{ hits }}{% endblocktrans %}
-| Pages : {% if is_paginated %}{% load paginator %}{% paginator 5 %}{% endif %}
+| Pages : {% if pages == 1 %}1{% else %}{% if is_paginated %}{% load paginator %}{% paginator 5 %}{% endif %}{% endif %}
 </p>
 {% endif %}
 <table class="listing">

diff --git a/telemeta/templates/telemeta_default/inc/mediaitem_list.html b/telemeta/templates/telemeta_default/inc/mediaitem_list.html
index 48cd29f2f888ed2d7fac7ed69bc90a6a44d9ae9b..3c6e48bfbdc54b135aa2f86737fc6ea4d19e3663 100644 (file)
--- a/telemeta/templates/telemeta_default/inc/mediaitem_list.html
+++ b/telemeta/templates/telemeta_default/inc/mediaitem_list.html
@@ -4,7 +4,7 @@
 {% if hits %}
 <p class="pagination">
 {% blocktrans %}Items {{ first_on_page }} to {{ last_on_page }} on {{ hits }}{% endblocktrans %}
-| Pages : {% if is_paginated %}{% load paginator %}{% paginator 5 %}{% endif %}
+| Pages : {% if pages == 1 %}1{% else %}{% if is_paginated %}{% load paginator %}{% paginator 5 %}{% endif %}{% endif %}
 </p>
 {% endif %}
 

diff --git a/telemeta/templates/telemeta_default/login.html b/telemeta/templates/telemeta_default/login.html
index ff3d92a0b324435338c960c9512c3f46822ac52c..f9d3f7e08ee48871d0d4d6b0b45ea8b45638c468 100644 (file)
--- a/telemeta/templates/telemeta_default/login.html
+++ b/telemeta/templates/telemeta_default/login.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% block content %}
-<h3>{% trans "User authentication" %}</h3>
+<h1>{% trans "User authentication" %}</h1>
 <br />
 {% if form.errors %}
 <p class="login-error">{% trans "Your username and password didn't match. Please try again." %}</p>

diff --git a/telemeta/templates/telemeta_default/messages.html b/telemeta/templates/telemeta_default/messages.html
index 15ced94940d440e4010ebc8958d19fa7932163de..6eabeab50b7cc4813a660de5c9eb75bb81b32d4d 100644 (file)
--- a/telemeta/templates/telemeta_default/messages.html
+++ b/telemeta/templates/telemeta_default/messages.html
@@ -5,7 +5,7 @@
 
 {% if messages %}
  {% for message in messages %}
-  <h3>{{ message }}</h3>
+  <h1>{{ message }}</h1>
   <p>{{ description }}
   
  {% endfor %}

diff --git a/telemeta/templates/telemeta_default/registration/password_change_done.html b/telemeta/templates/telemeta_default/registration/password_change_done.html
index 4037fc11970056e053cb555fd34e64ef3b0aaefc..77197a0336bccd50940a170eb04973efd2efff7c 100644 (file)
--- a/telemeta/templates/telemeta_default/registration/password_change_done.html
+++ b/telemeta/templates/telemeta_default/registration/password_change_done.html
@@ -3,12 +3,10 @@
 {% block userlinks %}{% url django-admindocs-docroot as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif %}{% trans 'Change password' %} / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %}
 {% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password change' %}</div>{% endblock %}
 
-{% block title %}{% trans 'Password change successful' %}{% endblock %}
+{% block title %}<br /><h1>{% trans 'Password change successful' %}</h1>{% endblock %}
 
 {% block content %}
 
-<h1>{% trans 'Password change successful' %}</h1>
-
 <p>{% trans 'Your password was changed.' %}</p>
 
 {% endblock %}

diff --git a/telemeta/templates/telemeta_default/registration/password_change_form.html b/telemeta/templates/telemeta_default/registration/password_change_form.html
index f44fb607971e87ca3d1111c47cefab148d23fcac..a36571702ad63da82dda74a1e19fe1507df9dc74 100644 (file)
--- a/telemeta/templates/telemeta_default/registration/password_change_form.html
+++ b/telemeta/templates/telemeta_default/registration/password_change_form.html
@@ -4,7 +4,7 @@
 {% block userlinks %}{% url django-admindocs-docroot as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif %} {% trans 'Change password' %} / <a href="../logout/">{% trans 'Log out' %}</a>{% endblock %}
 {% block breadcrumbs %}<div class="breadcrumbs"><a href="../">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password change' %}</div>{% endblock %}
 
-{% block title %}{% trans 'Password change' %}{% endblock %}
+{% block title %}<br /><h1>{% trans 'Password change' %}</h1>{% endblock %}
 
 {% block content %}<div id="content-main">
 

diff --git a/telemeta/templates/telemeta_default/registration/password_reset_complete.html b/telemeta/templates/telemeta_default/registration/password_reset_complete.html
index 140b8174f523d6d040210e99c1759858d6520964..8df0b86db6dd1dd221f20b1b0d602fb3a3baf5ec 100644 (file)
--- a/telemeta/templates/telemeta_default/registration/password_reset_complete.html
+++ b/telemeta/templates/telemeta_default/registration/password_reset_complete.html
@@ -3,12 +3,10 @@
 
 {% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password reset' %}</div>{% endblock %}
 
-{% block title %}{% trans 'Password reset complete' %}{% endblock %}
+{% block title %}<br /><h1>{% trans 'Password reset complete' %}</h1>{% endblock %}
 
 {% block content %}
 
-<h1>{% trans 'Password reset complete' %}</h1>
-
 <p>{% trans "Your password has been set.  You may go ahead and log in now." %}</p>
 
 <p><a href="{{ login_url }}">{% trans 'Log in' %}</a></p>

diff --git a/telemeta/templates/telemeta_default/registration/password_reset_confirm.html b/telemeta/templates/telemeta_default/registration/password_reset_confirm.html
index 347df5a06a5b1e2ff23b41e9fc04df956014e3c2..bc8a06fc54283be02b651dbf9b8c1b5281e8decf 100644 (file)
--- a/telemeta/templates/telemeta_default/registration/password_reset_confirm.html
+++ b/telemeta/templates/telemeta_default/registration/password_reset_confirm.html
@@ -3,14 +3,12 @@
 
 {% block breadcrumbs %}<div class="breadcrumbs"><a href="../">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password reset confirmation' %}</div>{% endblock %}
 
-{% block title %}{% trans 'Password reset' %}{% endblock %}
+{% block title %}<br /><h1>{% trans 'Password reset' %}</h1>{% endblock %}
 
 {% block content %}
 
 {% if validlink %}
 
-<h1>{% trans 'Enter new password' %}</h1>
-
 <p>{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}</p>
 
 <form id="password_confirm" action="" method="post">{% csrf_token %}

diff --git a/telemeta/templates/telemeta_default/registration/password_reset_done.html b/telemeta/templates/telemeta_default/registration/password_reset_done.html
index cc776025a431547c0330d2a4b126c5085d38f3db..322ac703aae23dec73c0d4d2dd3106f1f0dcd665 100644 (file)
--- a/telemeta/templates/telemeta_default/registration/password_reset_done.html
+++ b/telemeta/templates/telemeta_default/registration/password_reset_done.html
@@ -3,12 +3,10 @@
 
 {% block breadcrumbs %}<div class="breadcrumbs"><a href="../">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password reset' %}</div>{% endblock %}
 
-{% block title %}{% trans 'Password reset successful' %}{% endblock %}
+{% block title %}<br /><h1>{% trans 'Password reset successful' %}</h1>{% endblock %}
 
 {% block content %}
 
-<h1>{% trans 'Password reset successful' %}</h1>
-
 <p>{% trans "We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly." %}</p>
 
 {% endblock %}

diff --git a/telemeta/templates/telemeta_default/registration/password_reset_form.html b/telemeta/templates/telemeta_default/registration/password_reset_form.html
index 9003af5e349e721b27444d1f30ac6627642018e5..ddfd6f99440405bb39eb3e8217fdb3806d60a8c3 100644 (file)
--- a/telemeta/templates/telemeta_default/registration/password_reset_form.html
+++ b/telemeta/templates/telemeta_default/registration/password_reset_form.html
@@ -3,12 +3,10 @@
 
 {% block breadcrumbs %}<div class="breadcrumbs"><a href="../">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password reset' %}</div>{% endblock %}
 
-{% block title %}{% trans "Password reset" %}{% endblock %}
+{% block title %}<br /><h1>{% trans "Password reset" %}</h1>{% endblock %}
 
 {% block content %}
 
-<h1>{% trans "Password reset" %}</h1>
-
 <p>{% trans "Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one." %}</p>
 
 <form id="password_reset" action="" method="post">{% csrf_token %}