From e0cd5c6fb96227620e7ce7daab5589d3f22416e6 Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Tue, 28 Nov 2023 20:24:34 +0100 Subject: [PATCH] [CHANGE] Fat templates updated (Part 1) --- allianceauth/fleetactivitytracking/forms.py | 2 +- .../characternotexisting.html | 37 ++++- .../fleetactivitytracking/fatlinkcreate.html | 59 +++++-- .../fleetactivitytracking/fatlinkmodify.html | 42 +++-- .../fatlinkpersonalmonthlystatisticsview.html | 150 +++++++++++------- .../fatlinkpersonalstatisticsview.html | 15 +- .../fatlinkstatisticscorpview.html | 61 ++++--- .../fatlinkstatisticsview.html | 71 +++++---- .../fleetactivitytracking/fatlinkview.html | 22 ++- 9 files changed, 302 insertions(+), 157 deletions(-) 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 index 6cf71d4e..7bb1eb66 100644 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkcreate.html +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkcreate.html @@ -1,29 +1,54 @@ {% extends "allianceauth/base-bs5.html" %} -{% load bootstrap %} + +{% 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 Fleet Operation" %}

-
+
+

+ {% translate "Create Fatlink" %} +

+ +
{% if badrequest %} {% endif %} - {% for message in errormessages %}{% endfor %} -
-
- + + {% for message in errormessages %} + + {% endfor %} + +
+
+
+ {% translate "Fatlink details" %} +
+
+ +
+
+
+ +
+
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html index 15925a4e..68c4a766 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 b0230785..fa0f9138 100644 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html @@ -1,72 +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..b6948c57 100644 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html @@ -1,50 +1,61 @@ {% 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 () { + $(document).ready(() => { $("[rel=tooltip]").tooltip(); }); {% endblock extra_script %} diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html index 2a1568e3..daec850d 100644 --- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html +++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html @@ -1,54 +1,65 @@ {% 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 () { + $(document).ready(() => { $("[rel=tooltip]").tooltip(); }); {% endblock extra_script %} 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 %}
{% translate "Duration" %} {% translate "Edit" %}