aa-structures 3.0.0__tar.gz → 3.0.2__tar.gz

{aa_structures-3.0.0 → aa_structures-3.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aa-structures
-Version: 3.0.0
+Version: 3.0.2
 Summary: App for managing Eve Online structures with Alliance Auth.
 Author-email: Erik Kalkoken <kalkoken87@gmail.com>
 Requires-Python: >=3.8
@@ -20,8 +20,8 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 License-File: LICENSE
-Requires-Dist: allianceauth-app-utils>=1.22
-Requires-Dist: allianceauth>=4
+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-3.0.0 → aa_structures-3.0.2}/pyproject.toml

@@ -26,8 +26,8 @@ classifiers = [
     "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
 ]
 dependencies = [
-    "allianceauth-app-utils>=1.22",
-    "allianceauth>=4",
+    "allianceauth-app-utils>=1.26",
+    "allianceauth>=4,<5",
     "dhooks-lite>=1.0",
     "django-eveuniverse>=1.5.2",
     "django-multiselectfield",

{aa_structures-3.0.0 → aa_structures-3.0.2}/structures/__init__.py

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

{aa_structures-3.0.0 → aa_structures-3.0.2}/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
 
@@ -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

{aa_structures-3.0.0 → aa_structures-3.0.2}/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)

{aa_structures-3.0.0 → aa_structures-3.0.2}/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:

{aa_structures-3.0.0 → aa_structures-3.0.2}/structures/templates/structures/base.html

@@ -21,7 +21,6 @@
         </li>
     {% endif %}
 
-
     <li class="nav-item me-auto">
         <a class="nav-link {% navactive request 'structures:public' %}" href="{% url 'structures:public' %}">
             {% translate 'Public' %}
@@ -30,17 +29,22 @@
 
 {% endblock header_nav_collapse_left %}
 
-{% block header_nav_user_character_control %}
+{% block header_nav_collapse_right %}
     {% if perms.structures.add_structure_owner %}
         <li class="nav-item">
-            <a class="nav-link text-success" 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>
+            <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 %}
-    <div class="vr"></div>
-{% endblock header_nav_user_character_control %}
+{% 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 %}
-        {% block details %}{% endblock %}
+    {% block details %}{% endblock %}
 {% endblock %}

{aa_structures-3.0.0 → aa_structures-3.0.2}/structures/templates/structures/structures.html

@@ -27,9 +27,9 @@
 
         {% if show_jump_gates_tab %}
             <li role="presentation" class="nav-item">
-                <a class="nav-link" aria-controls="jump-gates" role="tab" data-bs-toggle="tab" data-bs-target="#jump-gates">
+                <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 %}
 

{aa_structures-3.0.0 → aa_structures-3.0.2}/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>'
         )