Merging in templates

misago/profiles/content/views.py

@@ -6,7 +6,7 @@ from misago.utils import make_pagination
 def posts(request, user, page=0):
     queryset = user.post_set.filter(forum_id__in=request.acl.threads.get_readable_forums(request.acl)).filter(deleted=False).filter(moderated=False).select_related('thread', 'forum').order_by('-id')
     count = queryset.count()
-    pagination = make_pagination(page, count, 40)
+    pagination = make_pagination(page, count, 12)
     return request.theme.render_to_response('profiles/content_posts.html',
                                             context_instance=RequestContext(request, {
                                              'profile': user,
@@ -21,7 +21,7 @@ def posts(request, user, page=0):
 def threads(request, user, page=0):
     queryset = user.thread_set.filter(forum_id__in=request.acl.threads.get_readable_forums(request.acl)).filter(deleted=False).filter(moderated=False).select_related('start_post', 'forum').order_by('-id')
     count = queryset.count()
-    pagination = make_pagination(page, count, 4)
+    pagination = make_pagination(page, count, 12)
     return request.theme.render_to_response('profiles/content_threads.html',
                                             context_instance=RequestContext(request, {
                                              'profile': user,

misago/profiles/followers/views.py

@@ -6,7 +6,7 @@ from misago.utils import make_pagination
 def followers(request, user, page=0):
     queryset = user.follows_set.order_by('username_slug')
     count = queryset.count()
-    pagination = make_pagination(page, count, 40)
+    pagination = make_pagination(page, count, 24)
     return request.theme.render_to_response('profiles/followers.html',
                                             context_instance=RequestContext(request, {
                                              'profile': user,

misago/profiles/follows/views.py

@@ -6,7 +6,7 @@ from misago.utils import make_pagination
 def follows(request, user, page=0):
     queryset = user.follows.order_by('username_slug')
     count = queryset.count()
-    pagination = make_pagination(page, count, 40)
+    pagination = make_pagination(page, count, 24)
     return request.theme.render_to_response('profiles/follows.html',
                                             context_instance=RequestContext(request, {
                                              'profile': user,

misago/views.py

@@ -24,7 +24,7 @@ def home(request):
             thread.forum_name = thread.forum.name
             thread.forum_slug = thread.forum.slug
             popular_threads.append(thread)
-        cache.set('thread_ranking_%s' % request.user.make_acl_key(), popular_threads, request.settings['thread_ranking_refresh'])
+        cache.set('thread_ranking_%s' % request.user.make_acl_key(), popular_threads, 60 * request.settings['thread_ranking_refresh'])
 
     # Ranks online
     ranks_list = cache.get('users_online', 'nada')
@@ -43,7 +43,7 @@ def home(request):
                     users_list.append(session.user_id)
             del ranks_dict
             del users_list
-        cache.set('ranks_list', ranks_list, 10)
+        cache.set('ranks_list', ranks_list, 300)
 
     # Render page with forums list
     reads_tracker = ForumsTracker(request.user)

templates/sora/profiles/follows.html

@@ -49,7 +49,11 @@
   {{ pager() }}
 </div>
 {% else %}
+<<<<<<< HEAD
 <p class="lead">{% trans username=profile.username %}{{ username }} follows nobody  at this time{% endtrans %}</p>
+=======
+<p class="lead">{% trans username=profile.username %}{{ username }} follows nobody at this time{% endtrans %}</p>
+>>>>>>> 28e12a6695789c8465b62ee3c14f027a7fec05a3
 {% endif %}
 {% endblock %}