Merge pull request #1224 from rafalp/remove-actions-icons

Remove actions icons

misago/admin/views/generic/list.py

@@ -40,22 +40,20 @@ class ListView(AdminView):
     empty_selection_label = _("Select items")
 
     @classmethod
-    def add_mass_action(cls, action, name, icon, confirmation=None):
+    def add_mass_action(cls, action, name, confirmation=None):
         if not cls.mass_actions:
             cls.mass_actions = []
 
         cls.extra_actions.append(
-            {"action": action, "name": name, "icon": icon, "confirmation": confirmation}
+            {"action": action, "name": name, "confirmation": confirmation}
         )
 
     @classmethod
-    def add_item_action(cls, name, icon, link, style=None):
+    def add_item_action(cls, name, link):
         if not cls.extra_actions:
             cls.extra_actions = []
 
-        cls.extra_actions.append(
-            {"name": name, "icon": icon, "link": link, "style": style}
-        )
+        cls.extra_actions.append({"name": name, "link": link})
 
     def get_queryset(self):
         return self.get_model().objects.all()

misago/categories/views/permsadmin.py

@@ -138,7 +138,7 @@ class CategoryPermissions(CategoryAdmin, generic.ModelFormView):
 
 
 CategoriesList.add_item_action(
-    name=_("Change permissions"), link="misago:admin:categories:permissions", icon=""
+    name=_("Change permissions"), link="misago:admin:categories:permissions"
 )
 
 
@@ -200,8 +200,5 @@ class RoleCategoriesACL(RoleAdmin, generic.ModelFormView):
 
 
 RolesList.add_item_action(
-    name=_("Categories permissions"),
-    icon="fa fa-comments-o",
-    link="misago:admin:permissions:categories",
-    style="success",
+    name=_("Categories permissions"), link="misago:admin:permissions:categories"
 )

misago/legal/views/admin.py

@@ -30,14 +30,13 @@ class AgreementsList(AgreementAdmin, generic.ListView):
     filter_form = FilterAgreementsForm
     selection_label = _("With agreements: 0")
     empty_selection_label = _("Select agreements")
-    mass_actions = (
+    mass_actions = [
         {
             "action": "delete",
-            "icon": "fa fa-times",
             "name": _("Delete agreements"),
             "confirmation": _("Are you sure you want to delete those agreements?"),
-        },
-    )
+        }
+    ]
 
     def get_queryset(self):
         qs = super().get_queryset()

misago/templates/misago/admin/attachments/list.html

@@ -71,7 +71,7 @@
 
 
 {% block blankslate %}
-<td colspan="{{ 5|add:extra_actions_len }}">
+<td colspan="5">
   {% if active_filters %}
     {% trans "No attachments matching criteria exist." %}
   {% else %}

misago/templates/misago/admin/generic/list_extra_actions.html

@@ -1,6 +1,6 @@
 {% for action in extra_actions %}
 <td>
-  <a href="{% url action.link pk=item.pk %}" class="btn btn-{% if action.style %}{{ action.style }}{% else %}light{% endif %} btn-sm" data-tooltip="top" title="{{ action.name }}">
+  <a href="{% url action.link pk=item.pk %}" class="btn btn-light btn-sm" data-tooltip="top" title="{{ action.name }}">
     <span class="{{ action.icon }}"></span>
   </a>
 </td>

misago/threads/views/admin/attachments.py

@@ -36,7 +36,6 @@ class AttachmentsList(AttachmentAdmin, generic.ListView):
         {
             "action": "delete",
             "name": _("Delete attachments"),
-            "icon": "fa fa-times-circle",
             "confirmation": _("Are you sure you want to delete selected attachments?"),
             "is_atomic": False,
         }

misago/users/admin/views/bans.py

@@ -29,14 +29,13 @@ class BansList(BanAdmin, generic.ListView):
     filter_form = FilterBansForm
     selection_label = _("With bans: 0")
     empty_selection_label = _("Select bans")
-    mass_actions = (
+    mass_actions = [
         {
             "action": "delete",
-            "icon": "fa fa-times",
             "name": _("Remove bans"),
             "confirmation": _("Are you sure you want to remove those bans?"),
-        },
-    )
+        }
+    ]
 
     def action_delete(self, request, items):
         items.delete()

misago/users/admin/views/datadownloads.py

@@ -26,7 +26,6 @@ class DataDownloadsList(DataDownloadAdmin, generic.ListView):
         {
             "action": "expire",
             "name": _("Expire downloads"),
-            "icon": "fa fa-ban",
             "confirmation": _(
                 "Are you sure you want to set selected data downloads as expired?"
             ),
@@ -34,7 +33,6 @@ class DataDownloadsList(DataDownloadAdmin, generic.ListView):
         {
             "action": "delete",
             "name": _("Delete downloads"),
-            "icon": "fa fa-times-circle",
             "confirmation": _(
                 "Are you sure you want to delete selected data downloads?"
             ),

misago/users/admin/views/users.py

@@ -69,27 +69,17 @@ class UsersList(UserAdmin, generic.ListView):
     selection_label = _("With users: 0")
     empty_selection_label = _("Select users")
     mass_actions = [
-        {
-            "action": "activate",
-            "name": _("Activate accounts"),
-            "icon": "fa fa-check-square-o",
-        },
+        {"action": "activate", "name": _("Activate accounts")},
         {"action": "ban", "name": _("Ban users"), "icon": "fa fa-lock"},
-        {
-            "action": "request_data_download",
-            "name": _("Request data download"),
-            "icon": "fa fa-download",
-        },
+        {"action": "request_data_download", "name": _("Request data download")},
         {
             "action": "delete_accounts",
             "name": _("Delete accounts"),
-            "icon": "fa fa-times-circle",
             "confirmation": _("Are you sure you want to delete selected users?"),
         },
         {
             "action": "delete_all",
             "name": _("Delete with content"),
-            "icon": "fa fa-eraser",
             "confirmation": _(
                 "Are you sure you want to delete selected users? "
                 "This will also delete all content associated with their accounts."