From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 26 Apr 2013 13:36:56 +0000 (+0200)
Subject: postman: conversation mode by default
X-Git-Tag: 2.8.1-pro~488^2~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f46603b38aa279a98051f87aed4c3fc4503d58f0;p=teleforma.git

postman: conversation mode by default
---

diff --git a/teleforma/templates/postman/base.html b/teleforma/templates/postman/base.html
index 99f23aee..401bc908 100644
--- a/teleforma/templates/postman/base.html
+++ b/teleforma/templates/postman/base.html
@@ -23,9 +23,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>
diff --git a/teleforma/templates/teleforma/answer_form.html b/teleforma/templates/teleforma/answer_form.html
index b39d1e73..a1fefffa 100644
--- a/teleforma/templates/teleforma/answer_form.html
+++ b/teleforma/templates/teleforma/answer_form.html
@@ -41,7 +41,7 @@ $(document).ready(function(){
     var b2 = $('#save_button');
     b2.unbind('click').click(function() {
       $(window).unbind('beforeunload');
-      b1.unbind('click');
+      b2.unbind('click');
       $('#_AnswerForm').submit();
     });
 
diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html
index fb053067..f7148c67 100644
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@ -101,7 +101,7 @@ alt="logo" />
 
  {% if user.is_authenticated %}
 
-    <li><a href="{% url postman_inbox %}m/" class="orange">{% trans "Contact us" %}{% if postman_unread_count %} ({{ postman_unread_count }}){% endif %}</a></li>
+    <li><a href="{% url postman_inbox %}" class="orange">{% trans "Contact us" %}{% 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>