mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2025-07-09 12:30:15 +02:00
Corrected usage of Bootstrap classes in FleetUp templates
This commit is contained in:
Peter Pfeufer
parent
d429c8b59a
commit
3c11c25d69
2
.gitignore
vendored
2
.gitignore
vendored
@ -62,3 +62,5 @@ celerybeat-schedule
|
|||||||
|
|
||||||
#pycharm
|
#pycharm
|
||||||
.idea/*
|
.idea/*
|
||||||
|
|
||||||
|
/nbproject/
|
||||||
|
|||||||
@ -15,7 +15,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<div class="col-lg-6">
|
<div class="col-lg-6">
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
<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>
|
||||||
|
|||||||
@ -8,12 +8,12 @@
|
|||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="col-lg-12">
|
<div class="col-lg-12">
|
||||||
{% include "fleetup/menu.html" %}
|
{% include "fleetup/menu.html" %}
|
||||||
<div class="panel">
|
<div>
|
||||||
{% 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>
|
||||||
@ -50,7 +50,7 @@
|
|||||||
{% 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>
|
||||||
|
|||||||
@ -8,12 +8,12 @@
|
|||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="col-lg-12">
|
<div class="col-lg-12">
|
||||||
{% include "fleetup/menu.html" %}
|
{% include "fleetup/menu.html" %}
|
||||||
<div class="panel">
|
<div>
|
||||||
{% if doctrines_list %}
|
{% if doctrines_list %}
|
||||||
{% for a, j in doctrines_list.items %}
|
{% for a, j in doctrines_list.items %}
|
||||||
{% regroup j|dictsort:"FolderName" by FolderName as folder_list %}
|
{% regroup j|dictsort:"FolderName" by FolderName as folder_list %}
|
||||||
{% for FolderName in folder_list %}
|
{% for FolderName in folder_list %}
|
||||||
<div class="col-lg-8">
|
<div>
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
<h3 class="panel-title"><b>{{ FolderName.grouper }}</b></h3>
|
<h3 class="panel-title"><b>{{ FolderName.grouper }}</b></h3>
|
||||||
@ -29,11 +29,11 @@
|
|||||||
<th class="col-lg-2">Note</th>-->
|
<th class="col-lg-2">Note</th>-->
|
||||||
</tr>
|
</tr>
|
||||||
{% for item in FolderName.list %}
|
{% for item in FolderName.list %}
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<a href="{% url 'fleetup:doctrine' item.DoctrineId %}"><img src="https://image.eveonline.com/InventoryType/{{ item.IconId }}_32.png"></a>
|
<a href="{% url 'fleetup:doctrine' item.DoctrineId %}"><img src="https://image.eveonline.com/InventoryType/{{ item.IconId }}_32.png"></a>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{{ item.Name }}
|
{{ item.Name }}
|
||||||
</td>
|
</td>
|
||||||
|
|||||||
@ -8,9 +8,9 @@
|
|||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="col-lg-12">
|
<div class="col-lg-12">
|
||||||
{% include "fleetup/menu.html" %}
|
{% include "fleetup/menu.html" %}
|
||||||
<div class="tab-content">
|
<div class="tab-content row">
|
||||||
<div id="fit" class="tab-pane fade in active">
|
<div id="fit" class="tab-pane fade in active">
|
||||||
<div class="col-lg-3">
|
<div class="col-lg-4">
|
||||||
{% for x, y in fitting_data.items %}
|
{% for x, y in fitting_data.items %}
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
@ -18,22 +18,24 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
{% for doctrin in y.Doctrines %}
|
{% for doctrin in y.Doctrines %}
|
||||||
<h4>{{ doctrin.Name }}</h4>
|
<div class="clearfix">
|
||||||
<div class="col-lg-12">
|
<h4>{{ doctrin.Name }}</h4>
|
||||||
<p>{% trans "Role in doctrine:" %} {{ doctrin.Role }}</p>
|
<div class="col-lg-12">
|
||||||
</div>
|
<p>{% trans "Role in doctrine:" %} {{ doctrin.Role }}</p>
|
||||||
<div class="col-lg-4">
|
</div>
|
||||||
<p>{% trans "Priority:" %}</p>
|
<div class="col-lg-4">
|
||||||
</div>
|
<p>{% trans "Priority:" %}</p>
|
||||||
<div class="col-lg-8">
|
</div>
|
||||||
<div class="progress">
|
<div class="col-lg-8">
|
||||||
<div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="{{ doctrin.Priority }}" aria-valuemin="0" aria-valuemax="5" style="width: {% widthratio doctrin.Priority 5 100 %}%;">
|
<div class="progress">
|
||||||
{{ doctrin.Priority }}/5
|
<div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="{{ doctrin.Priority }}" aria-valuemin="0" aria-valuemax="5" style="width: {% widthratio doctrin.Priority 5 100 %}%;">
|
||||||
|
{{ doctrin.Priority }}/5
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div class="pull-right">
|
||||||
<div class="pull-right">
|
<a class="btn btn-primary" href="{% url 'fleetup:doctrine' doctrin.DoctrineId %}">{% trans "See doctrine" %}</a>
|
||||||
<a class="btn btn-primary" href="{% url 'fleetup:doctrine' doctrin.DoctrineId %}">{% trans "See doctrine" %}</a>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
</div>
|
||||||
@ -56,10 +58,10 @@
|
|||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<div class="list-group">
|
<div class="list-group">
|
||||||
{% for arbit, orbit in doctrines_list.items %}
|
{% for arbit, orbit in doctrines_list.items %}
|
||||||
|
|
||||||
{% for fitting in orbit.Data %}
|
{% for fitting in orbit.Data %}
|
||||||
<a href="{% url 'fleetup:fitting' fitting.FittingId %}" class="list-group-item">
|
<a href="{% url 'fleetup:fitting' fitting.FittingId %}" class="list-group-item">
|
||||||
|
|
||||||
<h4 class="list-group-item-heading">{{ fitting.Name }}<span class="pull-right"><img src="https://image.eveonline.com/InventoryType/{{ fitting.EveTypeId }}_32.png" class="img-circle"></span></h4>
|
<h4 class="list-group-item-heading">{{ fitting.Name }}<span class="pull-right"><img src="https://image.eveonline.com/InventoryType/{{ fitting.EveTypeId }}_32.png" class="img-circle"></span></h4>
|
||||||
<p class="list-group-item-heading">{{ fitting.Role }} - {{ fitting.ShipType }}</p>
|
<p class="list-group-item-heading">{{ fitting.Role }} - {{ fitting.ShipType }}</p>
|
||||||
</a>
|
</a>
|
||||||
@ -107,8 +109,8 @@
|
|||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-lg-3">
|
<div class="col-lg-4">
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
<h3 class="panel-title">{% trans "EFT/Export" %}</h3>
|
<h3 class="panel-title">{% trans "EFT/Export" %}</h3>
|
||||||
|
|||||||
@ -20,11 +20,11 @@
|
|||||||
<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="{% url 'fleetup:fitting' fittings.fitting_id %}"><img src="https://image.eveonline.com/InventoryType/{{ fittings.icon_id }}_32.png"></a>
|
<a href="{% url 'fleetup:fitting' 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>
|
||||||
@ -38,12 +38,12 @@
|
|||||||
{% 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 %}
|
||||||
|
|||||||
@ -8,15 +8,16 @@
|
|||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="col-lg-12">
|
<div class="col-lg-12">
|
||||||
{% include "fleetup/menu.html" %}
|
{% include "fleetup/menu.html" %}
|
||||||
<div class="panel">
|
<!--<div class="panel">-->
|
||||||
|
<div>
|
||||||
<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 row">
|
||||||
<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-8">
|
||||||
{% 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">
|
||||||
@ -31,7 +32,7 @@
|
|||||||
</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>
|
||||||
@ -39,12 +40,12 @@
|
|||||||
<span id="localtime{{ start.operation_id }}"></span> <span class='label label-success'>Local time</span><br>
|
<span id="localtime{{ start.operation_id }}"></span> <span class='label label-success'>Local time</span><br>
|
||||||
<div id="countdown{{ start.operation_id }}"></div>
|
<div id="countdown{{ start.operation_id }}"></div>
|
||||||
</td>
|
</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>
|
||||||
@ -60,11 +61,11 @@
|
|||||||
<td>
|
<td>
|
||||||
{% if start.doctrine %}
|
{% if start.doctrine %}
|
||||||
{% for doctrine in start.doctrine %}
|
{% for doctrine in start.doctrine %}
|
||||||
|
|
||||||
<a href="{% url 'fleetup:doctrine' doctrine.Id %}" class="label label-success">{{ doctrine.Name }}</a>
|
<a href="{% url 'fleetup:doctrine' 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 %}
|
||||||
@ -89,7 +90,7 @@
|
|||||||
<h3>{% trans "There seems to be no Operations in the near future." %}</h3>
|
<h3>{% trans "There seems to be no Operations in the near future." %}</h3>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-3">
|
<div class="col-lg-4">
|
||||||
<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>
|
||||||
@ -158,7 +159,7 @@
|
|||||||
<td>
|
<td>
|
||||||
{{ type.owner }}
|
{{ type.owner }}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{{ type.notes }}
|
{{ type.notes }}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user