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

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

@@ -1,13 +1,12 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: aa-structures
-Version: 2.17.0
+Version: 3.0.0
 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
+License-File: LICENSE
 Requires-Dist: allianceauth-app-utils>=1.22
-Requires-Dist: allianceauth>=3.0
+Requires-Dist: allianceauth>=4
 Requires-Dist: dhooks-lite>=1.0
 Requires-Dist: django-eveuniverse>=1.5.2
 Requires-Dist: django-multiselectfield

{aa_structures-2.17.0 → aa_structures-3.0.0}/pyproject.toml

@@ -12,7 +12,6 @@ authors = [{ name = "Erik Kalkoken", email = "kalkoken87@gmail.com" }]
 classifiers = [
     "Environment :: Web Environment",
     "Framework :: Django",
-    "Framework :: Django :: 4.0",
     "Framework :: Django :: 4.2",
     "Intended Audience :: End Users/Desktop",
     "License :: OSI Approved :: MIT License",
@@ -22,12 +21,13 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Topic :: Internet :: WWW/HTTP",
     "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
 ]
 dependencies = [
     "allianceauth-app-utils>=1.22",
-    "allianceauth>=3.0",
+    "allianceauth>=4",
     "dhooks-lite>=1.0",
     "django-eveuniverse>=1.5.2",
     "django-multiselectfield",

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

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

{aa_structures-2.17.0 → aa_structures-3.0.0}/structures/core/serializers.py

@@ -330,8 +330,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 +340,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 +350,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>'

{aa_structures-2.17.0 → aa_structures-3.0.0}/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,
         },
     });
 });

{aa_structures-2.17.0 → aa_structures-3.0.0}/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"]) {

aa_structures-3.0.0/structures/templates/structures/base.html

@@ -0,0 +1,46 @@
+{% 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_user_character_control %}
+    {% 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>
+        </li>
+    {% endif %}
+    <div class="vr"></div>
+{% endblock header_nav_user_character_control %}
+
+{% block content %}
+        {% block details %}{% endblock %}
+{% endblock %}

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

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

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

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

{aa_structures-2.17.0 → aa_structures-3.0.0}/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"

{aa_structures-2.17.0 → aa_structures-3.0.0}/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">