rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-09-12 01:03:09 +00:00
Code Issues Releases Wiki Activity

Merge branch 'deprecated_font_html_tag' into 'master'

Browse source 
Fix #15 Deprecated font HTML tag

Closes #15

See merge request federez/re2o!32
This commit is contained in:
chirac 2017-11-14 17:59:35 +01:00
commit 42a081bd2a
5 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -73,7 +73,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
PDF PDF
</a> </a>
{% else %} {% else %}
<font color="red">Facture invalide</font> <i class="text-danger">Facture invalide</i>
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

8
templates/base.html
View file

@ -146,9 +146,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<th scope="row">Connexion</th> <th scope="row">Connexion</th>
<td class="text-right"> <td class="text-right">
{% if request_user.has_access %} {% if request_user.has_access %}
<font color="green">jusqu'au {{ request.user.end_access|date:"d b Y" }}</font> <i class="text-success">jusqu'au {{ request.user.end_access|date:"d b Y" }}</i>
{% else %} {% else %}
<font color="red">Désactivée</font> <i class="text-danger">Désactivée</i>
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -156,9 +156,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<th scope="row">Adhésion</th> <th scope="row">Adhésion</th>
<td class="text-right"> <td class="text-right">
{% if request_user.is_adherent %} {% if request_user.is_adherent %}
<font color="green">jusqu'au {{ request_user.end_adhesion|date:"d b Y" }}</font> <i class="text-success">jusqu'au {{ request_user.end_adhesion|date:"d b Y" }}</i>
{% else %} {% else %}
<font color="red">Non adhérent</font> <i class="text-danger">Non adhérent</i>
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

4
users/templates/users/aff_clubs.html
View file

@ -44,9 +44,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<td>{{ club.room }}</td> <td>{{ club.room }}</td>
<td>{% if club.is_adherent %}{{ club.end_adhesion }}{% else %}Non adhérent{% endif %}</td> <td>{% if club.is_adherent %}{{ club.end_adhesion }}{% else %}Non adhérent{% endif %}</td>
<td>{% if club.has_access == True %} <td>{% if club.has_access == True %}
<font color="green">Active</font> <i class="text-success">Active</i>
{% else %} {% else %}
<font color="red">Désactivée</font> <i class="text-danger">Désactivée</i>
{% endif %} {% endif %}
</td> </td>
<td><a href="{% url "users:profil" club.id%}" class="btn btn-primary btn-sm" role="button"><i class="glyphicon glyphicon-user"></i></a> <td><a href="{% url "users:profil" club.id%}" class="btn btn-primary btn-sm" role="button"><i class="glyphicon glyphicon-user"></i></a>

4
users/templates/users/aff_users.html
View file

@ -46,9 +46,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<td>{{ user.room }}</td> <td>{{ user.room }}</td>
<td>{% if user.is_adherent %}{{ user.end_adhesion }}{% else %}Non adhérent{% endif %}</td> <td>{% if user.is_adherent %}{{ user.end_adhesion }}{% else %}Non adhérent{% endif %}</td>
<td>{% if user.has_access == True %} <td>{% if user.has_access == True %}
<font color="green">Active</font> <i class="text-success">Active</i>
{% else %} {% else %}
<font color="red">Désactivée</font> <i class="text-danger">Désactivée</i>
{% endif %} {% endif %}
</td> </td>
<td><a href="{% url "users:profil" user.id%}" class="btn btn-primary btn-sm" role="button"><i class="glyphicon glyphicon-user"></i></a> <td><a href="{% url "users:profil" user.id%}" class="btn btn-primary btn-sm" role="button"><i class="glyphicon glyphicon-user"></i></a>

22
users/templates/users/profil.html
View file

@ -90,38 +90,38 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<tr> <tr>
<th>Fin d'adhésion</th> <th>Fin d'adhésion</th>
{% if user.end_adhesion != None %} {% if user.end_adhesion != None %}
<td><font color="green">{{ user.end_adhesion }}</font></td> <td><i class="text-success">{{ user.end_adhesion }}</i></td>
{% else %} {% else %}
<td><font color="red">Non adhérent</font></td> <td><i class="text-danger">Non adhérent</i></td>
{% endif %} {% endif %}
<th>Accès gracieux</th> <th>Accès gracieux</th>
{% if user.end_whitelist != None %} {% if user.end_whitelist != None %}
<td><font color="green">{{ user.end_whitelist }}</font></td> <td><i class="text-success">{{ user.end_whitelist }}</i></td>
{% else %} {% else %}
<td><font color="orange">Aucun</font></td> <td><i class="text-warning">Aucun</i></td>
{% endif %} {% endif %}
<tr> <tr>
<th>Bannissement</th> <th>Bannissement</th>
{% if user.end_ban != None %} {% if user.end_ban != None %}
<td><font color="red">{{ user.end_ban }}</font></td> <td><i class="text-danger">{{ user.end_ban }}</i></td>
{% else %} {% else %}
<td><font color="green">Non banni</font></td> <td><i class="text-success">Non banni</i></td>
{% endif %} {% endif %}
<th>Statut</th> <th>Statut</th>
{% if user.state == 0 %} {% if user.state == 0 %}
<td><font color="green">Actif</font></td> <td><i class="text-success">Actif</i></td>
{% elif user.state == 1 %} {% elif user.state == 1 %}
<td><font color="red">Désactivé</font></td> <td><i class="text-danger">Désactivé</i></td>
{% else %} {% else %}
<td><font color="orange">Archivé</font></td> <td><i class="text-warning">Archivé</i></td>
{% endif %} {% endif %}
</tr> </tr>
<tr> <tr>
<th>Accès internet</th> <th>Accès internet</th>
{% if user.has_access == True %} {% if user.has_access == True %}
<td><font color="green">Actif (jusqu'au {{ user.end_access }})</font></td> <td><i class="text-success">Actif (jusqu'au {{ user.end_access }})</i></td>
{% else %} {% else %}
<td><font color="red">Désactivé</font></td> <td><i class="text-danger">Désactivé</i></td>
{% endif %} {% endif %}
<th>Droits</th> <th>Droits</th>
{% if list_droits %} {% if list_droits %}