From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 22 Apr 2013 14:55:01 +0000 (+0200)
Subject: postman: conversation mode
X-Git-Tag: 1.1~612
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8d853618d3c39c9242b2870cf3ed970ecb797599;p=teleforma.git

postman: conversation mode
---

diff --git a/teleforma/templates/postman/base.html b/teleforma/templates/postman/base.html
index d762a903..cc500fb3 100644
--- 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 %}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_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_trash %}">{% trans "Trash" %}</a></li>
 </ul>
 </div>
@@ -24,4 +24,4 @@
 </div>
 </div>
 
-{% endblock postman_menu %}
\ No newline at end of file
+{% endblock postman_menu %}
diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html
index 65574673..eb907b00 100644
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@ -94,7 +94,7 @@ alt="logo" />
 
  {% if user.is_authenticated %}
 
- <li><a href="{% url postman_inbox %}m/" class="orange">{% trans "Messaging" %}{% if postman_unread_count %} ({{ postman_unread_count }}){% endif %}</a></li>
+ <li><a href="{% url postman_inbox %}" 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>