Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-09 12:30:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Corrected usage of Bootstrap classes in FleetUp templates

Browse Source
This commit is contained in:
Peter Pfeufer 2018-08-11 11:03:36 +02:00
parent d429c8b59a
commit 3c11c25d69
7 changed files with 49 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -62,3 +62,5 @@ celerybeat-schedule
#pycharm #pycharm
.idea/* .idea/*
/nbproject/

2
allianceauth/fleetup/templates/fleetup/doctrine.html
View File

@ -8,7 +8,7 @@
{% 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 %}

4
allianceauth/fleetup/templates/fleetup/doctrinesview.html
View File

@ -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>

36
allianceauth/fleetup/templates/fleetup/fitting.html
View File

@ -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>
@ -108,7 +110,7 @@
</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>

9
allianceauth/fleetup/templates/fleetup/index.html
View File

@ -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">
@ -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>