diff --git a/allianceauth/authentication/templates/authentication/dashboard.characters.html b/allianceauth/authentication/templates/authentication/dashboard.characters.html index 0e0229fd..b2e0588d 100644 --- a/allianceauth/authentication/templates/authentication/dashboard.characters.html +++ b/allianceauth/authentication/templates/authentication/dashboard.characters.html @@ -1,5 +1,5 @@ {% load i18n %} -
+
diff --git a/allianceauth/authentication/templates/authentication/dashboard.groups.html b/allianceauth/authentication/templates/authentication/dashboard.groups.html index 5cbd8cf3..88ed15c1 100644 --- a/allianceauth/authentication/templates/authentication/dashboard.groups.html +++ b/allianceauth/authentication/templates/authentication/dashboard.groups.html @@ -1,11 +1,11 @@ {% load i18n %} -
+

{% translate "Membership" %}

-
{% translate "State:" %} {{ request.user.profile.state }}
+
{% translate "State:" %} {{ request.user.profile.state }}
{% for group in groups %} diff --git a/allianceauth/authentication/templates/authentication/tokens.html b/allianceauth/authentication/templates/authentication/tokens.html index 4d522b96..e7907893 100644 --- a/allianceauth/authentication/templates/authentication/tokens.html +++ b/allianceauth/authentication/templates/authentication/tokens.html @@ -1,65 +1,85 @@ {% extends "allianceauth/base-bs5.html" %} + {% load i18n %} -{% block page_title %}{% translate "Dashboard" %}{% endblock page_title %} +{% block page_title %} + {% translate "Token Management" %} +{% endblock page_title %} + +{% block header_nav_brand %} + {% translate "Token Management" %} +{% endblock header_nav_brand %} {% block content %} -

{% translate "Token Management" %}

-
+

+ {% translate "This page is a best attempt, but backups or database logs can still contain your tokens. Always revoke tokens on https://community.eveonline.com/support/third-party-applications/ where possible."|urlize %} +

+ +
- + {% for t in tokens %} - - + + + {% endfor %}
{% translate "Scopes" %} {% translate "Actions" %} {% translate "Character" %}
{% for s in t.scopes.all %}{{ s.name }}{% endfor %} - - + + {% for s in t.scopes.all %} + {{ s.name }} + {% endfor %} + + + {{ t.character_name }}
- {% translate "This page is a best attempt, but backups or database logs can still contain your tokens. Always revoke tokens on https://community.eveonline.com/support/third-party-applications/ where possible."|urlize %}
{% endblock content %} {% block extra_javascript %} {% include "bundles/datatables-js-bs5.html" %} + + {% endblock extra_javascript %} {% block extra_css %} {% include "bundles/datatables-css-bs5.html" %} {% endblock extra_css %} - -{% block extra_script %} - $(document).ready(function(){ - let grp = 2; - var table = $('#table_tokens').DataTable({ - "columnDefs": [{ orderable: false, targets: [0,1] },{ "visible": false, "targets": grp }], - "order": [[grp, 'asc']], - "drawCallback": function (settings) { - var api = this.api(); - var rows = api.rows({ page: 'current' }).nodes(); - var last = null; - api.column(grp, { page: 'current' }) - .data() - .each(function (group, i) { - if (last !== group) { - $(rows).eq(i).before('' + group + ''); - last = group; - } - }); - }, - "stateSave": true, - }); - }); -{% endblock extra_script %} diff --git a/allianceauth/authentication/templates/public/base.html b/allianceauth/authentication/templates/public/base.html index 2951c284..feb8909a 100644 --- a/allianceauth/authentication/templates/public/base.html +++ b/allianceauth/authentication/templates/public/base.html @@ -7,7 +7,7 @@ - + @@ -16,8 +16,9 @@ {% block title %}{% block page_title %}{% endblock page_title %} - {{ SITE_NAME }}{% endblock title %} - {% include 'bundles/bootstrap-css.html' %} + {% include 'bundles/bootstrap-css-bs5.html' %} {% include 'bundles/fontawesome.html' %} + {% block extra_include %} {% endblock %} @@ -30,25 +31,23 @@ background-size: cover; } - .panel-transparent { + .card-login { background: rgba(48 48 48 / 0.7); - color: #ffffff; + color: rgb(255 255 255); padding-bottom: 21px; } - .panel-body { - - } - #lang-select { width: 40%; margin-left: auto; margin-right: auto; } + {% block extra_style %} {% endblock %} +
{% block content %} diff --git a/allianceauth/authentication/templates/public/lang_select.html b/allianceauth/authentication/templates/public/lang_select.html index 6556ad24..6bf5fa9f 100644 --- a/allianceauth/authentication/templates/public/lang_select.html +++ b/allianceauth/authentication/templates/public/lang_select.html @@ -1,9 +1,12 @@ {% load i18n %} +
{% csrf_token %} + +
diff --git a/allianceauth/corputils/templates/corputils/corpstats.html b/allianceauth/corputils/templates/corputils/corpstats.html index 9d75b5e7..393d58cc 100644 --- a/allianceauth/corputils/templates/corputils/corpstats.html +++ b/allianceauth/corputils/templates/corputils/corpstats.html @@ -1,178 +1,230 @@ {% extends 'corputils/base.html' %} + {% load i18n %} {% load humanize %} + {% block member_data %} {% if corpstats %}
- +
- + + {% if corpstats.corp.alliance %} - {% endif %} + - + + {% if corpstats.corp.alliance %} - + {% endif %}
- {{ corpstats.corp.corporation_name }} - + {{ corpstats.corp.corporation_name }} + + {{ corpstats.corp.alliance.alliance_name }}

{{ corpstats.corp.corporation_name }}

{{ corpstats.corp.corporation_name }}

{{ corpstats.corp.alliance.alliance_name }}

{{ corpstats.corp.alliance.alliance_name }}

-
-
-
- -
@@ -181,40 +233,41 @@ {% endblock %} {% block extra_javascript %} - {% include 'bundles/datatables-js.html' %} + {% include 'bundles/datatables-js-bs5.html' %} + + {% endblock %} {% block extra_css %} - {% include 'bundles/datatables-css.html' %} -{% endblock %} - -{% block extra_script %} - $(document).ready(function(){ - $('#table-mains').DataTable({ - "columnDefs": [ - { "sortable": false, "targets": [1] }, - ], - "stateSave": true, - "stateDuration": 0 - }); - $('#table-members').DataTable({ - "columnDefs": [ - { "searchable": false, "targets": [0, 2] }, - { "sortable": false, "targets": [0, 2] }, - ], - "order": [[ 1, "asc" ]], - "stateSave": true, - "stateDuration": 0 - }); - $('#table-unregistered').DataTable({ - "columnDefs": [ - { "searchable": false, "targets": [0, 2] }, - { "sortable": false, "targets": [0, 2] }, - ], - "order": [[ 1, "asc" ]], - "stateSave": true, - "stateDuration": 0 - }); - - }); + {% include 'bundles/datatables-css-bs5.html' %} {% endblock %} diff --git a/allianceauth/corputils/templates/corputils/search.html b/allianceauth/corputils/templates/corputils/search.html index 3b682413..8a100304 100644 --- a/allianceauth/corputils/templates/corputils/search.html +++ b/allianceauth/corputils/templates/corputils/search.html @@ -1,33 +1,36 @@ {% extends "corputils/base.html" %} + {% load i18n %} + {% block member_data %} -
-
-
{% translate "Search Results" %}
+
+
+
{% translate "Search Results" %}
-
+ +
- - - - - - - + + + + + + + {% for result in results %} - - - - - - - + + + + + + + {% endfor %} @@ -35,17 +38,20 @@ {% endblock %} + {% block extra_javascript %} - {% include 'bundles/datatables-js.html' %} -{% endblock %} -{% block extra_css %} - {% include 'bundles/datatables-css.html' %} -{% endblock %} -{% block extra_script %} - $(document).ready(function(){ - $('#table-search').DataTable({ - "stateSave": true, - "stateDuration": 0 + {% include 'bundles/datatables-js-bs5.html' %} + + +{% endblock %} + +{% block extra_css %} + {% include 'bundles/datatables-css-bs5.html' %} {% endblock %} diff --git a/allianceauth/eveonline/templatetags/examples.html b/allianceauth/eveonline/templatetags/examples.html index 486394c8..69482457 100644 --- a/allianceauth/eveonline/templatetags/examples.html +++ b/allianceauth/eveonline/templatetags/examples.html @@ -16,7 +16,7 @@ Needs to be called with a context containing three objects: {% block content %}
-

Evelinks templatetags examples

+

Evelinks templatetags examples

profile URLs

diff --git a/allianceauth/fleetactivitytracking/forms.py b/allianceauth/fleetactivitytracking/forms.py index 0bbf560c..451bc3cb 100644 --- a/allianceauth/fleetactivitytracking/forms.py +++ b/allianceauth/fleetactivitytracking/forms.py @@ -4,4 +4,4 @@ from django.utils.translation import gettext_lazy as _ class FatlinkForm(forms.Form): fleet = forms.CharField(label=_("Fleet Name"), max_length=50) - duration = forms.IntegerField(label=_("Duration of fat-link"), required=True, initial=30, min_value=1, max_value=2147483647, help_text=_('minutes')) + duration = forms.IntegerField(label=_("Duration of fat-link"), required=True, initial=30, min_value=1, max_value=2147483647, help_text=_('Duration of the fat-link in minutes')) diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html index fe015866..8183da5d 100644 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html @@ -1,23 +1,44 @@ {% extends 'allianceauth/base-bs5.html' %} + {% load i18n %} + {% block page_title %} {% translate "Fleet Participation" %} {% endblock %} + +{% block header_nav_brand %} + {% translate "Fleet Activity Tracking" %} +{% endblock header_nav_brand %} + {% block content %} -
-

{% translate "Character not found!" %}

-
+
+

+ {% translate "Character not found!" %} +

+ +
-
-
{{ character_name }}
-
+
+
+
+ {{ character_name }} +
+
+ +
{{ character_name }}
+
- - {% translate "This character is not associated with an auth account." %} {% translate "Add it here" %} {% translate "before attempting to click fleet attendance links." %} + + + {% translate "This character is not associated with an auth account." %} + {% translate "Add it here" %} + {% translate "before attempting to click fleet attendance links." %}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkcreate.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkcreate.html new file mode 100644 index 00000000..e23df8de --- /dev/null +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkcreate.html @@ -0,0 +1,54 @@ +{% extends "allianceauth/base-bs5.html" %} + +{% load django_bootstrap5 %} +{% load i18n %} + +{% block page_title %} + {% translate "Create Fatlink" %} +{% endblock page_title %} + +{% block header_nav_brand %} + {% translate "Fleet Activity Tracking" %} +{% endblock header_nav_brand %} + +{% block content %} +
+

+ {% translate "Create Fatlink" %} +

+ +
+ {% if badrequest %} + + {% endif %} + + {% for message in errormessages %} + + {% endfor %} + +
+
+
+ {% translate "Fatlink details" %} +
+
+ +
+
+
+
+ {% csrf_token %} + {% bootstrap_form form %} + +
+ {% translate "Create fatlink" as button_text %} + {% bootstrap_button button_class="btn btn-primary" content=button_text name="submit_fat" id="submit_fat" %} +
+ +
+
+
+
+
+
+{% endblock content %} diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html deleted file mode 100644 index 6cf71d4e..00000000 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html +++ /dev/null @@ -1,31 +0,0 @@ -{% extends "allianceauth/base-bs5.html" %} -{% load bootstrap %} -{% load i18n %} -{% block page_title %} - {% translate "Create Fatlink" %} -{% endblock page_title %} -{% block content %} -
-

{% translate "Create Fleet Operation" %}

-
- {% if badrequest %} - - {% endif %} - {% for message in errormessages %}{% endfor %} -
-
- - {% csrf_token %} - {{ form|bootstrap }} -
- - -
-
-
-
-{% endblock content %} diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html index 5415cb54..c935d853 100644 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html @@ -1,21 +1,35 @@ {% extends "allianceauth/base-bs5.html" %} + {% load i18n %} -{% block page_title %}{% translate "Fatlink view" %}{% endblock page_title %} + +{% block page_title %} + {% translate "Fatlink view" %} +{% endblock page_title %} + +{% block header_nav_brand %} + {% translate "Fleet Activity Tracking" %} +{% endblock header_nav_brand %} {% block content %} -
-

{% translate "Edit fatlink" %} "{{ fatlink }}" +
+

+ {% translate "Edit fatlink" %} "{{ fatlink }}" +
-

-
-
{% translate "Registered characters" %}
-
+ +
+
+
{% translate "Registered characters" %}
+
+ +

@@ -25,21 +39,23 @@ + {% for fat in registered_fats %} - {% if fat.station != "No Station" %} - - {% else %} - - {% endif %} + diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html index ecad5a8e..fa0f9138 100644 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html @@ -1,71 +1,104 @@ {% extends "allianceauth/base-bs5.html" %} + {% load i18n %} -{% block page_title %}{% translate "Personal fatlink statistics" %}{% endblock page_title %} +{% block page_title %} + {% translate "Personal fatlink statistics" %} +{% endblock page_title %} + +{% block header_nav_brand %} + {% translate "Fleet Activity Tracking" %} +{% endblock header_nav_brand %} {% block content %} -
-

{% blocktranslate %}Participation data statistics for {{ month }}, {{ year }}{% endblocktranslate %} +
+

+ {% blocktranslate %}Participation data statistics for {{ month }}, {{ year }}{% endblocktranslate %} + {% if char_id %} -
- {% translate "Previous month" %} - {% translate "Next month" %} -
+
+ + {% translate "Previous month" %} + + + {% translate "Next month" %} + +
{% endif %}

-

- {% blocktranslate count links=n_fats trimmed %} - {{ user }} has collected one link this month. - {% plural %} - {{ user }} has collected {{ links }} links this month. - {% endblocktranslate %} -

-

{% translate "User" %}{% translate "Eve Time" %}
{{ fat.user }} {{ fat.character.character_name }}{% blocktranslate %}Docked in {% endblocktranslate %}{{ fat.system }}{{ fat.system }} + {% if fat.station != "No Station" %} + {% translate "Docked in" %} + {% endif %} + {{ fat.system }} + {{ fat.shiptype }} {{ fat.fatlink.fatdatetime }}
- - - - - {% for ship, n_fats in shipStats %} - - - - - {% endfor %} -
{% translate "Ship" %}{% translate "Times used" %}
{{ ship }}{{ n_fats }}
- {% if created_fats %} -

- {% blocktranslate count links=n_created_fats trimmed %} - {{ user }} has created one link this month. - {% plural %} - {{ user }} has created {{ links }} links this month. - {% endblocktranslate %} -

- {% if created_fats %} - - - - - - - - - {% for link in created_fats %} - - - - - - - - {% endfor %} +
+
+
+ {% blocktranslate count links=n_fats trimmed %} + {{ user }} has collected one link this month. + {% plural %} + {{ user }} has collected {{ links }} links this month. + {% endblocktranslate %} +
+
+ +
+
{% translate "Fleet" %}{% translate "Creator" %}{% translate "Eve Time" %}{% translate "Duration" %}{% translate "Edit" %}
{{ link.fleet }}{{ link.creator.username }}{{ link.fatdatetime }}{{ link.duration }} - - - -
+ + + + + + {% for ship, n_fats in shipStats %} + + + + + {% endfor %}
{% translate "Ship" %}{% translate "Times used" %}
{{ ship }}{{ n_fats }}
- {% endif %} +
+
+ + {% if created_fats %} +
+
+
+ {% blocktranslate count links=n_created_fats trimmed %} + {{ user }} has created one link this month. + {% plural %} + {{ user }} has created {{ links }} links this month. + {% endblocktranslate %} +
+
+ +
+ + + + + + + + + + {% for link in created_fats %} + + + + + + + + {% endfor %} +
{% translate "Fleet" %}{% translate "Creator" %}{% translate "Eve Time" %}{% translate "Duration" %}{% translate "Edit" %}
+ + {{ link.fleet }} + + {{ link.creator.username }}{{ link.fatdatetime }}{{ link.duration }} + + + +
+
+
{% endif %}
{% endblock content %} diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html index 7ac8cfa4..30b19512 100644 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html @@ -1,25 +1,36 @@ {% extends "allianceauth/base-bs5.html" %} + {% load i18n %} + {% block page_title %} {% translate "Personal fatlink statistics" %} {% endblock page_title %} + +{% block header_nav_brand %} + {% translate "Fleet Activity Tracking" %} +{% endblock header_nav_brand %} + {% block content %} -
-

+
+

{% blocktranslate %}Participation data statistics for {{ year }}{% endblocktranslate %} +
{% translate "Previous year" %} + {% if next_year %} {% translate "Next year" %} {% endif %}

+
+ {% for monthnr, month, n_fats in monthlystats %} + + + + + + + {% endfor %} +
{% translate "Month" %} {% translate "Fats" %}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html index 3d18bf0d..3132d889 100644 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html @@ -1,50 +1,63 @@ {% extends "allianceauth/base-bs5.html" %} + {% load i18n %} + {% block page_title %} {% translate "Fatlink Corp Statistics" %} {% endblock page_title %} + +{% block header_nav_brand %} + {% translate "Fleet Activity Tracking" %} +{% endblock header_nav_brand %} + {% block content %}
-

+

{% blocktranslate %}Participation data statistics for {{ month }}, {{ year }}{% endblocktranslate %} +
{% translate "Previous month" %} + {% if next_month %} {% translate "Next month" %} {% endif %}

+ {% if fatStats %} -
- - - - - - - - - {% for memberStat in fatStats %} +
+
{% translate "Main Character" %}{% translate "Characters" %}{% translate "Fats" %} - {% translate "Average fats" %} - -
- - - - - + + + + + - {% endfor %} -
- {{ memberStat.mainchar.character_name }} - {{ memberStat.mainchar.character_name }}{{ memberStat.n_chars }}{{ memberStat.n_fats }}{{ memberStat.avg_fat }}{% translate "Main Character" %}{% translate "Characters" %}{% translate "Fats" %} + {% translate "Average fats" %} + +
-
+ {% for memberStat in fatStats %} +
+ {{ memberStat.mainchar.character_name }} + {{ memberStat.mainchar.character_name }}{{ memberStat.n_chars }}{{ memberStat.n_fats }}{{ memberStat.avg_fat }}
+
{% endif %}
{% endblock content %} -{% block extra_script %} - $(document).ready(function () { - $("[rel=tooltip]").tooltip(); - }); -{% endblock extra_script %} + +{% block extra_javascript %} + +{% endblock extra_javascript %} diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html index 2a1568e3..f48a1d64 100644 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html @@ -1,54 +1,67 @@ {% extends "allianceauth/base-bs5.html" %} + {% load i18n %} + {% block page_title %} {% translate "Fatlink Statistics" %} {% endblock page_title %} + +{% block header_nav_brand %} + {% translate "Fleet Activity Tracking" %} +{% endblock header_nav_brand %} + {% block content %} -
-

+
+

{% blocktranslate %}Participation data statistics for {{ month }}, {{ year }}{% endblocktranslate %} +
{% translate "Previous month" %} + {% if next_month %} {% translate "Next month" %} {% endif %}

+ {% if fatStats %} -
- - - - - - - - - - {% for corpStat in fatStats %} +
+
{% translate "Ticker" %}{% translate "Corp" %}{% translate "Members" %}{% translate "Fats" %} - {% translate "Average fats" %} - -
- - - - - - + + + + + + - {% endfor %} -
- {{ corpStat.corp.corporation_name }} - - [{{ corpStat.corp.corporation_ticker }}] - {{ corpStat.corp.corporation_name }}{{ corpStat.corp.member_count }}{{ corpStat.n_fats }}{{ corpStat.avg_fat }}{% translate "Ticker" %}{% translate "Corp" %}{% translate "Members" %}{% translate "Fats" %} + {% translate "Average fats" %} + +
-
+ {% for corpStat in fatStats %} + + + {{ corpStat.corp.corporation_name }} + + + [{{ corpStat.corp.corporation_ticker }}] + + {{ corpStat.corp.corporation_name }} + {{ corpStat.corp.member_count }} + {{ corpStat.n_fats }} + {{ corpStat.avg_fat }} + + {% endfor %} + +
{% endif %}

{% endblock content %} -{% block extra_script %} - $(document).ready(function () { - $("[rel=tooltip]").tooltip(); - }); -{% endblock extra_script %} + +{% block extra_javascript %} + +{% endblock extra_javascript %} diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html index 2959ca81..53131194 100644 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html @@ -1,11 +1,21 @@ {% extends "allianceauth/base-bs5.html" %} + {% load i18n %} + {% block page_title %} {% translate "Fatlink view" %} {% endblock page_title %} + +{% block header_nav_brand %} + {% translate "Fleet Activity Tracking" %} +{% endblock header_nav_brand %} + {% block content %}
-

{% translate "Participation data" %}

+

+ {% translate "Participation data" %} +

+
@@ -15,11 +25,15 @@
- {% translate "Personal statistics" %} + + + {% translate "Personal statistics" %} +
+ {% if fats %}
@@ -30,6 +44,7 @@ + {% for fat in fats %} @@ -48,6 +63,7 @@ {% else %}
{% translate "No fleet activity on record." %}
{% endif %} + {% if perms.auth.fleetactivitytracking %}
{% translate "Ship" %} {% translate "Eve Time" %}
{{ fat.fatlink.fleet }}
@@ -66,6 +82,7 @@
+ {% if fatlinks %}
@@ -77,6 +94,7 @@ + {% for link in fatlinks %} + {% for notif in notifications %} diff --git a/allianceauth/optimer/auth_hooks.py b/allianceauth/optimer/auth_hooks.py index 686bd4d4..e04fa524 100644 --- a/allianceauth/optimer/auth_hooks.py +++ b/allianceauth/optimer/auth_hooks.py @@ -32,7 +32,7 @@ def register_url(): class NextOpsHook(hooks.DashboardItemHook): - def __init__(self): #TODO add the view permms so if they cant see it is not rendered + def __init__(self): #TODO add the view perms so if they cant see it is not rendered hooks.DashboardItemHook.__init__( self, dashboard_ops, diff --git a/allianceauth/optimer/form_widgets.py b/allianceauth/optimer/form_widgets.py index 3cd313b8..e639e18b 100644 --- a/allianceauth/optimer/form_widgets.py +++ b/allianceauth/optimer/form_widgets.py @@ -3,6 +3,7 @@ Form Widgets """ from django import forms +from django.utils.safestring import mark_safe class DataListWidget(forms.TextInput): @@ -42,4 +43,4 @@ class DataListWidget(forms.TextInput): data_list += "" - return text_html + data_list + return mark_safe(text_html + data_list) diff --git a/allianceauth/optimer/templates/optimer/add.html b/allianceauth/optimer/templates/optimer/add.html index 9b9ddecd..8bcb58bd 100644 --- a/allianceauth/optimer/templates/optimer/add.html +++ b/allianceauth/optimer/templates/optimer/add.html @@ -1,47 +1,65 @@ -{% extends "allianceauth/base.html" %} -{% load bootstrap %} +{% extends "allianceauth/base-bs5.html" %} + +{% load django_bootstrap5 %} {% load i18n %} {% get_current_language as LANGUAGE_CODE %} -{% block page_title %}{% translate "Create Operation" %}{% endblock page_title %} +{% block page_title %} + {% translate "Create Operation" %} +{% endblock page_title %} + +{% block header_nav_brand %} + {% translate "Fleet Operation Timers" %} +{% endblock header_nav_brand %} + {% block extra_css %} {% include 'bundles/jquery-datetimepicker-css.html' %} {% endblock extra_css %} {% block content %} -
-

{% translate "Create Fleet Operation" %}

+
+

+ {% translate "Create Fleet Operation" %} +

-
-
-
- +
+
+
+ {% translate "Fleet operation details" %} +
+
+ +
+
+
+ {% csrf_token %} - {{ form|bootstrap }} -
- + + {% bootstrap_form form %} + +
+ {% translate "Create fleet operation" as button_text %} + {% bootstrap_button button_class="btn btn-primary" content=button_text %} +
+
- {% endblock content %} {% block extra_javascript %} {% include 'bundles/jquery-datetimepicker-js.html' %} -{% endblock %} -{% block extra_script %} - $('#id_start').datetimepicker({ - setlocale: '{{ LANGUAGE_CODE }}', - {% if NIGHT_MODE %} - theme: 'dark', - {% else %} - theme: 'default', - {% endif %} - mask: true, - format: 'Y-m-d H:i', - minDate: 0 - }); -{% endblock extra_script %} + +{% endblock %} diff --git a/allianceauth/optimer/templates/optimer/dashboard.ops.html b/allianceauth/optimer/templates/optimer/dashboard.ops.html index b271c591..a21e6306 100644 --- a/allianceauth/optimer/templates/optimer/dashboard.ops.html +++ b/allianceauth/optimer/templates/optimer/dashboard.ops.html @@ -1,10 +1,11 @@ {% load i18n %} {% load evelinks %} -
+

{% translate "Upcoming Fleets" %}

+
{% translate "Duration" %} {% translate "Edit" %}
diff --git a/allianceauth/fleetactivitytracking/views.py b/allianceauth/fleetactivitytracking/views.py index 138646c4..59644ba0 100644 --- a/allianceauth/fleetactivitytracking/views.py +++ b/allianceauth/fleetactivitytracking/views.py @@ -352,11 +352,11 @@ def create_fatlink_view(request): for errorname, message in e.message_dict.items(): messages.append(message[0].decode()) context = {'form': form, 'errormessages': messages} - return render(request, 'fleetactivitytracking/fatlinkformatter.html', context=context) + return render(request, 'fleetactivitytracking/fatlinkcreate.html', context=context) else: form = FatlinkForm() context = {'form': form, 'badrequest': True} - return render(request, 'fleetactivitytracking/fatlinkformatter.html', context=context) + return render(request, 'fleetactivitytracking/fatlinkcreate.html', context=context) return redirect('fatlink:view') else: @@ -365,7 +365,7 @@ def create_fatlink_view(request): context = {'form': form} - return render(request, 'fleetactivitytracking/fatlinkformatter.html', context=context) + return render(request, 'fleetactivitytracking/fatlinkcreate.html', context=context) @login_required diff --git a/allianceauth/groupmanagement/auth_hooks.py b/allianceauth/groupmanagement/auth_hooks.py index 211973ac..318d2095 100644 --- a/allianceauth/groupmanagement/auth_hooks.py +++ b/allianceauth/groupmanagement/auth_hooks.py @@ -16,7 +16,7 @@ class GroupManagementMenuItem(MenuItemHook): MenuItemHook.__init__( self, text=_("Group Management"), - classes="fas fa-users-cog fa-fw", + classes="fa-solid fa-users-gear", url_name="groupmanagement:management", order=50, navactive=[ @@ -36,7 +36,7 @@ class GroupManagementMenuItem(MenuItemHook): """
  • - + {% translate "Groups" %} @@ -49,7 +49,7 @@ class GroupsMenuItem(MenuItemHook): MenuItemHook.__init__( self, text=_("Groups"), - classes="fas fa-user fa-fw", + classes="fa-solid fa-user", url_name="groupmanagement:groups", order=25, navactive=[ diff --git a/allianceauth/groupmanagement/templates/groupmanagement/audit.html b/allianceauth/groupmanagement/templates/groupmanagement/audit.html index d22f72e2..0a6ed580 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/audit.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/audit.html @@ -1,15 +1,21 @@ {% extends "allianceauth/base-bs5.html" %} + {% load static %} {% load i18n %} {% load navactive %} -{% block page_title %}{{ group }} {% translate "Audit Log" %}{% endblock page_title %} -{% block header_nav_brand %}{% translate "Audit Log" %} - {{ group.name }}{% endblock header_nav_brand %} +{% block page_title %} + {{ group }} {% translate "Audit Log" %} +{% endblock page_title %} + +{% block header_nav_brand %} + {% translate "Audit Log" %} - {{ group.name }} +{% endblock header_nav_brand %} {% block header_nav_collapse_left %} -
  • - {% translate "Back" %} -
    • +
  • + {% translate "Back" %} +
    • {% endblock %} {% block content %} @@ -65,61 +71,61 @@ {% block extra_javascript %} {% include 'bundles/datatables-js-bs5.html' %} {% include 'bundles/moment-js.html' with locale=True %} - {% include 'bundles/filterdropdown-js.html' %} +{# {% include 'bundles/filterdropdown-js.html' %}#} + + {% endblock %} {% block extra_css %} {% include 'bundles/datatables-css-bs5.html' %} {% endblock %} - -{% block extra_script %} - $.fn.dataTable.moment = function(format, locale) { - let types = $.fn.dataTable.ext.type; - - // Add type detection - types.detect.unshift(function(d) { - return moment(d, format, locale, true).isValid() ? - 'moment-'+format : - null; - }); - - // Add sorting method - use an integer for the sorting - types.order[ 'moment-'+format+'-pre' ] = function(d) { - return moment(d, format, locale, true).unix(); - }; - }; - - $(document).ready(function(){ - $.fn.dataTable.moment('YYYY-MMM-D, HH:mm'); - - $('#log-entries').DataTable({ - order: [[0, 'desc'], [1, 'asc']], - filterDropDown: - { - columns: [ - { - idx: 1 - }, - { - idx: 2 - }, - { - idx: 3 - }, - { - idx: 4 - }, - { - idx: 5 - }, - { - idx: 6 - } - ], - bootstrap: true - }, - "stateSave": true, - "stateDuration": 0 - }); - }); -{% endblock %} diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html b/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html index 9cad2137..3a8fc64f 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html @@ -1,22 +1,28 @@ {% extends "allianceauth/base-bs5.html" %} + {% load static %} {% load i18n %} {% load evelinks %} {% load navactive %} -{% block page_title %}{% translate "Group Members" %}{% endblock page_title %} -{% block header_nav_brand %}{% translate "Group Members" %} - {{ group.name }}{% endblock header_nav_brand %} +{% block page_title %} + {% translate "Group Members" %} +{% endblock page_title %} + +{% block header_nav_brand %} + {% translate "Group Members" %} - {{ group.name }} +{% endblock header_nav_brand %} {% block header_nav_collapse_left %} -
  • - {% translate "Back" %} -
    • +
  • + {% translate "Back" %} +
    • {% endblock %} {% block content %} {% if group.user_set %}
    - +
    @@ -30,6 +36,7 @@ @@ -53,6 +60,7 @@ {% translate "(unknown)" %} {% endif %} + + + + + + + + + {% endfor %} +
    {% translate "Character" %}
    {{ member.main_char.character_name }} + {% if member.main_char %} {{ member.main_char.character_name }} @@ -39,7 +46,7 @@ {% endif %} {% if member.is_leader %} - title="{% translate "Group leader" %}" style="margin-left: 1rem;">  + {% endif %} @@ -77,24 +85,24 @@ {% block extra_javascript %} {% include 'bundles/datatables-js-bs5.html' %} + + {% endblock %} {% block extra_css %} {% include 'bundles/datatables-css-bs5.html' %} {% endblock %} - -{% block extra_script %} - $(document).ready(function(){ - $('#tab_group_members').DataTable({ - order: [[0, "asc"]], - columnDefs: [ - { - "sortable": false, - "targets": [2] - }, - ], - "stateSave": true, - "stateDuration": 0 - }); - }); -{% endblock %} diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html index e50f3838..cf67ba5a 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html @@ -9,7 +9,7 @@ {% block extra_css %}{% endblock extra_css %} {% block header_nav_collapse_left %} -
  • +
  • {% translate "Join/Leave Requests" %}
    • {% endblock header_nav_collapse_left %} @@ -17,7 +17,7 @@ {% block content %} {% if groups %}
    - +
    @@ -54,15 +54,15 @@ diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groups.html b/allianceauth/groupmanagement/templates/groupmanagement/groups.html index 6284f65f..f46c8515 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/groups.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/groups.html @@ -1,21 +1,28 @@ {% extends "allianceauth/base-bs5.html" %} + {% load static %} {% load i18n %} -{% block page_title %}{% translate "Available Groups" %}{% endblock page_title %} -{% block header_nav_brand %}{% translate "Available Groups" %}{% endblock header_nav_brand %} +{% block page_title %} + {% translate "Available Groups" %} +{% endblock page_title %} + +{% block header_nav_brand %} + {% translate "Available Groups" %} +{% endblock header_nav_brand %} {% if manager_perms %} -{% block header_nav_collapse_left %} -
  • - {% translate "Group Management" %} - {% if req_count %} - {{ req_count }} - {% endif %} - -
    • -{% endblock %} + {% block header_nav_collapse_left %} +
  • + {% translate "Group Management" %} + {% if req_count %} + {{ req_count }} + {% endif %} + +
    • + {% endblock %} {% endif %} + {% block content %} {% if groups %}
    {% translate "Name" %} - + - + - +
    @@ -78,16 +85,17 @@ {% endif %} {% endblock content %} + {% block extra_javascript %} {% include 'bundles/datatables-js-bs5.html' %} + + {% endblock %} {% block extra_css %} {% include 'bundles/datatables-css-bs5.html' %} {% endblock %} - -{% block extra_script %} - $(document).ready(function () { - $('#groupsTable').DataTable(); - }); -{% endblock extra_script %} diff --git a/allianceauth/groupmanagement/templates/groupmanagement/index.html b/allianceauth/groupmanagement/templates/groupmanagement/index.html index ca3b0f07..1cd6c651 100644 --- a/allianceauth/groupmanagement/templates/groupmanagement/index.html +++ b/allianceauth/groupmanagement/templates/groupmanagement/index.html @@ -1,165 +1,55 @@ {% extends "allianceauth/base-bs5.html" %} + {% load static %} {% load i18n %} {% load evelinks %} {% load navactive %} -{% block page_title %}{% translate "Groups Management" %}{% endblock page_title %} -{% block header_nav_brand %}{% translate "Groups Management" %}{% endblock header_nav_brand %} +{% block page_title %} + {% translate "Groups Management" %} +{% endblock page_title %} -{% block extra_css %} -{% endblock extra_css %} +{% block header_nav_brand %} + {% translate "Groups Management" %} +{% endblock header_nav_brand %} {% block header_nav_collapse_left %} -
  • - - {% translate "Join Requests" %} +
  • + + {% translate "Join Requests" %} - {% if acceptrequests %} - {{ acceptrequests|length }} - {% endif %} - -
    • - -{% if not auto_leave %} -
  • - - {% translate "Leave Requests" %} - - {% if not show_leave_tab %} -
  • - - {% translate "Leave Requests" %} - - {% if leaverequests %} - {{ leaverequests|length }} - {% endif %} - -
    • + {% if acceptrequests %} + {{ acceptrequests|length }} {% endif %} -{% endif %} -
  • - {% translate "Group Membership" %} -
    • -{% endblock %} + {% if not show_leave_tab %} +
  • + + {% translate "Leave Requests" %} + + {% if leaverequests %} + {{ leaverequests|length }} + {% endif %} + +
    • + {% endif %} + +
  • + + {% translate "Group Membership" %} + +
    • +{% endblock header_nav_collapse_left %} {% block content %} -
    -
    - {% if acceptrequests %} -
    -
    - - - - - - - - - - - {% for acceptrequest in acceptrequests %} - - - - - + + + + + + {% endfor %} +
    {% translate "Character" %}{% translate "Organization" %}{% translate "Group" %}
    - {{ acceptrequest.main_char.character_name }} - {% if acceptrequest.main_char %} - - {{ acceptrequest.main_char.character_name }} - - {% else %} - {{ acceptrequest.user.username }} - {% endif %} - - {% if acceptrequest.main_char %} - - {{ acceptrequest.main_char.corporation_name }} -
    - {{ acceptrequest.main_char.alliance_name|default_if_none:"" }} - {% else %} - {% translate "(unknown)" %} - {% endif %} -     		{{ acceptrequest.group.name }} - - {% translate "Accept" %} - - - {% if not show_leave_tab %} -
    - {% if leaverequests %} -
    - - - - - - - - - - - - {% for leaverequest in leaverequests %} - - - - - - - {% endfor %} - -
    {% translate "Character" %}{% translate "Organization" %}{% translate "Group" %}
    - {{ leaverequest.main_char.character_name }} - {% if leaverequest.main_char %} - - {{ leaverequest.main_char.character_name }} - - {% else %} - {{ leaverequest.user.username }} - {% endif %} - - {% if leaverequest.main_char %} - - {{ leaverequest.main_char.corporation_name }} -
    - {{ leaverequest.main_char.alliance_name|default_if_none:"" }} - {% else %} - {% translate "(unknown)" %} - {% endif %} -     		{{ leaverequest.group.name }} - - {% translate "Accept" %} - - - - {% translate "Reject" %} - -
    -
    - {% else %} -
    {% translate "No group leave requests." %}
    - {% endif %} -
    - {% endif %} - - - {% else %} -
    {% translate "No group add requests." %}
    - {% endif %} - - - {% if not auto_leave %} -
    - {% if leaverequests %} +
    +
    + {% if acceptrequests %}
    - +
    @@ -170,36 +60,37 @@ - {% for leaverequest in leaverequests %} + {% for acceptrequest in acceptrequests %} + - - + + @@ -208,9 +99,73 @@
    {% translate "Character" %}
    - {{ leaverequest.main_char.character_name }} - {% if leaverequest.main_char %} - - {{ leaverequest.main_char.character_name }} + {{ acceptrequest.main_char.character_name }} + + {% if acceptrequest.main_char %} + + {{ acceptrequest.main_char.character_name }} {% else %} - {{ leaverequest.user.username }} + {{ acceptrequest.user.username }} {% endif %} - {% if leaverequest.main_char %} - - {{ leaverequest.main_char.corporation_name }} -
    - {{ leaverequest.main_char.alliance_name|default_if_none:"" }} + {% if acceptrequest.main_char %} + + {{ acceptrequest.main_char.corporation_name }} + +
    + {{ acceptrequest.main_char.alliance_name|default_if_none:"" }} {% else %} {% translate "(unknown)" %} {% endif %}     		{{ leaverequest.group.name }} - - {% translate "Accept" %} - - - {% translate "Reject" %} + {{ acceptrequest.group.name }} + + {% translate "Accept" %}
    {% else %} -
    {% translate "No group leave requests." %}
    +
    + {% translate "No group add requests." %} +
    {% endif %}
    - {% endif %} -
    + + {% if not show_leave_tab %} +
    + {% if leaverequests %} +
    + + + + + + + + + + + + {% for leaverequest in leaverequests %} + + + + + + + + + + {% endfor %} + +
    {% translate "Character" %}{% translate "Organization" %}{% translate "Group" %}
    + {{ leaverequest.main_char.character_name }} + + {% if leaverequest.main_char %} + + {{ leaverequest.main_char.character_name }} + + {% else %} + {{ leaverequest.user.username }} + {% endif %} + + {% if leaverequest.main_char %} + + {{ leaverequest.main_char.corporation_name }} + +
    + {{ leaverequest.main_char.alliance_name|default_if_none:"" }} + {% else %} + {% translate "(unknown)" %} + {% endif %} +     		{{ leaverequest.group.name }} + + {% translate "Accept" %} + + + + {% translate "Reject" %} + +
    +
    + {% else %} +
    {% translate "No group leave requests." %}
    + {% endif %} +
    + {% endif %} +
    {% endblock content %} diff --git a/allianceauth/groupmanagement/tests/test_views.py b/allianceauth/groupmanagement/tests/test_views.py index edd18224..41f075ba 100644 --- a/allianceauth/groupmanagement/tests/test_views.py +++ b/allianceauth/groupmanagement/tests/test_views.py @@ -99,5 +99,5 @@ class TestViews(TestCase): # then content = response_content_to_str(response) self.assertEqual(response.status_code, 200) - self.assertIn('', content) + self.assertIn('', content) diff --git a/allianceauth/hrapplications/templates/hrapplications/corpchoice.html b/allianceauth/hrapplications/templates/hrapplications/corpchoice.html index e22ae52c..e36a18ba 100644 --- a/allianceauth/hrapplications/templates/hrapplications/corpchoice.html +++ b/allianceauth/hrapplications/templates/hrapplications/corpchoice.html @@ -1,22 +1,38 @@ {% extends "allianceauth/base-bs5.html" %} + {% load i18n %} -{% block page_title %}{% translate "Choose a Corp" %}{% endblock page_title %} +{% block page_title %} + {% translate "Choose a Corp" %} +{% endblock page_title %} + +{% block header_nav_brand %} + {% translate "HR Application Management" %} +{% endblock header_nav_brand %} + {% block content %} -
    -

    {% translate "Choose a Corp" %}

    +
    +

    + {% translate "Choose a Corp" %} +

    + {% if choices %} -
    -
    {% translate "Available Corps" %}
    - - {% for choice in choices %} - - - - {% endfor %} -
    - {{ choice.1 }} -
    +
    +
    +
    {% translate "Available Corps" %}
    +
    + +
    + + {% for choice in choices %} + + + + {% endfor %} +
    + {{ choice.1 }} +
    +
    {% else %}
    {% translate "No corps are accepting applications at this time." %}
    diff --git a/allianceauth/hrapplications/templates/hrapplications/create.html b/allianceauth/hrapplications/templates/hrapplications/create.html index e906109a..57df45ed 100644 --- a/allianceauth/hrapplications/templates/hrapplications/create.html +++ b/allianceauth/hrapplications/templates/hrapplications/create.html @@ -1,35 +1,66 @@ {% extends "allianceauth/base-bs5.html" %} +{% load django_bootstrap5 %} + {% load i18n %} -{% block page_title %}{% translate "Apply To" %} {{ corp.corporation_name }}{% endblock page_title %} +{% block page_title %} + {% translate "Apply To" %} {{ corp.corporation_name }} +{% endblock page_title %} + +{% block header_nav_brand %} + {% translate "HR Application Management" %} +{% endblock header_nav_brand %} + {% block content %} -
    -

    {% translate "Apply To" %} {{ corp.corporation_name }}

    -
    -
    -
    - {% endblock %} diff --git a/allianceauth/hrapplications/templates/hrapplications/management.html b/allianceauth/hrapplications/templates/hrapplications/management.html index b6bdc739..f7016c4d 100644 --- a/allianceauth/hrapplications/templates/hrapplications/management.html +++ b/allianceauth/hrapplications/templates/hrapplications/management.html @@ -1,13 +1,19 @@ -{% extends "allianceauth/base.html" %} -{% load bootstrap %} +{% extends "allianceauth/base-bs5.html" %} + +{% load django_bootstrap5 %} {% load i18n %} -{% block page_title %}{% translate "HR Application Management" %}{% endblock page_title %} -{% block extra_css %}{% endblock extra_css %} +{% block page_title %} + {% translate "HR Application Management" %} +{% endblock page_title %} + +{% block header_nav_brand %} + {% translate "HR Application Management" %} +{% endblock header_nav_brand %} {% block content %} -
    -

    {% translate "Personal Applications" %} +
    +

    {% translate "Personal Applications" %}
    {% if create %} @@ -18,176 +24,190 @@ {% endif %}

    - {% if personal_apps %} -
    - - - - - - - {% for personal_app in personal_apps %} - - - - - + {% if personal_apps %} +
    +
    +
    {% translate "Username" %}{% translate "Corporation" %} - {% translate "Status" %}{% translate "Actions" %}
    {{ personal_app.user.username }}{{ personal_app.form.corp.corporation_name }} - {% if personal_app.approved == None %} -
    {% translate "Pending" %}
    - {% elif personal_app.approved == True %} -
    {% translate "Approved" %}
    - {% else %} -
    {% translate "Rejected" %}
    - {% endif %} -     		- - - - {% if personal_app.approved == None %} - - - - {% endif %} -
    + + + + - {% endfor %} -
    {% translate "Username" %}{% translate "Corporation" %} + {% translate "Status" %}{% translate "Actions" %}
    + + {% for personal_app in personal_apps %} +

    {{ personal_app.user.username }}{{ personal_app.form.corp.corporation_name }} + {% if personal_app.approved == None %} +
    {% translate "Pending" %}
    + {% elif personal_app.approved == True %} +
    {% translate "Approved" %}
    + {% else %} +
    {% translate "Rejected" %}
    + {% endif %} +     		+ + + + + {% if personal_app.approved == None %} + + + + {% endif %} +
    +
    {% endif %} + {% if perms.auth.human_resources %} -

    {% translate "Application Management" %} +

    {% translate "Application Management" %}
    -

    - -
    -
    -
    - {% if applications %} - - - - - - - - - - {% for app in applications %} + +
    +
    + + +
    +
    + {% if applications %} +
    {% translate "Date" %}{% translate "Username" %}{% translate "Main Character" %}{% translate "Corporation" %}{% translate "Status" %}{% translate "Actions" %}
    - - - - - - + + + + + + - {% endfor %} -
    {{ app.created }}{{ app.user.username }}{{ app.main_character }}{{ app.form.corp.corporation_name }} - {% if app.approved == None %} - {% if app.reviewer_str %} -
    {% translate "Reviewer:" %} {{ app.reviewer_str }}
    - {% else %} -
    {% translate "Pending" %}
    - {% endif %} - {% elif app.approved == True %} -
    {% translate "Approved" %}
    - {% else %} -
    {% translate "Rejected" %}
    - {% endif %} -     		- - - - {% translate "Date" %}{% translate "Username" %}{% translate "Main Character" %}{% translate "Corporation" %}{% translate "Status" %}{% translate "Actions" %}
    - {% else %} -
    {% translate "No pending applications." %}
    - {% endif %} -
    -
    -
    -
    - {% if finished_applications %} - - - - - - - - - - {% for app in finished_applications %} - - - - - - + + + + + - + + + + {% endfor %} +
    {% translate "Date" %}{% translate "Username" %}{% translate "Main Character" %}{% translate "Corporation" %}{% translate "Status" %}{% translate "Actions" %}
    {{ app.created }}{{ app.user.username }}{{ app.main_character }}{{ app.form.corp.corporation_name }} - {% if app.approved == None %} - {% if app.reviewer_str %} -
    {% translate "Reviewer:" %} {{ app.reviewer_str }}
    + + {% for app in applications %} +
    {{ app.created }}{{ app.user.username }}{{ app.main_character }}{{ app.form.corp.corporation_name }} + {% if app.approved == None %} + {% if app.reviewer_str %} +
    {% translate "Reviewer:" %} {{ app.reviewer_str }}
    + {% else %} +
    {% translate "Pending" %}
    + {% endif %} + {% elif app.approved == True %} +
    {% translate "Approved" %}
    {% else %} -
    {% translate "Pending" %}
    +
    {% translate "Rejected" %}
    {% endif %} - {% elif app.approved == True %} -
    {% translate "Approved" %}
    - {% else %} -
    {% translate "Rejected" %}
    - {% endif %} -     		- - - - {% if perms.hrapplications.delete_application %} - - + + + - {% endif %} -
    + {% else %} +
    {% translate "No pending applications." %}
    + {% endif %} +
    + +
    + {% if finished_applications %} + + + + + + + + - {% endfor %} -
    {% translate "Date" %}{% translate "Username" %}{% translate "Main Character" %}{% translate "Corporation" %}{% translate "Status" %}{% translate "Actions" %}
    - {% else %} -
    {% translate "No reviewed applications." %}
    - {% endif %} + + {% for app in finished_applications %} +
    {{ app.created }}{{ app.user.username }}{{ app.main_character }}{{ app.form.corp.corporation_name }} + {% if app.approved == None %} + {% if app.reviewer_str %} +
    {% translate "Reviewer:" %} {{ app.reviewer_str }}
    + {% else %} +
    {% translate "Pending" %}
    + {% endif %} + {% elif app.approved == True %} +
    {% translate "Approved" %}
    + {% else %} +
    {% translate "Rejected" %}
    + {% endif %} +     		+ + + + + {% if perms.hrapplications.delete_application %} + + + + {% endif %} +
    + {% else %} +
    {% translate "No reviewed applications." %}
    + {% endif %} +
    {% endif %} - {% if perms.auth.human_resources %} - - - {% endif %} + {% include "hrapplications/partials/modals/search.html" %} {% endblock content %} diff --git a/allianceauth/hrapplications/templates/hrapplications/partials/modals/search.html b/allianceauth/hrapplications/templates/hrapplications/partials/modals/search.html new file mode 100644 index 00000000..96190abb --- /dev/null +++ b/allianceauth/hrapplications/templates/hrapplications/partials/modals/search.html @@ -0,0 +1,32 @@ +{% load django_bootstrap5 %} +{% load i18n %} + +{% if perms.auth.human_resources %} + + +{% endif %} diff --git a/allianceauth/hrapplications/templates/hrapplications/searchview.html b/allianceauth/hrapplications/templates/hrapplications/searchview.html index 19b8e801..41077232 100644 --- a/allianceauth/hrapplications/templates/hrapplications/searchview.html +++ b/allianceauth/hrapplications/templates/hrapplications/searchview.html @@ -1,37 +1,47 @@ -{% extends "allianceauth/base.html" %} +{% extends "allianceauth/base-bs5.html" %} + {% load bootstrap %} {% load i18n %} -{% block page_title %}{% translate "HR Application Management" %}{% endblock page_title %} -{% block extra_css %}{% endblock extra_css %} +{% block page_title %} + {% translate "HR Application Management" %} +{% endblock page_title %} + +{% block header_nav_brand %} + {% translate "HR Application Management" %} +{% endblock header_nav_brand %} {% block content %} -
    +
    {% if perms.auth.human_resources %} -

    {% translate "Application Search Results" %} -
    - - -
    +

    + {% translate "Application Search Results" %}

    -
    - + +
    + + +
    + +
    +
    - - - - + + + + - + + {% for app in applications %} - - - - + + + + - @@ -53,27 +63,5 @@ {% endif %} - {% if perms.auth.human_resources %} - - - {% endif %} + {% include "hrapplications/partials/modals/search.html" %} {% endblock content %} diff --git a/allianceauth/hrapplications/templates/hrapplications/view.html b/allianceauth/hrapplications/templates/hrapplications/view.html index 2656db31..9b621bb4 100644 --- a/allianceauth/hrapplications/templates/hrapplications/view.html +++ b/allianceauth/hrapplications/templates/hrapplications/view.html @@ -1,149 +1,178 @@ -{% extends "allianceauth/base.html" %} -{% load bootstrap %} +{% extends "allianceauth/base-bs5.html" %} + +{% load django_bootstrap5 %} {% load i18n %} -{% block page_title %}{% translate "View Application" %}{% endblock page_title %} -{% block extra_css %}{% endblock extra_css %} +{% block page_title %} + {% translate "View Application" %} +{% endblock page_title %} + +{% block header_nav_brand %} + {% translate "HR Application Management" %} +{% endblock header_nav_brand %} {% block content %} -
    -

    {% translate "View Application" %}

    -
    -
    -
    - {% if app.approved %} -
    {% translate "Approved" %}
    - {% elif app.approved == False %} -
    {% translate "Denied" %}
    - {% else %} -
    {% translate "Pending" %}
    - {% endif %} - {% if app.reviewer_str %} -
    {% translate "Reviewer:" %} {{ app.reviewer_str }}
    - {% endif %} -
    -
    -
    -
    {% translate "Applicant" %}
    -
    {% translate "Application ID" %}{% translate "Username" %}{% translate "Main Character" %}{% translate "Corporation" %}{% translate "Application ID" %}{% translate "Username" %}{% translate "Main Character" %}{% translate "Corporation" %} {% translate "Status" %}{% translate "Actions" %}{% translate "Actions" %}
    {{ app.id }}{{ app.user }}{{ app.main_character }}{{ app.form.corp }}{{ app.id }}{{ app.user }}{{ app.main_character }}{{ app.form.corp }} {% if app.approved == None %}
    {% translate "Pending" %}
    @@ -41,9 +51,9 @@
    {% translate "Rejected" %}
    {% endif %}     		+ - +
    - - - - - - - - -
    {% translate "User" %}{% translate "Main Character" %}
    {{ app.user }}{{ app.main_character }}
    -
    -
    -
    {% translate "Characters" %}
    - - - - - - - - {% for char in app.characters %} - - - - - - - {% endfor %} -
    {% translate "Name" %}{% translate "Corp" %}{% translate "Alliance" %}
    - {{ char.character_name }} - {{ char.character_name }}{{ char.corporation_name }}{{ char.alliance_name }}
    -
    -
    -
    - {% for response in responses %} -
    -
    {{ response.question.title }}
    -
    {{ response.answer|linebreaksbr }}
    -
    - {% endfor %} -
    - {% if buttons %} - {% if perms.auth.human_resources %} -
    -
    -
    {% translate "Actions" %}
    -
    - {% if app.approved == None %} - {% if app.reviewer == user %} - {% if perms.hrapplications.approve_application %} - {% translate "Approve" %} - {% endif %} - {% if perms.hrapplications.reject_application %} - {% translate "Reject" %} - {% endif %} - {% if perms.hrapplications.delete_application %} - {% translate "Delete" %} - {% endif %} - {% elif not app.reviewer %} - {% translate "Mark in Progress" %} - {% endif %} - {% endif %} - {% if perms.hrapplications.add_applicationcomment %} - - {% endif %} -
    -
    -
    -
    -
    - -
    -
    - {% for comment in comments %} -
    - -
    {{ comment.text|linebreaks }}
    -
    - {% endfor %} -
    -
    -
    -
    - {% endif %} - {% endif %} +
    +

    {% translate "View Application" %}

    + +
    + {% if app.approved %} +
    {% translate "Approved" %}
    + {% elif app.approved == False %} +
    {% translate "Denied" %}
    + {% else %} +
    {% translate "Pending" %}
    + {% endif %} + + {% if app.reviewer_str %} +
    {% translate "Reviewer:" %} {{ app.reviewer_str }}
    + {% endif %} +
    + +
    +
    +
    {% translate "Applicant" %}
    +
    + +
    + + + + + + + + + +
    {% translate "User" %}{% translate "Main Character" %}
    {{ app.user }}{{ app.main_character }}
    + +
    +
    +
    {% translate "Characters" %}
    +
    + +
    + + + + + + + + + {% for char in app.characters %} + + + + + + + {% endfor %} +
    {% translate "Name" %}{% translate "Corporation" %}{% translate "Alliance" %}
    + {{ char.character_name }} + {{ char.character_name }}{{ char.corporation_name }}{{ char.alliance_name }}
    +
    +
    + + {% for response in responses %} +
    +
    +
    {{ response.question.title }}
    +
    + +
    {{ response.answer|linebreaksbr }}
    +
    + {% endfor %} + + {% if buttons %} + {% if perms.auth.human_resources %} +
    +
    +
    {% translate "Actions" %}
    +
    + +
    + {% if app.approved == None %} + {% if app.reviewer == user %} + {% if perms.hrapplications.approve_application %} + {% translate "Approve" %} + {% endif %} + {% if perms.hrapplications.reject_application %} + {% translate "Reject" %} + {% endif %} + {% if perms.hrapplications.delete_application %} + {% translate "Delete" %} + {% endif %} + {% elif not app.reviewer %} + {% translate "Mark in Progress" %} + {% endif %} + {% endif %} + + {% if perms.hrapplications.add_applicationcomment %} + + {% endif %} +
    +
    + +
    +
    +
    +
    + {% translate 'Comments' %} ({{ comments.count }}) +
    +
    + +
    + {% if comments %} + {% for comment in comments %} +
    + +
    {{ comment.text|linebreaks }}
    +
    + {% endfor %} + {% else %} +
    + {% translate "No comments" %} +
    + {% endif %} +
    +
    +
    + {% endif %} + {% endif %}
    + {% if perms.hrapplications.add_applicationcomment %} -
    		{% translate "Title" %} {% translate "Action" %}
    {{ notif.timestamp }} {{ notif.title }} - + + - +
    @@ -16,22 +17,23 @@ + - {% for ops in timers %} - - - - - - - {% endfor %} - + {% for ops in timers %} + + + + + + + {% endfor %} +
    {% translate "Start Time" %}
    - {{ ops.operation_name }} - - ({{ ops.type }}) - - {{ ops.system }} - {{ ops.start | date:"Y-m-d H:i" }}
    + {{ ops.operation_name }} + + {{ ops.type }} + + {{ ops.system }} + {{ ops.start | date:"Y-m-d H:i" }}
    diff --git a/allianceauth/optimer/templates/optimer/fleetoptable.html b/allianceauth/optimer/templates/optimer/fleetoptable.html index 438a96f8..5c7cf50c 100644 --- a/allianceauth/optimer/templates/optimer/fleetoptable.html +++ b/allianceauth/optimer/templates/optimer/fleetoptable.html @@ -14,17 +14,20 @@ {% translate "Local Time" %} {% translate "Duration" %} {% translate "FC" %} + {% if perms.auth.optimer_management %} {# {% translate "Creator" %}#} {% translate "Action" %} {% endif %} + {% for ops in timers %} {{ ops.operation_name }} + {% if ops.type %}
    ({{ ops.type }}) {% endif %} @@ -38,15 +41,16 @@
    {{ ops.duration }} {{ ops.fc }} + {% if perms.auth.optimer_management %} {# {{ ops.eve_character }}#} - + - + {% endif %} diff --git a/allianceauth/optimer/templates/optimer/management.html b/allianceauth/optimer/templates/optimer/management.html index ef8bb90b..9a3ecde9 100644 --- a/allianceauth/optimer/templates/optimer/management.html +++ b/allianceauth/optimer/templates/optimer/management.html @@ -1,41 +1,62 @@ -{% extends "allianceauth/base.html" %} +{% extends "allianceauth/base-bs5.html" %} + {% load i18n %} {% get_current_language as LANGUAGE_CODE %} -{% block page_title %}{% translate "Fleet Operation Management" %}{% endblock page_title %} -{% block extra_css %}{% endblock extra_css %} +{% block page_title %} + {% translate "Fleet Operation Management" %} +{% endblock page_title %} + +{% block header_nav_brand %} + {% translate "Fleet Operation Timers" %} +{% endblock header_nav_brand %} {% block content %} -
    -

    {% translate "Fleet Operation Timers" %} -
    - {% if perms.auth.optimer_management %} - {% translate "Create Operation" %} - {% endif %} -
    -

    - -
    -
    - {% translate "Current Eve Time:" %} -
    - -
    +
    +
    + {% if perms.auth.optimer_management %} + {% translate "Create Operation" %} + {% endif %}
    -

    {% translate "Next Fleet Operations" %}

    - {% if future_timers %} - {% include "optimer/fleetoptable.html" with timers=future_timers %} - {% else %} -
    {% translate "No upcoming timers." %}
    - {% endif %} +
    +
    + {% translate "Current Eve Time:" %} + +
    +
    -

    {% translate "Past Fleet Operations" %}

    - {% if past_timers %} - {% include "optimer/fleetoptable.html" with timers=past_timers %} - {% else %} -
    {% translate "No past timers." %}
    - {% endif %} +
    +
    +
    + {% translate "Next Fleet Operations" %} +
    +
    + +
    + {% if future_timers %} + {% include "optimer/fleetoptable.html" with timers=future_timers %} + {% else %} +
    {% translate "No upcoming timers." %}
    + {% endif %} +
    +
    + +
    +
    +
    + {% translate "Past Fleet Operations" %} +
    +
    + +
    + {% if past_timers %} + {% include "optimer/fleetoptable.html" with timers=past_timers %} + {% else %} +
    {% translate "No past timers." %}
    + {% endif %} +
    +
    {% include 'bundles/moment-js.html' with locale=True %} @@ -43,23 +64,23 @@ {% endblock %} - -{% block extra_script %} - - $('#id_start').datetimepicker({ - setlocale: '{{ LANGUAGE_CODE }}', - {% if NIGHT_MODE %} - theme: 'dark', - {% else %} - theme: 'default', - {% endif %} - mask: true, - format: 'Y-m-d H:i', - minDate: 0 - }); - -{% endblock extra_script %} diff --git a/allianceauth/optimer/views.py b/allianceauth/optimer/views.py index 3ebcf863..f3627e89 100644 --- a/allianceauth/optimer/views.py +++ b/allianceauth/optimer/views.py @@ -18,6 +18,15 @@ logger = logging.getLogger(__name__) @login_required @permission_required('auth.optimer_view') def optimer_view(request): + """ + View for the optimer management page + + :param request: + :type request: + :return: + :rtype: + """ + logger.debug("optimer_view called by user %s" % request.user) base_query = OpTimer.objects.select_related('eve_character', 'type') render_items = {'optimer': base_query.all(), @@ -32,7 +41,17 @@ def optimer_view(request): @login_required @permission_required('auth.optimer_management') def add_optimer_view(request): + """ + View for the add optimer page + + :param request: + :type request: + :return: + :rtype: + """ + logger.debug("add_optimer_view called by user %s" % request.user) + if request.method == 'POST': form = OpForm(request.POST, data_list=OpTimerType.objects.all()) logger.debug("Request type POST contains form valid: %s" % form.is_valid()) @@ -81,19 +100,43 @@ def add_optimer_view(request): @login_required @permission_required('auth.optimer_management') def remove_optimer(request, optimer_id): + """ + Remove optimer + + :param request: + :type request: + :param optimer_id: + :type optimer_id: + :return: + :rtype: + """ + logger.debug(f"remove_optimer called by user {request.user} for operation id {optimer_id}") op = get_object_or_404(OpTimer, id=optimer_id) op.delete() logger.info(f"Deleting optimer id {optimer_id} by user {request.user}") messages.success(request, _('Removed operation timer for %(opname)s.') % {"opname": op.operation_name}) + return redirect("optimer:view") @login_required @permission_required('auth.optimer_management') def edit_optimer(request, optimer_id): + """ + Edit optimer + + :param request: + :type request: + :param optimer_id: + :type optimer_id: + :return: + :rtype: + """ + logger.debug(f"edit_optimer called by user {request.user} for optimer id {optimer_id}") op = get_object_or_404(OpTimer, id=optimer_id) + if request.method == 'POST': form = OpForm(request.POST, data_list=OpTimerType.objects.all()) logger.debug("Received POST request containing update optimer form, is valid: %s" % form.is_valid()) @@ -141,8 +184,18 @@ def edit_optimer(request, optimer_id): def dashboard_ops(request): + """ + Returns the next five upcoming ops for the dashboard + + :param request: + :type request: + :return: + :rtype: + """ + base_query = OpTimer.objects.select_related('eve_character', 'type') timers = base_query.filter(start__gte=timezone.now())[:5] + if timers.count(): context = { 'timers': timers, diff --git a/allianceauth/permissions_tool/templates/permissions_tool/audit.html b/allianceauth/permissions_tool/templates/permissions_tool/audit.html index 9db22d3d..4407ff9e 100644 --- a/allianceauth/permissions_tool/templates/permissions_tool/audit.html +++ b/allianceauth/permissions_tool/templates/permissions_tool/audit.html @@ -1,18 +1,29 @@ {% extends "allianceauth/base-bs5.html" %} + {% load i18n %} + {% block page_title %} {{ permission.permission.codename }} - {% translate "Permissions Audit" %} {% endblock page_title %} + +{% block header_nav_brand %} + {% translate "Permissions Audit" %} +{% endblock header_nav_brand %} + {% block content %}
    -

    {% translate "Permissions Audit" %}: {{ permission.permission.codename }}

    +

    + {% translate "Permissions Audit" %}: {{ permission.permission.codename }} +

    +

    {% translate "Back" %}

    +
    - +
    @@ -44,52 +55,52 @@ {% endblock content %} {% block extra_javascript %} {% include "bundles/datatables-js-bs5.html" %} - {% include "bundles/filterdropdown-js.html" %} +{# {% include "bundles/filterdropdown-js.html" %}#} + + {% endblock extra_javascript %} + {% block extra_css %} {% include "bundles/datatables-css-bs5.html" %} {% endblock extra_css %} -{% block extra_script %} - $(document).ready(function () { - let groupColumn = 0; - - $('#tab_permissions_audit').DataTable({ - columnDefs: [{ - "visible": false, - "targets": groupColumn - }], - order: [ - [groupColumn, 'asc'], - [2, 'asc'] - ], - filterDropDown: { - columns: [{ - idx: 0, - title: 'Source' - }], - bootstrap: true - }, - "stateSave": true, - "stateDuration": 0, - drawCallback: function (settings) { - let api = this.api(); - let rows = api.rows({ - page: 'current' - }).nodes(); - let last = null; - - api.column(groupColumn, { - page: 'current' - }).data().each(function (group, i) { - if (last !== group) { - $(rows).eq(i).before( - '' - ); - - last = group; - } - }); - } - }); - }); -{% endblock extra_script %} diff --git a/allianceauth/permissions_tool/templates/permissions_tool/audit_row.html b/allianceauth/permissions_tool/templates/permissions_tool/audit_row.html index f2993490..de3e4ff5 100644 --- a/allianceauth/permissions_tool/templates/permissions_tool/audit_row.html +++ b/allianceauth/permissions_tool/templates/permissions_tool/audit_row.html @@ -1,10 +1,14 @@ {% load evelinks %} {% load i18n %} + - + {{ user.profile.main_character.character_name }} + +
    {% translate "Group" %}
    ' + group + '
    {{ type }}: {{ name }} - {{ user.profile.main_character.character_name }}{{ user }}
    {{ user.profile.main_character.character_name }}    		 + {{ user }}
    {{ user.profile.main_character.character_name }} +     		{% if user.profile.main_character %} {{ user.profile.main_character.corporation_name }} diff --git a/allianceauth/permissions_tool/templates/permissions_tool/overview.html b/allianceauth/permissions_tool/templates/permissions_tool/overview.html index 75f7183e..8dbace83 100644 --- a/allianceauth/permissions_tool/templates/permissions_tool/overview.html +++ b/allianceauth/permissions_tool/templates/permissions_tool/overview.html @@ -1,11 +1,17 @@ {% extends "allianceauth/base-bs5.html" %} + {% load i18n %} + {% block page_title %} {% translate "Permissions Overview" %} {% endblock page_title %} + +{% block header_nav_brand %} + {% translate "Permissions Audit" %} +{% endblock header_nav_brand %} + {% block content %} -
    -

    {% translate "Permissions Overview" %}

    +

    {% if request.GET.all != 'yes' %} {% translate "Showing only applied permissions" %} @@ -15,8 +21,9 @@ {% translate "Show Applied" %} {% endif %}

    +
    - +
    @@ -28,6 +35,7 @@ + {% for perm in permissions %} @@ -49,59 +57,60 @@ {% endblock content %} + {% block extra_javascript %} {% include "bundles/datatables-js-bs5.html" %} - {% include "bundles/filterdropdown-js.html" %} +{# {% include "bundles/filterdropdown-js.html" %}#} + + {% endblock extra_javascript %} + {% block extra_css %} {% include "bundles/datatables-css-bs5.html" %} {% endblock extra_css %} -{% block extra_script %} - $(document).ready(function () { - let groupColumn = 0; - $('#tab_permissions_overview').DataTable({ - columnDefs: [{ - "visible": false, - "targets": groupColumn - }], - order: [ - [groupColumn, 'asc'], - [1, 'asc'], - [2, 'asc'] - ], - filterDropDown: { - columns: [{ - idx: 0 - }, - { - idx: 1 - } - ], - bootstrap: true, - }, - "stateSave": true, - "stateDuration": 0, - drawCallback: function (settings) { - let api = this.api(); - let rows = api.rows({ - page: 'current' - }).nodes(); - let last = null; - api.column(groupColumn, { - page: 'current' - }).data().each(function (group, i) { - if (last !== group) { - $(rows).eq(i).before( - ' - - - - ' - ); - last = group; - } - }); - } - }); - }); -{% endblock extra_script %} diff --git a/allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html b/allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html index 96e98a7f..ca86d1df 100644 --- a/allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html +++ b/allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html @@ -24,26 +24,26 @@ {% if not user_has_account %} {% if urls.auth_activate %} - + {% endif %} {% else %} {% if urls.auth_reset %} - + {% endif %} {% if urls.auth_deactivate %} - + {% endif %} {% endif %} {% if request.user.is_superuser %} - + {% endif %} {% endblock %} diff --git a/allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html b/allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html index bcc54610..70acdf28 100644 --- a/allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html +++ b/allianceauth/services/modules/discourse/templates/services/discourse/discourse_service_ctrl.html @@ -21,6 +21,6 @@ {% block controls %} - + {% endblock %} diff --git a/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html b/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html index d4b589e1..ef70a136 100644 --- a/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html +++ b/allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html @@ -18,31 +18,31 @@ {% if username == "" %} {% if urls.auth_activate %} - + {% endif %} {% else %} {% if urls.auth_set_password %} - + {% endif %} {% if urls.auth_reset_password %} - + {% endif %} {% if urls.auth_deactivate %} - + {% endif %} {% if connect_url %} - + {% endif %} {% endif %} diff --git a/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html b/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html index f99e1781..ba28d870 100644 --- a/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html +++ b/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html @@ -1,30 +1,47 @@ -{% extends "allianceauth/base.html" %} +{% extends "allianceauth/base-bs5.html" %} + {% load django_bootstrap5 %} {% load i18n %} -{% block page_title %}{% translate "Jabber Broadcast" %}{% endblock page_title %} -{% block extra_css %}{% endblock extra_css %} +{% block page_title %} + {% translate "Jabber Broadcast" %} +{% endblock page_title %} + +{% block header_nav_brand %} + {% translate "Jabber Broadcast" %} +{% endblock header_nav_brand %} {% block content %} -
    -

    {% translate "Jabber Broadcast" %}

    +
    +
    +
    +
    + {% translate "Jabber Broadcast" %} +
    +
    -
    -
    -
    - {% if success %} - - {% endif %} - - {% csrf_token %} - {% bootstrap_form form %} -
    - - +
    +
    +
    + {% if success %} + + {% endif %} + +
    + {% csrf_token %} + + {% bootstrap_form form %} + +
    + {% translate "Broadcast" as button_text %} + {% bootstrap_button button_class="btn btn-primary" content=button_text %} +
    + +
    - {% endblock content %} diff --git a/allianceauth/services/modules/teamspeak3/templates/admin/teamspeak3/authts/change_list.html b/allianceauth/services/modules/teamspeak3/templates/admin/teamspeak3/authts/change_list.html index 49df399f..8850de11 100644 --- a/allianceauth/services/modules/teamspeak3/templates/admin/teamspeak3/authts/change_list.html +++ b/allianceauth/services/modules/teamspeak3/templates/admin/teamspeak3/authts/change_list.html @@ -1,11 +1,13 @@ {% extends "admin/change_list.html" %} + {% load i18n %} {% block object-tools-items %} + {{ block.super }} -
  • - - {% translate "Update TeamSpeak3 groups" %} - -
    • +
  • + + {% translate "Update TeamSpeak3 groups" %} + +
    • {% endblock %} diff --git a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeak3_service_ctrl.html b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeak3_service_ctrl.html index 4fafbead..fe5d8873 100644 --- a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeak3_service_ctrl.html +++ b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeak3_service_ctrl.html @@ -1,4 +1,5 @@ {% extends "services/services_ctrl_base.html" %} + {% load i18n %} {% block title %} @@ -20,20 +21,20 @@ {% block controls %} {% if authinfo.teamspeak3_uid == "" %} - + {% else %} - + - + - + - + - {% endif %} + {% endif %} {% endblock %} diff --git a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html index 716c82eb..3a72d034 100644 --- a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html +++ b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html @@ -1,24 +1,29 @@ {% extends "allianceauth/base-bs5.html" %} + {% load django_bootstrap5 %} {% load i18n %} {% block page_title %}{% translate "Verify TeamSpeak3" %}{% endblock page_title %} -{% block extra_css %}{% endblock extra_css %} {% block content %}
    -

    {% translate "Verify TeamSpeak3 Identity" %}

    -
    -
    +

    + {% translate "Verify TeamSpeak3 Identity" %} +

    + +
    +
    {% translate "Join Server" %}
    {% csrf_token %} + {% bootstrap_form form %} +
    -
    +
    {% endblock %} diff --git a/allianceauth/services/templates/public/menuitem.html b/allianceauth/services/templates/public/menuitem.html index 6a758db7..ac03fc9f 100644 --- a/allianceauth/services/templates/public/menuitem.html +++ b/allianceauth/services/templates/public/menuitem.html @@ -4,6 +4,7 @@
  • {% translate item.text %} + {% if item.count != None %} {{ item.count }} {% endif %} diff --git a/allianceauth/services/templates/services/fleetformattertool.html b/allianceauth/services/templates/services/fleetformattertool.html index c5535b6f..67c1fc79 100644 --- a/allianceauth/services/templates/services/fleetformattertool.html +++ b/allianceauth/services/templates/services/fleetformattertool.html @@ -2,30 +2,45 @@ {% load django_bootstrap5 %} {% load i18n %} -{% block page_title %}{% translate "Fleet Formatter Tool" %}{% endblock page_title %} -{% block extra_css %}{% endblock extra_css %} +{% block page_title %} + {% translate "Fleet Formatter Tool" %} +{% endblock page_title %} + +{% block header_nav_brand %} + {% translate "Fleet Formatter Tool" %} +{% endblock header_nav_brand %} {% block content %} -
    -

    {% translate "Fleet Broadcast Formatter Tool" %}

    +
    +
    +
    +
    + {% translate "Fleet Details" %} +
    +
    -
    -
    -
    - {% if generated != "" %} - - {% endif %} - - {% csrf_token %} - {% bootstrap_form form %} -
    - -
    - +
    +
    +
    + {% if generated != "" %} +
    + +
    + {% endif %} + +
    + {% csrf_token %} + + {% bootstrap_form form %} + +
    + {% translate "Format" as button_text %} + {% bootstrap_button button_class="btn btn-primary" content=button_text %} +
    + +
    - {% endblock content %} diff --git a/allianceauth/services/templates/services/service_confirm_delete.html b/allianceauth/services/templates/services/service_confirm_delete.html index 224065f7..a8975223 100644 --- a/allianceauth/services/templates/services/service_confirm_delete.html +++ b/allianceauth/services/templates/services/service_confirm_delete.html @@ -1,29 +1,32 @@ {% extends "allianceauth/base-bs5.html" %} -{% load i18n %} +{% load i18n %} {% block page_title %} {% blocktranslate with service_name=view.service_name|title %}Delete {{ service_name }} Account?{% endblocktranslate %} {% endblock page_title %} +{% block header_nav_brand %} + {% translate "Available Services" %} +{% endblock header_nav_brand %} + {% block content %} -
    -

    +
    +

    {% blocktranslate with service_name=view.service_name|title %}Delete {{ service_name }} Account?{% endblocktranslate %}

    -
    -
    -
    -
    - {% csrf_token %} -

    - {% blocktranslate trimmed with service_name=view.service_name|title %} + +

    +
    + + {% csrf_token %} +

    + {% blocktranslate trimmed with service_name=view.service_name|title %} Are you sure you want to delete your {{ service_name }} account {{ object }}? - {% endblocktranslate %} -

    - - -
    + {% endblocktranslate %} +

    + +
    diff --git a/allianceauth/services/templates/services/service_credentials.html b/allianceauth/services/templates/services/service_credentials.html index 0ed536d1..24e99a58 100644 --- a/allianceauth/services/templates/services/service_credentials.html +++ b/allianceauth/services/templates/services/service_credentials.html @@ -1,24 +1,33 @@ {% extends "allianceauth/base-bs5.html" %} + {% load i18n %} -{% block page_title %}{% blocktranslate with service_name=view.service_name|title %}{{ service_name }} Credentials{% endblocktranslate %}{% endblock page_title %} +{% block page_title %} + {% blocktranslate with service_name=view.service_name|title %}{{ service_name }} Credentials{% endblocktranslate %} +{% endblock page_title %} + +{% block header_nav_brand %} + {% translate "Available Services" %} +{% endblock header_nav_brand %} {% block content %}
    -

    {% blocktranslate with service_name=view.service_name|title %}{{ service_name }} Credentials{% endblocktranslate %}

    -
    -
    -
    - - {% for key, value in credentials.items %} -
    - - -
    - {% endfor %} - - {% translate "Continue" %} -
    +

    + {% blocktranslate with service_name=view.service_name|title %}{{ service_name }} Credentials{% endblocktranslate %} +

    + +
    +
    +
    + {% for key, value in credentials.items %} +
    + + +
    + {% endfor %} + + +     {% translate "Continue" %}
    diff --git a/allianceauth/services/templates/services/service_password.html b/allianceauth/services/templates/services/service_password.html index d431868d..02a88bb0 100644 --- a/allianceauth/services/templates/services/service_password.html +++ b/allianceauth/services/templates/services/service_password.html @@ -1,22 +1,30 @@ {% extends "allianceauth/base-bs5.html" %} + {% load django_bootstrap5 %} {% load i18n %} -{% block page_title %}{% blocktranslate with service_name=view.service_name|title %}{{ service_name }} Password Change{% endblocktranslate %}{% endblock page_title %} +{% block page_title %} + {% blocktranslate with service_name=view.service_name|title %}{{ service_name }} Password Change{% endblocktranslate %} +{% endblock page_title %} + +{% block header_nav_brand %} + {% translate "Available Services" %} +{% endblock header_nav_brand %} {% block content %} -
    -

    {% blocktranslate with service_name=view.service_name|title %}Set {{service_name}} Password{% endblocktranslate %}

    -
    -
    -
    - - {% csrf_token %} - {% bootstrap_form form %} -
    - - -
    +
    +

    + {% blocktranslate with service_name=view.service_name|title %}Set {{service_name}} Password{% endblocktranslate %} +

    + +
    +
    +
    + {% csrf_token %} + {% bootstrap_form form %} +
    + +
    diff --git a/allianceauth/services/templates/services/services.html b/allianceauth/services/templates/services/services.html index b3929fdf..9a1fe104 100644 --- a/allianceauth/services/templates/services/services.html +++ b/allianceauth/services/templates/services/services.html @@ -1,11 +1,13 @@ {% extends "allianceauth/base-bs5.html" %} {% load i18n %} -{% block page_title %}{% translate "Services Management" %}{% endblock page_title %} -{% block extra_css %}{% endblock extra_css %} - -{% block header_nav_brand %}{% translate "Available Services" %}{% endblock header_nav_brand %} +{% block page_title %} + {% translate "Services Management" %} +{% endblock page_title %} +{% block header_nav_brand %} + {% translate "Available Services" %} +{% endblock header_nav_brand %} {% block content %}
    @@ -14,40 +16,40 @@ {% endfor %}
    -
    -

    Legend

    +
    +

    {% translate "Legend" %}

    -
    - - - +
    + + +

    {% translate "Click to activate the service for your user." %}

    -
    - - - +
    + + +

    {% translate "Click to manually set your password." %}

    -
    - - - +
    + + +

    {% translate "Click to randomly generate your password." %}

    -
    - - - +
    + + +

    {% translate "Click to deactivate the service for your user" %}

    diff --git a/allianceauth/services/templates/services/services_ctrl.html b/allianceauth/services/templates/services/services_ctrl.html index 5e551c40..442522b9 100644 --- a/allianceauth/services/templates/services/services_ctrl.html +++ b/allianceauth/services/templates/services/services_ctrl.html @@ -1,4 +1,5 @@ {% extends "services/services_ctrl_base.html" %} + {% load i18n %} {% block title %} @@ -12,25 +13,27 @@ {% block controls %} {% if username == "" %} {% if urls.auth_activate %} - - - + + + {% endif %} {% else %} {% if urls.auth_set_password %} - - - + + + {% endif %} + {% if urls.auth_reset_password %} - - - + + + {% endif %} + {% if urls.auth_deactivate %} - - - + + + {% endif %} {% endif %} {% endblock %} diff --git a/allianceauth/services/templates/services/services_ctrl_base.html b/allianceauth/services/templates/services/services_ctrl_base.html index 526f345b..d039db03 100644 --- a/allianceauth/services/templates/services/services_ctrl_base.html +++ b/allianceauth/services/templates/services/services_ctrl_base.html @@ -1,6 +1,6 @@ {% load i18n %} -
    +
    {% block title %}{% endblock title %}
    diff --git a/allianceauth/srp/templates/srp/add.html b/allianceauth/srp/templates/srp/add.html index 5b38500d..502d21a1 100644 --- a/allianceauth/srp/templates/srp/add.html +++ b/allianceauth/srp/templates/srp/add.html @@ -1,57 +1,75 @@ -{% extends "allianceauth/base.html" %} -{% load bootstrap %} +{% extends "allianceauth/base-bs5.html" %} + +{% load django_bootstrap5 %} {% load i18n %} -{% block page_title %}{% translate "SRP Fleet Create" %}{% endblock page_title %} +{% block page_title %} + {% translate "SRP Fleet Create" %} +{% endblock page_title %} + +{% block header_nav_brand %} + {% translate "Ship Replacement Program" %} +{% endblock header_nav_brand %} + {% block extra_css %} {% include 'bundles/jquery-datetimepicker-css.html' %} {% endblock extra_css %} {% block content %} +
    +

    + {% translate "Create SRP Fleet" %} +

    -
    -

    {% translate "Create SRP Fleet" %}

    +
    +
    +
    + {% translate "SRP fleet details" %} +
    +
    -
    -
    -
    - {% if completed == False %} - - {% csrf_token %} - {{ form|bootstrap }} -
    - - - {% else %} - - -
    - {% translate "Continue" %} -
    - {% endif %} +
    +
    +
    + {% if completed == False %} +
    + {% csrf_token %} + + {% bootstrap_form form %} + +
    + {% translate "Create SRP fleet" as button_text %} + {% bootstrap_button button_class="btn btn-primary" content=button_text %} +
    + + {% else %} + + +
    + {% translate "Continue" %} +
    + {% endif %} +
    - {% endblock content %} {% block extra_javascript %} {% include 'bundles/jquery-datetimepicker-js.html' %} -{% endblock %} -{% block extra_script %} - $('#id_fleet_time').datetimepicker({ - setlocale: '{{ LANGUAGE_CODE }}', - {% if NIGHT_MODE %} - theme: 'dark', - {% else %} - theme: 'default', - {% endif %} - mask: true, - format: 'Y-m-d H:i', - minDate: 0 - }); -{% endblock extra_script %} + +{% endblock %} diff --git a/allianceauth/srp/templates/srp/data.html b/allianceauth/srp/templates/srp/data.html index 34aeb5c1..d649cdc2 100644 --- a/allianceauth/srp/templates/srp/data.html +++ b/allianceauth/srp/templates/srp/data.html @@ -1,140 +1,157 @@ {% extends "allianceauth/base-bs5.html" %} + {% load i18n %} - {% load humanize %} -{% block page_title %}{% translate "Srp Fleet Data" %}{% endblock page_title %} -{% block content %} -
    -
    -

    {% translate "SRP Fleet Data" %} -
    - {% if perms.auth.srp_management %} - {% if fleet_status == "Completed" %} - - {% translate "Mark Incomplete" %} - - {% else %} - - {% translate "Mark Completed" %} - - {% endif %} - {% endif %} -
    -

    - {% if srpfleetrequests %} -
    - {% csrf_token %} -

    • {% translate "App" %}{% translate "States" %}
    ' + group + '
    - - - - - - - + {% if perms.auth.srp_management %} - - - + {% endif %} - - - - {% else %} -
    - {% translate "No SRP requests for this fleet." %} +
    + + + {% for srpfleetrequest in srpfleetrequests %} + + + + + + + + + + {% if perms.auth.srp_management %} + + {% endif %} + + {% endfor %} + +
    {% translate "Pilot Name" %}{% translate "Killboard Link" %}{% translate "Additional Info" %}{% translate "Ship Type" %}{% translate "Killboard Loss Amt" %}{% translate "SRP ISK Cost" %} - + + + + + + + + - - - {% if perms.auth.srp_management %} - - {% endif %} - - - - {% for srpfleetrequest in srpfleetrequests %} - - - - - - - - - - {% if perms.auth.srp_management %} - - {% endif %} - - {% endfor %} - - -
    {% translate "Pilot Name" %}{% translate "Killboard Link" %}{% translate "Additional Info" %}{% translate "Ship Type" %}{% translate "Killboard Loss Amt" %} + {% translate "SRP ISK Cost" %} + {% translate "Post Time" %}{% translate "Status" %}{% translate "Actions" %}
    - {% if srpfleetrequest.character.alliance.alliance_ticker %} - {{ srpfleetrequest.character.alliance.alliance_ticker }} - {% endif %} - [{{ srpfleetrequest.character.corporation.corporation_ticker }}] - {{ srpfleetrequest.character.character_name }}  - - {% translate "Link" %} - {{ srpfleetrequest.additional_info }}{{ srpfleetrequest.srp_ship_name }}{{ srpfleetrequest.kb_total_loss | intcomma }} ISK{{ srpfleetrequest.srp_total_amount | intcomma }} ISK{{ srpfleetrequest.post_time | date:"Y-M-d H:i" }} - {% if srpfleetrequest.srp_status == "Approved" %} -
    - {% translate "Approved" %} -
    - {% elif srpfleetrequest.srp_status == "Rejected" %} -
    - {% translate "Rejected" %} -
    - {% else %} -
    - {% translate "Pending" %} -
    - {% endif %} -     		-
    - -
    -
    - -     		{% translate "Post Time" %}{% translate "Status" %}{% translate "Actions" %}
    + {% if srpfleetrequest.character.alliance.alliance_ticker %} + {{ srpfleetrequest.character.alliance.alliance_ticker }} + {% endif %} + [{{ srpfleetrequest.character.corporation.corporation_ticker }}] + {{ srpfleetrequest.character.character_name }}  + + {% translate "Link" %} + {{ srpfleetrequest.additional_info }}{{ srpfleetrequest.srp_ship_name }}{{ srpfleetrequest.kb_total_loss | intcomma }} ISK{{ srpfleetrequest.srp_total_amount | intcomma }} ISK{{ srpfleetrequest.post_time | date:"Y-M-d H:i" }} + {% if srpfleetrequest.srp_status == "Approved" %} +
    + {% translate "Approved" %} +
    + {% elif srpfleetrequest.srp_status == "Rejected" %} +
    + {% translate "Rejected" %} +
    + {% else %} +
    + {% translate "Pending" %} +
    + {% endif %} +     		+
    + +
    +
    - {% endif %} -
    + + + + {% else %} +
    + {% translate "No SRP requests for this fleet." %} +
    + {% endif %}
    {% endblock content %} @@ -146,97 +163,100 @@ ESC to cancel{% endblocktranslate %}" id="blah"> {% endblock extra_javascript %} -{% block extra_script %} - $(document).ready(function() { - $.fn.editable.defaults.mode = 'inline'; - $.fn.editable.defaults.showbuttons = false; - $.fn.editable.defaults.highlight = "#AAFF80"; - - $.fn.dataTable.moment = function(format, locale) { - let types = $.fn.dataTable.ext.type; - - // Add type detection - types.detect.unshift(function(d) { - return moment(d, format, locale, true).isValid() ? - 'moment-' + format : - null; - }); - - // Add sorting method - use an integer for the sorting - types.order[ 'moment-' + format+'-pre' ] = function(d) { - return moment(d, format, locale, true).unix(); - }; - }; - $.fn.dataTable.moment('YYYY-MMM-D, HH:mm'); - - $('.srp').editable({ - display: function(value, response) { - return false; - }, - success: function(response, newValue) { - newValue = parseInt(newValue); - let newValueOutput = newValue.toLocaleString() + " ISK"; - - $(this).html(newValueOutput.bold()); - }, - validate: function(value) { - if (value === null || value === '') { - return 'Empty values not allowed'; - } - } - }); - - $('.srp').on('hidden', function(e, reason){ - if(reason === 'save' || reason === 'nochange') { - let $next = $(this).closest('tr').next().find('.editable'); - - setTimeout(function() { - $next.editable('show'); - }, 400); - } - }); - - $('table.srplist').DataTable({ - "order": [[ 6, "asc" ]], - "paging": false, - "columnDefs": [ - { - "targets": [1, 8], - "orderable": false - }, - { - "targets": [4, 5], - "type": "num" - } - ], - "stateSave": true, - "stateDuration": 0 - }); - - // tooltip - $("[rel=tooltip]").tooltip({ placement: 'top'}); - }); -{% endblock extra_script %} - {% block extra_css %} {% include "bundles/datatables-css-bs5.html" %} {% include "bundles/x-editable.css.html" %} {% include "bundles/checkbox-css.html" %} +