rezometz
/
re2o
mirror of https://gitlab.federez.net/re2o/re2o
8
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Merge branch 'minor_ui_fixes' into 'dev' 

Fix: Minor UI issues

See merge request re2o/re2o!594
fix-permission-does-not-exist-for-base-invoice
chirac 5 years ago
parent
d5bdc7fe41 3d748e9e42
commit
6ccd120ff0
5 changed files with 46 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      cotisations/templates/cotisations/aff_cost_estimate.html
  2. 2
      cotisations/templates/cotisations/aff_cotisations.html
  3. 4
      re2o/templatetags/design.py
  4. 2
      tickets/templates/tickets/aff_tickets.html
  5. 79
      users/templates/users/aff_whitelists.html

4
cotisations/templates/cotisations/aff_cost_estimate.html
View File

@ -73,9 +73,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<td>{{ estimate.id }}</td> <td>{{ estimate.id }}</td>
<td> <td>
{% if estimate.final_invoice %} {% if estimate.final_invoice %}
<a href="{% url 'cotisations:edit-custom-invoice' estimate.final_invoice.pk %}"><i style="color: #1ECA18;" class="fa fa-check"></i></a> <a href="{% url 'cotisations:edit-custom-invoice' estimate.final_invoice.pk %}"><i class="fa fa-check text-success"></i></a>
{% else %} {% else %}
<i style="color: #D10115;" class="fa fa-times"></i> <i class="fa fa-times text-danger"></i>
{% endif %} {% endif %}
</td> </td>
<td> <td>

2
cotisations/templates/cotisations/aff_cotisations.html
View File

@ -60,7 +60,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<tr> <tr>
<td><a href="{% url 'users:profil' userid=facture.user.id %}">{{ facture.user }}</a></td> <td><a href="{% url 'users:profil' userid=facture.user.id %}">{{ facture.user }}</a></td>
<td> <td>
<table class="table-striped"> <table class="table-borderless">
{% for article in facture.name_detailed %} {% for article in facture.name_detailed %}
<tr> <tr>
<td> <td>

4
re2o/templatetags/design.py
View File

@ -31,9 +31,9 @@ def tick(valeur, autoescape=False):
if isinstance(valeur, bool): if isinstance(valeur, bool):
if valeur == True: if valeur == True:
result = '<i style="color: #1ECA18;" class="fa fa-check"></i>' result = '<i class="fa fa-check text-success"></i>'
else: else:
result = '<i style="color: #D10115;" class="fa fa-times"></i>' result = '<i class="fa fa-times text-danger"></i>'
return mark_safe(result) return mark_safe(result)
else: # if the value is not a boolean, display it as if tick was not called else: # if the value is not a boolean, display it as if tick was not called

2
tickets/templates/tickets/aff_tickets.html
View File

@ -46,7 +46,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<div class="table-responsiv"> <div class="table-responsive">
<table class="table"> <table class="table">
<thead> <thead>

79
users/templates/users/aff_whitelists.html
View File

@ -30,43 +30,44 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% load acl %} {% load acl %}
{% load logs_extra %} {% load logs_extra %}
<table class="table table-striped"> <div class="table-responsive">
<thead> <table class="table table-striped">
<tr> <thead>
{% trans "User" as tr_user %} <tr>
<th>{% include 'buttons/sort.html' with prefix='white' col="user" text=tr_user %}</th> {% trans "User" as tr_user %}
<th>{% trans "Reason" %}</th> <th>{% include 'buttons/sort.html' with prefix='white' col="user" text=tr_user %}</th>
{% trans "Start date" as tr_start %} <th>{% trans "Reason" %}</th>
<th>{% include 'buttons/sort.html' with prefix='white' col="start" text=tr_start %}</th> {% trans "Start date" as tr_start %}
{% trans "End date" as tr_end %} <th>{% include 'buttons/sort.html' with prefix='white' col="start" text=tr_start %}</th>
<th>{% include 'buttons/sort.html' with prefix='white' col="end" text=tr_end %}</th> {% trans "End date" as tr_end %}
<th></th> <th>{% include 'buttons/sort.html' with prefix='white' col="end" text=tr_end %}</th>
</tr> <th></th>
</thead> </tr>
{% for whitelist in white_list %} </thead>
{% if whitelist.is_active %} {% for whitelist in white_list %}
<tr class="success"> {% if whitelist.is_active %}
{% else %} <tr class="success">
<tr> {% else %}
{% endif %} <tr>
<td><a href="{% url 'users:profil' whitelist.user.id%}" class="btn btn-primary btn-sm" role="button"><i class="fa fa-user"></i> {{ whitelist.user }}</a></td> {% endif %}
<td>{{ whitelist.raison }}</td> <td><a href="{% url 'users:profil' whitelist.user.id%}" class="btn btn-primary btn-sm" role="button"><i class="fa fa-user"></i> {{ whitelist.user }}</a></td>
<td>{{ whitelist.date_start }}</td> <td>{{ whitelist.raison }}</td>
<td>{{ whitelist.date_end }}</td> <td>{{ whitelist.date_start }}</td>
<td class="text-right"> <td>{{ whitelist.date_end }}</td>
{% can_delete whitelist %} <td class="text-right">
{% include 'buttons/suppr.html' with href='users:del-whitelist' id=whitelist.id %} {% can_delete whitelist %}
{% acl_end %} {% include 'buttons/suppr.html' with href='users:del-whitelist' id=whitelist.id %}
{% history_button whitelist %} {% acl_end %}
{% can_edit whitelist %} {% history_button whitelist %}
{% include 'buttons/edit.html' with href='users:edit-whitelist' id=whitelist.id %} {% can_edit whitelist %}
{% acl_end %} {% include 'buttons/edit.html' with href='users:edit-whitelist' id=whitelist.id %}
</td> {% acl_end %}
</tr> </td>
{% endfor %} </tr>
</table> {% endfor %}
</table>
{% if white_list.paginator %}
{% include 'pagination.html' with list=white_list %}
{% endif %}
{% if white_list.paginator %}
{% include 'pagination.html' with list=white_list %}
{% endif %}
</div>

Write Preview
Loading…
Cancel
Save