Small tweaks to new/popular threads lists.

misago/apps/newthreads.py

@@ -10,10 +10,12 @@ from misago.shortcuts import render_to_response
 from misago.utils.pagination import make_pagination
 
 def new_threads(request, page=0):
-    queryset = Thread.objects.filter(forum_id__in=Forum.objects.readable_forums(request.acl)).filter(deleted=False).filter(moderated=False).filter(start__gte=(timezone.now() - timedelta(days=2)))
+    queryset = Thread.objects.filter(forum_id__in=Forum.objects.readable_forums(request.acl)).filter(deleted=False).filter(moderated=False)
     items_total = queryset.count();
+    if items_total > (settings.threads_per_page * 3):
+        items_total = settings.threads_per_page * 3
     try:
-        pagination = make_pagination(page, items_total, 30)
+        pagination = make_pagination(page, items_total, settings.threads_per_page)
     except Http404:
         return redirect(reverse('new_threads'))
 

misago/apps/popularthreads.py

@@ -12,8 +12,10 @@ from misago.utils.pagination import make_pagination
 def popular_threads(request, page=0):
     queryset = Thread.objects.filter(forum_id__in=Forum.objects.readable_forums(request.acl)).filter(deleted=False).filter(moderated=False)
     items_total = queryset.count();
+    if items_total > (settings.threads_per_page * 3):
+        items_total = settings.threads_per_page * 3
     try:
-        pagination = make_pagination(page, items_total, 30)
+        pagination = make_pagination(page, items_total, settings.threads_per_page)
     except Http404:
         return redirect(reverse('popular_threads'))
 

templates/cranefly/new_threads.html

@@ -111,7 +111,7 @@
   </div>
   {{ pager() }}
   {% else %}
-  <p class="lead">{% trans %}No new threads were started in last 48 hours.{% endtrans %}</p>
+  <p class="lead">{% trans %}Looks like there are no threads... yet!{% endtrans %}</p>
   {% endif %}
 </div>
 {% endblock %}

templates/cranefly/popular_threads.html

@@ -111,7 +111,7 @@
   </div>
   {{ pager() }}
   {% else %}
-  <p class="lead">{% trans %}Looks like there are no popular threads... yet!{% endtrans %}</p>
+  <p class="lead">{% trans %}Looks like there are no threads... yet!{% endtrans %}</p>
   {% endif %}
 </div>
 {% endblock %}