From ec4232c00a5f0a4c759ad46e02e996c28e252963 Mon Sep 17 00:00:00 2001 From: Ariel Rin Date: Tue, 12 Mar 2019 22:16:00 +0000 Subject: [PATCH] Create Issue Templates --- .gitignore | 4 +- .gitlab/issue_templates/Bug.md | 14 + .gitlab/issue_templates/Feature Request.md | 7 + .../fleetup/templates/fleetup/index.html | 508 +++++++++--------- 4 files changed, 278 insertions(+), 255 deletions(-) create mode 100644 .gitlab/issue_templates/Bug.md create mode 100644 .gitlab/issue_templates/Feature Request.md diff --git a/.gitignore b/.gitignore index 046a0618..63f651bf 100644 --- a/.gitignore +++ b/.gitignore @@ -62,5 +62,7 @@ celerybeat-schedule #pycharm .idea/* - /nbproject/ + +#gitlab configs +.gitlab/ diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md new file mode 100644 index 00000000..e7d9ffff --- /dev/null +++ b/.gitlab/issue_templates/Bug.md @@ -0,0 +1,14 @@ +# Bug + +- I have searched [issues](https://gitlab.com/allianceauth/allianceauth/issues?scope=all&utf8=%E2%9C%93&state=all) (Y/N): +- What Version of Alliance Auth: +- What Operating System: +- Version of other components relevant to issue eg. Service, Database: + +Please include a brief description of your issue here. + +Please include steps to reproduce the issue + +Please include any tracebacks or logs + +Please include the results of the command `pip list` \ No newline at end of file diff --git a/.gitlab/issue_templates/Feature Request.md b/.gitlab/issue_templates/Feature Request.md new file mode 100644 index 00000000..b3351169 --- /dev/null +++ b/.gitlab/issue_templates/Feature Request.md @@ -0,0 +1,7 @@ +# Feature Request + +- Describe the feature are you requesting. + +- Is this a Service (external integration), a Module (Alliance Auth extension) or an enhancement to an existing service/module. + +- Describe why its useful to you or others. \ No newline at end of file diff --git a/allianceauth/fleetup/templates/fleetup/index.html b/allianceauth/fleetup/templates/fleetup/index.html index 77a451ae..d4bd8333 100644 --- a/allianceauth/fleetup/templates/fleetup/index.html +++ b/allianceauth/fleetup/templates/fleetup/index.html @@ -1,254 +1,254 @@ -{% extends "allianceauth/base.html" %} -{% load bootstrap %} -{% load staticfiles %} -{% load i18n %} - -{% block page_title %}FleetUp{% endblock page_title %} - -{% block content %} -
-{% include "fleetup/menu.html" %} -
- - -
-
-
- {% if operations_list %} - {% for subject, start in operations_list %} -
-
-

{{ start.subject }}

-
-
- - - - - - - - - - - - - - - -
{% 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|linebreaks }} - - - - - - - - - - - - - - -
{% 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 %} -
-
-
- {% endfor %} - {% else %} -

{% trans "There seems to be no Operations in the near future." %}

- {% endif %} -
-
-
-
-

{% trans "Current Eve Time:" %}

-
-
-
-
-
- {% if timers_list %} -
-
-

{% trans "Timers" %}

-
-
- - {% for notes, type in timers_list %} - - - - - {% endfor %} -
- {{ type.solarsystem }} - - {{ type.expires|date:"l d M H:i" }} -
-
-
- {% endif %} -
-
-
-
- {% if timers_list %} -
-
-

{% trans "Timers" %}

-
-
-
- - - - - - - - - - {% for notes, type in timers_list %} - - - - - - - - - {% endfor %} -
{% 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 }} -
-
-
-
- {% else %} -

{% trans "There seems to be no Timers in the near future." %}

- {% endif %} -
-
-
- -
-
-{% include 'bundles/moment-js.html' with locale=True %} - - - -{% endblock content %} +{% extends "allianceauth/base.html" %} +{% load bootstrap %} +{% load staticfiles %} +{% load i18n %} + +{% block page_title %}FleetUp{% endblock page_title %} + +{% block content %} +
+{% include "fleetup/menu.html" %} +
+ + +
+
+
+ {% if operations_list %} + {% for subject, start in operations_list %} +
+
+

{{ start.subject }}

+
+
+ + + + + + + + + + + + + + + +
{% 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|linebreaks }} + + + + + + + + + + + + + + +
{% 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 %} +
+
+
+ {% endfor %} + {% else %} +

{% trans "There seems to be no Operations in the near future." %}

+ {% endif %} +
+
+
+
+

{% trans "Current Eve Time:" %}

+
+
+
+
+
+ {% if timers_list %} +
+
+

{% trans "Timers" %}

+
+
+ + {% for notes, type in timers_list %} + + + + + {% endfor %} +
+ {{ type.solarsystem }} + + {{ type.expires|date:"l d M H:i" }} +
+
+
+ {% endif %} +
+
+
+
+ {% if timers_list %} +
+
+

{% trans "Timers" %}

+
+
+
+ + + + + + + + + + {% for notes, type in timers_list %} + + + + + + + + + {% endfor %} +
{% 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 }} +
+
+
+
+ {% else %} +

{% trans "There seems to be no Timers in the near future." %}

+ {% endif %} +
+
+
+ +
+
+{% include 'bundles/moment-js.html' with locale=True %} + + + +{% endblock content %}