better styles

diff --git a/teleforma/htdocs/css/teleforma_black.css b/teleforma/htdocs/css/teleforma_black.css
index a1fc7e3998ebe4577afd517f7ed40ca6da0cd078..a2aaeacb8df51803f1923d61037f278089143f0b 100644 (file)
--- 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 a60ffd0f8ffa544ae3acf476b764a52ef9dab4e0..2246d8a356fc9693b6f44c85f94361631289c484 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 2019a9d548bab08b1fdc8b369bc6a4ab59748d43..d34d2fba5d34f002c3fe3873523b169a1fb896f7 100644 (file)
--- a/teleforma/templates/postman/base.html
+++ b/teleforma/templates/postman/base.html
@@ -20,7 +20,7 @@
 </div>
 </div>
 <div id="pm_write">
-<a href="{% url postman_write %}" class="component_icon button icon_edit">{% trans "Write" %}</a>
+<a href="{% url postman_write %}" class="component_icon button" id="button_action_red">{% trans "New message" %}</a>
 </div>
 </div>
 

diff --git a/teleforma/templates/postman/base_folder.html b/teleforma/templates/postman/base_folder.html
index 4597105d10b880af61745cf33368146567997c9f..f4bbfcb981d56f2dd8dbed8a9dfb6a7761fce996 100644 (file)
--- a/teleforma/templates/postman/base_folder.html
+++ b/teleforma/templates/postman/base_folder.html
@@ -11,14 +11,14 @@
 {% else %}
 
 {% if pm_messages %}
-<br /><br />
-{% block pm_by_modes %}<div id="pm_by_modes">
+
+{% block pm_by_modes %}<div id="pm_by_modes" style="float: right;">
 <a href="{{ by_conversation_url }}" class="component_icon button icon_filter">{% trans "by conversation" %}</a>
 <a href="{{ by_message_url }}" class="component_icon button icon_filter">{% trans "by message" %}</a>
 </div>{% endblock pm_by_modes %}
 <br />
 
-<form action="{% block pm_form_action %}{% endblock %}" method="post">{% csrf_token %}
+<form id="_messageForm" action="{% block pm_form_action %}{% endblock %}" method="post">{% csrf_token %}
 
 <table id="pm_messages" class="listing" >
  <thead>
@@ -33,7 +33,7 @@
  <tbody>{% for message in pm_messages %}
   <tr>
    <td><input type="checkbox" {% if by_conversation and message.thread_id %}name="tpks" value="{{ message.thread_id }}"{% else %}name="pks" value="{{ message.pk }}"{% endif %} /></td>
-{% block pm_sender_cell %}   <td>{{ message.obfuscated_sender|or_me:user }}{% if message.count %} ({{ message.count }}){% endif %}</td>{% endblock %}
+   {% block pm_sender_cell %}   <td>{% if message.is_new %}<strong>{% endif %}{{ message.obfuscated_sender|or_me:user }}{% if message.count %} ({{ message.count }}){% endif %}{% if message.is_new %}</strong>{% endif %}</td>{% endblock %}
 {% block pm_recipient_cell %}   <td>{{ message.obfuscated_recipient|or_me:user }}{% if message.count %} ({{ message.count }}){% endif %}</td>{% endblock %}
    <td>{% if message.is_new %}<strong>{% endif %}{% if message.is_replied %}<em>{% endif %}
 {% block pm_subject %}
@@ -49,9 +49,15 @@
 
 <br />
 {% block pm_form_buttons %}<span id="pm_buttons">
-{% block pm_delete_button %}<button type="submit" onclick="this.form.action='{% url postman_delete %}'">{% trans "Delete" %}</button>{% endblock %}
-{% block pm_archive_button %}<button type="submit" onclick="this.form.action='{% url postman_archive %}'">{% trans "Archive" %}</button>{% endblock %}
-{% block pm_undelete_button %}<button type="submit" onclick="this.form.action='{% url postman_undelete %}'">{% trans "Undelete" %}</button>{% endblock %}
+{% block pm_delete_button %}
+<a href="#" class="component_icon button icon_delete" onclick="f=document.getElementById('_messageForm'); f.action='{% url postman_delete %}'; f.submit(); return false;">{% trans "Delete" %}</a>
+{% endblock %}
+{% block pm_archive_button %}
+<a href="#" class="component_icon button icon_save" onclick="f=document.getElementById('_messageForm'); f.action='{% url postman_archive %}'; f.submit(); return false;">{% trans "Archive" %}</a>
+{% endblock %}
+{% block pm_undelete_button %}
+<a href="#" class="component_icon button icon_previous" onclick="f=document.getElementById('_messageForm'); f.action='{% url postman_undelete %}'; f.submit(); return false;">{% trans "Undelete" %}</a>
+{% endblock %}
 </span>{% endblock %}
 
 </form>

diff --git a/teleforma/templates/postman/base_write.html b/teleforma/templates/postman/base_write.html
index f89d57492db51395b4ab78705dbeb7e6c93efdcd..b8ca60de756eb2193dc1360b0dfb7e6f0749c2b2 100644 (file)
--- a/teleforma/templates/postman/base_write.html
+++ b/teleforma/templates/postman/base_write.html
@@ -12,12 +12,12 @@
 {% block content %}
 <div id="postman" class="desk_center">
 <h1>{% block pm_write_title %}{% endblock %}</h1>
-<form action="{% if next_url %}?next={{ next_url|urlencode }}{% endif %}" method="post">{% csrf_token %}
+<form id="_messageForm" action="{% if next_url %}?next={{ next_url|urlencode }}{% endif %}" method="post">{% csrf_token %}
 <table>
 {% block pm_write_recipient %}{% endblock %}
 {{ form.as_table }}
 </table>
-<button type="submit">{% trans "Send" %}</button>
+<a href="#" class="component_icon button icon_next" onclick="f=document.getElementById('_messageForm'); f.submit(); return false;">{% trans "Send" %}</a>
 </form>
 </div>
 {% endblock %}
\ No newline at end of file

diff --git a/teleforma/templates/postman/view.html b/teleforma/templates/postman/view.html
index d7fb23219f014c439c86a64f44cfd0d84a9bbbd3..56a1fd08bd3643ec16ac5dda34ef00f742ffea17 100644 (file)
--- a/teleforma/templates/postman/view.html
+++ b/teleforma/templates/postman/view.html
@@ -4,7 +4,7 @@
 {% load postman_tags %}
 
 {% block content %}
-<div id="postman">
+<div id="postman" class="desk_center">
 <h1>{% if pm_messages|length > 1 %}{% trans "Conversation" %}{% else %}{% trans "Message" %}{% endif %}</h1>
 <br /><br />
 {% for message in pm_messages %}
@@ -21,20 +21,29 @@
 </div>
 <br />
 {% if forloop.last %}
-<form action="" method="post">{% csrf_token %}
+<form id="_messageForm" action="" method="post">{% csrf_token %}
 <input type="hidden" {% if message.thread_id %}name="tpks" value="{{ message.thread_id }}"{% else %}name="pks" value="{{ message.pk }}"{% endif %} />
-<a href="{{ next_url }}">{% trans "Back" %}</a>
+
+<a href="{{ next_url }}" class="component_icon button icon_previous">{% trans "Back" %}</a>
+
 <span id="pm_buttons">
-<button type="submit" onclick="this.form.action='{% url postman_delete %}?next={{ next_url|urlencode }}'">{% trans "Delete" %}</button>
-{% if not archived %}<button type="submit" onclick="this.form.action='{% url postman_archive %}?next={{ next_url|urlencode }}'">{% trans "Archive" %}</button>{% endif %}
-</span>
-{% if reply_to_pk %}<a href="{% url postman_reply reply_to_pk %}?next={{ next_url|urlencode }}">{% trans "Reply" %}</a>{% endif %}
+
+{% block pm_delete_button %}
+<a href="#" class="component_icon button icon_delete" onclick="f=document.getElementById('_messageForm'); f.action='{% url postman_delete %}'; f.submit(); return false;">{% trans "Delete" %}</a>
+{% endblock %}
+{% block pm_archive_button %}
+{% if not archived %}
+<a href="#" class="component_icon button icon_save" onclick="f=document.getElementById('_messageForm'); f.action='{% url postman_archive %}'; f.submit(); return false;">{% trans "Archive" %}</a>
+{% endif %}
+{% endblock %}
+
+{% if reply_to_pk %}<a class="component_icon button icon_next" href="{% url postman_reply reply_to_pk %}?next={{ next_url|urlencode }}">{% trans "Reply" %}</a>{% endif %}
 </form>
 {% if reply_to_pk %}<hr />
 <h2>{% trans 'Reply' %}</h2>
-<form action="{% url postman_reply reply_to_pk %}?next={{ next_url|urlencode }}" method="post">{% csrf_token %}
-<div id="pm_reply">{{ form.body }}</div>
-<button type="submit">{% trans 'Reply' %}</button>
+<form id="_messageReply" action="{% url postman_reply reply_to_pk %}?next={{ next_url|urlencode }}" method="post">{% csrf_token %}
+<div id="pm_reply">{{ form.body }}</div><br />
+<a href="#" class="component_icon button icon_next" onclick="f=document.getElementById('_messageReply'); f.submit(); return false;">{% trans "Reply" %}</a>
 </form>{% endif %}
 {% endif %}
 {% endfor %}

diff --git a/teleforma/templates/teleforma/courses.html b/teleforma/templates/teleforma/courses.html
index 59abe8cc5c61918a90584870ffebf27c35c64947..5144f3c0ddad488f208d4646951c91ad4139b709 100644 (file)
--- a/teleforma/templates/teleforma/courses.html
+++ b/teleforma/templates/teleforma/courses.html
@@ -7,22 +7,23 @@
 
 {% block content %}
 
-<div class="home-description">
-   <div id="module-set-left" style="width: 30%">
-    <div class="module">
-    <h3><img src="{% url telemeta-images "module_playlist.png" %}" alt="playlists" style="vertical-align:middle" />{% trans "My courses" %}</h3>
-
-        <div style="background: white;">
-        <ul>
-        {% block courses %}
-        {% for course in object_list %}
-            <li><a href="{% url teleforma-course-detail course.id %}">{{ course.title }}</a></li>
-        {% endfor %}
-        {% endblock courses %}
-        </ul>
-        </div>
-    </div>
-   </div>
+<div id="module-set-left" style="width: 20%">
+<div class="module">
+<h3><img src="{% url telemeta-images "module_playlist.png" %}" alt="playlists" style="vertical-align:middle" />{% trans "My courses" %}</h3>
+
+<div style="background: white;">
+<ul>
+{% block courses %}
+{% for course in object_list %}
+<li><a href="{% url teleforma-course-detail course.id %}">{{ course.title }}</a></li>
+{% endfor %}
+{% endblock courses %}
+</ul>
+</div>
+</div>
+</div>
+
+
 
     <div class="desk_center">
     {% block course %}
@@ -57,7 +58,6 @@
 
     </div>
 
-</div>
 
 
 </div>

diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html
index 931af9f3dde58ebc069bed39a46e09d25626a33a..0214d9f3fcd8dc87d3b927657a5704dd22b75d97 100644 (file)
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@ -93,13 +93,16 @@ alt="Telemeta Powered"/>-->
  {% endif %}
 
  {% if user.is_authenticated %}
- <li><a href="#profil#"  class="origin"><img src="{% url telemeta-images "user.png" %}" alt="user" style="vertical-align:middle" width="12px" />{% if user.first_name and user.last_name %}
+ <li><a href="#profil#"  class="origin"><img src="{% url telemeta-images "user_tr.png" %}" alt="user" style="vertical-align:middle" width="13px" />{% if user.first_name and user.last_name %}
  {{ user.first_name }} {{ user.last_name }}
  {% else %}
  {{ user.username }}
  {% endif %}</a>
     <ul>
     <li><a href="{% url telemeta-profile-detail user.username %}">{% trans "Profile" %}</a></li>
+    {% if user.is_staff %}
+    <li><a href="{% url telemeta-desk-lists %}">{% trans "Lists" %}</a></li>
+    {% endif %}
     <li><a href="{% url telemeta-flatpage "help" %}">{% trans "Help" %}</a></li>
     <li><a href="{% url telemeta-logout %}">{% trans "Sign out" %}</a></li>
     </ul>