Simplified private threads list, commented out modbar

misago/apps/privatethreads/list.py

@@ -6,7 +6,7 @@ from misago.readstrackers import ThreadsTracker
 from misago.utils.pagination import make_pagination
 from misago.apps.privatethreads.mixins import TypeMixin
 
-class AllThreadsListView(ThreadsListBaseView, ThreadsListModeration, TypeMixin):
+class ThreadsListView(ThreadsListBaseView, ThreadsListModeration, TypeMixin):
     def fetch_forum(self):
         self.forum = Forum.objects.get(special='private_threads')
 
@@ -27,16 +27,3 @@ class AllThreadsListView(ThreadsListBaseView, ThreadsListModeration, TypeMixin):
         for thread in qs_threads[self.pagination['start']:self.pagination['stop']]:
             thread.is_read = tracker_forum.is_read(thread)
             self.threads.append(thread)
-
-    def template_vars(self, context):
-        context['tab'] = 'all'
-        return context
-
-
-class MyThreadsListView(AllThreadsListView, ThreadsListModeration, TypeMixin):
-    def threads_queryset(self):
-        return self.forum.thread_set.filter(start_poster_id=self.request.user.pk).order_by('-last')
-
-    def template_vars(self, context):
-        context['tab'] = 'my'
-        return context

misago/apps/privatethreads/urls.py

@@ -1,10 +1,8 @@
 from django.conf.urls import patterns, url
 
 urlpatterns = patterns('misago.apps.privatethreads',
-    url(r'^$', 'list.AllThreadsListView', name="private_threads"),
-    url(r'^(?P<page>\d+)/$', 'list.AllThreadsListView', name="private_threads"),
-    url(r'^my/$', 'list.MyThreadsListView', name="my_private_threads"),
-    url(r'^my/(?P<page>\d+)/$', 'list.MyThreadsListView', name="my_private_threads"),
+    url(r'^$', 'list.ThreadsListView', name="private_threads"),
+    url(r'^(?P<page>\d+)/$', 'list.ThreadsListView', name="private_threads"),
     url(r'^start/$', 'posting.NewThreadView', name="private_thread_start"),
     url(r'^(?P<slug>(\w|-)+)-(?P<thread>\d+)/edit/$', 'posting.EditThreadView', name="private_thread_edit"),
     url(r'^(?P<slug>(\w|-)+)-(?P<thread>\d+)/reply/$', 'posting.NewReplyView', name="private_thread_reply"),

templates/cranefly/layout.html

@@ -4,7 +4,7 @@
 {% block body %}
 <div id="wrap">
 
-  {% if acl.special.can_use_mcp() %}
+  {#{% if acl.special.can_use_mcp() %}
   <div class="navbar navbar-inverse navbar-modbar navbar-static-top">
     <div class="navbar-inner">
       <div class="container">
@@ -22,7 +22,7 @@
       </div>
     </div>
   </div>
-  {% endif %}
+  {% endif %}#}
 
   <div class="navbar navbar-header navbar-static-top">
     <div class="navbar-inner">

templates/cranefly/private_threads/list.html

@@ -16,11 +16,6 @@
       {{ self.breadcrumb() }}</li>
     </ul>
     <h1>{% trans %}Private Threads{% endtrans %}</h1>
-
-    <ul class="nav nav-tabs header-tabs">
-      <li class="{% if tab == 'all' %}active{% endif %}"><a href="{% url 'private_threads' %}">{% trans %}Threads I participate in{% endtrans %}</a></li>
-      <li class="{% if tab == 'my' %}active{% endif %}"><a href="{% url 'my_private_threads' %}">{% trans %}Threads I've started{% endtrans %}</a></li>
-    </ul>
   </div>
 </div>
 
@@ -119,7 +114,7 @@
     </table>
     {% if list_form %}
     <div class="threads-actions">
-      <form id="threads_form" class="form-inline pull-right" action="{{ route_name()|url() }}" method="POST">
+      <form id="threads_form" class="form-inline pull-right" action="{% url 'private_threads' %}" method="POST">
         <input type="hidden" name="{{ csrf_id }}" value="{{ csrf_token }}">
         {{ form_theme.input_select(list_form['list_action'],width=3) }}
         <button type="submit" class="btn btn-danger">{% trans %}Go{% endtrans %}</button>
@@ -139,18 +134,6 @@
 {% endblock %}
 
 
-{% macro route_name() -%}
-{% filter trim %}
-{% if tab == 'all' %}
-private_threads
-{% elif tab == 'new' %}
-new_private_threads
-{% else %}
-my_private_threads
-{% endif %}
-{% endfilter %}
-{%- endmacro %}
-
 {% macro replies(thread_replies) -%}
 {% trans count=thread_replies, replies=('<strong>' ~ (thread_replies|intcomma) ~ '</strong>')|safe -%}
 {{ replies }} reply
@@ -172,9 +155,9 @@ my_private_threads
 <div class="pagination pull-left">
   <ul>
     <li class="count">{{ macros.pager_label(pagination) }}</li>
-    {%- if pagination['prev'] > 1 %}<li><a href="{{ route_name()|url }}" class="tooltip-top" title="{% trans %}First Page{% endtrans %}"><i class="icon-chevron-left"></i> {% trans %}First{% endtrans %}</a></li>{% endif -%}
-    {%- if pagination['prev'] > 0 %}<li><a href="{%- if pagination['prev'] > 1 %}{{ route_name()|url(page=pagination['prev']) }}{% else %}{{ route_name()|url() }}{% endif %}" class="tooltip-top" title="{% trans %}Newest Threads{% endtrans %}"><i class="icon-chevron-left"></i></a></li>{% endif -%}
-    {%- if pagination['next'] > 0 %}<li><a href="{{ route_name()|url(page=pagination['next']) }}" class="tooltip-top" title="{% trans %}Older Threads{% endtrans %}"><i class="icon-chevron-right"></i></a></li>{% endif -%}
+    {%- if pagination['prev'] > 1 %}<li><a href="{% url 'private_threads' %}" class="tooltip-top" title="{% trans %}First Page{% endtrans %}"><i class="icon-chevron-left"></i> {% trans %}First{% endtrans %}</a></li>{% endif -%}
+    {%- if pagination['prev'] > 0 %}<li><a href="{%- if pagination['prev'] > 1 %}{% url 'private_threads' page=pagination['prev'] %}{% else %}{% url 'private_threads' %}{% endif %}" class="tooltip-top" title="{% trans %}Newest Threads{% endtrans %}"><i class="icon-chevron-left"></i></a></li>{% endif -%}
+    {%- if pagination['next'] > 0 %}<li><a href="{% url 'private_threads' page=pagination['next'] %}" class="tooltip-top" title="{% trans %}Older Threads{% endtrans %}"><i class="icon-chevron-right"></i></a></li>{% endif -%}
   </ul>
 </div>
 {% endif %}