Browse Source

Remove actions icons

rafalp 6 years ago
parent
commit
4953431959

+ 4 - 6
misago/admin/views/generic/list.py

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

+ 0 - 1
misago/categories/views/permsadmin.py

@@ -201,7 +201,6 @@ class RoleCategoriesACL(RoleAdmin, generic.ModelFormView):
 
 
 RolesList.add_item_action(
 RolesList.add_item_action(
     name=_("Categories permissions"),
     name=_("Categories permissions"),
-    icon="fa fa-comments-o",
     link="misago:admin:permissions:categories",
     link="misago:admin:permissions:categories",
     style="success",
     style="success",
 )
 )

+ 3 - 4
misago/legal/views/admin.py

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

+ 0 - 1
misago/threads/views/admin/attachments.py

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

+ 3 - 4
misago/users/admin/views/bans.py

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

+ 0 - 2
misago/users/admin/views/datadownloads.py

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

+ 2 - 12
misago/users/admin/views/users.py

@@ -69,27 +69,17 @@ class UsersList(UserAdmin, generic.ListView):
     selection_label = _("With users: 0")
     selection_label = _("With users: 0")
     empty_selection_label = _("Select users")
     empty_selection_label = _("Select users")
     mass_actions = [
     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": "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",
             "action": "delete_accounts",
             "name": _("Delete accounts"),
             "name": _("Delete accounts"),
-            "icon": "fa fa-times-circle",
             "confirmation": _("Are you sure you want to delete selected users?"),
             "confirmation": _("Are you sure you want to delete selected users?"),
         },
         },
         {
         {
             "action": "delete_all",
             "action": "delete_all",
             "name": _("Delete with content"),
             "name": _("Delete with content"),
-            "icon": "fa fa-eraser",
             "confirmation": _(
             "confirmation": _(
                 "Are you sure you want to delete selected users? "
                 "Are you sure you want to delete selected users? "
                 "This will also delete all content associated with their accounts."
                 "This will also delete all content associated with their accounts."