diff --git a/.gitignore b/.gitignore index a06f33f4..046a0618 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,5 @@ celerybeat-schedule #pycharm .idea/* + +/nbproject/ diff --git a/allianceauth/fleetup/templates/fleetup/characters.html b/allianceauth/fleetup/templates/fleetup/characters.html index c805a8ea..275965ff 100644 --- a/allianceauth/fleetup/templates/fleetup/characters.html +++ b/allianceauth/fleetup/templates/fleetup/characters.html @@ -15,7 +15,7 @@
@@ -26,7 +26,7 @@ {% for char_name, user_id in member_list %} | |||
---|---|---|---|
- ![]() ![]() |
{{ user_id.char_name }} diff --git a/allianceauth/fleetup/templates/fleetup/doctrine.html b/allianceauth/fleetup/templates/fleetup/doctrine.html index a06d0c18..3564356f 100644 --- a/allianceauth/fleetup/templates/fleetup/doctrine.html +++ b/allianceauth/fleetup/templates/fleetup/doctrine.html @@ -8,12 +8,12 @@ {% block content %}
{% include "fleetup/menu.html" %}
-
+
{% for a, j in doctrine.items %}
{% regroup j.Data|dictsort:"Role" by Role as role_list %}
{% for Role in role_list %}
-
+
{{ Role.grouper }}@@ -50,7 +50,7 @@ {% load humanize %}{{ item.EstPrice|intword }} |
- {% for categories in item.Categories %} + {% for categories in item.Categories %} {{ categories }}, {% endfor %} | diff --git a/allianceauth/fleetup/templates/fleetup/doctrinesview.html b/allianceauth/fleetup/templates/fleetup/doctrinesview.html index acb2b3c5..c0e47329 100644 --- a/allianceauth/fleetup/templates/fleetup/doctrinesview.html +++ b/allianceauth/fleetup/templates/fleetup/doctrinesview.html @@ -8,12 +8,12 @@ {% block content %}Note | -->
![]() |
+
{{ item.Name }} | diff --git a/allianceauth/fleetup/templates/fleetup/fitting.html b/allianceauth/fleetup/templates/fleetup/fitting.html index ecf638c2..eff680af 100644 --- a/allianceauth/fleetup/templates/fleetup/fitting.html +++ b/allianceauth/fleetup/templates/fleetup/fitting.html @@ -8,9 +8,9 @@ {% block content %}{% trans "Categories" %} | |
![]() |
+
{{ fittings.name }} | @@ -38,12 +38,12 @@ {% load humanize %}{{ fittings.estimated|intword }}- {% for categories in fittings.categories %} + {% for categories in fittings.categories %} {{ categories }}, {% endfor %} |
{% trans "Start" %} | -{% trans "End" %} | -
---|---|
{{ start.start|date:"l d M H:i" }} {% trans "Eve Time" %} | - -{{ start.end|date:"l d M H:i" }} {% trans "Eve Time" %} | -
- Local time - - |
-
- - |
{{ start.details }}
- -{% trans "Location" %} | -{% trans "Doctrine" %} | -{% trans "Organizer" %} | -{% trans "URL" %} | -
---|---|---|---|
- {{ start.location }} - {{ start.location_info }} Dotlan - | -- {% if start.doctrine %} - {% for doctrine in start.doctrine %} - - {{ doctrine.Name }} - - {% endfor %} - - {% else %} - {% trans "TBA" %} - {% endif %} - | -- {{ start.organizer }} - | -
- {% ifequal start.url "" %}
- {% trans "No link" %}
- {% else %}
- {% trans "External link" %}
- {% endifequal %}
- |
-
- {{ type.solarsystem }} - | -- {{ type.expires|date:"l d M H:i" }} - | -
{% trans "Type" %} | -{% trans "Structure" %} | -{% trans "Location" %} | -{% trans "Expires(EVE-time)" %} | -{% trans "Owner" %} | -{% trans "Note" %} | -
---|---|---|---|---|---|
- {% ifequal type.type "Final" %} - - {{ type.type }}{% else %}{{ type.type }}{% endifequal %} - | -- {{ type.timer_type }} - | -- {{ type.solarsystem }} - Planet:{{ type.planet }} Moon:{{ type.moon }} - | -- {{ type.expires|date:"l d M H:i" }} - | -- {{ type.owner }} - | -- {{ type.notes }} - | -
{% trans "Start" %} | +{% trans "End" %} | +
---|---|
{{ start.start|date:"l d M H:i" }} {% trans "Eve Time" %} | + +{{ start.end|date:"l d M H:i" }} {% trans "Eve Time" %} | +
+ Local time + + |
+
+ + |
{% trans "Location" %} | +{% trans "Doctrine" %} | +{% trans "Organizer" %} | +{% trans "URL" %} | +
---|---|---|---|
+ {{ start.location }} - {{ start.location_info }} Dotlan + | ++ {% if start.doctrine %} + {% for doctrine in start.doctrine %} + + {{ doctrine.Name }} + + {% endfor %} + + {% else %} + {% trans "TBA" %} + {% endif %} + | ++ {{ start.organizer }} + | +
+ {% ifequal start.url "" %}
+ {% trans "No link" %}
+ {% else %}
+ {% trans "External link" %}
+ {% endifequal %}
+ |
+
+ {{ type.solarsystem }} + | ++ {{ type.expires|date:"l d M H:i" }} + | +
{% trans "Type" %} | +{% trans "Structure" %} | +{% trans "Location" %} | +{% trans "Expires(EVE-time)" %} | +{% trans "Owner" %} | +{% trans "Note" %} | +
---|---|---|---|---|---|
+ {% ifequal type.type "Final" %} + + {{ type.type }}{% else %}{{ type.type }}{% endifequal %} + | ++ {{ type.timer_type }} + | ++ {{ type.solarsystem }} - Planet:{{ type.planet }} Moon:{{ type.moon }} + | ++ {{ type.expires|date:"l d M H:i" }} + | ++ {{ type.owner }} + | ++ {{ type.notes }} + | +