From d993c78b012d79b74f7b00e4faf8ee027f024389 Mon Sep 17 00:00:00 2001 From: yomguy Date: Wed, 4 Apr 2012 22:56:07 +0200 Subject: [PATCH] better styles --- teleforma/htdocs/css/teleforma_black.css | 58 +++++++++-- teleforma/locale/fr/LC_MESSAGES/django.po | 100 +++++++++++-------- teleforma/templates/postman/base.html | 2 +- teleforma/templates/postman/base_folder.html | 20 ++-- teleforma/templates/postman/base_write.html | 4 +- teleforma/templates/postman/view.html | 29 ++++-- teleforma/templates/teleforma/courses.html | 34 +++---- teleforma/templates/telemeta/base.html | 5 +- 8 files changed, 167 insertions(+), 85 deletions(-) diff --git a/teleforma/htdocs/css/teleforma_black.css b/teleforma/htdocs/css/teleforma_black.css index a1fc7e39..a2aaeacb 100644 --- a/teleforma/htdocs/css/teleforma_black.css +++ b/teleforma/htdocs/css/teleforma_black.css @@ -433,12 +433,12 @@ form.login .submit { /* Main navigation bar (borrowed from Trac) */ #menu { background-color: #000000 ; - background:no-repeat url(http://si0.twimg.com/a/1333470865/t1/img/twitter_web_sprite_bgs.png) 0 0; + background:no-repeat url(../images/tw_hd_bg.png) 0 0; background-color:#ebebeb; background-repeat:repeat; font: normal verdana,'Bitstream Vera Sans',helvetica,arial,sans-serif; border-top: 1px solid #333; - padding-left:15%; + padding-left:10%; } #menu a, #menu a:visited{ @@ -527,7 +527,7 @@ color:#FFF; width: 100%; float:left; border-bottom:0px solid #fff; - background:no-repeat url(http://si0.twimg.com/a/1333470865/t1/img/twitter_web_sprite_bgs.png) 0 0; + background:no-repeat url(../images/tw_hd_bg.png) 0 0; background-color:#ebebeb; background-repeat:repeat; } @@ -563,7 +563,7 @@ color:#FFF; /* Footer (borrowed from Trac) */ #footer { background: #000000; - background:no-repeat url(http://si0.twimg.com/a/1333470865/t1/img/twitter_web_sprite_bgs.png) 0 0; + background:no-repeat url(../images/tw_hd_bg.png) 0 0; background-color:#ebebeb; background-repeat:repeat; clear: both; @@ -1141,6 +1141,22 @@ a.image-link { color: #000; /*#6A0307;*/ } +#button_action_blue { + background-color: #4b8df8; + color: #FFF; + padding:0.8em 0.8em 0.8em 0.8em; + } + +#button_action_red { + background-color: #d34836; + color: #FFF; + padding:0.8em 0.8em 0.8em 0.8em; + } +#button_action_green { + background-color: #92b220; + color: #FFF; + padding:0.8em 0.8em 0.8em 0.8em; + } .list_item, .list_item:visited, .list_item:hover{ display:block; @@ -1338,7 +1354,7 @@ input,textarea{ -moz-border-radius: 8px 0px 0px 0px; -webkit-border-radius: 8px 0px 0px 0px; border-radius: 8px 0px 0px 0px; - padding: 0em 0.8em 0em 0em; + padding: 0em 0.8em 0.8em 0em; font-weight: bold; font-size: 1.2em; } @@ -1350,9 +1366,14 @@ input,textarea{ -moz-border-radius: 8px 0px 8px 8px; -webkit-border-radius: 8px 0px 8px 8px; border-radius: 8px 0px 8px 8px; - + padding: 0em 0em 0em 0.3em; } + +.course_content h2 { + padding: 0.5em 0em 0em 0.3em; + } + .course_media { background-color: transparent; margin: 0em 0em 2em 0em; @@ -1365,11 +1386,12 @@ input,textarea{ .media_infos { background-color: #FFF; padding: 0.3em 0.8em 0.3em 0.8em; + width: 100%; } .video { background-color: transparent; - padding: 0.8em 1em 1em 0em; + padding: 0.8em 0em 1em 0em; } .audio { @@ -1388,12 +1410,34 @@ input,textarea{ padding: 0em 0em 0em 1em; } +.pm_message { + background-color: #FFF; + -moz-border-radius: 8px 0px 8px 8px; + -webkit-border-radius: 8px 0px 8px 8px; + border-radius: 8px 0px 8px 8px; + padding: 0.8em 0.8em 0.8em 1em; + } + +#pm_messages { + font-weight: normal; + font-size: 1em; + background-color: #FFF; + -moz-border-radius: 8px 0px 8px 8px; + -webkit-border-radius: 8px 0px 8px 8px; + border-radius: 8px 0px 8px 8px; + padding: 0.8em 0.8em 0.8em 1em; + width: 100%; + margin-top : 1em; + } + #pm_messages td { font-weight: normal; font-size: 1em; + } #pm_write { text-align: center; margin: 0em 0em 3em 0em; + padding: 1em; } \ No newline at end of file diff --git a/teleforma/locale/fr/LC_MESSAGES/django.po b/teleforma/locale/fr/LC_MESSAGES/django.po index a60ffd0f..2246d8a3 100644 --- a/teleforma/locale/fr/LC_MESSAGES/django.po +++ b/teleforma/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: 2012-04-04 13:32+0200\n" +"POT-Creation-Date: 2012-04-04 22:38+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -226,9 +226,9 @@ msgid "" "long term storage." msgstr "" -#: templates/postman/base.html:7 templates/telemeta/base.html:71 -msgid "Messages" -msgstr "Messages" +#: templates/postman/base.html:10 +msgid "Folders" +msgstr "Dossiers" #: templates/postman/base.html:15 msgid "Inbox" @@ -239,18 +239,18 @@ msgstr "" msgid "Sent Messages" msgstr "Messages" -#: templates/postman/base.html:17 templates/postman/write.html:3 -msgid "Write" -msgstr "" - -#: templates/postman/base.html:18 templates/telemeta/base.html:79 +#: templates/postman/base.html:17 templates/telemeta/base.html:79 msgid "Archives" msgstr "" -#: templates/postman/base.html:19 +#: templates/postman/base.html:18 msgid "Trash" msgstr "" +#: templates/postman/base.html:23 +msgid "New message" +msgstr "Nouveau message" + #: templates/postman/base_folder.html:10 msgid "Sorry, this page number is invalid." msgstr "" @@ -288,19 +288,19 @@ msgstr "" msgid "g:i A,M j,n/j/y" msgstr "" -#: templates/postman/base_folder.html:52 templates/postman/view.html:28 +#: templates/postman/base_folder.html:53 templates/postman/view.html:32 msgid "Delete" msgstr "" -#: templates/postman/base_folder.html:53 templates/postman/view.html:29 +#: templates/postman/base_folder.html:56 templates/postman/view.html:36 msgid "Archive" msgstr "" -#: templates/postman/base_folder.html:54 +#: templates/postman/base_folder.html:59 msgid "Undelete" msgstr "" -#: templates/postman/base_folder.html:60 +#: templates/postman/base_folder.html:66 #, fuzzy msgid "No messages." msgstr "Messages" @@ -394,8 +394,8 @@ msgstr "Messages" msgid "Received" msgstr "" -#: templates/postman/reply.html:3 templates/postman/view.html:31 -#: templates/postman/view.html.py:34 templates/postman/view.html:37 +#: templates/postman/reply.html:3 templates/postman/view.html:40 +#: templates/postman/view.html.py:43 templates/postman/view.html:46 msgid "Reply" msgstr "" @@ -431,31 +431,35 @@ msgstr "" msgid ":" msgstr "" -#: templates/postman/view.html:26 +#: templates/postman/view.html:27 msgid "Back" msgstr "" +#: templates/postman/write.html:3 +msgid "Write" +msgstr "" + #: templates/teleforma/course.html:15 -#: templates/teleforma/inc/document_list.html:3 +#: templates/teleforma/inc/document_list.html:4 msgid "Documents" msgstr "Documents" #: templates/teleforma/course.html:18 templates/teleforma/course.html.py:34 -#: templates/teleforma/inc/document_list.html:7 +#: templates/teleforma/inc/document_list.html:8 #: templates/teleforma/inc/media_list.html:8 msgid "Title" msgstr "Titre" #: templates/teleforma/course.html:19 templates/teleforma/course.html.py:35 -#: templates/teleforma/inc/document_list.html:8 +#: templates/teleforma/inc/document_list.html:9 #: templates/teleforma/inc/media_list.html:9 msgid "Description" msgstr "Description" #: templates/teleforma/course.html:20 templates/teleforma/course.html.py:36 #: templates/teleforma/course.html:53 -#: templates/teleforma/inc/conference_list.html:9 -#: templates/teleforma/inc/document_list.html:9 +#: templates/teleforma/inc/conference_list.html:10 +#: templates/teleforma/inc/document_list.html:10 #: templates/teleforma/inc/media_list.html:10 msgid "Date added" msgstr "Date d'ajout" @@ -466,35 +470,26 @@ msgid "Medias" msgstr "Médias" #: templates/teleforma/course.html:48 -#: templates/teleforma/inc/conference_list.html:3 +#: templates/teleforma/inc/conference_list.html:4 msgid "Conferences" msgstr "Conférences" #: templates/teleforma/course.html:51 -#: templates/teleforma/inc/conference_list.html:7 +#: templates/teleforma/inc/conference_list.html:8 msgid "Session" msgstr "Session" #: templates/teleforma/course.html:52 -#: templates/teleforma/inc/conference_list.html:8 +#: templates/teleforma/inc/conference_list.html:9 msgid "Professor" msgstr "Professeur" -#: templates/teleforma/course_media.html:27 +#: templates/teleforma/course_media.html:48 #, fuzzy msgid "Recording date" msgstr "date de début" -#: templates/teleforma/course_media.html:32 -#, fuzzy -msgid "Last modification" -msgstr "date de modification" - -#: templates/teleforma/courses.html:18 -msgid "Bureau" -msgstr "" - -#: templates/teleforma/courses.html:24 +#: templates/teleforma/courses.html:12 msgid "My courses" msgstr "Mes matières" @@ -510,6 +505,10 @@ msgstr "" msgid "Sign in" msgstr "" +#: templates/telemeta/base.html:71 templates/telemeta/inc/user_list.html:10 +msgid "Messages" +msgstr "Messages" + #: templates/telemeta/base.html:73 msgid "Users" msgstr "" @@ -555,21 +554,21 @@ msgstr "" msgid "Sign out" msgstr "" -#: templates/telemeta/base.html:144 +#: templates/telemeta/base.html:145 msgid "Powered by" msgstr "" -#: templates/telemeta/base.html:145 +#: templates/telemeta/base.html:146 msgid "By" msgstr "" -#: templates/telemeta/base.html:150 +#: templates/telemeta/base.html:151 msgid "" "Usage of the archives in the respect of cultural heritage of the original " "communities." msgstr "" -#: templates/telemeta/base.html:156 +#: templates/telemeta/base.html:157 msgid "Legal notices" msgstr "" @@ -577,6 +576,27 @@ msgstr "" msgid "Musical selection" msgstr "" +#: templates/telemeta/inc/user_list.html:7 +msgid "User" +msgstr "" + +#: templates/telemeta/inc/user_list.html:8 +msgid "First Name" +msgstr "" + +#: templates/telemeta/inc/user_list.html:9 +msgid "Last Name" +msgstr "" + +#: templates/telemeta/inc/user_list.html:11 +#, fuzzy +msgid "Training" +msgstr "formation" + +#, fuzzy +#~ msgid "Last modification" +#~ msgstr "date de modification" + #~ msgid "course types" #~ msgstr "types de matières" diff --git a/teleforma/templates/postman/base.html b/teleforma/templates/postman/base.html index 2019a9d5..d34d2fba 100644 --- a/teleforma/templates/postman/base.html +++ b/teleforma/templates/postman/base.html @@ -20,7 +20,7 @@ diff --git a/teleforma/templates/postman/base_folder.html b/teleforma/templates/postman/base_folder.html index 4597105d..f4bbfcb9 100644 --- a/teleforma/templates/postman/base_folder.html +++ b/teleforma/templates/postman/base_folder.html @@ -11,14 +11,14 @@ {% else %} {% if pm_messages %} -

-{% block pm_by_modes %}
+ +{% block pm_by_modes %}{% endblock pm_by_modes %}
-
{% csrf_token %} +{% csrf_token %} @@ -33,7 +33,7 @@ {% for message in pm_messages %} -{% block pm_sender_cell %} {% endblock %} + {% block pm_sender_cell %} {% endblock %} {% block pm_recipient_cell %} {% endblock %}
{{ message.obfuscated_sender|or_me:user }}{% if message.count %} ({{ message.count }}){% endif %}{% if message.is_new %}{% endif %}{{ message.obfuscated_sender|or_me:user }}{% if message.count %} ({{ message.count }}){% endif %}{% if message.is_new %}{% endif %}{{ message.obfuscated_recipient|or_me:user }}{% if message.count %} ({{ message.count }}){% endif %}{% if message.is_new %}{% endif %}{% if message.is_replied %}{% endif %} {% block pm_subject %} @@ -49,9 +49,15 @@
{% block pm_form_buttons %} -{% block pm_delete_button %}{% endblock %} -{% block pm_archive_button %}{% endblock %} -{% block pm_undelete_button %}{% endblock %} +{% block pm_delete_button %} +{% trans "Delete" %} +{% endblock %} +{% block pm_archive_button %} +{% trans "Archive" %} +{% endblock %} +{% block pm_undelete_button %} +{% trans "Undelete" %} +{% endblock %} {% endblock %} diff --git a/teleforma/templates/postman/base_write.html b/teleforma/templates/postman/base_write.html index f89d5749..b8ca60de 100644 --- a/teleforma/templates/postman/base_write.html +++ b/teleforma/templates/postman/base_write.html @@ -12,12 +12,12 @@ {% block content %}

{% block pm_write_title %}{% endblock %}

-
{% csrf_token %} +{% csrf_token %} {% block pm_write_recipient %}{% endblock %} {{ form.as_table }}
- +{% trans "Send" %}
{% endblock %} \ No newline at end of file diff --git a/teleforma/templates/postman/view.html b/teleforma/templates/postman/view.html index d7fb2321..56a1fd08 100644 --- a/teleforma/templates/postman/view.html +++ b/teleforma/templates/postman/view.html @@ -4,7 +4,7 @@ {% load postman_tags %} {% block content %} -
+

{% if pm_messages|length > 1 %}{% trans "Conversation" %}{% else %}{% trans "Message" %}{% endif %}



{% for message in pm_messages %} @@ -21,20 +21,29 @@

{% if forloop.last %} -
{% csrf_token %} +{% csrf_token %} -{% trans "Back" %} + +{% trans "Back" %} + - -{% if not archived %}{% endif %} - -{% if reply_to_pk %}{% trans "Reply" %}{% endif %} + +{% block pm_delete_button %} +{% trans "Delete" %} +{% endblock %} +{% block pm_archive_button %} +{% if not archived %} +{% trans "Archive" %} +{% endif %} +{% endblock %} + +{% if reply_to_pk %}{% trans "Reply" %}{% endif %}
{% if reply_to_pk %}

{% trans 'Reply' %}

-
{% csrf_token %} -
{{ form.body }}
- +{% csrf_token %} +
{{ form.body }}

+{% trans "Reply" %}
{% endif %} {% endif %} {% endfor %} diff --git a/teleforma/templates/teleforma/courses.html b/teleforma/templates/teleforma/courses.html index 59abe8cc..5144f3c0 100644 --- a/teleforma/templates/teleforma/courses.html +++ b/teleforma/templates/teleforma/courses.html @@ -7,22 +7,23 @@ {% block content %} -
-
-
-

playlists{% trans "My courses" %}

- -
-
    - {% block courses %} - {% for course in object_list %} -
  • {{ course.title }}
    • - {% endfor %} - {% endblock courses %} -
-
-
-
+
+
+

playlists{% trans "My courses" %}

+ +
+
    +{% block courses %} +{% for course in object_list %} +
  • {{ course.title }}
    • +{% endfor %} +{% endblock courses %} +
+
+
+
+ +
{% block course %} @@ -57,7 +58,6 @@
-
diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html index 931af9f3..0214d9f3 100644 --- a/teleforma/templates/telemeta/base.html +++ b/teleforma/templates/telemeta/base.html @@ -93,13 +93,16 @@ alt="Telemeta Powered"/>--> {% endif %} {% if user.is_authenticated %} -
  • user{% if user.first_name and user.last_name %} +
  • user{% if user.first_name and user.last_name %} {{ user.first_name }} {{ user.last_name }} {% else %} {{ user.username }} {% endif %} -- 2.39.5