postman: conversation mode by default

diff --git a/teleforma/templates/postman/base.html b/teleforma/templates/postman/base.html
index 99f23aeef6dda3b0129f7005a0dde297a4f66373..401bc9089b9cd511040d2b785b5c8b1f73f985b7 100644 (file)
--- 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 b39d1e737b6add40c2daefb0ca4876b29fd2f375..a1fefffab1c7c34501467f6671ca9899f31cb268 100644 (file)
--- 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 fb0530672c19bd02cdb4bbf437060603a310c0c1..f7148c674337a7d5d55b5e84fef73b687dbbde66 100644 (file)
--- 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>