mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2025-07-13 14:30:17 +02:00
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.
This commit is contained in:
RichterSR
Adarnof
parent
f591207d5c
commit
a6ff3c48b1
@ -1,218 +1,218 @@
|
|||||||
{% extends "public/base.html" %}
|
{% extends "public/base.html" %}
|
||||||
{% load bootstrap %}
|
{% load bootstrap %}
|
||||||
{% load staticfiles %}
|
{% load staticfiles %}
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
|
|
||||||
{% block title %}Alliance Auth{% endblock %}
|
{% block title %}Alliance Auth{% endblock %}
|
||||||
{% block page_title %}FleetUp{% endblock page_title %}
|
{% block page_title %}FleetUp{% endblock page_title %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="col-lg-12">
|
<div class="col-lg-12">
|
||||||
<nav class="navbar navbar-default">
|
<nav class="navbar navbar-default">
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
<div class="navbar-header">
|
<div class="navbar-header">
|
||||||
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
|
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
|
||||||
<span class="sr-only">{% trans "Toggle navigation" %}</span>
|
<span class="sr-only">{% trans "Toggle navigation" %}</span>
|
||||||
<span class="icon-bar"></span>
|
<span class="icon-bar"></span>
|
||||||
<span class="icon-bar"></span>
|
<span class="icon-bar"></span>
|
||||||
<span class="icon-bar"></span>
|
<span class="icon-bar"></span>
|
||||||
</button>
|
</button>
|
||||||
<a class="navbar-brand" href="#">{% trans "Fleet-Up" %}</a>
|
<a class="navbar-brand" href="#">{% trans "Fleet-Up" %}</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
|
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
|
||||||
<ul class="nav navbar-nav">
|
<ul class="nav navbar-nav">
|
||||||
<li class="active"><a href="#">{% trans "Ops and Timers" %} <span class="sr-only">(current)</span></a></li>
|
<li class="active"><a href="#">{% trans "Ops and Timers" %} <span class="sr-only">(current)</span></a></li>
|
||||||
<li><a href="/fleetup/doctrines/">{% trans "Doctrines" %}</a></li>
|
<li><a href="/fleetup/doctrines/">{% trans "Doctrines" %}</a></li>
|
||||||
<li><a href="/fleetup/fittings/">{% trans "Fittings" %}</a></li>
|
<li><a href="/fleetup/fittings/">{% trans "Fittings" %}</a></li>
|
||||||
{% if perms.auth.human_resources %}
|
{% if perms.auth.human_resources %}
|
||||||
<li><a href="/fleetup/characters/">{% trans "Characters" %}</a></li>
|
<li><a href="/fleetup/characters/">{% trans "Characters" %}</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<li></li>
|
<li></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
<div class="panel">
|
<div class="panel">
|
||||||
<ul class="nav nav-tabs">
|
<ul class="nav nav-tabs">
|
||||||
<li class="active"><a data-toggle="tab" href="#operations">{% trans "Operations" %}</a></li>
|
<li class="active"><a data-toggle="tab" href="#operations">{% trans "Operations" %}</a></li>
|
||||||
<li><a data-toggle="tab" href="#timers">{% trans "Timers" %}</a></li>
|
<li><a data-toggle="tab" href="#timers">{% trans "Timers" %}</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<div class="tab-content">
|
<div class="tab-content">
|
||||||
<div id="operations" class="tab-pane fade in active">
|
<div id="operations" class="tab-pane fade in active">
|
||||||
<div class="col-lg-7">
|
<div class="col-lg-7">
|
||||||
{% if operations_list %}
|
{% if operations_list %}
|
||||||
{% for subject, start in operations_list %}
|
{% for subject, start in operations_list %}
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
<h3 class="panel-title"><b>{{ start.subject }}</b></h3>
|
<h3 class="panel-title"><b>{{ start.subject }}</b></h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<table class="table table-condensed">
|
<table class="table table-condensed">
|
||||||
<tr>
|
<tr>
|
||||||
<th class="col-md-6">{% trans "Start" %}</th>
|
<th class="col-md-6">{% trans "Start" %}</th>
|
||||||
<th class="col-md-6">{% trans "End" %}</th>
|
<th class="col-md-6">{% trans "End" %}</th>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="col-md-6">{{ start.start|date:"l d M H:i" }} <span class="label label-success">{% trans "Eve Time" %}</span></td>
|
<td class="col-md-6">{{ start.start|date:"l d M H:i" }} <span class="label label-success">{% trans "Eve Time" %}</span></td>
|
||||||
|
|
||||||
<td class="col-md-6">{{ start.end|date:"l d M H:i" }} <span class="label label-success">{% trans "Eve Time" %}</span></td>
|
<td class="col-md-6">{{ start.end|date:"l d M H:i" }} <span class="label label-success">{% trans "Eve Time" %}</span></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="col-md-6"><div id="countdown{{ start.operation_id }}"></div></td>
|
<td class="col-md-6"><div id="countdown{{ start.operation_id }}"></div></td>
|
||||||
|
|
||||||
<td class="col-md-6"></td>
|
<td class="col-md-6"></td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
<p>{{ start.details }}</p>
|
<p>{{ start.details }}</p>
|
||||||
|
|
||||||
<div class="col-lg-12">
|
<div class="col-lg-12">
|
||||||
<table class="table table-condensed table-striped">
|
<table class="table table-condensed table-striped">
|
||||||
<tr>
|
<tr>
|
||||||
<th class="col-md-4">{% trans "Location" %}</th>
|
<th class="col-md-4">{% trans "Location" %}</th>
|
||||||
<th class="col-md-4">{% trans "Doctrine" %}</th>
|
<th class="col-md-4">{% trans "Doctrine" %}</th>
|
||||||
<th class="col-md-2">{% trans "Organizer" %}</th>
|
<th class="col-md-2">{% trans "Organizer" %}</th>
|
||||||
<th class="col-md-2">{% trans "URL" %}</th>
|
<th class="col-md-2">{% trans "URL" %}</th>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
{{ start.location }} - {{ start.location_info }} <a href="http://evemaps.dotlan.net/system/{{ start.location }}" target="_blank" class="label label-success">Dotlan</a>
|
{{ start.location }} - {{ start.location_info }} <a href="http://evemaps.dotlan.net/system/{{ start.location }}" target="_blank" class="label label-success">Dotlan</a>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{% if start.doctrine %}
|
{% if start.doctrine %}
|
||||||
{% for doctrine in start.doctrine %}
|
{% for doctrine in start.doctrine %}
|
||||||
|
|
||||||
<a href="/fleetup/doctrines/{{ doctrine.Id }}" class="label label-success">{{ doctrine.Name }}</a>
|
<a href="/fleetup/doctrines/{{ doctrine.Id }}/" class="label label-success">{{ doctrine.Name }}</a>
|
||||||
|
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
{% else %}
|
{% else %}
|
||||||
<span class="label label-danger">{% trans "TBA" %}</span>
|
<span class="label label-danger">{% trans "TBA" %}</span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{{ start.organizer }}
|
{{ start.organizer }}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{% ifequal start.url "" %}
|
{% ifequal start.url "" %}
|
||||||
<div class="label label-danger">{% trans "No link" %}</div>
|
<div class="label label-danger">{% trans "No link" %}</div>
|
||||||
{% else %}
|
{% else %}
|
||||||
<a href="{{ start.url }}" target="_blank" class="label label-success">{% trans "External link" %}</a>
|
<a href="{{ start.url }}" target="_blank" class="label label-success">{% trans "External link" %}</a>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% else %}
|
{% else %}
|
||||||
<h3>{% trans "There seems to be no Operations in the near future, go make ISK!" %}</h3>
|
<h3>{% trans "There seems to be no Operations in the near future, go make ISK!" %}</h3>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-3">
|
<div class="col-lg-3">
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
<h2 class="panel-title">{% trans "Current Eve Time:" %}</h2>
|
<h2 class="panel-title">{% trans "Current Eve Time:" %}</h2>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<div id="current-time"></div>
|
<div id="current-time"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% if timers_list %}
|
{% if timers_list %}
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
<h2 class="panel-title">{% trans "Timers" %}</h2>
|
<h2 class="panel-title">{% trans "Timers" %}</h2>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<table class="table table-condensed table-hover table-striped">
|
<table class="table table-condensed table-hover table-striped">
|
||||||
{% for notes, type in timers_list %}
|
{% for notes, type in timers_list %}
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
{{ type.solarsystem }}
|
{{ type.solarsystem }}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{{ type.expires|date:"l d M H:i" }}
|
{{ type.expires|date:"l d M H:i" }}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="timers" class="tab-pane fade in">
|
<div id="timers" class="tab-pane fade in">
|
||||||
<div class="col-lg-12">
|
<div class="col-lg-12">
|
||||||
{% if timers_list %}
|
{% if timers_list %}
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
<h2 class="panel-title">{% trans "Timers" %}</h2>
|
<h2 class="panel-title">{% trans "Timers" %}</h2>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<div class="col-lg-12">
|
<div class="col-lg-12">
|
||||||
<table class="table table-condensed table-hover table-striped">
|
<table class="table table-condensed table-hover table-striped">
|
||||||
<tr>
|
<tr>
|
||||||
<th class="col-lg-1">{% trans "Type" %}</th>
|
<th class="col-lg-1">{% trans "Type" %}</th>
|
||||||
<th class="col-lg-1">{% trans "Structure" %}</th>
|
<th class="col-lg-1">{% trans "Structure" %}</th>
|
||||||
<th class="col-lg-2">{% trans "Location" %}</th>
|
<th class="col-lg-2">{% trans "Location" %}</th>
|
||||||
<th class="col-lg-2">{% trans "Expires(EVE-time)" %}</th>
|
<th class="col-lg-2">{% trans "Expires(EVE-time)" %}</th>
|
||||||
<th class="col-lg-1">{% trans "Owner" %}</th>
|
<th class="col-lg-1">{% trans "Owner" %}</th>
|
||||||
<th class="col-lg-2">{% trans "Note" %}</th>
|
<th class="col-lg-2">{% trans "Note" %}</th>
|
||||||
</tr>
|
</tr>
|
||||||
{% for notes, type in timers_list %}
|
{% for notes, type in timers_list %}
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
{% ifequal type.type "Final" %}
|
{% ifequal type.type "Final" %}
|
||||||
<span class="label label-danger">
|
<span class="label label-danger">
|
||||||
{{ type.type }}</span>{% else %}{{ type.type }}{% endifequal %}
|
{{ type.type }}</span>{% else %}{{ type.type }}{% endifequal %}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{{ type.timer_type }}
|
{{ type.timer_type }}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{{ type.solarsystem }} - Planet:{{ type.planet }} Moon:{{ type.moon }}
|
{{ type.solarsystem }} - Planet:{{ type.planet }} Moon:{{ type.moon }}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{{ type.expires|date:"l d M H:i" }}
|
{{ type.expires|date:"l d M H:i" }}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{{ type.owner }}
|
{{ type.owner }}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{{ type.notes }}
|
{{ type.notes }}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% else %}
|
{% else %}
|
||||||
<h3>{% trans "There seems to be no Timers in the near future, this does not mean there isn't any!" %}</h3>
|
<h3>{% trans "There seems to be no Timers in the near future, this does not mean there isn't any!" %}</h3>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<script src="/static/js/dateformat.js"></script>
|
<script src="/static/js/dateformat.js"></script>
|
||||||
<script src="/static/js/countdown.js"></script>
|
<script src="/static/js/countdown.js"></script>
|
||||||
<script>
|
<script>
|
||||||
var clockClosest = document.getElementById("countdownclosest"), targetDate = new Date(Date.UTC({{ closest_timer.eve_time | date:"Y, m-1, d, H, i" }}));{% for subject, start in operations_list %}
|
var clockClosest = document.getElementById("countdownclosest"), targetDate = new Date(Date.UTC({{ closest_timer.eve_time | date:"Y, m-1, d, H, i" }}));{% for subject, start in operations_list %}
|
||||||
var clock{{ start.operation_id }} = document.getElementById("countdown{{ start.operation_id }}"), targetDate{{ start.operation_id }} = new Date(Date.UTC({{ start.start | date:"Y, m-1, d, H, i" }}));{% endfor %}
|
var clock{{ start.operation_id }} = document.getElementById("countdown{{ start.operation_id }}"), targetDate{{ start.operation_id }} = new Date(Date.UTC({{ start.start | date:"Y, m-1, d, H, i" }}));{% endfor %}
|
||||||
|
|
||||||
setInterval(function(){clockClosest.innerHTML = targetDate.format('D @ h:ia'); if (targetDate > Date.now()){ clockClosest.innerHTML = clockClosest.innerHTML + "<BR>" + countdown(targetDate).toString();}}, 1000);
|
setInterval(function(){clockClosest.innerHTML = targetDate.format('D @ h:ia'); if (targetDate > Date.now()){ clockClosest.innerHTML = clockClosest.innerHTML + "<BR>" + countdown(targetDate).toString();}}, 1000);
|
||||||
{% for subject, start in operations_list %}setInterval(function(){clock{{ start.operation_id }}.innerHTML = targetDate{{ start.operation_id }}.format('l d M H:i'); if (targetDate{{ start.operation_id }} > Date.now()){ clock{{ start.operation_id }}.innerHTML = clock{{ start.operation_id }}.innerHTML + " <span class='label label-success'>Local time</span></br><h2>" + countdown(targetDate{{ start.operation_id }}).toString() + "</h2>";}}, 1000);{% endfor %}
|
{% for subject, start in operations_list %}setInterval(function(){clock{{ start.operation_id }}.innerHTML = targetDate{{ start.operation_id }}.format('l d M H:i'); if (targetDate{{ start.operation_id }} > Date.now()){ clock{{ start.operation_id }}.innerHTML = clock{{ start.operation_id }}.innerHTML + " <span class='label label-success'>Local time</span></br><h2>" + countdown(targetDate{{ start.operation_id }}).toString() + "</h2>";}}, 1000);{% endfor %}
|
||||||
{% for timer in corp_timers %}setInterval(function(){clock{{ timer.id }}.innerHTML = targetDate{{ timer.id }}.format('D @ h:ia'); if (targetDate{{ timer.id }} > Date.now()){ clock{{ timer.id }}.innerHTML = clock{{ timer.id }}.innerHTML + "<BR>" + countdown(targetDate{{ timer.id }}).toString();}}, 1000);{% endfor %}
|
{% for timer in corp_timers %}setInterval(function(){clock{{ timer.id }}.innerHTML = targetDate{{ timer.id }}.format('D @ h:ia'); if (targetDate{{ timer.id }} > Date.now()){ clock{{ timer.id }}.innerHTML = clock{{ timer.id }}.innerHTML + "<BR>" + countdown(targetDate{{ timer.id }}).toString();}}, 1000);{% endfor %}
|
||||||
|
|
||||||
setInterval(function(){updateClock()}, 1000);
|
setInterval(function(){updateClock()}, 1000);
|
||||||
|
|
||||||
function updateClock() {
|
function updateClock() {
|
||||||
var clock = new Date();
|
var clock = new Date();
|
||||||
document.getElementById("current-time").innerHTML = "<b>" + clock.toUTCString() + "</b>";
|
document.getElementById("current-time").innerHTML = "<b>" + clock.toUTCString() + "</b>";
|
||||||
}
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
{% endblock content %}
|
{% endblock content %}
|
||||||
|
|||||||
@ -1,91 +1,91 @@
|
|||||||
{% extends "public/base.html" %}
|
{% extends "public/base.html" %}
|
||||||
{% load bootstrap %}
|
{% load bootstrap %}
|
||||||
{% load staticfiles %}
|
{% load staticfiles %}
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
|
|
||||||
{% block title %}Alliance Auth{% endblock %}
|
{% block title %}Alliance Auth{% endblock %}
|
||||||
{% block page_title %}FleetUp - Doctrine{% endblock page_title %}
|
{% block page_title %}FleetUp - Doctrine{% endblock page_title %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="col-lg-12">
|
<div class="col-lg-12">
|
||||||
<nav class="navbar navbar-default">
|
<nav class="navbar navbar-default">
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
<div class="navbar-header">
|
<div class="navbar-header">
|
||||||
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
|
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
|
||||||
<span class="sr-only">{% trans "Toggle navigation" %}</span>
|
<span class="sr-only">{% trans "Toggle navigation" %}</span>
|
||||||
<span class="icon-bar"></span>
|
<span class="icon-bar"></span>
|
||||||
<span class="icon-bar"></span>
|
<span class="icon-bar"></span>
|
||||||
<span class="icon-bar"></span>
|
<span class="icon-bar"></span>
|
||||||
</button>
|
</button>
|
||||||
<a class="navbar-brand" href="#">Fleet-Up</a>
|
<a class="navbar-brand" href="#">Fleet-Up</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
|
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
|
||||||
<ul class="nav navbar-nav">
|
<ul class="nav navbar-nav">
|
||||||
<li><a href="/fleetup/">{% trans "Ops and Timers" %}</a></li>
|
<li><a href="/fleetup/">{% trans "Ops and Timers" %}</a></li>
|
||||||
<li class="active"><a href="/fleetup/doctrines/">{% trans "Doctrines" %} <span class="sr-only">(current)</span></a></li>
|
<li class="active"><a href="/fleetup/doctrines/">{% trans "Doctrines" %} <span class="sr-only">(current)</span></a></li>
|
||||||
<li><a href="/fleetup/fittings/">{% trans "Fittings" %}</a></li>
|
<li><a href="/fleetup/fittings/">{% trans "Fittings" %}</a></li>
|
||||||
{% if perms.auth.corp_stats %}
|
{% if perms.auth.corp_stats %}
|
||||||
<li><a href="/fleetup/characters/">{% trans "Characters" %}</a></li>
|
<li><a href="/fleetup/characters/">{% trans "Characters" %}</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<li></li>
|
<li></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
<div class="panel">
|
<div class="panel">
|
||||||
{% for a, j in doctrine.items %}
|
{% for a, j in doctrine.items %}
|
||||||
{% regroup j.Data|dictsort:"Role" by Role as role_list %}
|
{% regroup j.Data|dictsort:"Role" by Role as role_list %}
|
||||||
|
|
||||||
{% for Role in role_list %}
|
{% for Role in role_list %}
|
||||||
|
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
<h3 class="panel-title"><b>{{ Role.grouper }}</b></h3>
|
<h3 class="panel-title"><b>{{ Role.grouper }}</b></h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<table class="table table-condensed table-hover table-striped">
|
<table class="table table-condensed table-hover table-striped">
|
||||||
<tr>
|
<tr>
|
||||||
<th class="col-md-1"></th>
|
<th class="col-md-1"></th>
|
||||||
<th class="col-md-1">{% trans "Name" %}</th>
|
<th class="col-md-1">{% trans "Name" %}</th>
|
||||||
<th class="col-md-1">{% trans "Role" %}</th>
|
<th class="col-md-1">{% trans "Role" %}</th>
|
||||||
<th class="col-md-1">{% trans "Hull type" %}</th>
|
<th class="col-md-1">{% trans "Hull type" %}</th>
|
||||||
<th class="col-md-1">{% trans "Ship type" %}</th>
|
<th class="col-md-1">{% trans "Ship type" %}</th>
|
||||||
<th class="col-md-1">{% trans "Estimated ISK" %}</th>
|
<th class="col-md-1">{% trans "Estimated ISK" %}</th>
|
||||||
<th class="col-md-2">{% trans "Categories" %}</th>
|
<th class="col-md-2">{% trans "Categories" %}</th>
|
||||||
</tr>
|
</tr>
|
||||||
{% for item in Role.list %}
|
{% for item in Role.list %}
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<a href="/fleetup/fittings/{{ item.FittingId }}"><img src="https://image.eveonline.com/InventoryType/{{ item.EveTypeId }}_32.png"></a>
|
<a href="/fleetup/fittings/{{ item.FittingId }}/"><img src="https://image.eveonline.com/InventoryType/{{ item.EveTypeId }}_32.png"></a>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{{ item.Name }}
|
{{ item.Name }}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{{ item.Role }}
|
{{ item.Role }}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{{ item.HullType }}
|
{{ item.HullType }}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{{ item.ShipType }}
|
{{ item.ShipType }}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{% load humanize %}{{ item.EstPrice|intword }}
|
{% load humanize %}{{ item.EstPrice|intword }}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{% for categories in item.Categories %}
|
{% for categories in item.Categories %}
|
||||||
{{ categories }},
|
{{ categories }},
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% endblock content %}
|
{% endblock content %}
|
||||||
|
|||||||
@ -1,79 +1,79 @@
|
|||||||
{% extends "public/base.html" %}
|
{% extends "public/base.html" %}
|
||||||
{% load bootstrap %}
|
{% load bootstrap %}
|
||||||
{% load staticfiles %}
|
{% load staticfiles %}
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
|
|
||||||
{% block title %}Alliance Auth{% endblock %}
|
{% block title %}Alliance Auth{% endblock %}
|
||||||
{% block page_title %}FleetUp{% endblock page_title %}
|
{% block page_title %}FleetUp{% endblock page_title %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="col-lg-12">
|
<div class="col-lg-12">
|
||||||
<nav class="navbar navbar-default">
|
<nav class="navbar navbar-default">
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
<div class="navbar-header">
|
<div class="navbar-header">
|
||||||
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
|
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
|
||||||
<span class="sr-only">{% trans "Toggle navigation" %}</span>
|
<span class="sr-only">{% trans "Toggle navigation" %}</span>
|
||||||
<span class="icon-bar"></span>
|
<span class="icon-bar"></span>
|
||||||
<span class="icon-bar"></span>
|
<span class="icon-bar"></span>
|
||||||
<span class="icon-bar"></span>
|
<span class="icon-bar"></span>
|
||||||
</button>
|
</button>
|
||||||
<a class="navbar-brand" href="#">{% trans "Fleet-Up" %}</a>
|
<a class="navbar-brand" href="#">{% trans "Fleet-Up" %}</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
|
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
|
||||||
<ul class="nav navbar-nav">
|
<ul class="nav navbar-nav">
|
||||||
<li><a href="/fleetup/">{% trans "Ops and Timers" %}</a></li>
|
<li><a href="/fleetup/">{% trans "Ops and Timers" %}</a></li>
|
||||||
<li><a href="/fleetup/doctrines/">{% trans "Doctrines" %}</a></li>
|
<li><a href="/fleetup/doctrines/">{% trans "Doctrines" %}</a></li>
|
||||||
<li class="active"><a href="/fleetup/fittings/">{% trans "Fittings" %} <span class="sr-only">(current)</span></a></li>
|
<li class="active"><a href="/fleetup/fittings/">{% trans "Fittings" %} <span class="sr-only">(current)</span></a></li>
|
||||||
{% if perms.auth.corp_stats %}
|
{% if perms.auth.corp_stats %}
|
||||||
<li><a href="/fleetup/characters/">{% trans "Characters" %}</a></li>
|
<li><a href="/fleetup/characters/">{% trans "Characters" %}</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<li></li>
|
<li></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
<div class="panel">
|
<div class="panel">
|
||||||
{% if fitting_list %}
|
{% if fitting_list %}
|
||||||
<table class="table table-condensed table-hover table-striped">
|
<table class="table table-condensed table-hover table-striped">
|
||||||
<tr>
|
<tr>
|
||||||
<th class="col-md-1"></th>
|
<th class="col-md-1"></th>
|
||||||
<th class="col-md-1">{% trans "Name" %}</th>
|
<th class="col-md-1">{% trans "Name" %}</th>
|
||||||
<th class="col-md-1">{% trans "Hull" %}</th>
|
<th class="col-md-1">{% trans "Hull" %}</th>
|
||||||
<th class="col-md-1">{% trans "Ship type" %}</th>
|
<th class="col-md-1">{% trans "Ship type" %}</th>
|
||||||
<th class="col-md-1">{% trans "Estimated ISK" %}</th>
|
<th class="col-md-1">{% trans "Estimated ISK" %}</th>
|
||||||
<th class="col-md-2">{% trans "Categories" %}</th>
|
<th class="col-md-2">{% trans "Categories" %}</th>
|
||||||
</tr>
|
</tr>
|
||||||
{% for id, fittings in fitting_list %}
|
{% for id, fittings in fitting_list %}
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<a href="/fleetup/fittings/{{ fittings.fitting_id }}"><img src="https://image.eveonline.com/InventoryType/{{ fittings.icon_id }}_32.png"></a>
|
<a href="/fleetup/fittings/{{ fittings.fitting_id }}/"><img src="https://image.eveonline.com/InventoryType/{{ fittings.icon_id }}_32.png"></a>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{{ fittings.name }}
|
{{ fittings.name }}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{{ fittings.hull }}
|
{{ fittings.hull }}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{{ fittings.shiptype }}
|
{{ fittings.shiptype }}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{% load humanize %}{{ fittings.estimated|intword }}
|
{% load humanize %}{{ fittings.estimated|intword }}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{% for categories in fittings.categories %}
|
{% for categories in fittings.categories %}
|
||||||
{{ categories }},
|
{{ categories }},
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</table>
|
</table>
|
||||||
{% else %}
|
{% else %}
|
||||||
<h3>{% trans "There seems to be no Doctrines in here at the moment!" %}</h3>
|
<h3>{% trans "There seems to be no Doctrines in here at the moment!" %}</h3>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% endblock content %}
|
{% endblock content %}
|
||||||
Loading…
x
Reference in New Issue
Block a user