From a6ff3c48b1811501403c78892604c89b4245a603 Mon Sep 17 00:00:00 2001 From: RichterSR Date: Tue, 5 Jul 2016 02:23:23 +0200 Subject: [PATCH] 404 error when selecting doctrin/fitting (#492) This fix will resolve the 404 (Page not found) error due to a missing "/" in the URL from different links. --- stock/templates/registered/fleetup.html | 436 +++++++++--------- .../templates/registered/fleetupdoctrine.html | 182 ++++---- .../registered/fleetupfittingsview.html | 156 +++---- 3 files changed, 387 insertions(+), 387 deletions(-) diff --git a/stock/templates/registered/fleetup.html b/stock/templates/registered/fleetup.html index 31620552..a62064c0 100644 --- a/stock/templates/registered/fleetup.html +++ b/stock/templates/registered/fleetup.html @@ -1,218 +1,218 @@ -{% extends "public/base.html" %} -{% load bootstrap %} -{% load staticfiles %} -{% load i18n %} - -{% block title %}Alliance Auth{% endblock %} -{% block page_title %}FleetUp{% endblock page_title %} - -{% block content %} -
- -
- - -
-
-
- {% 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" %}
-

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

{% trans "There seems to be no Operations in the near future, go make ISK!" %}

- {% 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, this does not mean there isn't any!" %}

- {% endif %} -
-
-
- -
-
- - - -{% endblock content %} +{% extends "public/base.html" %} +{% load bootstrap %} +{% load staticfiles %} +{% load i18n %} + +{% block title %}Alliance Auth{% endblock %} +{% block page_title %}FleetUp{% endblock page_title %} + +{% block content %} +
+ +
+ + +
+
+
+ {% 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" %}
+

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

{% trans "There seems to be no Operations in the near future, go make ISK!" %}

+ {% 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, this does not mean there isn't any!" %}

+ {% endif %} +
+
+
+ +
+
+ + + +{% endblock content %} diff --git a/stock/templates/registered/fleetupdoctrine.html b/stock/templates/registered/fleetupdoctrine.html index dd1ff496..2d14368e 100644 --- a/stock/templates/registered/fleetupdoctrine.html +++ b/stock/templates/registered/fleetupdoctrine.html @@ -1,91 +1,91 @@ -{% extends "public/base.html" %} -{% load bootstrap %} -{% load staticfiles %} -{% load i18n %} - -{% block title %}Alliance Auth{% endblock %} -{% block page_title %}FleetUp - Doctrine{% endblock page_title %} - -{% block content %} -
- -
- {% for a, j in doctrine.items %} - {% regroup j.Data|dictsort:"Role" by Role as role_list %} - - {% for Role in role_list %} - -
-
-

{{ Role.grouper }}

-
-
- - - - - - - - - - - {% for item in Role.list %} - - - - - - - - - - {% endfor %} -
{% trans "Name" %}{% trans "Role" %}{% trans "Hull type" %}{% trans "Ship type" %}{% trans "Estimated ISK" %}{% trans "Categories" %}
- - - {{ item.Name }} - - {{ item.Role }} - - {{ item.HullType }} - - {{ item.ShipType }} - - {% load humanize %}{{ item.EstPrice|intword }} - - {% for categories in item.Categories %} - {{ categories }}, - {% endfor %} -
-
-
- {% endfor %} -
- {% endfor %} -
- -{% endblock content %} +{% extends "public/base.html" %} +{% load bootstrap %} +{% load staticfiles %} +{% load i18n %} + +{% block title %}Alliance Auth{% endblock %} +{% block page_title %}FleetUp - Doctrine{% endblock page_title %} + +{% block content %} +
+ +
+ {% for a, j in doctrine.items %} + {% regroup j.Data|dictsort:"Role" by Role as role_list %} + + {% for Role in role_list %} + +
+
+

{{ Role.grouper }}

+
+
+ + + + + + + + + + + {% for item in Role.list %} + + + + + + + + + + {% endfor %} +
{% trans "Name" %}{% trans "Role" %}{% trans "Hull type" %}{% trans "Ship type" %}{% trans "Estimated ISK" %}{% trans "Categories" %}
+ + + {{ item.Name }} + + {{ item.Role }} + + {{ item.HullType }} + + {{ item.ShipType }} + + {% load humanize %}{{ item.EstPrice|intword }} + + {% for categories in item.Categories %} + {{ categories }}, + {% endfor %} +
+
+
+ {% endfor %} +
+ {% endfor %} +
+ +{% endblock content %} diff --git a/stock/templates/registered/fleetupfittingsview.html b/stock/templates/registered/fleetupfittingsview.html index 2a617c5f..f3dfd623 100644 --- a/stock/templates/registered/fleetupfittingsview.html +++ b/stock/templates/registered/fleetupfittingsview.html @@ -1,79 +1,79 @@ -{% extends "public/base.html" %} -{% load bootstrap %} -{% load staticfiles %} -{% load i18n %} - -{% block title %}Alliance Auth{% endblock %} -{% block page_title %}FleetUp{% endblock page_title %} - -{% block content %} -
- -
- {% if fitting_list %} - - - - - - - - - - {% for id, fittings in fitting_list %} - - - - - - - - - - - {% endfor %} -
{% trans "Name" %}{% trans "Hull" %}{% trans "Ship type" %}{% trans "Estimated ISK" %}{% trans "Categories" %}
- - - {{ fittings.name }} - - {{ fittings.hull }} - - {{ fittings.shiptype }} - - {% load humanize %}{{ fittings.estimated|intword }} - - {% for categories in fittings.categories %} - {{ categories }}, - {% endfor %} -
- {% else %} -

{% trans "There seems to be no Doctrines in here at the moment!" %}

- {% endif %} -
-
- +{% extends "public/base.html" %} +{% load bootstrap %} +{% load staticfiles %} +{% load i18n %} + +{% block title %}Alliance Auth{% endblock %} +{% block page_title %}FleetUp{% endblock page_title %} + +{% block content %} +
+ +
+ {% if fitting_list %} + + + + + + + + + + {% for id, fittings in fitting_list %} + + + + + + + + + + + {% endfor %} +
{% trans "Name" %}{% trans "Hull" %}{% trans "Ship type" %}{% trans "Estimated ISK" %}{% trans "Categories" %}
+ + + {{ fittings.name }} + + {{ fittings.hull }} + + {{ fittings.shiptype }} + + {% load humanize %}{{ fittings.estimated|intword }} + + {% for categories in fittings.categories %} + {{ categories }}, + {% endfor %} +
+ {% else %} +

{% trans "There seems to be no Doctrines in here at the moment!" %}

+ {% endif %} +
+
+ {% endblock content %} \ No newline at end of file