aa-structures 2.17.0__py3-none-any.whl → 3.0.1__py3-none-any.whl

{aa_structures-2.17.0.dist-info → aa_structures-3.0.1.dist-info}/METADATA

@@ -1,13 +1,12 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: aa-structures
-Version: 2.17.0
+Version: 3.0.1
 Summary: App for managing Eve Online structures with Alliance Auth.
 Author-email: Erik Kalkoken <kalkoken87@gmail.com>
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
-Classifier: Framework :: Django :: 4.0
 Classifier: Framework :: Django :: 4.2
 Classifier: Intended Audience :: End Users/Desktop
 Classifier: License :: OSI Approved :: MIT License
@@ -17,10 +16,12 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
-Requires-Dist: allianceauth-app-utils>=1.22
-Requires-Dist: allianceauth>=3.0
+License-File: LICENSE
+Requires-Dist: allianceauth-app-utils>=1.26
+Requires-Dist: allianceauth>=4,<5
 Requires-Dist: dhooks-lite>=1.0
 Requires-Dist: django-eveuniverse>=1.5.2
 Requires-Dist: django-multiselectfield

{aa_structures-2.17.0.dist-info → aa_structures-3.0.1.dist-info}/RECORD

@@ -1,11 +1,11 @@
-structures/__init__.py,sha256=IHFQy-PBTGawZQIDMVt3La5YoH6pK9dlDO5jvrQQph4,204
+structures/__init__.py,sha256=IL7XpCaDfbWxPI8lPbABfS7iBnvgjzCyOJhmV1bGUFI,203
 structures/admin.py,sha256=K7wh8mHFfGHONn7oLdqXsBAxq0rmYrwbZ7S3uIOuMtg,41303
 structures/app_settings.py,sha256=aWA2bTcv_vVwIyisx-G7GBSpfM6JDyt2MWcXKtHnjK0,6651
 structures/apps.py,sha256=MNZH9l3qWCwuS7OGiKGkBVrDzKoOFlqwDdEgyEFzxVA,195
 structures/auth_hooks.py,sha256=nRbrixFkAE5gphDokB1E8xhH8FY2VtXVwu0XMmSGBAw,1013
 structures/constants.py,sha256=k5rfD29ZjR7ToRmJw4WnLVd4LmoZvDw4OK5IoiiyJ6w,1063
 structures/forms.py,sha256=kXs-SGIIj-D9xtFCILKe_PMRU4eHl3-HLNWRhaZKmnQ,391
-structures/helpers.py,sha256=_dw7j7yobpcV70VwWxoQiptk69b3ksvaDlRQKHg8Kmg,2344
+structures/helpers.py,sha256=iadnXcpkHrWciB9snTHyc2bfxk3Hd5Xj1hKshOpvTJU,2542
 structures/managers.py,sha256=_XZhsWb4is7LpQTUmGZwxQeJzyZnsB3n21EETgEIlzU,20062
 structures/providers.py,sha256=9QYHd8X5HwBhrbgbX3LUrXXV1KGM3hFhcxK6qIJjJtg,317
 structures/tasks.py,sha256=INZ3soMYHYfxrQsyTO-ozoxbVX6lpMnF3AUo8ybWIoA,9083
@@ -13,7 +13,7 @@ structures/urls.py,sha256=An5v27AD_NXMNL66cMVtQNci1C_Aqry32rrvDkMpgYo,1467
 structures/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/core/notification_timers.py,sha256=KLjkVrlCCKTWtHJNUfI3U6ppAIZN8vPnIx1zCafRkKQ,16748
 structures/core/notification_types.py,sha256=AMelkzBgOVcXKQauHEjBkcu5iFcLx6R_e9kXLBasbrs,13676
-structures/core/serializers.py,sha256=4W6kA7mhVvc-1OSiTl_w0rSio_HUsjIBm9qbkEr9vCY,20965
+structures/core/serializers.py,sha256=qBkDP-gOU4t-Ew_pyjok31T3k7CAJEFSp2WohmlQAik,21082
 structures/core/sovereignty.py,sha256=XKgjAFO4BfLpEEUz_hBr2DVDnvWBq9sL9EEQiT4T0n0,730
 structures/core/starbases.py,sha256=nw7skHYATrnAV-zuPAuxmhM5E4Aqjc_DHSU2TYWgBng,1757
 structures/core/notification_embeds/__init__.py,sha256=30cpjKLZ5_OFtXDACDcjvWQAYszM2BrYxUYb5PRQoTA,131
@@ -67,7 +67,7 @@ structures/models/__init__.py,sha256=Da0-Z4BtsZ_mlnI6XtyvoE0UtTuOA0psGCuVhVPVKrM
 structures/models/eveuniverse.py,sha256=vTIfzZL9guEDuZHQvRdG6pI4zSEdMqfVE-2SkHdqbRo,2213
 structures/models/notifications.py,sha256=HwQc-ChdP0ULuJgxUym9_CBsCWCmcHT7whlk9tB2vzw,35364
 structures/models/owners.py,sha256=yXeP21KkdpNdO6yqKLoEMfYVA72uVaCvBmq0e19Qm78,59611
-structures/models/structures_1.py,sha256=zk380uG2DuQ7exO7THbq5TE5Ro2jr6EyVCIxRJXHIJI,29958
+structures/models/structures_1.py,sha256=ZxKx3xmAxeOozyFeQ63A4ftOOeP1FrHkzhhEm28LldA,30064
 structures/models/structures_2.py,sha256=g5Pct5jNmZC-n7fnpLs5UyiP9JLrGdI1vjYucHTV_wQ,10371
 structures/static/structures/css/global.css,sha256=R4LEH9PwLoN77qkqBK7u2y_vzRC3fq8X_zKnAW7yhiA,1165
 structures/static/structures/css/main.css,sha256=kNgHhC3tVG376h8-6b71MtiERhYZ48cTIno5Kj6ZFGo,303
@@ -126,26 +126,26 @@ structures/static/structures/img/panel/tyrannis_darkred.png,sha256=CwCeqXvr6Nm-K
 structures/static/structures/img/panel/tyrannis_default.png,sha256=18TntkT7i0YZHZ-v9D_-glKHDKYEA0rSTjXMqwXFy0Q,38343
 structures/static/structures/img/panel/tyrannis_revelations.png,sha256=mnaL5lt-1D-Do7sb77QJDc3EPtoynz207Z932S09is0,42868
 structures/static/structures/js/global.js,sha256=DK1IZs-SePAO00WVTo03iOcw1CfT43ET2X7a4givvgk,1842
-structures/static/structures/js/public.js,sha256=b7CnBNpjffMmvQ022_vb6RfVmnyoH2bAmA0JIUFiw2s,3746
+structures/static/structures/js/public.js,sha256=Bxi2BOE2H9fxzlC9U4qiboKqUDXy8MMGC5elvWKiFeE,3970
 structures/static/structures/js/statistics.js,sha256=qSfjy3opXq9XQ1Fp1yXA0dbk6JylgavpJpVIPfRZ9x8,2857
-structures/static/structures/js/structures.js,sha256=YccSuNWXvCs5WNitWy7NdC-nIHlCu2-LCjPAWbApJSk,15089
+structures/static/structures/js/structures.js,sha256=RPgdyQHPssY1VcaPMdkTFiKeRuZGz1r-T3CWm3Fn83w,15240
 structures/static/structures/vendor/datatables/plugins/dataTables.rowGroup.min.js,sha256=TqdVnz3vX_H-UpCbPy3eqKY7poGMHGkKud7oBnHu9eY,5573
 structures/static/structures/vendor/datatables/plugins/datetime.js,sha256=yJzBU69oWEoQI16MOC18R2vrPpzqPGrGmtFhR6UT30A,3908
 structures/static/structures/vendor/datatables/plugins/filterDropDown.min.js,sha256=_ZGm5gV7NHq3wulljXeipLvpJi0SNEI4mydoEUCXIeQ,2529
 structures/static/structures/vendor/datatables/plugins/rowGroup.bootstrap.min.css,sha256=mfb-mieZDwLASMlQTUNXrZQr8OXvQyEDfV3Xz3E7DSU,384
 structures/static/structures/vendor/datatables/plugins/rowGroup.dataTables.min.css,sha256=mfb-mieZDwLASMlQTUNXrZQr8OXvQyEDfV3Xz3E7DSU,384
-structures/templates/structures/base.html,sha256=ND0JjP2Pa537FXOrIj3cziHfDbTh0ZNzrLFJ_zpVhw8,337
-structures/templates/structures/public.html,sha256=R3kjhr1MLC5r9r8L3t-1-Nh7-ngKbRiiZNIwgpsGg70,3239
-structures/templates/structures/statistics.html,sha256=rVI_wPW4VXIO3IoWna8_GoqWCc5ra-6Jc9iekfusS78,1736
-structures/templates/structures/structures.html,sha256=q0c7Wlaxvt2dg1B236JIEmmSBgQyX5F_QlBLokt-W0E,8329
+structures/templates/structures/base.html,sha256=FYo6aJJ8DReEnyr7lUzlMcUHbTlBhnrL27WHK6767b8,1844
+structures/templates/structures/public.html,sha256=P93tur3mxlx-MwTfGPu6KBlxBfMVV2WnnJJdGOF5tQI,3219
+structures/templates/structures/statistics.html,sha256=2AVIeznBQCaJc-z7kxNSx3pxSdLW5Y81AiISbvUTAPE,1644
+structures/templates/structures/structures.html,sha256=Q_1AVWIZkW1Svvzt6OxAcMlNV8UzXz85G00Oa_TN2gE,8148
 structures/templates/structures/modals/fitting_assets.html,sha256=0GSpDAk-wgvaZdxM9JzteUYhoPsek5y-L4TdG2q5Sbg,264
 structures/templates/structures/modals/fitting_gfx.html,sha256=hmdU1Zv09woGKigUugbBRxScKQun8l81yEPUMGrok2g,9530
-structures/templates/structures/modals/poco_details.html,sha256=uwaEM0jDvkdu_Lff2mUKwm7pn1KXePcgN9yBwFHsQO4,2705
-structures/templates/structures/modals/starbase_detail.html,sha256=qfFayAyzL1Sa20NVhK-O4gnfASQQ-zvR-0Q8FyAwBQc,4133
-structures/templates/structures/modals/structure_details.html,sha256=lA6PoGPECv7c3MPBiF059gjYTwvjTOGspgfldC1gb2s,4102
+structures/templates/structures/modals/poco_details.html,sha256=oiaSEMF9HiojXHbN2OjHmK5nPuWRR4mZBgB9ySYNrAY,2835
+structures/templates/structures/modals/starbase_detail.html,sha256=-mOo5zMGClZ2oRjVQS440n55ipHM8rU2O8wVPuI3OmI,4383
+structures/templates/structures/modals/structure_details.html,sha256=zY3X_LFmrj2c3bUevSDd10qzmR1rsHqtgkDbSI_e8Xc,4339
 structures/templates/structures/modals/tab_general_detail.html,sha256=oX3Aa3RrjfWXUDiQgxB7HN-6ILJDL0fZuf85_0Kua5w,2324
 structures/templates/structures/modals/tab_services_detail.html,sha256=fd-KhwR0ARF3hFCPXCjirpBHgdZv-RgoXzHMYUe0vSQ,596
-structures/templates/structures/partials/menu.html,sha256=pxN_Tvo_vON0Fauyg_XPYlE6R6kaKRNFfhkLszIAMJI,2329
+structures/templates/structures/partials/menu.html,sha256=rSsemMJclo_O33V9NaGRMa39tZizpwZXHXvkfUAYknM,2335
 structures/templates/structures/partials/public/poco_list.html,sha256=tVAsGXS7rh7Qr5x2X26buyt7jwJJ-YoNLs9eMs0gDM4,1222
 structures/templates/structures/partials/statistics/structure_summary.html,sha256=ZCEBOPhfOUyih7C8TzaQi9OI2AsMzZGBb9ZGHsShzmk,1133
 structures/templates/structures/partials/structures/active_tags.html,sha256=KhYA6LbAqg-iJJ2J4BGACXdbdiZFM4wAgDEq2RQEu0s,106
@@ -154,10 +154,10 @@ structures/templates/structures/partials/structures/orbital_list.html,sha256=uWV
 structures/templates/structures/partials/structures/starbase_list.html,sha256=Djl3nsTSn9TIZ6k4F0hiF-qDv_rLiVSIapnWUz0bvqU,1412
 structures/templates/structures/partials/structures/structure_list.html,sha256=2EHP1xJrmDNhwENhxGY3L6YbC53qFwhnDHcFzxkNXpI,1421
 structures/templates/structures/templatetags/detail_title.html,sha256=PWoYNZhTt1ngDEdz_B4TlyC7duO-8MxgznSUb27lUDA,117
-structures/templates/structures/templatetags/list_asset.html,sha256=6wWndrdBlWbOMIQlGaqeUtSfk-c6F3ZQMYErZJ4H7SM,375
-structures/templates/structures/templatetags/list_item.html,sha256=vWOvGx-QEjsno-iqSJrfv_ip4VphoVVV0-FIngqnK5Q,706
-structures/templates/structures/templatetags/list_tax_item.html,sha256=K5XSYY5UyNx_o3GWN_WLyObxb0mDcmCJkztc20sTC0Q,505
-structures/templates/structures/templatetags/list_title.html,sha256=C2NWwo27TGfGsQo4BgSD_2A6TemcR4DEwb04tSN_hEM,68
+structures/templates/structures/templatetags/list_asset.html,sha256=loGzJwxp--c3nYAukAAGqfp4_hcBddoWgbooLLPDI1A,414
+structures/templates/structures/templatetags/list_item.html,sha256=jhl2Clt6fmLSQPidTqkgwTk2gZmwx7aWTQ7ClQSwwyM,706
+structures/templates/structures/templatetags/list_tax_item.html,sha256=Cs9KDpCaiC-hyBqETbWObSnepn1lpRBjto33OY_X4x0,505
+structures/templates/structures/templatetags/list_title.html,sha256=IzRlAPQ1cDDXnhpEO2CtD_GIfHrh-wy06LeOZP3KmNw,52
 structures/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/templatetags/structures.py,sha256=vSt5AnfYuo11q1SxiskT4oshSMsZ9ZgM0nYpYiMl8bA,1637
 structures/tests/__init__.py,sha256=9MrJzKr8DdsQY3-79v188pTpwqT4TDQ46vKnBJAGqic,75
@@ -191,7 +191,7 @@ structures/tests/models/test_owners_3.py,sha256=cpDkfFkVvC1v4uuXha1vGUmWZ163huYT
 structures/tests/models/test_owners_4.py,sha256=_VP4QsPYGwBnn_bVN4aNX2ZVeJzMAzWObZrgCJkOPgY,19496
 structures/tests/models/test_owners_5.py,sha256=TIF_SqJqyGja8FBV2lQNAC4yff1usmJ4e0QW7e68zTg,36929
 structures/tests/models/test_owners_6.py,sha256=R9UE2QGwiGTWLHzzOZwGQPWJrAPwIIl7UwrHH-ki4Ak,940
-structures/tests/models/test_structures.py,sha256=iCCa0yYyPHieNfj8TQbdoIv141oLc6hlICZ6AsTnHAw,41849
+structures/tests/models/test_structures.py,sha256=l51TGu1GFFmfSp9aJa9NvjN-YbZWf8_efVEwQYU5peY,41855
 structures/tests/testdata/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/tests/testdata/constants.py,sha256=iab-9cHjAO4RBM88UeWbBypRm9qoZcViwZ8BPY17p1Q,441
 structures/tests/testdata/create_eveuniverse.py,sha256=a5DHYAxxsytOeevAL53RDoeDWObKwViqfpXRlmZeOHY,2157
@@ -225,7 +225,7 @@ structures/webhooks/models.py,sha256=kUkt9rnRQIJIrU9Bjcs34rvkb-TMbUubHdn-kny08kI
 structures/webhooks/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/webhooks/tests/test_core.py,sha256=4NcEAQgK2KhQkFOxYh2ad0S-qUWh1DNGDmLo5Mo5opI,6762
 structures/webhooks/tests/test_utils.py,sha256=ekADFv0JOEtXeqdiejbeqrABO__Q1flJHzVieQ7L9e0,459
-aa_structures-2.17.0.dist-info/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
-aa_structures-2.17.0.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-aa_structures-2.17.0.dist-info/METADATA,sha256=3WP4Xyde_TRUUwypayCkO-nnldwGuQqYtNpwGiQClIE,5972
-aa_structures-2.17.0.dist-info/RECORD,,
+aa_structures-3.0.1.dist-info/licenses/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
+aa_structures-3.0.1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+aa_structures-3.0.1.dist-info/METADATA,sha256=dh5tIejpIOxoAwsJkbAq-UBkzUaWed9os_IWNdk1RoE,6006
+aa_structures-3.0.1.dist-info/RECORD,,

{aa_structures-2.17.0.dist-info → aa_structures-3.0.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: flit 3.10.1
+Generator: flit 3.12.0
 Root-Is-Purelib: true
 Tag: py3-none-any

structures/__init__.py

@@ -3,5 +3,5 @@
 # pylint: disable = invalid-name
 default_app_config = "structures.apps.StructuresConfig"
 
-__version__ = "2.17.0"
+__version__ = "3.0.1"
 __title__ = "Structures"

structures/core/serializers.py

@@ -20,8 +20,7 @@ from eveuniverse.models import EvePlanet
 from allianceauth.eveonline.models import EveCharacter
 from app_utils.datetime import DATETIME_FORMAT, timeuntil_str
 from app_utils.views import (
-    BootstrapStyle,
-    bootstrap_label_html,
+    BootstrapStyleBS5,
     format_html_lazy,
     link_html,
     no_wrap_html,
@@ -31,7 +30,7 @@ from app_utils.views import (
 
 from structures.app_settings import STRUCTURES_SHOW_FUEL_EXPIRES_RELATIVE
 from structures.constants import EveGroupId
-from structures.helpers import floating_icon_with_text_html
+from structures.helpers import bootstrap5_label_html, floating_icon_with_text_html
 from structures.models import EveSpaceType, PocoDetails, Structure
 
 
@@ -176,24 +175,24 @@ class _AbstractStructureListSerializer(ABC):
 
         elif structure.is_low_power:
             fuel_expires_display = format_html_lazy(
-                bootstrap_label_html(
-                    structure.get_power_mode_display(), BootstrapStyle.WARNING
+                bootstrap5_label_html(
+                    structure.get_power_mode_display(), BootstrapStyleBS5.WARNING
                 )
             )
             fuel_expires_timestamp = None
 
         elif structure.is_abandoned:
             fuel_expires_display = format_html_lazy(
-                bootstrap_label_html(
-                    structure.get_power_mode_display(), BootstrapStyle.DANGER
+                bootstrap5_label_html(
+                    structure.get_power_mode_display(), BootstrapStyleBS5.DANGER
                 )
             )
             fuel_expires_timestamp = None
 
         elif structure.is_maybe_abandoned:
             fuel_expires_display = format_html_lazy(
-                bootstrap_label_html(
-                    structure.get_power_mode_display(), BootstrapStyle.WARNING
+                bootstrap5_label_html(
+                    structure.get_power_mode_display(), BootstrapStyleBS5.WARNING
                 )
             )
             fuel_expires_timestamp = None
@@ -226,21 +225,21 @@ class _AbstractStructureListSerializer(ABC):
 
         if structure.is_full_power:
             last_online_at_display = format_html_lazy(
-                bootstrap_label_html(
-                    structure.get_power_mode_display(), BootstrapStyle.SUCCESS
+                bootstrap5_label_html(
+                    structure.get_power_mode_display(), BootstrapStyleBS5.SUCCESS
                 )
             )
         elif structure.is_maybe_abandoned:
             last_online_at_display = format_html_lazy(
-                bootstrap_label_html(
-                    structure.get_power_mode_display(), BootstrapStyle.WARNING
+                bootstrap5_label_html(
+                    structure.get_power_mode_display(), BootstrapStyleBS5.WARNING
                 )
             )
 
         elif structure.is_abandoned:
             last_online_at_display = format_html_lazy(
-                bootstrap_label_html(
-                    structure.get_power_mode_display(), BootstrapStyle.DANGER
+                bootstrap5_label_html(
+                    structure.get_power_mode_display(), BootstrapStyleBS5.DANGER
                 )
             )
 
@@ -307,11 +306,15 @@ class _AbstractStructureListSerializer(ABC):
 
         elif structure.has_core is False:
             has_core = False
-            core_status = bootstrap_label_html("Core missing", BootstrapStyle.DANGER)
+            core_status = bootstrap5_label_html(
+                "Core missing", BootstrapStyleBS5.DANGER
+            )
 
         else:
             has_core = None
-            core_status = bootstrap_label_html("No core status", BootstrapStyle.WARNING)
+            core_status = bootstrap5_label_html(
+                "No core status", BootstrapStyleBS5.WARNING
+            )
 
         return core_status, has_core
 
@@ -330,8 +333,8 @@ class _AbstractStructureListSerializer(ABC):
         ):
             ajax_url = reverse("structures:structure_details", args=[structure.id])
             row["details"] = format_html(
-                '<button type="button" class="btn btn-default" '
-                'data-toggle="modal" data-target="#modalUpwellDetails" '
+                '<button type="button" class="btn btn-secondary" '
+                'data-bs-toggle="modal" data-bs-target="#modalUpwellDetails" '
                 f"data-ajax_url={ajax_url} "
                 f'title="{_("Show fitting")}">'
                 '<i class="fas fa-search"></i></button>'
@@ -340,8 +343,8 @@ class _AbstractStructureListSerializer(ABC):
         elif structure.is_poco:
             ajax_url = reverse("structures:poco_details", args=[structure.id])
             row["details"] = format_html(
-                '<button type="button" class="btn btn-default" '
-                'data-toggle="modal" data-target="#modalPocoDetails" '
+                '<button type="button" class="btn btn-secondary" '
+                'data-bs-toggle="modal" data-bs-target="#modalPocoDetails" '
                 f"data-ajax_url={ajax_url} "
                 f'title="{_("Show details")}">'
                 '<i class="fas fa-search"></i></button>'
@@ -350,8 +353,8 @@ class _AbstractStructureListSerializer(ABC):
         elif structure.is_starbase:
             ajax_url = reverse("structures:starbase_detail", args=[structure.id])
             row["details"] = format_html(
-                '<button type="button" class="btn btn-default" '
-                'data-toggle="modal" data-target="#modalStarbaseDetail" '
+                '<button type="button" class="btn btn-secondary" '
+                'data-bs-toggle="modal" data-bs-target="#modalStarbaseDetail" '
                 f"data-ajax_url={ajax_url} "
                 f'title="{_("Show details")}">'
                 '<i class="fas fa-search"></i></button>'
@@ -431,7 +434,7 @@ class PocoListSerializer(_AbstractStructureListSerializer):
         solar_system_html = format_html(
             "{}<br>{}",
             link_html(dotlan.solar_system_url(solar_system_name), solar_system_name),
-            bootstrap_label_html(text=space_type.label, label=space_badge_type),
+            bootstrap5_label_html(text=space_type.label, label=space_badge_type),
         )
 
         constellation_name = structure.eve_solar_system.eve_constellation.name

structures/helpers.py

@@ -67,3 +67,8 @@ def floating_icon_with_text_html(
     text_html = format_html_join(mark_safe("<br>"), "{}", ((line,) for line in lines))
     result_html = format_html("<p>{}{}</p>", icon_html, text_html)
     return result_html
+
+
+def bootstrap5_label_html(text: str, label: str = "default") -> str:
+    """Return HTML for a Bootstrap 5 label."""
+    return format_html('<span class="badge text-bg-{}">{}</span>', label, text)

structures/models/structures_1.py

@@ -17,13 +17,16 @@ from eveuniverse.models import EveMoon, EvePlanet, EveSolarSystem, EveType
 
 from allianceauth.services.hooks import get_extension_logger
 from app_utils.logging import LoggerAddTag
-from app_utils.views import bootstrap_label_html
 
 from structures import __title__
 from structures.app_settings import STRUCTURES_FEATURE_REFUELED_NOTIFICATIONS
 from structures.constants import EveCategoryId, EveGroupId, EveTypeId
 from structures.core import starbases
-from structures.helpers import datetime_almost_equal, hours_until_deadline
+from structures.helpers import (
+    bootstrap5_label_html,
+    datetime_almost_equal,
+    hours_until_deadline,
+)
 from structures.managers import StructureManager, StructureTagManager
 
 from .eveuniverse import EveSpaceType
@@ -125,7 +128,9 @@ class StructureTag(models.Model):
             name = escape(self.name)
         else:
             name = _(self.name)
-        return bootstrap_label_html(name, self.style)
+        # Convert BS3 style names
+        style = "secondary" if self.style == StructureTag.Style.GREY else self.style
+        return bootstrap5_label_html(name, style)
 
     @classmethod
     def sorted(cls, tags: list, reverse: bool = False) -> list:

structures/static/structures/js/public.js

@@ -92,41 +92,47 @@ $(document).ready(function () {
                 {
                     idx: pocos_idx_start,
                     title: filterTitles.constellation,
-                    maxWidth: "11em",
+                    maxWidth: "10em",
                 },
                 {
                     idx: pocos_idx_start + 1,
                     title: filterTitles.planet_type,
+                    maxWidth: "10em",
                 },
                 {
                     idx: pocos_idx_start + 2,
                     title: filterTitles.space_type,
+                    maxWidth: "10em",
                 },
                 {
                     idx: pocos_idx_start + 3,
                     title: filterTitles.region,
+                    maxWidth: "10em",
                 },
                 {
                     idx: pocos_idx_start + 4,
                     title: filterTitles.solar_system,
+                    maxWidth: "10em",
                 },
                 {
                     idx: pocos_idx_start + 5,
                     title: filterTitles.corporation,
-                    maxWidth: "11em",
+                    maxWidth: "10em",
                 },
                 {
                     idx: pocos_idx_start + 6,
                     title: filterTitles.alliance,
-                    maxWidth: "11em",
+                    maxWidth: "10em",
                 },
                 {
                     idx: pocos_idx_start + 7,
                     title: filterTitles.access,
+                    maxWidth: "10em",
                 },
             ],
             autoSize: false,
             bootstrap: true,
+            bootstrap_version: 5,
         },
     });
 });

structures/static/structures/js/structures.js

@@ -22,7 +22,7 @@ $(document).ready(function () {
     $('a[href="#' + tabId + '"]').tab("show");
 
     /* remember last selected tab */
-    $('a[data-toggle="tab"]').on("shown.bs.tab", function (e) {
+    $('a[data-bs-toggle="tab"]').on("shown.bs.tab", function (e) {
         const selectedTabId = $(e.target).attr("href").substr(1);
         setCookie(COOKIE_LAST_TAB_ID, selectedTabId, COOKIE_LAST_TAB_HOURS);
     });
@@ -155,6 +155,7 @@ $(document).ready(function () {
                 ],
                 autoSize: false,
                 bootstrap: true,
+                bootstrap_version: 5,
             },
         },
     });
@@ -242,6 +243,7 @@ $(document).ready(function () {
                 ],
                 autoSize: false,
                 bootstrap: true,
+                bootstrap_version: 5,
             },
         },
     });
@@ -328,6 +330,7 @@ $(document).ready(function () {
                 ],
                 autoSize: false,
                 bootstrap: true,
+                bootstrap_version: 5,
             },
         },
     });
@@ -455,6 +458,7 @@ $(document).ready(function () {
             ],
             autoSize: false,
             bootstrap: true,
+            bootstrap_version: 5,
         },
         createdRow: function (row, data, dataIndex) {
             if (data["is_reinforced"]) {

structures/templates/structures/base.html

@@ -1,13 +1,50 @@
-{% extends 'allianceauth/base.html' %}
+{% extends 'allianceauth/base-bs5.html' %}
 {% load i18n %}
+{% load navactive %}
 
 {% block page_title %}{% translate "Structures" %}{% endblock %}
 
+{% block header_nav_brand %}{% translate "Structures" %}{% endblock %}
+
+{% block header_nav_collapse_left %}
+    {% if perms.structures.view_corporation_structures or perms.structures.view_alliance_structures or perms.structures.view_all_structures %}
+        <li class="nav-item">
+            <a class="nav-link {% navactive request 'structures:structure_list' %}" href="{% url 'structures:structure_list' %}">
+                {% translate 'Structure List' %}
+            </a>
+        </li>
+
+        <li class="nav-item">
+            <a class="nav-link {% navactive request 'structures:statistics' %}" href="{% url 'structures:statistics' %}">
+                {% translate 'Statistics' %}
+            </a>
+        </li>
+    {% endif %}
+
+    <li class="nav-item me-auto">
+        <a class="nav-link {% navactive request 'structures:public' %}" href="{% url 'structures:public' %}">
+            {% translate 'Public' %}
+        </a>
+    </li>
+
+{% endblock header_nav_collapse_left %}
+
+{% block header_nav_collapse_right %}
+    {% if perms.structures.add_structure_owner %}
+        <li class="nav-item">
+            <a class="btn btn-success me-2" href="{% url 'structures:add_structure_owner' %}" title="{% translate 'Add new structure owner or add new sync character to an existing structure owner' %}">
+                <i class="fa-solid fa-plus"></i>&nbsp;Add owner
+            </a>
+        </li>
+    {% endif %}
+{% endblock header_nav_collapse_right %}
+
+{% block header_nav_user_character_control %}
+    {% comment %}
+        Leave empty to remove user control nav items for this app
+    {% endcomment %}
+{% endblock %}
+
 {% block content %}
-    <br />
-    <div>
-        {% include 'structures/partials/menu.html' %}
-        <h2 class="text-left">{{ page_title }}</h2>
-        {% block details %}{% endblock %}
-    </div>
+    {% block details %}{% endblock %}
 {% endblock %}

structures/templates/structures/modals/poco_details.html

@@ -4,8 +4,8 @@
 {% load structures %}
 
 <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-    <h4 class="modal-title">{{ structure }}</h4>
+    <h5 class="modal-title">{{ structure }}</h5>
+    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 </div>
 
 <div class="modal-body">
@@ -13,27 +13,27 @@
     <br>
 
     <!-- Nav tabs -->
-    <ul class="nav nav-tabs" role="tablist">
-        <li role="presentation" class="active">
-            <a href="#tab-poco-general" aria-controls="modules" role="tab" data-toggle="tab">
+    <ul class="nav nav-pills" role="tablist">
+        <li class="nav-item" role="presentation">
+            <button class="nav-link active" data-bs-target="#tab-poco-general" aria-controls="modules" role="tab" data-bs-toggle="tab">
                 {% translate "General" %}
-            </a>
+            </button>
         </li>
-        <li role="presentation">
-            <a href="#tab-poco-reinforcement" aria-controls="access" role="tab" data-toggle="tab">
-                {% translate "Reinforcement Time" %}
-            </a>
+            <li class="nav-item" role="presentation">
+            <button class="nav-link" data-bs-target="#tab-poco-reinforcement" aria-controls="access" role="tab" data-bs-toggle="tab">
+                {% translate "Reinforcement" %}
+            </button>
         </li>
-        <li role="presentation">
-            <a href="#tab-poco-settings" aria-controls="settings" role="tab" data-toggle="tab">
-                {% translate "Tax Rates & Access" %}
-            </a>
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" data-bs-target="#tab-poco-settings" aria-controls="settings" role="tab" data-bs-toggle="tab">
+                {% translate "Tax & Access" %}
+            </button>
         </li>
     </ul>
 
     <!-- Tab panes -->
     <div class="tab-content">
-        <div role="tabpanel" class="tab-pane active" id="tab-poco-general">
+        <div role="tabpanel" class="tab-pane show active" id="tab-poco-general">
             {% include "structures/modals/tab_general_detail.html" %}
         </div>
 

structures/templates/structures/modals/starbase_detail.html

@@ -4,8 +4,8 @@
 {% load structures %}
 
 <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-    <h4 class="modal-title">{{structure}}</h4>
+    <h5 class="modal-title">{{structure}}</h5>
+    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 </div>
 
 <div class="modal-body">
@@ -13,37 +13,36 @@
     <br>
 
     <!-- Nav tabs -->
-    <ul class="nav nav-tabs" role="tablist">
-        <li role="presentation" class="active">
-            <a href="#tab-starbase-general" aria-controls="modules" role="tab" data-toggle="tab">
+    <ul class="nav nav-pills" role="tablist">
+        <li class="nav-item" role="presentation">
+            <button class="nav-link active" data-bs-target="#tab-starbase-general" aria-controls="modules" role="tab" data-bs-toggle="tab">
                 {% translate "General" %}
-            </a>
+            </button>
         </li>
-        <li role="presentation">
-            <a href="#tab-starbase-fuel" aria-controls="fuels" role="tab" data-toggle="tab">
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" data-bs-target="#tab-starbase-fuel" aria-controls="fuels" role="tab" data-bs-toggle="tab">
                 {% translate "Fuel" %} <small>({{ fuel_blocks_count|default:"-"|intcomma }})</small>
-            </a>
+            </button>
         </li>
-        <li role="presentation">
-            <a href="#tab-starbase-modules" aria-controls="modules" role="tab" data-toggle="tab">
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" data-bs-target="#tab-starbase-modules" aria-controls="modules" role="tab" data-bs-toggle="tab">
                 {% translate "Modules" %} <small>({{ modules_count }})</small>
-            </a>
+            </button>
         </li>
-        <li role="presentation">
-            <a href="#tab-starbase-settings" aria-controls="settings" role="tab" data-toggle="tab">
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" data-bs-target="#tab-starbase-settings" aria-controls="settings" role="tab" data-bs-toggle="tab">
                 {% translate "Settings" %}
-            </a>
+            </button>
         </li>
-        <li role="presentation">
-            <a href="#tab-starbase-access" aria-controls="access" role="tab" data-toggle="tab">
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" data-bs-target="#tab-starbase-access" aria-controls="access" role="tab" data-bs-toggle="tab">
                 {% translate "Access" %}
-            </a>
+            </button>
         </li>
     </ul>
-
     <!-- Tab panes -->
     <div class="tab-content">
-        <div role="tabpanel" class="tab-pane active" id="tab-starbase-general">
+        <div role="tabpanel" class="tab-pane show active" id="tab-starbase-general">
             {% include "structures/modals/tab_general_detail.html" %}
         </div>
 

structures/templates/structures/modals/structure_details.html

@@ -4,10 +4,8 @@
 {% load structures %}
 
 <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-        <span aria-hidden="true">&times;</span>
-    </button>
-    <h4 class="modal-title">{{structure.eve_solar_system.name}} - {{structure.name}}</h4>
+    <h5 class="modal-title">{{structure.eve_solar_system.name}} - {{structure.name}}</h5>
+    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 </div>
 
 <div class="modal-body">
@@ -15,38 +13,38 @@
     <br>
 
     <!-- Nav tabs -->
-    <ul class="nav nav-tabs" role="tablist">
-        <li role="presentation" class="active">
-            <a href="#tab-structure-general" aria-controls="modules" role="tab" data-toggle="tab">
+    <ul class="nav nav-pills" role="tablist">
+        <li class="nav-item" role="presentation">
+            <button class="nav-link active" data-bs-target="#tab-structure-general" aria-controls="modules" role="tab" data-bs-toggle="tab">
                 {% translate "General" %}
-            </a>
+            </button>
         </li>
-        <li role="presentation">
-            <a href="#tab-structure-services" aria-controls="fuel" role="tab" data-toggle="tab">
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" data-bs-target="#tab-structure-services" aria-controls="fuel" role="tab" data-bs-toggle="tab">
                 {% translate "Services" %} <small>({{ services_count|default:"-"|intcomma }})</small>
-            </a>
+            </button>
         </li>
 
-        <li role="presentation">
-            <a href="#tab-structure-fuel" aria-controls="fuel" role="tab" data-toggle="tab">
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" data-bs-target="#tab-structure-fuel" aria-controls="fuel" role="tab" data-bs-toggle="tab">
                 {% translate "Fuel" %} <small>({{ fuel_blocks_total|default:"-"|intcomma }})</small>
-            </a>
+            </button>
         </li>
-        <li role="presentation">
-            <a href="#tab-structure-ammo" aria-controls="ammo" role="tab" data-toggle="tab">
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" data-bs-target="#tab-structure-ammo" aria-controls="ammo" role="tab" data-bs-toggle="tab">
                 {% translate "Ammo" %} <small>({{ ammo_total|default:"-"|intcomma }})</small>
-            </a>
+            </button>
         </li>
-        <li role="presentation">
-            <a href="#tab-structure-modules" aria-controls="modules" role="tab" data-toggle="tab">
+        <li class="nav-item" role="presentation">
+            <button class="nav-link" data-bs-target="#tab-structure-modules" aria-controls="modules" role="tab" data-bs-toggle="tab">
                 {% translate "Modules" %} <small>({{ modules_count }})</small>
-            </a>
+            </button>
         </li>
     </ul>
 
     <!-- Tab panes -->
     <div class="tab-content">
-        <div role="tabpanel" class="tab-pane active" id="tab-structure-general">
+        <div role="tabpanel" class="tab-pane show active" id="tab-structure-general">
             {% include "structures/modals/tab_general_detail.html" %}
         </div>
 

structures/templates/structures/partials/menu.html

@@ -5,8 +5,8 @@
 <nav class="navbar navbar-default">
     <div class="container-fluid">
         <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse"
-                data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
+            <button type="button" class="navbar-toggle collapsed" data-bs-toggle="collapse"
+                data-bs-target="#bs-example-navbar-collapse-1" aria-expanded="false">
                 <span class="sr-only">{% translate "Toggle navigation" %}</span>
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>

structures/templates/structures/public.html

@@ -5,44 +5,41 @@
 
 {% block details %}
 
-    <span class="pull-right">
-        <form class="form-inline">
-            <select
-                class="form-control"
-                name="character_id"
-                style="height: auto;"
-                onchange="this.form.submit()"
-                title="Character for calculating access and tax">
-                    {% for character in characters %}
-                        <option
-                            value="{{ character.character_id }}"
-                            {% if character.character_id == selected_character.character_id %} selected{% endif %}>
-                                {{ character.character_name }}
-                        </option>
-                    {% endfor %}
-            </select>
-        </form>
-    </span>
 
     <!-- Nav tabs -->
-    <ul id="public-tabs" class="nav nav-tabs" role="tablist">
+    <ul class="nav nav-tabs" role="tablist">
 
-        <li role="presentation" class="active">
-            <a href="#pocos" aria-controls="orbitals" role="tab" data-toggle="tab">
+        <li role="presentation" class="nav-item me-auto">
+            <button class="nav-link active" aria-controls="orbitals" role="tab" data-bs-toggle="tab" data-bs-target="#pocos">
                 {% translate "Customs Offices" %} <small>({{ pocos_count|default:"-" }})</small>
-            </a>
+            </button>
         </li>
 
+        <li role="presentation" class="nav-item">
+            <form class="form-inline">
+                <select
+                    class="form-control"
+                    name="character_id"
+                    style="height: auto;"
+                    onchange="this.form.submit()"
+                    title="Character for calculating access and tax">
+                        {% for character in characters %}
+                            <option
+                                value="{{ character.character_id }}"
+                                {% if character.character_id == selected_character.character_id %} selected{% endif %}>
+                                    {{ character.character_name }}
+                            </option>
+                        {% endfor %}
+                </select>
+            </form>
+        </li>
     </ul>
 
-    <div class="panel panel-default panel-tabs">
-        <div class="panel-body">
-            <div class="tab-content">
-
-                <div role="tabpanel" class="tab-pane active" id="orbitals">
-                    {% include "structures/partials/public/poco_list.html" %}
-                </div>
+    <div class="card card-default card-tabs border-0">
+        <div class="card-body tab-content">
 
+            <div role="tabpanel" class="tab-pane show active" id="orbitals">
+                {% include "structures/partials/public/poco_list.html" %}
             </div>
 
             <p class="text-muted">
@@ -65,16 +62,13 @@
         type="application/javascript"
         src="{% static 'structures/vendor/datatables/plugins/dataTables.rowGroup.min.js' %}">
     </script>
-    <script
-        type="application/javascript"
-        src="{% static 'structures/vendor/datatables/plugins/filterDropDown.min.js' %}">
-    </script>
+    {% include "bundles/filterdropdown-js.html" %}
     <script type="application/javascript" src="{% static 'structures/js/global.js' %}"></script>
     <script type="application/javascript" src="{% static 'structures/js/public.js' %}"></script>
 {% endblock %}
 
 {% block extra_css %}
-    {% include 'bundles/datatables-css.html' %}
+    {% include 'bundles/datatables-css-bs5.html' %}
 
     <link
         rel="stylesheet"

structures/templates/structures/statistics.html

@@ -6,22 +6,18 @@
 {% block details %}
 
     <!-- Nav tabs -->
-    <ul id="statistics-tabs" class="nav nav-tabs" role="tablist">
-
-        <li role="presentation" class="active">
-            <a href="#summary" aria-controls="summary" role="tab" data-toggle="tab">{% trans "Summary" %}</a>
+    <ul class="nav nav-tabs" role="tablist">
+        <li role="presentation" class="nav-item">
+            <button class="nav-link active" aria-controls="summary" role="tab" data-bs-toggle="tab" data-bs-toggle="#summary">
+                {% trans "Summary" %}
+            </button>
         </li>
-
     </ul>
 
-    <div class="panel panel-default panel-tabs">
-        <div class="panel-body">
-            <div class="tab-content">
-
-                <div role="tabpanel" class="tab-pane active" id="summary">
-                    {% include "structures/partials/statistics/structure_summary.html" %}
-                </div>
-
+    <div class="card card-default card-tabs border-0">
+        <div class="card-body tab-content">
+            <div role="tabpanel" class="tab-pane show active" id="summary">
+                {% include "structures/partials/statistics/structure_summary.html" %}
             </div>
         </div>
     </div>
@@ -33,18 +29,14 @@
 
 {% block extra_javascript %}
     {% include 'bundles/datatables-js.html' %}
-    <script
-        type="application/javascript"
-        src="{% static 'structures/vendor/datatables/plugins/filterDropDown.min.js' %}">
-    </script>
+    {% include "bundles/filterdropdown-js.html" %}
     <script type="application/javascript" src="{% static 'structures/js/global.js' %}"></script>
     <script type="application/javascript" src="{% static 'structures/js/statistics.js' %}"></script>
 
 {% endblock %}
 
 {% block extra_css %}
-    {% include 'bundles/datatables-css.html' %}
-
+    {% include 'bundles/datatables-css-bs5.html' %}
     <link rel="stylesheet" href="{% static 'structures/css/global.css' %}" type="text/css" media="screen">
     <link rel="stylesheet" href="{% static 'structures/css/main.css' %}" type="text/css" media="screen">
     <link rel="stylesheet" href="{% static 'structures/css/statistics.css' %}" type="text/css" media="screen">

structures/templates/structures/structures.html

@@ -5,134 +5,126 @@
 {% load humanize %}
 
 {% block details %}
+    <ul class="nav nav-tabs" role="tablist">
 
-    <!-- Tags Filter Button -->
-    <span class="pull-right">
-        {% if tags_exist %}
-            {% if active_tags %}
-                <button
-                    type="button"
-                    class="btn btn-warning btn-tabs"
-                    data-toggle="modal"
-                    data-target="#modalTagsFilter">
-                        {% translate "Tags Filter (Active)" %}
-                </button>
-            {% else %}
-                <button
-                    type="button"
-                    class="btn btn-default btn-tabs"
-                    data-toggle="modal"
-                    data-target="#modalTagsFilter">
-                        {% translate "Tags Filter" %}
-                </button>
-            {% endif %}
-        {% else %}
-            <button
-                type="button"
-                class="btn btn-default btn-tabs"
-                data-toggle="modal"
-                data-target="#modalTagsFilter"
-                disabled="disabled">
-                    {% translate "Tags Filter" %}
-            </button>
-        {% endif %}
-    </span>
-
-    <!-- Nav tabs -->
-    <ul id="structure-tabs" class="nav nav-tabs" role="tablist">
-
-        <li role="presentation">
-            <a href="#structures" aria-controls="structures" role="tab" data-toggle="tab">
+        <li role="presentation" class="nav-item">
+            <button class="nav-link active" aria-controls="structures" role="tab" data-bs-toggle="tab" data-bs-target="#structures">
                 {% trans "Upwell Structures" %} <small>({{ structures_count|default:"-" }})</small>
-            </a>
+            </button>
         </li>
 
-        <li role="presentation">
-            <a href="#orbitals" aria-controls="orbitals" role="tab" data-toggle="tab">
+        <li role="presentation" class="nav-item">
+            <button class="nav-link" aria-controls="orbitals" role="tab" data-bs-toggle="tab" data-bs-target="#orbitals">
                 {% trans "Orbitals" %} <small>({{ orbitals_count|default:"-" }})</small>
-            </a>
+            </button>
         </li>
 
-        <li role="presentation">
-            <a href="#starbases" aria-controls="starbases" role="tab" data-toggle="tab">
+        <li role="presentation" class="nav-item">
+            <button class="nav-link" aria-controls="starbases" role="tab" data-bs-toggle="tab" data-bs-target="#starbases">
                 {% trans "Starbases" %} <small>({{ starbases_count|default:"-" }})</small>
-            </a>
+            </button>
         </li>
 
         {% if show_jump_gates_tab %}
-            <li role="presentation">
-                <a href="#jump-gates" aria-controls="jump-gates" role="tab" data-toggle="tab">
+            <li role="presentation" class="nav-item">
+                <button class="nav-link" aria-controls="jump-gates" role="tab" data-bs-toggle="tab" data-bs-target="#jump-gates">
                     {% trans "Jump Gates" %} <small>({{ jump_gates_count|default:"-" }})</small>
-                </a>
+                </button>
             </li>
         {% endif %}
 
-    </ul>
+        <li role="presentation" class="nav-item ms-auto">
+            {% if tags_exist %}
+                {% if active_tags %}
+                    <button
+                        type="button"
+                        class="btn btn-warning"
+                        data-bs-toggle="modal"
+                        data-bs-target="#modalTagsFilter">
+                            {% translate "Tags Filter (Active)" %}
+                    </button>
+                {% else %}
+                    <button
+                        type="button"
+                        class="btn btn-secondary"
+                        data-bs-toggle="modal"
+                        data-bs-target="#modalTagsFilter">
+                            {% translate "Tags Filter" %}
+                    </button>
+                {% endif %}
+            {% else %}
+                <button
+                    type="button"
+                    class="btn btn-secondary"
+                    data-bs-toggle="modal"
+                    data-bs-target="#modalTagsFilter"
+                    disabled="disabled">
+                        {% translate "Tags Filter" %}
+                </button>
+            {% endif %}
+        </li>
 
-    <div class="panel panel-default panel-tabs">
-        <div class="panel-body">
-            <div class="tab-content">
+    </ul>
 
-                <div role="tabpanel" class="tab-pane" id="structures">
-                    {% include "structures/partials/structures/structure_list.html" %}
-                </div>
+    <div class="card card-default card-tabs border-0">
+        <div class="card-body tab-content">
 
-                <div role="tabpanel" class="tab-pane" id="orbitals">
-                    {% include "structures/partials/structures/orbital_list.html" %}
-                </div>
+            <div class="tab-pane show active" id="structures" role="tabpanel">
+                {% include "structures/partials/structures/structure_list.html" %}
+            </div>
 
-                <div role="tabpanel" class="tab-pane" id="starbases">
-                    {% include "structures/partials/structures/starbase_list.html" %}
-                </div>
+            <div class="tab-pane" id="orbitals" role="tabpanel">
+                {% include "structures/partials/structures/orbital_list.html" %}
+            </div>
 
-                {% if show_jump_gates_tab %}
-                    <div role="tabpanel" class="tab-pane" id="jump-gates">
-                        {% include "structures/partials/structures/jump_gate_list.html" %}
-                    </div>
-                {% endif %}
+            <div class="tab-pane" id="starbases" role="tabpanel">
+                {% include "structures/partials/structures/starbase_list.html" %}
+            </div>
 
-                <p class="text-muted">
-                    {% translate "All dates are EVE time" %}
-                    | {% translate "Data can be outdated by up to 1 hour due to API caching" %}
-                    | {% translate "Last updated" %} {{ last_updated|naturaltime|default:"?" }}
-                </p>
+            {% if show_jump_gates_tab %}
+                <div class="tab-pane" id="jump-gates" role="tabpanel">
+                    {% include "structures/partials/structures/jump_gate_list.html" %}
+                </div>
+            {% endif %}
 
-            </div>
+            <p class="text-muted">
+                {% translate "All dates are EVE time" %}
+                | {% translate "Data can be outdated by up to 1 hour due to API caching" %}
+                | {% translate "Last updated" %} {{ last_updated|naturaltime|default:"?" }}
+            </p>
 
         </div>
     </div>
 
     <!-- Tags Filter Modal -->
-    <div class="modal" id="modalTagsFilter" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-        <div class="modal-dialog" role="document">
-            <form method="post">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                            <span aria-hidden="true">&times;</span>
-                        </button>
-                        <h4 class="modal-title">{% translate "Tags Filter" %}</h4>
-                    </div>
+    <div class="modal" id="modalTagsFilter" tabindex="-1">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title">{% translate "Tags Filter" %}</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <form method="post">
                     <div class="modal-body">
                         {% csrf_token %}
                         {{ tags_filter_form|bootstrap }}
                     </div>
                     <div class="modal-footer">
-                        <a class="btn btn-default pull-left" href="{% url 'structures:index' %}" role="button">
+                        <a class="btn btn-secondary pull-left" href="{% url 'structures:index' %}" role="button">
                             {% translate "Reset Filter" %}
                         </a>
-                        <a class="btn btn-default pull-left" href="{% url 'structures:structure_list' %}" role="button">
+                        <a class="btn btn-secondary pull-left" href="{% url 'structures:structure_list' %}" role="button">
                             {% translate "Clear Filter" %}
                         </a>
-                        <button type="button" class="btn btn-default" data-dismiss="modal">
+                        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
                             {% translate "Cancel" %}
                         </button>
                         <button type="submit" class="btn btn-primary">
                             {% translate "Apply Filter" %}
                         </button>
                     </div>
-                </div>
-            </form>
+                </form>
+            </div>
         </div>
     </div>
 
@@ -141,8 +133,8 @@
         <div class="modal-dialog" role="document">
             <div class="modal-content" id="modalUpwellDetailsContent">
                 <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title">Loading...</h4>
+                    <h5 class="modal-title">Loading...</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
                 <div class="modal-body">
                 </div>
@@ -151,12 +143,12 @@
     </div>
 
     <!-- Poco details modal -->
-    <div class="modal" id="modalPocoDetails" tabindex="-1" role="dialog" aria-labelledby="modalPocoDetails">
-        <div class="modal-dialog" role="document">
+    <div class="modal" id="modalPocoDetails" tabindex="-1" aria-labelledby="modalPocoDetails">
+        <div class="modal-dialog">
             <div class="modal-content" id="modalPocoDetailsContent">
                 <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title">Loading...</h4>
+                    <h5 class="modal-title">Loading...</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
                 <div class="modal-body">
                 </div>
@@ -169,8 +161,8 @@
         <div class="modal-dialog" role="document">
             <div class="modal-content" id="modalStarbaseDetailContent">
                 <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title">Loading...</h4>
+                    <h5 class="modal-title">Loading...</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
                 <div class="modal-body">
                 </div>
@@ -184,18 +176,16 @@
 {% endblock %}
 
 {% block extra_javascript %}
-    {% include 'bundles/datatables-js.html' %}
-    <script
-        type="application/javascript"
-        src="{% static 'structures/vendor/datatables/plugins/filterDropDown.min.js' %}">
-    </script>
+    {% include "bundles/datatables-js-bs5.html" %}
+    {% include "bundles/filterdropdown-js.html" %}
+
     <script type="application/javascript" src="{% static 'structures/js/global.js' %}"></script>
     <script type="application/javascript" src="{% static 'structures/js/structures.js' %}"></script>
 
 {% endblock %}
 
 {% block extra_css %}
-    {% include 'bundles/datatables-css.html' %}
+    {% include 'bundles/datatables-css-bs5.html' %}
 
     <link rel="stylesheet" href="{% static 'structures/css/global.css' %}" type="text/css" media="screen">
     <link rel="stylesheet" href="{% static 'structures/css/main.css' %}" type="text/css" media="screen">

structures/templates/structures/templatetags/list_asset.html

@@ -1,9 +1,11 @@
 <li class="list-group-item">
-     <p class="list-group-item-text">
-        <img src="{{ icon_url }}" style="height: 32px; width: 32px;">&nbsp;
-        <a href="{{ profile_url }}" target="_blank">{{ name }}</a>
+    <div class="d-flex w-100 justify-content-between">
+        <span>
+            <img src="{{ icon_url }}" style="height: 32px; width: 32px;">&nbsp;
+            <a href="{{ profile_url }}" target="_blank">{{ name }}</a>
+        </span>
         {% if not is_singleton %}
-            <span class="pull-right">{{ quantity|default_if_none:"?"|floatformat:"0g" }}</span>
+            <span>{{ quantity|default_if_none:"?"|floatformat:"0g" }}</span>
         {% endif %}
-    </p>
+    </div>
 </li>

structures/templates/structures/templatetags/list_item.html

@@ -1,13 +1,13 @@
 {% load humanize %}
 
 <li class="list-group-item">
-     <p class="list-group-item-text">
+    <div class="d-flex w-100 justify-content-between">
         {% if is_muted %}
             <span class="text-muted">{{ title }}</span>
         {% else %}
             {{ title }}
         {% endif %}
-        <span class="pull-right">
+        <span>
             {% if value is False or value is None %}
                 <i class="fas fa-times text-danger" title="Disabled"></i>
             {% elif value is True %}
@@ -18,5 +18,5 @@
                 {{ value }}
             {% endif %}
         </span>
-    </p>
+    </div>
 </li>

structures/templates/structures/templatetags/list_tax_item.html

@@ -1,9 +1,9 @@
 {% load i18n %}
 
 <li class="list-group-item">
-     <p class="list-group-item-text">
+    <div class="d-flex w-100 justify-content-between">
         {{ title }}
-        <span class="pull-right">
+        <span>
             {% widthratio value 1 100 %} %
             {% if has_access is False %}
                 <i class="fas fa-ban text-danger" title="{% translate 'No Access' %}"></i>
@@ -11,5 +11,5 @@
                 <i class="fas fa-check text-success" title="{% translate 'Has Access' %}"></i>
             {% endif %}
         </span>
-    </p>
+    </div>
 </li>

structures/templates/structures/templatetags/list_title.html

@@ -1 +1 @@
-<li class="list-group-item list-group-item-custom">{{ title }}</li>
+<li class="list-group-item active">{{ title }}</li>

structures/tests/models/test_structures.py

@@ -1042,13 +1042,13 @@ class TestStructureTag(NoSocketsTestCase):
     def test_html_default(self):
         x = StructureTag(name="Super cool tag")
         self.assertEqual(
-            x.html, '<span class="label label-default">Super cool tag</span>'
+            x.html, '<span class="badge text-bg-secondary">Super cool tag</span>'
         )
 
     def test_html_primary(self):
         x = StructureTag(name="Super cool tag", style="primary")
         self.assertEqual(
-            x.html, '<span class="label label-primary">Super cool tag</span>'
+            x.html, '<span class="badge text-bg-primary">Super cool tag</span>'
         )