Small tweaks in admin actions.

misago/forums/admin.py

@@ -1,7 +1,7 @@
 from django.conf.urls import url
 from django.utils.translation import ugettext_lazy as _
 from misago.forums.views.forumsadmin import (ForumsList, NewForum, EditForum,
-                                             MoveUpForum, MoveDownForum,
+                                             MoveDownForum, MoveUpForum,
                                              DeleteForum)
 from misago.forums.views.permsadmin import (ForumRolesList, NewForumRole,
                                             EditForumRole, DeleteForumRole,
@@ -20,8 +20,8 @@ class MisagoAdminExtension(object):
             url(r'^new/$', NewForum.as_view(), name='new'),
             url(r'^edit/(?P<forum_id>\d+)/$', EditForum.as_view(), name='edit'),
             url(r'^permissions/(?P<forum_id>\d+)/$', ForumPermissions.as_view(), name='permissions'),
-            url(r'^move/up/(?P<forum_id>\d+)/$', MoveUpForum.as_view(), name='up'),
             url(r'^move/down/(?P<forum_id>\d+)/$', MoveDownForum.as_view(), name='down'),
+            url(r'^move/up/(?P<forum_id>\d+)/$', MoveUpForum.as_view(), name='up'),
             url(r'^delete/(?P<forum_id>\d+)/$', DeleteForum.as_view(), name='delete'),
         )
 

misago/forums/views/forumsadmin.py

@@ -117,27 +117,31 @@ class DeleteForum(ForumAdmin, generic.ModelFormView):
         return redirect(self.root_link)
 
 
-class MoveUpForum(ForumAdmin, generic.ButtonView):
+class MoveDownForum(ForumAdmin, generic.ButtonView):
     def button_action(self, request, target):
         try:
-            other_target = target.get_previous_sibling()
+            other_target = target.get_next_sibling()
         except Forum.DoesNotExist:
             other_target = None
 
         if other_target:
-            Forum.objects.move_node(target, other_target, 'left')
-            message = _('Forum "%s" has been moved up.') % target.name
-            messages.success(request, message)
+            Forum.objects.move_node(target, other_target, 'right')
 
+            message = _('Forum "%s" has been moved below "%s".')
+            targets_names = (target.name, other_target.name)
+            messages.success(request, message % targets_names)
 
-class MoveDownForum(ForumAdmin, generic.ButtonView):
+
+class MoveUpForum(ForumAdmin, generic.ButtonView):
     def button_action(self, request, target):
         try:
-            other_target = target.get_next_sibling()
+            other_target = target.get_previous_sibling()
         except Forum.DoesNotExist:
             other_target = None
 
         if other_target:
-            Forum.objects.move_node(target, other_target, 'right')
-            message = _('Forum "%s" has been moved down.') % target.name
-            messages.success(request, message)
+            Forum.objects.move_node(target, other_target, 'left')
+
+            message = _('Forum "%s" has been moved above "%s".')
+            targets_names = (target.name, other_target.name)
+            messages.success(request, message % targets_names)

misago/templates/misago/admin/warnings/list.html

@@ -116,7 +116,7 @@
 
 
 {% block emptylist %}
-<td colspan="{{ 5|add:extra_actions_len }}">
+<td colspan="{{ 8|add:extra_actions_len }}">
   <p>{% trans "No warning levels are currently defined." %}</p>
 </td>
 {% endblock emptylist %}

misago/users/views/admin/ranks.py

@@ -63,8 +63,10 @@ class MoveDownRank(RankAdmin, generic.ButtonView):
             other_target.order, target.order = target.order, other_target.order
             other_target.save(update_fields=['order'])
             target.save(update_fields=['order'])
-            message = _('Rank "%s" has been moved down.') % unicode(target.name)
-            messages.success(request, message)
+
+            message = _('Rank "%s" has been moved below "%s".')
+            targets_names = (target.name, other_target.name)
+            messages.success(request, message % targets_names)
 
 
 class MoveUpRank(RankAdmin, generic.ButtonView):
@@ -79,8 +81,10 @@ class MoveUpRank(RankAdmin, generic.ButtonView):
             other_target.order, target.order = target.order, other_target.order
             other_target.save(update_fields=['order'])
             target.save(update_fields=['order'])
-            message = _('Rank "%s" has been moved up.') % unicode(target.name)
-            messages.success(request, message)
+
+            message = _('Rank "%s" has been moved above "%s".')
+            targets_names = (target.name, other_target.name)
+            messages.success(request, message % targets_names)
 
 
 class DefaultRank(RankAdmin, generic.ButtonView):

misago/users/views/admin/warnings.py

@@ -45,6 +45,7 @@ class MoveDownWarning(WarningsAdmin, generic.ButtonView):
             other_target.level, target.level = target.level, other_target.level
             other_target.save(update_fields=['level'])
             target.save(update_fields=['level'])
+
             message = _('Warning level "%s" has been moved below "%s".')
             targets_names = (target.name, other_target.name)
             messages.success(request, message % targets_names)
@@ -62,6 +63,7 @@ class MoveUpWarning(WarningsAdmin, generic.ButtonView):
             other_target.level, target.level = target.level, other_target.level
             other_target.save(update_fields=['level'])
             target.save(update_fields=['level'])
+
             message = _('Warning level "%s" has been moved above "%s".')
             targets_names = (target.name, other_target.name)
             messages.success(request, message % targets_names)