mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-23 11:53:12 +00:00
Remove redundant code, reuse aff_ templates
This commit is contained in:
grisel-davy
Gabriel Detraz
parent
46a8005885
commit
52a23be738
2 changed files with 16 additions and 314 deletions
|
|
@ -52,89 +52,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
{% if facture_list %}
|
{% if facture_list %}
|
||||||
<div class="table-responsive">
|
{% include 'cotisations/aff_cotisations.html' with facture_list=facture_list %}
|
||||||
{% if facture_list.paginator %}
|
{% else %}
|
||||||
{% include 'pagination.html' with list=facture_list %}
|
<p>{% trans "No invoice" %}</p>
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
<table class="table table-striped">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th>
|
|
||||||
{% trans "User" as tr_user %}
|
|
||||||
{% include 'buttons/sort.html' with prefix='cotis' col='user' text=tr_user %}
|
|
||||||
</th>
|
|
||||||
<th>{% trans "Designation" %}</th>
|
|
||||||
<th>{% trans "Total price" %}</th>
|
|
||||||
<th>
|
|
||||||
{% trans "Payment method" as tr_payment_method %}
|
|
||||||
{% include 'buttons/sort.html' with prefix='cotis' col='paiement' text=tr_payment_method %}
|
|
||||||
</th>
|
|
||||||
<th>
|
|
||||||
{% trans "Date" as tr_date %}
|
|
||||||
{% include 'buttons/sort.html' with prefix='cotis' col='date' text=tr_date %}
|
|
||||||
</th>
|
|
||||||
<th>
|
|
||||||
{% trans "Invoice ID" as tr_invoice_id %}
|
|
||||||
{% include 'buttons/sort.html' with prefix='cotis' col='id' text=tr_invoice_id %}
|
|
||||||
</th>
|
|
||||||
<th></th>
|
|
||||||
<th></th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
{% for facture in facture_list %}
|
|
||||||
<tr>
|
|
||||||
<td><a href="{% url 'users:profil' userid=facture.user.id %}">{{ facture.user }}</a></td>
|
|
||||||
<td>
|
|
||||||
<table class="table-striped">
|
|
||||||
{% for article in facture.name_detailed %}
|
|
||||||
<tr>
|
|
||||||
<td>
|
|
||||||
{{ article }}
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
{% endfor %}
|
|
||||||
</table>
|
|
||||||
</td>
|
|
||||||
<td>{{ facture.prix_total }}</td>
|
|
||||||
<td>{{ facture.paiement }}</td>
|
|
||||||
<td>{{ facture.date }}</td>
|
|
||||||
<td>{{ facture.id }}</td>
|
|
||||||
<td>
|
|
||||||
{% can_edit facture %}
|
|
||||||
{% include 'buttons/edit.html' with href='cotisations:edit-facture' id=facture.id %}
|
|
||||||
{% acl_else %}
|
|
||||||
{% trans "Controlled invoice" %}
|
|
||||||
{% acl_end %}
|
|
||||||
{% can_delete facture %}
|
|
||||||
{% include 'buttons/suppr.html' with href='cotisations:del-facture' id=facture.id %}
|
|
||||||
{% acl_end %}
|
|
||||||
{% history_button facture %}
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
{% if facture.valid %}
|
|
||||||
<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:facture-pdf' facture.id %}">
|
|
||||||
<i class="fa fa-file-pdf-o"></i> {% trans "PDF" %}
|
|
||||||
</a>
|
|
||||||
{% else %}
|
|
||||||
<i class="text-danger">{% trans "Invalidated invoice" %}</i>
|
|
||||||
{% endif %}
|
|
||||||
{% if facture.control and facture.is_subscription %}
|
|
||||||
<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:voucher-pdf' facture.id %}">
|
|
||||||
<i class="fa fa-file-pdf-o"></i> {% trans "Voucher" %}
|
|
||||||
</a>
|
|
||||||
{% endif %}
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
{% endfor %}
|
|
||||||
</table>
|
|
||||||
|
|
||||||
{% if facture_list.paginator %}
|
|
||||||
{% include 'pagination.html' with list=facture_list %}
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
{% else %}
|
|
||||||
<p>{% trans "No invoice" %}</p>
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -34,238 +34,20 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
{% trans "Machines" %}
|
{% trans "Machines" %}
|
||||||
<span class="badge">{{ nb_machines }}</span>
|
<span class="badge">{{ nb_machines }}</span>
|
||||||
</h3>
|
</h3>
|
||||||
</div>
|
|
||||||
<div id="machines" class="panel-collapse collapse">
|
|
||||||
<div class="panel-body">
|
|
||||||
<a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:new-machine' users.id %}">
|
|
||||||
<i class="fa fa-desktop"></i>
|
|
||||||
{% trans "Add a machine" %}
|
|
||||||
</a>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div id="machines" class="panel-collapse collapse">
|
||||||
{% if machines_list %}
|
<div class="panel-body">
|
||||||
<div class="table-responsive">
|
<a class="btn btn-primary btn-sm" role="button" href="{% url 'machines:new-machine' users.id %}">
|
||||||
{% if machines_list.paginator %}
|
<i class="fa fa-desktop"></i>
|
||||||
{% include 'pagination.html' with list=machines_list go_to_id="machines" %}
|
{% trans "Add a machine" %}
|
||||||
{% endif %}
|
</a>
|
||||||
|
</div>
|
||||||
<table class="table" id="machines_table">
|
<div class="panel-body">
|
||||||
<colgroup>
|
{% if machines_list %}
|
||||||
<col>
|
{% include 'machines/aff_machines.html' with machines_list=machines_list %}
|
||||||
<col>
|
{% else %}
|
||||||
<col>
|
<p>{%trans "No machines" %}</p>
|
||||||
<col width="{% if ipv6_enabled %}300{% else %}150{% endif %}px">
|
{% endif %}
|
||||||
<col width="144px">
|
|
||||||
</colgroup>
|
|
||||||
<thead>
|
|
||||||
{% trans "DNS name" as tr_dns_name %}
|
|
||||||
<th>{% include 'buttons/sort.html' with prefix='machine' col='name' text=tr_dns_name %}</th>
|
|
||||||
<th>{% trans "Type" %}</th>
|
|
||||||
<th>{% trans "MAC address" %}</th>
|
|
||||||
<th>{% trans "IP address" %}</th>
|
|
||||||
<th>{% trans "Actions" %}</th>
|
|
||||||
<tbody>
|
|
||||||
{% for machine in machines_list %}
|
|
||||||
<tr class="info">
|
|
||||||
<td colspan="4">
|
|
||||||
{% trans "No name" as tr_no_name %}
|
|
||||||
{% trans "View the profile" as tr_view_the_profile %}
|
|
||||||
{% if machine.active %}
|
|
||||||
<span class="text-success">
|
|
||||||
{% else %}
|
|
||||||
<span class="text-warning">{% trans "Deactivated" %}:
|
|
||||||
{% endif %}
|
|
||||||
<b>{{ machine.get_name|default:tr_no_name }}</b> </span><i class="fa fa-angle-right"></i>
|
|
||||||
<a href="{% url 'users:profil' userid=machine.user.id %}" title=tr_view_the_profile>
|
|
||||||
<i class="fa fa-user"></i> {{ machine.user }}
|
|
||||||
</a>
|
|
||||||
</td>
|
|
||||||
<td class="text-right">
|
|
||||||
{% can_create Interface machine.id %}
|
|
||||||
{% trans "Create an interface" as tr_create_an_interface %}
|
|
||||||
{% include 'buttons/add.html' with href='machines:new-interface' id=machine.id desc=tr_create_an_interface %}
|
|
||||||
{% acl_end %}
|
|
||||||
{% history_button machine %}
|
|
||||||
{% can_delete machine %}
|
|
||||||
{% include 'buttons/suppr.html' with href='machines:del-machine' id=machine.id %}
|
|
||||||
{% acl_end %}
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
{% for interface in machine.interface_set.all %}
|
|
||||||
<tr>
|
|
||||||
<td>
|
|
||||||
{% if interface.domain.related_domain.all %}
|
|
||||||
{{ interface.domain }}
|
|
||||||
<button class="btn btn-default btn-xs" type="button" data-toggle="collapse"
|
|
||||||
data-target="#collapseDomain_{{ interface.id }}" aria-expanded="true"
|
|
||||||
aria-controls="collapseDomain_{{ interface.id }}">
|
|
||||||
{% trans "Display the aliases" %}
|
|
||||||
</button>
|
|
||||||
{% else %}
|
|
||||||
{{ interface.domain }}
|
|
||||||
{% endif %}
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
{{ interface.machine_type }}
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
{{ interface.mac_address }}
|
|
||||||
<button class="btn btn-default btn-xs" type="button" data-toggle="collapse"
|
|
||||||
data-target="#collapseVendor_{{ interface.id }}" aria-expanded="true"
|
|
||||||
aria-controls="collapseVendor_{{ interface.id }}">
|
|
||||||
{% trans "Display the vendor" %}
|
|
||||||
</button>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<b>IPv4</b> {{ interface.ipv4 }}
|
|
||||||
<br>
|
|
||||||
{% if ipv6_enabled and interface.ipv6 != 'None' %}
|
|
||||||
<b>IPv6</b>
|
|
||||||
<button class="btn btn-default btn-xs" type="button" data-toggle="collapse"
|
|
||||||
data-target="#collapseIpv6_{{ interface.id }}" aria-expanded="true"
|
|
||||||
aria-controls="collapseIpv6_{{ interface.id }}">
|
|
||||||
{% trans "Display the IPv6 address" %}
|
|
||||||
</button>
|
|
||||||
{% endif %}
|
|
||||||
</td>
|
|
||||||
<td class="text-right">
|
|
||||||
<div style="width: 128px;">
|
|
||||||
<div class="btn-group" role="group">
|
|
||||||
<button class="btn btn-primary btn-sm dropdown-toggle" type="button"
|
|
||||||
id="editioninterface" data-toggle="dropdown" aria-haspopup="true"
|
|
||||||
aria-expanded="true">
|
|
||||||
<i class="fa fa-edit"></i> <span class="caret"></span>
|
|
||||||
</button>
|
|
||||||
<ul class="dropdown-menu" aria-labelledby="editioninterface">
|
|
||||||
{% can_edit interface %}
|
|
||||||
<li>
|
|
||||||
<a href="{% url 'machines:edit-interface' interface.id %}">
|
|
||||||
<i class="fa fa-edit"></i>
|
|
||||||
{% trans "Edit" %}
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
{% acl_end %}
|
|
||||||
{% can_create Domain interface.id %}
|
|
||||||
<li>
|
|
||||||
<a href="{% url 'machines:index-alias' interface.id %}">
|
|
||||||
<i class="fa fa-edit"></i>
|
|
||||||
{% trans "Manage the aliases" %}
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
{% acl_end %}
|
|
||||||
{% can_create Ipv6List interface.id %}
|
|
||||||
<li>
|
|
||||||
<a href="{% url 'machines:index-ipv6' interface.id %}">
|
|
||||||
<i class="fa fa-edit"></i>
|
|
||||||
{% trans "Manage the IPv6 addresses" %}
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
{% acl_end %}
|
|
||||||
{% can_create SshFp interface.machine.id %}
|
|
||||||
<li>
|
|
||||||
<a href="{% url 'machines:index-sshfp' interface.machine.id %}">
|
|
||||||
<i class="fa fa-edit"></i>
|
|
||||||
{% trans "Manage the SSH fingerprints" %}
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
{% acl_end %}
|
|
||||||
{% can_create OuverturePortList %}
|
|
||||||
<li>
|
|
||||||
<a href="{% url 'machines:port-config' interface.id %}">
|
|
||||||
<i class="fa fa-edit"></i>
|
|
||||||
{% trans "Manage the ports configuration" %}
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
{% acl_end %}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
{% history_button interface %}
|
|
||||||
{% can_delete interface %}
|
|
||||||
{% include 'buttons/suppr.html' with href='machines:del-interface' id=interface.id %}
|
|
||||||
{% acl_end %}
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td colspan=5 style="border-top: none; padding: 1px;">
|
|
||||||
<div class="collapse in" id="collapseVendor_{{ interface.id }}">
|
|
||||||
<ul class="list-group" style="margin-bottom: 0;">
|
|
||||||
<li class="list-group-item col-xs-6 col-sm-6 col-md-6" style="border: none;">
|
|
||||||
{{ interface.get_vendor }}
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
{% if ipv6_enabled and interface.ipv6 != 'None' %}
|
|
||||||
<tr>
|
|
||||||
<td colspan=5 style="border-top: none; padding: 1px;">
|
|
||||||
<div class="collapse in" id="collapseIpv6_{{ interface.id }}">
|
|
||||||
<ul class="list-group" style="margin-bottom: 0;">
|
|
||||||
{% for ipv6 in interface.ipv6.all %}
|
|
||||||
<li class="list-group-item col-xs-6 col-sm-6 col-md-6" style="border: none;">
|
|
||||||
{{ ipv6 }}
|
|
||||||
</li>
|
|
||||||
{% endfor %}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
{% endif %}
|
|
||||||
{% if interface.domain.related_domain.all %}
|
|
||||||
<tr>
|
|
||||||
<td colspan=5 style="border-top: none; padding: 1px;">
|
|
||||||
<div class="collapse in" id="collapseDomain_{{ interface.id }}">
|
|
||||||
<ul class="list-group" style="margin-bottom: 0;">
|
|
||||||
{% for al in interface.domain.related_domain.all %}
|
|
||||||
<li class="list-group-item col-xs-6 col-sm-4 col-md-3" style="border: none;">
|
|
||||||
<a href="http://{{ al }}">
|
|
||||||
{{ al }}
|
|
||||||
<i class="fa fa-share"></i>
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
{% endfor %}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
{% endif %}
|
|
||||||
{% endfor %}
|
|
||||||
<tr>
|
|
||||||
<td colspan="8"></td>
|
|
||||||
</tr>
|
|
||||||
{% endfor %}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
$("#machines_table").ready(function () {
|
|
||||||
var alias_div = [{% for machine in machines_list %}{% for interface in machine.interface_set.all %}{% if interface.domain.related_domain.all %}$("#collapseDomain_{{ interface.id }}"), {% endif %}{% endfor %}{% endfor %}];
|
|
||||||
for (var i = 0; i < alias_div.length; i++) {
|
|
||||||
alias_div[i].collapse('hide');
|
|
||||||
}
|
|
||||||
});
|
|
||||||
$("#machines_table").ready(function () {
|
|
||||||
var ipv6_div = [{% for machine in machines_list %}{% for interface in machine.interface_set.all %}{% if interface.ipv6.all %}$("#collapseIpv6_{{ interface.id }}"), {% endif %}{% endfor %}{% endfor %}];
|
|
||||||
for (var i = 0; i < ipv6_div.length; i++) {
|
|
||||||
ipv6_div[i].collapse('hide');
|
|
||||||
}
|
|
||||||
});
|
|
||||||
$("#machines_table").ready(function () {
|
|
||||||
var vendor_div = [{% for machine in machines_list %}{% for interface in machine.interface_set.all %}{% if interface.get_vendor %}$("#collapseVendor_{{ interface.id }}"), {% endif %}{% endfor %}{% endfor %}];
|
|
||||||
for (var i = 0; i < vendor_div.length; i++) {
|
|
||||||
vendor_div[i].collapse('hide');
|
|
||||||
}
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
{% if machines_list.paginator %}
|
|
||||||
{% include 'pagination.html' with list=machines_list go_to_id="machines" %}
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
{% else %}
|
|
||||||
<p>{% trans "No machine" %}</p>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue