go back

diff --git a/setup.py b/setup.py
index f004a9a0912feaea6c78a4eebe74815ba505d071..ea38a078b857fe737072d6147b0591522f533687 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -19,6 +19,9 @@ setup(
         'django-json-rpc',
         'timeside',
         'south',
+        'django-pagination',
+        'django-postman',
+        'django-socialregistration',
   ],
   platforms=['OS Independent'],
   license='CeCILL v2',

diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html
index 02d703a4c3df1e4f4a378dfc3a31ab8f8d5fa6cf..0b014baa281a76b1f17aef74145e9ee505163b5a 100644 (file)
--- a/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@ -84,11 +84,6 @@
   <li><a href="#desk#" class="blue">{% trans "Desk" %}</a></span>
    <ul>
     <li><a href="{% url telemeta-desk-lists %}">{% trans "Lists" %}</a></li>
-    {% if 'postman'|installed %}
-    {% load postman_tags %}
-    {% postman_unread as unread_count %}
-    <li><a href="{% url postman_inbox %}">{% trans "Messages" %}{% if unread_count %} <strong>({{ unread_count }})</strong>{% endif %}</a></li>
-    {% endif %}
     <li><a href="{% url telemeta-desk-profile user.username %}">{% trans "Profile" %}</a></li>
     <li><a href="{% url telemeta-desk-home %}">{% trans "Home" %}</a></li>
    </ul>
@@ -128,15 +123,16 @@
 </div>
 {% endblock header %}
 
+{% block postman_menu %}
+{% endblock postman_menu %}
+
 <div id="content">
     <table id="content_header"><tr>
             <td class="leftcol"><h1>{% block title %}{% endblock %}</h1></td>
             <td class="rightcol">{% block title_buttons %}{% endblock %}</td>
     </tr></table>
-    {% block content %}
-    {% endblock %}
+{% block content %}{% endblock %}
 <div class="nett"></div>
-
 {% block delete %}{% endblock %}
 </div>