Merge branch 'bootstrap-class-fixes' into 'master'

[FIX] BG color classes See merge request allianceauth/allianceauth!1716
2025-07-20 17:52:30 +02:00 · 2025-05-06 02:04:01 +00:00 · 2025-05-06 02:03:56 +00:00 · 2025-05-06 02:03:50 +00:00 · 2025-05-06 02:03:44 +00:00 · 2025-05-05 01:49:40 +02:00
2 changed files with 12 additions and 3 deletions
--- a/allianceauth/srp/templates/srp/data.html
+++ b/allianceauth/srp/templates/srp/data.html
@ -92,7 +92,10 @@ ESC to cancel{% endblocktranslate %}" id="blah"></i></th>
                                        {{ srpfleetrequest.character.alliance.alliance_ticker }}
                                    {% endif %}
                                    [{{ srpfleetrequest.character.corporation.corporation_ticker }}]
-                                    {{ srpfleetrequest.character.character_name }}&nbsp;<i class="copy-text-fa-icon far fa-copy" data-clipboard-text="{{ srpfleetrequest.character.character_name }}"></i>
+                                    {{ srpfleetrequest.character.character_name }}&nbsp;
+                                    <sup>
+                                        <i class="copy-text-fa-icon far fa-copy" data-clipboard-text="{{ srpfleetrequest.character.character_name }}"></i>
+                                    </sup>
                                </td>
                                <td>
                                    <a href="{{ srpfleetrequest.killboard_link }}"
@ -239,13 +242,19 @@ ESC to cancel{% endblocktranslate %}" id="blah"></i></th>
                }
            });

+            // Non-Orderable columns
+            const nonOrderableTargets = [1];
+            {% if perms.auth.srp_management %}
+                nonOrderableTargets.push(8);
+            {% endif %}
+
            elementTableSrpList.DataTable({
                language: {url: '{{ DT_LANG_PATH }}'},
                "order": [[ 6, "asc" ]],
                "paging": false,
                "columnDefs": [
                    {
-                        "targets": [1, 8],
+                        "targets": nonOrderableTargets,
                        "orderable": false
                    },
                    {
--- a/allianceauth/templates/allianceauth/top-menu-rh-default.html
+++ b/allianceauth/templates/allianceauth/top-menu-rh-default.html
@ -2,7 +2,7 @@
 {% if user.is_authenticated %}
 <li class="nav-item">
    <a href="{% url 'authentication:add_character' %}" class="nav-link" title="{% translate 'Add Character' %}">
-        <i class="fa-solid fa-plus"></i>
+        <i class="fa-solid fa-user-plus"></i>
        <span class="d-lg-none d-md-inline m-2">{% translate "Add Character" %}</span>
    </a>
 </li>
Author	SHA1	Message	Date
Peter Pfeufer	306623f3f1	Merge branch 'bootstrap-class-fixes' into 'master' [FIX] BG color classes See merge request allianceauth/allianceauth!1716	2025-05-06 02:04:01 +00:00
Ariel Rin	54910746e3	Merge branch 'bootstrap-class-fixes' into 'master' [FIX] BG color classes See merge request allianceauth/allianceauth!1716	2025-05-06 02:03:56 +00:00
Ariel Rin	07ae68333d	Merge branch 'improve-add-character-icon' into 'master' [CHANGE] Better "Add Character" Icon See merge request allianceauth/allianceauth!1720	2025-05-06 02:03:50 +00:00
Ariel Rin	69e70a4c9b	Merge branch '1426-fix-srp-datatable-warning' into 'master' [FIX] SRP Datatable Warning about incorrect column count Closes #1426 See merge request allianceauth/allianceauth!1721	2025-05-06 02:03:44 +00:00
Peter Pfeufer	b55f11ee74	[FIX] SRP Datatable Warning about incorrect column count This was triggered by an incorrect column count due to missing permissions, or not taking missing permissions into account when loading the page and setting up the non-orderable columns. Fixes #1426	2025-05-05 01:49:40 +02:00
Peter Pfeufer	94ee3c0203	[CHANGE] Better "Add Character" Icon	2025-05-02 01:06:26 +02:00