make <h1> titles

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index 7ff0812999ad8f7ac4fe7d8016e5e26b26507f02..92f3290524e1657386876ddb6b14bc8f6affc443 100644 (file)
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -83,6 +83,12 @@ a img { border: none; }
 #content li a {
     padding: .1em 0;
 }
+#content h1 {
+    color: #6a0307;
+    font-weight: bold;
+    display:  inline;
+    font-size: 120%; 
+}
 #content h3 {
     color: #6a0307;
     font-weight: bold;
@@ -823,6 +829,7 @@ table td.error {
     margin-top: 0.4em;
     margin-bottom: 0.4em;
     font-size: 1.1em;
+    color: #000000;
 }
 
 #module h3 {
@@ -1092,4 +1099,15 @@ a.image-link {
     display:none;
     left: 0;
     top: 0;
+}
+
+/* FORMS */
+#id_title {
+    width: 500px;
+}
+#id_old_code {
+    width: 300px;
+}
+#id_code {
+    width: 300px;
 }
\ No newline at end of file

diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo
index 2614b218ec2f18f29125355012c9e58467adac6c..d7167a41d68ab8a03e7c66ee0c6c5b90822a9f69 100644 (file)
Binary files a/telemeta/locale/fr/LC_MESSAGES/django.mo and b/telemeta/locale/fr/LC_MESSAGES/django.mo differ

diff --git a/telemeta/locale/fr/LC_MESSAGES/django.po b/telemeta/locale/fr/LC_MESSAGES/django.po
index 2d761139d58073a8a96fb97222cdfd4a7553409e..87ffb76c1e3463b5e1d5ff744074858519e2b52f 100644 (file)
--- a/telemeta/locale/fr/LC_MESSAGES/django.po
+++ b/telemeta/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-28 12:01+0200\n"
+"POT-Creation-Date: 2011-04-29 17:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Olivier Guilyardi <olivier samalyse com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -503,7 +503,7 @@ msgstr "instruments"
 
 #: templates/telemeta_default/admin_enumerations.html:12
 #: templates/telemeta_default/home.html:31
-#: templates/telemeta_default/home.html:87
+#: templates/telemeta_default/home.html:83
 #: templates/telemeta_default/search_criteria.html:76
 #: templates/telemeta_default/search_results.html:28
 #: templates/telemeta_default/inc/collection_list.html:14
@@ -663,7 +663,7 @@ msgid "Geographic and cultural informations"
 msgstr "Indications géographiques et culturelles"
 
 #: templates/telemeta_default/collection_detail.html:117
-#: templates/telemeta_default/home.html:90
+#: templates/telemeta_default/home.html:86
 #: templates/telemeta_default/inc/collection_list.html:17
 #: templates/telemeta_default/inc/mediaitem_list.html:17
 msgid "Recordist"
@@ -713,7 +713,7 @@ msgid "All"
 msgstr "Toutes"
 
 #: templates/telemeta_default/collection_list.html:12
-msgid "Novel"
+msgid "Unpublished"
 msgstr "Inédites"
 
 #: templates/telemeta_default/collection_list.html:13
@@ -823,12 +823,12 @@ msgid "Date"
 msgstr ""
 
 #: templates/telemeta_default/home.html:32
-#: templates/telemeta_default/home.html:88
+#: templates/telemeta_default/home.html:84
 msgid "Type"
 msgstr ""
 
 #: templates/telemeta_default/home.html:51
-#: templates/telemeta_default/home.html:108
+#: templates/telemeta_default/home.html:104
 msgid "deleted"
 msgstr "supprimé"
 
@@ -837,18 +837,18 @@ msgstr "supprimé"
 msgid "Playlists"
 msgstr "Listes de lecture"
 
-#: templates/telemeta_default/home.html:78
+#: templates/telemeta_default/home.html:76
 #, fuzzy
 msgid "Delete"
 msgstr "Supprimé"
 
-#: templates/telemeta_default/home.html:89
+#: templates/telemeta_default/home.html:85
 #: templates/telemeta_default/inc/collection_list.html:15
 #: templates/telemeta_default/inc/mediaitem_list.html:16
 msgid "Code"
 msgstr "Cote"
 
-#: templates/telemeta_default/home.html:91
+#: templates/telemeta_default/home.html:87
 #: templates/telemeta_default/search_criteria.html:92
 #: templates/telemeta_default/search_results.html:31
 #: templates/telemeta_default/inc/collection_list.html:18
@@ -856,13 +856,13 @@ msgstr "Cote"
 msgid "Year of recording"
 msgstr "Année d'enregistrement"
 
-#: templates/telemeta_default/home.html:92
+#: templates/telemeta_default/home.html:88
 #: templates/telemeta_default/inc/collection_list.html:19
 #: templates/telemeta_default/inc/mediaitem_list.html:24
 msgid "Sound"
 msgstr "Son"
 
-#: templates/telemeta_default/home.html:93
+#: templates/telemeta_default/home.html:89
 #, fuzzy
 msgid "Action"
 msgstr "Fonction"
@@ -1256,7 +1256,7 @@ msgid_plural "%(count)d collections"
 msgstr[0] "%(count)d collection"
 msgstr[1] "%(count)d collections"
 
-#: web/base.py:1094
+#: web/base.py:1077
 msgid "Access not allowed"
 msgstr "Accès non autorisé"
 

diff --git a/telemeta/templates/telemeta_default/admin.html b/telemeta/templates/telemeta_default/admin.html
index 10f9ae163787af21214c134a74eb41b5d56b3018..59cf2e63f74b92268aa6957ac448897021c5c99f 100644 (file)
--- a/telemeta/templates/telemeta_default/admin.html
+++ b/telemeta/templates/telemeta_default/admin.html
@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block content %}
-<h3>{% trans "Administration" %}</h3>
+<h1>{% trans "Administration" %}</h1>
 <br />
 <div class="tabs">
 <ul>

diff --git a/telemeta/templates/telemeta_default/collection_detail.html b/telemeta/templates/telemeta_default/collection_detail.html
index f1373e52253cf93f52aba564f6949f763eeeb6f0..4505e682f7a759bc195705577bc371ab909139eb 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_detail.html
+++ b/telemeta/templates/telemeta_default/collection_detail.html
@@ -34,7 +34,7 @@
 {% if collection %}
 
 {% block title %}
-    Collection: {{ collection }}
+    <h1>Collection: {{ collection }}</h1>
 {% endblock %}
 
 {% block title_buttons %}
@@ -49,7 +49,6 @@
 {% endblock %}
 
 {% block content %}
-<!--    <h3>Collection: {{ collection }}</h3>-->
     <div class="{% if collection.has_mediafile %}with-rightcol{% endif %}">
         {% if collection.has_mediafile %}
         <div id="rightcol">

diff --git a/telemeta/templates/telemeta_default/collection_edit.html b/telemeta/templates/telemeta_default/collection_edit.html
index eaf4aa4528fa08cf2f0b9d1b79e17a5f23161fe7..18ec62dbc51a65a4dfe4655409d7185bfcb8756d 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_edit.html
+++ b/telemeta/templates/telemeta_default/collection_edit.html
@@ -3,7 +3,7 @@
 {% load telemeta_utils %}
 
 {% block title %}
-    Collection: {{ collection }}
+    <h1>Collection: {{ collection }}</h1>
 {% endblock %}
 {% block title_buttons %}
     <a href="{% url telemeta-collection-detail collection.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>

diff --git a/telemeta/templates/telemeta_default/collection_list.html b/telemeta/templates/telemeta_default/collection_list.html
index 8e3a3f2652f90f02992b7c69383de2ccd413df77..20bd60e8dca14095590dc298b72efae3bbe853da 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_list.html
+++ b/telemeta/templates/telemeta_default/collection_list.html
@@ -5,11 +5,11 @@
 {% block head_title %}{% trans "Media Collections" %} - {{ block.super }}{% endblock %}
 
 {% block title%}
-    {% trans "Media Collections" %}
+    <h1>{% trans "Media Collections" %}</h1>
 {% endblock %}
 {% block title_buttons %} 
      <a href="{% url telemeta-collections %}" class="component_icon button icon_search">{% trans "All" %}</a>
-     <a href="{% url telemeta-collections-novel %}" class="component_icon button icon_filter">{% trans "Novel" %}</a>
+     <a href="{% url telemeta-collections-novel %}" class="component_icon button icon_filter">{% trans "Unpublished" %}</a>
      <a href="{% url telemeta-collections-published %}" class="component_icon button icon_filter">{% trans "Published" %}</a>
     {% if user.is_authenticated and perms.telemeta.add_mediacollection %}
       <a href="{% url telemeta-collection-add %}" class="component_icon button icon_add">{% trans "Add" %}</a>

diff --git a/telemeta/templates/telemeta_default/geo_continents.html b/telemeta/templates/telemeta_default/geo_continents.html
index d20e8a4ffb16b464a92fa4145a910b6b6e60af5f..c9e460f982f445a7979fcdc077c99c15c3f439f5 100644 (file)
--- a/telemeta/templates/telemeta_default/geo_continents.html
+++ b/telemeta/templates/telemeta_default/geo_continents.html
@@ -17,7 +17,7 @@ var resourceMap = new ResourceMap('.continents', {
 {% endblock %}
 
 {% block title %}
-    {% trans "Geographic Navigator" %}
+    <h1>{% trans "Geographic Navigator" %}</h1>
 {% endblock %}
 {% block title_buttons %}
         {% if continents %}

diff --git a/telemeta/templates/telemeta_default/home.html b/telemeta/templates/telemeta_default/home.html
index e086788a5c9ec40a173fea7c5969927d8ba4f442..8fab57a29912d37b016a4dc4a4c265c94822f021 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">
-<h3>{% trans "Playlists" %}</h3>
+<h1>{% 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/mediaitem_add.html b/telemeta/templates/telemeta_default/mediaitem_add.html
index 70092706c83b603e00501f65049dde93bc749a1d..e2bdec6c90ff5e5d6521e5421e6a5417d7bb33cd 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_add.html
+++ b/telemeta/templates/telemeta_default/mediaitem_add.html
@@ -7,7 +7,7 @@
 
 {% if item %}
 {% block title %}
-    <img src="images/item.png" style="vertical-align:middle" /> Item : NEW
+    <img src="images/item.png" style="vertical-align:middle" /> <h1>Item : NEW</h1>
 {% endblock %}
 {% block title_buttons %}
     {% if perms.telemeta.add_mediaitem %}

diff --git a/telemeta/templates/telemeta_default/mediaitem_copy.html b/telemeta/templates/telemeta_default/mediaitem_copy.html
index b56ade844358266fe26f1bec0d71d9731be302b4..5973fbf7e1485a3f0b00a72e403e406fbdcc5382 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_copy.html
+++ b/telemeta/templates/telemeta_default/mediaitem_copy.html
@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block title %}
-    <img src="images/item.png" style="vertical-align:middle" /> Item : {{ item }}
+    <img src="images/item.png" style="vertical-align:middle" /> <h1>Item : NEW</h1>
 {% endblock %}
 {% block title_buttons %}
     {% if user.is_authenticated and perms.telemeta.add_mediaitem %}

diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html
index 7a151155c96b35fa4e51a658e7c02d2c3f153346..1aa87ea721f19153a283aabe8c4711893467da9c 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_detail.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail.html
@@ -74,7 +74,7 @@
 {% if item %}
 
 {% block title %}
-<img src="images/item.png" style="vertical-align:middle" /> Item : {{ item }}
+<img src="images/item.png" style="vertical-align:middle" /> <h1>Item : {{ item }}</h1>
 {% endblock %}
 {% block title_buttons %}
      <div class="fixedWidthAsPlayer">
@@ -92,7 +92,6 @@
 {% endblock %}
 
 {% block content %}
-<!--<div id="div_title" style="padding-bottom:2ex;padding-right:362px"><h3><img src="images/item.png" style="vertical-align:middle" /> Item : {{ item }}</h3></div>-->
 
 <div class="{% if item.file %}{% if item.public_access == 'full' or public_access or user.is_staff %}with-rightcol{% endif %}{% endif %}">
     {% if item.file %}

diff --git a/telemeta/templates/telemeta_default/mediaitem_edit.html b/telemeta/templates/telemeta_default/mediaitem_edit.html
index e2a68087d3431e3f9f2eddd0119ac36205858b6e..1c93e824d98e8ee07abc7bde716b5c9b48aa0a5a 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_edit.html
+++ b/telemeta/templates/telemeta_default/mediaitem_edit.html
@@ -3,7 +3,7 @@
 {% load telemeta_utils %}
 
   {% block title %}
-        <img src="images/item.png" style="vertical-align:middle" /> Item : {{ item }}
+        <img src="images/item.png" style="vertical-align:middle" /> <h1>Item : {{ item }}</h1>
   {% endblock %}
   {% block title_buttons %}
    <a href="{% url telemeta-item-detail item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
@@ -21,7 +21,7 @@
              {% if field.html_name == "file" %}
               <td> {{ item.file.name }} <br /> {{ field }}</td>
              {% else %}
-              <td> {{ field }}</td>
+              <td>{{ field }}</td>
              {% endif %}
         </tr>
         {% endif %}

diff --git a/telemeta/templates/telemeta_default/mediaitem_list.html b/telemeta/templates/telemeta_default/mediaitem_list.html
index af97e0f1861151ff4605cbb0ba7d0ecd1d9b83d0..ba4c676715e2011dbefa0e4d772c46c7734f21c5 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_list.html
+++ b/telemeta/templates/telemeta_default/mediaitem_list.html
@@ -5,7 +5,7 @@
 {% block head_title %}{% trans "Media Items" %} - {{ block.super }}{% endblock %}
 
 {% block title %}
-    <img src="images/item.png" style="vertical-align:middle" /> {% trans "Media Items" %}
+    <img src="images/item.png" style="vertical-align:middle" /> <h1>{% trans "Media Items" %}</h1>
 {% endblock %}
 {% block title_buttons %}
     {% if user.is_authenticated and perms.telemeta.add_mediaitem %}

diff --git a/telemeta/templates/telemeta_default/profile_detail.html b/telemeta/templates/telemeta_default/profile_detail.html
index 6bad9276236d574afa32063e8dee097967ba98b4..a58989f750540a1ba4a5dea867d9b285b6a5c97d 100644 (file)
--- a/telemeta/templates/telemeta_default/profile_detail.html
+++ b/telemeta/templates/telemeta_default/profile_detail.html
@@ -23,7 +23,7 @@
   {% endblock %}
   </div>
 
-  <h3>{% trans "User profile" %} : {{ usr.username }}</h3>
+  <h1>{% trans "User profile" %} : {{ usr.username }}</h1>
     <div class="infos" style="padding-top: 1em;">
      <dl class="listing">
       <dt>{% trans "First Name" %}</dt><dd>{{ usr.first_name }}</dd>

diff --git a/telemeta/templates/telemeta_default/search_criteria.html b/telemeta/templates/telemeta_default/search_criteria.html
index cd3ff8eefff0c61f14af41cf1f1cbef7981abc6d..6fbfa3a9000ee45965f990630aedb5563be24a17 100644 (file)
--- a/telemeta/templates/telemeta_default/search_criteria.html
+++ b/telemeta/templates/telemeta_default/search_criteria.html
@@ -52,7 +52,7 @@ $(document).ready(function () {
 {% endblock %}
 
 {% block content %}
-<h3>{% trans "Advanced Search" %}</h3>
+<h1>{% trans "Advanced Search" %}</h1>
 
 <form action="{% url telemeta-search %}" id="searchform">{% csrf_token %}
 <fieldset>