diff --git a/cotisations/templates/cotisations/aff_cotisations.html b/cotisations/templates/cotisations/aff_cotisations.html index b9a1a810..4d2cd3ee 100644 --- a/cotisations/templates/cotisations/aff_cotisations.html +++ b/cotisations/templates/cotisations/aff_cotisations.html @@ -59,7 +59,17 @@ with this program; if not, write to the Free Software Foundation, Inc., {% for facture in facture_list %}
+ {{ article }} + | +
- {% trans "User" as tr_user %} - {% include 'buttons/sort.html' with prefix='cotis' col='user' text=tr_user %} - | -{% trans "Designation" %} | -{% trans "Total price" %} | -- {% trans "Payment method" as tr_payment_method %} - {% include 'buttons/sort.html' with prefix='cotis' col='paiement' text=tr_payment_method %} - | -- {% trans "Date" as tr_date %} - {% include 'buttons/sort.html' with prefix='cotis' col='date' text=tr_date %} - | -- {% trans "Invoice ID" as tr_invoice_id %} - {% include 'buttons/sort.html' with prefix='cotis' col='id' text=tr_invoice_id %} - | -- | - | |
---|---|---|---|---|---|---|---|---|
{{ facture.user }} | -
-
|
- {{ facture.prix_total }} | -{{ facture.paiement }} | -{{ facture.date }} | -{{ facture.id }} | -- {% 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 %} - | -- {% if facture.valid %} - - {% trans "PDF" %} - - {% else %} - {% trans "Invalidated invoice" %} - {% endif %} - {% if facture.control and facture.is_subscription %} - - {% trans "Voucher" %} - - {% endif %} - | -
{% trans "No invoice" %}
+ {% include 'cotisations/aff_cotisations.html' with facture_list=facture_list %} + {% else %} +{% trans "No invoice" %}
{% endif %}{% trans "IP type" %} | -{% trans "Extension" %} | -{% blocktrans %}"infra" right required{% endblocktrans %} | -{% trans "IPv4 range" %} | -{% trans "v6 prefix" %} | -{% trans "DNSSEC reverse v4/v6" %} | -{% trans "On VLAN(s)" %} | -{% trans "Default ports opening" %} | -- |
---|---|---|---|---|---|---|---|---|
{{ type.name }} | -{{ type.extension }} | -{{ type.need_infra|tick }} | -{{ type.domaine_ip_start }}-{{ type.domaine_ip_stop }}{% if type.ip_network %} on - {{ type.ip_network }}{% endif %} | -{{ type.prefix_v6 }}/{{ type.prefix_v6_length }} | -{{ type.reverse_v4|tick }}/{{ type.reverse_v6|tick }} | -{{ type.vlan }} | -{{ type.ouverture_ports }} | -
+{% if iptype_list.paginator %}
+ {% include 'pagination.html' with list=iptype_list %}
+{% endif %}
+
+{% for type in iptype_list %}
+
+
+
+
+
+
+ {{ type.name }}+
+
+ {{ type.extension }}+
+ {% if type.need_infra %}
+ {% trans "Infra right required" %}
+ {% else %}
+ {% trans "Infra right not required" %}
+ {% endif %}
+
+
{% can_edit type %}
{% include 'buttons/edit.html' with href='machines:edit-iptype' id=type.id %}
{% acl_end %}
{% history_button type %}
- |
-
{% include 'buttons/sort.html' with prefix='machine' col='name' text=tr_dns_name %} | -{% trans "Type" %} | -{% trans "MAC address" %} | -{% trans "IP address" %} | -{% trans "Actions" %} | - - {% for machine in machines_list %} -|||
---|---|---|---|---|---|---|---|
- {% trans "No name" as tr_no_name %} - {% trans "View the profile" as tr_view_the_profile %} - {% if machine.active %} - - {% else %} - {% trans "Deactivated" %}: - {% endif %} - {{ machine.get_name|default:tr_no_name }} - - {{ machine.user }} - - | -
+{% for machine in machines_list %}
+
+
+
+
+
+ {% trans "No name" as tr_no_name %}
+ {{ machine.user }}
+
+ {{ machine.get_name|default:tr_no_name }}
+
+
{% 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 %}
@@ -71,156 +50,165 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% can_delete machine %}
{% include 'buttons/suppr.html' with href='machines:del-machine' id=machine.id %}
{% acl_end %}
- |
- ||||||
- {% if interface.domain.related_domain.all %} - {{ interface.domain }} - - {% else %} - {{ interface.domain }} - {% endif %} - | -- {{ interface.machine_type }} - | -- {{ interface.mac_address }} - - | -
- IPv4 {{ interface.ipv4 }}
- - {% if ipv6_enabled and interface.ipv6 != 'None' %} - IPv6 - - {% endif %} - |
-
-
-
+
+
+
+
-
-
- {% history_button interface %}
- {% can_delete interface %}
- {% include 'buttons/suppr.html' with href='machines:del-interface' id=interface.id %}
+
-
+ {% for interface in machine.interface_set.all %}
+
+
+
+ {% trans "DNS name"%}:
+
+ {% if interface.domain.related_domain.all %}
+ {{ interface.domain }}
+
+ {% else %}
+ {{ interface.domain }}
+ {% endif %}
+
+
+ {% trans "Type" %}:
+
+ {{ interface.machine_type }}
+
+
+ {% trans "MAC address" %}:
+
+ {{ interface.mac_address }}
+
+
+
+ IPv4 {{ interface.ipv4 }}
+
+ + {% if interface.ipv6.count > 0 %} + IPv6 + + {% else %} + {% trans "No IPv6" %} + {% endif %} +
+
+
+
- |
- |||
-
-
-
|
- |||||||
-
-
-
|
- |||||||
-
-
-
|
- |||||||
- |
{% include 'buttons/sort.html' with prefix='machine' col='name' text=tr_dns_name %} | -{% trans "Type" %} | -{% trans "MAC address" %} | -{% trans "IP address" %} | -{% trans "Actions" %} | - - {% for machine in machines_list %} -|||
---|---|---|---|---|---|---|---|
- {% trans "No name" as tr_no_name %} - {% trans "View the profile" as tr_view_the_profile %} - {% if machine.active %} - - {% else %} - {% trans "Deactivated" %}: - {% endif %} - {{ machine.get_name|default:tr_no_name }} - - {{ machine.user }} - - | -- {% 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 %} - | -||||||
- {% if interface.domain.related_domain.all %} - {{ interface.domain }} - - {% else %} - {{ interface.domain }} - {% endif %} - | -- {{ interface.machine_type }} - | -- {{ interface.mac_address }} - - | -
- IPv4 {{ interface.ipv4 }}
- - {% if ipv6_enabled and interface.ipv6 != 'None' %} - IPv6 - - {% endif %} - |
-
-
-
-
-
-
- {% history_button interface %}
- {% can_delete interface %}
- {% include 'buttons/suppr.html' with href='machines:del-interface' id=interface.id %}
- {% acl_end %}
-
- |
- |||
-
-
-
|
- |||||||
-
-
-
|
- |||||||
-
-
-
|
- |||||||
- |
{% trans "No machine" %}
- {% endif %} +{%trans "No machines" %}
+ {% endif %}{% trans "Name" %} | -{% trans "TCP (input)" %} | -{% trans "TCP (output)" %} | -{% trans "UDP (input)" %} | -{% trans "UDP (output)" %} | -{% trans "Machines" %} | -- |
---|---|---|---|---|---|---|
{{ pl.name }} | -{% for p in pl.tcp_ports_in %}{{ p.show_port }}, {% endfor %} | -{% for p in pl.tcp_ports_out %}{{ p.show_port }}, {% endfor %} | -{% for p in pl.udp_ports_in %}{{ p.show_port }}, {% endfor %} | -{% for p in pl.udp_ports_out %}{{ p.show_port }}, {% endfor %} | -
- {% if pl.interface_set.all %}
-
-
-
- {% endif %}
-
- | - {% can_edit pl %} - {% include 'buttons/edit.html' with href='machines:edit-portlist' id=pl.id %} - {% acl_end %} - {% can_delete pl %} - {% include 'buttons/suppr.html' with href='machines:del-portlist' id=pl.id %} - {% acl_end %} - | -
{% include 'buttons/sort.html' with prefix='building' col='name' text=tr_building %} | -{% include 'buttons/sort.html' with prefix='room' col='name' text=tr_room %} | -{% trans "Connnected to" %} | -{% trans "User" %} | -{% trans "Details" %} | -{% trans "End of subscription on" %} | -{% trans "Internet access" %} | -{% trans "Action" %} | -
---|---|---|---|---|---|---|---|
{{ room.building }} | -{{ room.name }} | -{% if room.port_set.all %}{{ asso_name }}{% else %}{% trans "Other operator" %}{% endif %} | -{% if room.adherent %}{{ room.adherent }}{% else %} {% trans "None" %}{% endif %} | -{{ room.details }} | -{% if room.adherent.is_adherent %}{% else %}{% endif %}{% if room.adherent.end_adhesion %}{{ room.adherent.end_adhesion}}{% else %}{% trans "Non member" %}{% endif %} | -- {% if room.adherent.has_access == True %} - {% trans "Active" %} - {% else %} - {% trans "Disabled" %} - {% endif %} - | -- {% if room.port_set.all %} - - {% endif %} - | -
{% trans "User"%} | +{% trans "Connected to"%} | +{% trans "End of subscription on" %} | +{% trans "Internet access" %} | +
---|---|---|---|
+ {% if room.adherent %} + {{ room.adherent }} + {% else %} + {% trans "None" %} + {% endif %} + | ++ {% if room.port_set.all %} + {{ asso_name }} + {% else %} + {% trans "Other operator" %} + {% endif %} + | ++ {% if room.adherent.is_adherent %} + + {% else %} + + {% endif %} + {% if room.adherent.end_adhesion %} + {{ room.adherent.end_adhesion}} + {% else %} + {% trans "Non member" %} + {% endif %} + + | ++ {% if room.adherent.has_access == True %} + {% trans "Active" %} + {% else %} + {% trans "Disabled" %} + {% endif %} + | +
{% trans "Name" %} | -{% trans "URL" %} | -{% trans "Description" %} | -{% trans "Image" %} | -- |
---|---|---|---|---|
{{ service.name }} | -{{ service.url }} | -{{ service.description }} | -{{ service.image }} | -- {% can_edit service %} - {% include 'buttons/edit.html' with href='preferences:edit-service' id=service.id %} - {% acl_end %} - {% can_delete service %} - {% include 'buttons/suppr.html' with href='preferences:del-service' id=service.id %} - {% acl_end %} - {% history_button service %} - | -