message list per message

diff --git a/setup.py b/setup.py
index ebc47695cf444ff8b643dd9923ab30e7fb82d682..e7a8ab809b5783bb02cfe94cfa185d18b6f5c114 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ CLASSIFIERS = ['Environment :: Web Environment', 'Framework :: Django', 'Intende
 setup(
   name = "TeleForma",
   url = "http://parisson.com",
-  description = "open multimedia e-leaning system",
+  description = "open web multimedia e-learning system",
   long_description = open('README.rst').read(),
   author = "Guillaume Pellerin",
   author_email = "yomguy@parisson.com",

diff --git a/teleforma/templates/postman/base.html b/teleforma/templates/postman/base.html
index 5f061d6dfefd963afd400d48a414b4f4571254c5..fe0afe41a300d3d2468680b080c5ab8de6b7ba41 100644 (file)
--- a/teleforma/templates/postman/base.html
+++ b/teleforma/templates/postman/base.html
@@ -12,9 +12,9 @@
 <div style="background: white;">
 {% postman_unread as unread_count %}
 <ul>
-<li><a href="{% url postman_inbox %}">{% if unread_count %} <strong>{% trans "Inbox" %} ({{ unread_count }})</strong>{% else %}{% trans "Inbox" %}{% endif %}</a></li>
-<li><a href="{% url postman_sent %}">{% trans "Sent Messages" %}</a></li>
-<li><a href="{% url postman_archives %}">{% trans "Archives" %}</a></li>
+<li><a href="{% url postman_inbox %}m/">{% if unread_count %} <strong>{% trans "Inbox" %} ({{ unread_count }})</strong>{% else %}{% trans "Inbox" %}{% endif %}</a></li>
+<li><a href="{% url postman_sent %}m/">{% trans "Sent Messages" %}</a></li>
+<li><a href="{% url postman_archives %}m/">{% trans "Archives" %}</a></li>
 <li><a href="{% url postman_trash %}">{% trans "Trash" %}</a></li>
 </ul>
 </div>

diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html
index 75da2f7163d6dfa206a6f97ff6e12070f7e5db57..b9a7ae1b9253ae04ca7c759b44e11b96e995e5b7 100644 (file)
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@ -90,7 +90,7 @@ alt="logo" />
 
  {% if user.is_authenticated %}
 
- <li><a href="/messages" class="orange">{% trans "Messaging" %}{% if postman_unread_count %} ({{ postman_unread_count }}){% endif %}</a></li>
+ <li><a href="{% url postman_inbox %}m/" class="orange">{% trans "Messaging" %}{% if postman_unread_count %} ({{ postman_unread_count }}){% endif %}</a></li>
 
  {% if user.is_staff %}
  <li><a href="{% url teleforma-users %}" class="yellow">{% trans "Users" %}</a></li>