From 972fa1cc7f0117ec742ff2936f11d1270e044046 Mon Sep 17 00:00:00 2001 From: yomguy Date: Fri, 29 Apr 2011 19:14:59 +0200 Subject: [PATCH] make

titles --- telemeta/htdocs/css/telemeta.css | 18 +++++++++++++ telemeta/locale/fr/LC_MESSAGES/django.mo | Bin 10939 -> 10945 bytes telemeta/locale/fr/LC_MESSAGES/django.po | 24 +++++++++--------- .../templates/telemeta_default/admin.html | 2 +- .../telemeta_default/collection_detail.html | 3 +-- .../telemeta_default/collection_edit.html | 2 +- .../telemeta_default/collection_list.html | 4 +-- .../telemeta_default/geo_continents.html | 2 +- telemeta/templates/telemeta_default/home.html | 2 +- .../telemeta_default/mediaitem_add.html | 2 +- .../telemeta_default/mediaitem_copy.html | 2 +- .../telemeta_default/mediaitem_detail.html | 3 +-- .../telemeta_default/mediaitem_edit.html | 4 +-- .../telemeta_default/mediaitem_list.html | 2 +- .../telemeta_default/profile_detail.html | 2 +- .../telemeta_default/search_criteria.html | 2 +- 16 files changed, 45 insertions(+), 29 deletions(-) diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css index 7ff08129..92f32905 100644 --- 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 GIT binary patch delta 3067 zcmXxleN5F=9LMo(rI?m; z>ikKYJ@`09`~$PwYE2qa%cgUs%^v2kbWV-_aV;svYW4nf53J+sobx*m-}C*Q-|b3S zciD%v5zZ)MOfvt(<8zpTb8rN%!&uyc<8TKK#a4{LQ|QBX+x`SKz6;~6jb5CG3T!cIg9_A!4LAmasBwo-8yv%7cpOLK zIaI)(p~hWHa>A9HbZEox?1Q_g3HNb0KEncx8f{DhzJOYw6!m-!GQ>2X0^4mpf?DS! zj>QoA@f%FW9*2q|?L(z@02PRrr#iVGH6aOgk_^;_(@`g%hst0PYTim~1!~>~RKQzp z{~lxua{!eI=L{7Myo5^a=k~!Z976jZD!>P*agR}fKEnw7*R~_bzxw^C@yV!wQ&1Vn zMg^FUI@nw!0LLt`9p$Jw?Zo^5~fm-kmj>mhbS2KW`r@ZU= z2&Bu5LtW-P^s~Pyp`uh)qc*I!?Omvh?8iiW7nQn8s7!oq{T{W^L)7i=L*0d8?4ou$ zs-2J8rx+Px)?zCAn;;c!+-e83qb7z>DZ7r^;5O=H4^f%wMP*_Dl^GAm*YhaUtMQ@w z6bd{)M`Hf1~bBbbuc* z9El3B6xF{LHNOs((O|#{pJ*Q)8hFauhB>r5P@hQ;YGN;HVm~T?p{e$A;s2Kl`5;Ul zD#gofy9%>uZ$|}u8Wqrahl&>d2sN=AHQ+Al=?J}QbZA~PI-57kaVZJ32xxBxYN zKI(R_KrL8<8ovp3hni7=A4VPM1Js@Bu9|GHE^)1lk@7`0$OD)LBPs3MO= zZJdbePeW~xiOS4ORDerR<4aMmuo5+XD=Ls?)cX5T2XnK?zZN)8ha$RyQP_pNesc}A z(Ql})p&z}NI5`~fSk%H(Q70@!rG5=+UNc7HUerDZF$Pbg4t&v}qDVVYpV2MUf=^H< z?nnKwc(cPl#Q{vEJ;z#&d?@A()XC2xZ_{)jU#z)L0YniAHT#QIAE^maXxRLV9bS|95 z*3WDT&I``Lrj>ij)?`bEx~5HQGc=o}S#AEI7E!Ho+WX^kV4hy*oZq>8&-ZtJPp3;y zmVR6}#0@vbjEOgfeFO5$hLb>kRhfH70?^j9jJBo z;Ny4<{rDx0!9JIYBD{x6=>RH_ho}=rFiI0*@i9zBZJ2>NaULpj1*mz&)>72GDpbI$ zZ2u-?X|oNL3Acla26m%T`k8%j9*5Gtf(r0^)VLd{K=0xZ{KvNMTO-K7#>b%oPC#WO z4He)t)WLF*09-TMb}T|gT7jCl5|z3p)QNYX7Vbcu_#jTiF4Te-aV%azy_x~kynpTU zDDqF$#G@{8Ci>am6jD(tD^MHO+V)0NMz-K6+=WVAH!2gSt(Q<6T}R#Od#Jk*&MsQerNx;svQ zV9<|RzX;X81U0`JmC=TP8#>XObZFpS>p`4Ky9@Q1^r0r+LQU*P1rU}Jx_nXi=yD++ zg2_asc&=@i;}qI!Q31E30y^MQ(ZWYj6HlTBTt=PzJIui!Q2~w_AId}kH9ifM@;p>v zi%|1wQ0u&E+iOsnU5DCuv+Z|VspvMhp%&bSx}7JG`((aBZEy#5Vkb4UQ6wtmNvPYM zj=D?vs0|jNHmpQl<~r0tn{fiRBCpsrA5u}|y{P}`e2WU`57a_VTIjhS)efK*egd^{ zHtMr1LAZhks;hM94%|R3*pG_*0V?vL zyijc%jp|QAZIFV>%#)}9XQRd!pm4BJr$KI~Faq$g0H(RtK@ zH&G|`qUl1uSaT6|SAIjC+?Nsh3gR%5wwpmk z4`!fF{wykh=TWIEN1eFJT8l$yudvToqvo$g&EJfgzYUe*_pM#%&~BupPzos9jqxr; z@rzr<0c@!mlKIJ{iBFf-j2bD6)af-f|!9TruE|OX79gmql?u)^0YpeAv)_YFu zbf?10jtxW>(q2PZ=vBpTb&7&FV{^j7UTdmf9ZZPd>U16%?Tg4s$(ok?R95iV*kE|% YyoTQHx)tl|*9EIne|3TjC%o?aA8i68v;Y7A diff --git a/telemeta/locale/fr/LC_MESSAGES/django.po b/telemeta/locale/fr/LC_MESSAGES/django.po index 2d761139..87ffb76c 100644 --- 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 \n" "Language-Team: LANGUAGE \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 10f9ae16..59cf2e63 100644 --- a/telemeta/templates/telemeta_default/admin.html +++ b/telemeta/templates/telemeta_default/admin.html @@ -8,7 +8,7 @@ {% endblock %} {% block content %} -

{% trans "Administration" %}

+

{% trans "Administration" %}


    diff --git a/telemeta/templates/telemeta_default/collection_detail.html b/telemeta/templates/telemeta_default/collection_detail.html index f1373e52..4505e682 100644 --- 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 }} +

    Collection: {{ collection }}

    {% endblock %} {% block title_buttons %} @@ -49,7 +49,6 @@ {% endblock %} {% block content %} -
    {% if collection.has_mediafile %}
    diff --git a/telemeta/templates/telemeta_default/collection_edit.html b/telemeta/templates/telemeta_default/collection_edit.html index eaf4aa45..18ec62db 100644 --- 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 }} +

    Collection: {{ collection }}

    {% endblock %} {% block title_buttons %} {% trans "Cancel" %} diff --git a/telemeta/templates/telemeta_default/collection_list.html b/telemeta/templates/telemeta_default/collection_list.html index 8e3a3f26..20bd60e8 100644 --- 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" %} +

    {% trans "Media Collections" %}

    {% endblock %} {% block title_buttons %} {% trans "All" %} - {% trans "Novel" %} + {% trans "Unpublished" %} {% trans "Published" %} {% if user.is_authenticated and perms.telemeta.add_mediacollection %} {% trans "Add" %} diff --git a/telemeta/templates/telemeta_default/geo_continents.html b/telemeta/templates/telemeta_default/geo_continents.html index d20e8a4f..c9e460f9 100644 --- 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" %} +

    {% trans "Geographic Navigator" %}

    {% endblock %} {% block title_buttons %} {% if continents %} diff --git a/telemeta/templates/telemeta_default/home.html b/telemeta/templates/telemeta_default/home.html index e086788a..8fab57a2 100644 --- a/telemeta/templates/telemeta_default/home.html +++ b/telemeta/templates/telemeta_default/home.html @@ -63,7 +63,7 @@
    -

    {% trans "Playlists" %}

    +

    {% trans "Playlists" %}

    {% trans "Add" %} {% for playlist in playlists %} diff --git a/telemeta/templates/telemeta_default/mediaitem_add.html b/telemeta/templates/telemeta_default/mediaitem_add.html index 70092706..e2bdec6c 100644 --- a/telemeta/templates/telemeta_default/mediaitem_add.html +++ b/telemeta/templates/telemeta_default/mediaitem_add.html @@ -7,7 +7,7 @@ {% if item %} {% block title %} - Item : NEW +

    Item : NEW

    {% 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 b56ade84..5973fbf7 100644 --- a/telemeta/templates/telemeta_default/mediaitem_copy.html +++ b/telemeta/templates/telemeta_default/mediaitem_copy.html @@ -8,7 +8,7 @@ {% endblock %} {% block title %} - Item : {{ item }} +

    Item : NEW

    {% 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 7a151155..1aa87ea7 100644 --- a/telemeta/templates/telemeta_default/mediaitem_detail.html +++ b/telemeta/templates/telemeta_default/mediaitem_detail.html @@ -74,7 +74,7 @@ {% if item %} {% block title %} - Item : {{ item }} +

    Item : {{ item }}

    {% endblock %} {% block title_buttons %}
    @@ -92,7 +92,6 @@ {% endblock %} {% block content %} -
    {% if item.file %} diff --git a/telemeta/templates/telemeta_default/mediaitem_edit.html b/telemeta/templates/telemeta_default/mediaitem_edit.html index e2a68087..1c93e824 100644 --- 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 %} - Item : {{ item }} +

    Item : {{ item }}

    {% endblock %} {% block title_buttons %} {% trans "Cancel" %} @@ -21,7 +21,7 @@ {% if field.html_name == "file" %} {{ item.file.name }}
    {{ field }} {% else %} - {{ field }} + {{ field }} {% endif %} {% endif %} diff --git a/telemeta/templates/telemeta_default/mediaitem_list.html b/telemeta/templates/telemeta_default/mediaitem_list.html index af97e0f1..ba4c6767 100644 --- 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 %} - {% trans "Media Items" %} +

    {% trans "Media Items" %}

    {% 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 6bad9276..a58989f7 100644 --- a/telemeta/templates/telemeta_default/profile_detail.html +++ b/telemeta/templates/telemeta_default/profile_detail.html @@ -23,7 +23,7 @@ {% endblock %}
    -

    {% trans "User profile" %} : {{ usr.username }}

    +

    {% trans "User profile" %} : {{ usr.username }}

    {% trans "First Name" %}
    {{ usr.first_name }}
    diff --git a/telemeta/templates/telemeta_default/search_criteria.html b/telemeta/templates/telemeta_default/search_criteria.html index cd3ff8ee..6fbfa3a9 100644 --- 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 %} -

    {% trans "Advanced Search" %}

    +

    {% trans "Advanced Search" %}

    {% csrf_token %}
    -- 2.39.5