Correction nouveau neg

- Echec d'indentation corrigé
- Plus de CSS pour les pages normales
This commit is contained in:
Aurélien Delobelle 2016-08-20 01:20:06 +02:00
parent 056fb610de
commit 813b7230b6
6 changed files with 109 additions and 40 deletions

View file

@ -1,4 +1,5 @@
{% extends "kfet/base.html" %}
{% load kfet_tags %}
{% block title %}
{% if account.user == request.user %}
@ -19,35 +20,56 @@
{% block content %}
<div class="row">
<div class="col-lg-12">
<div class="btn-group btn-group-lg">
<a class="btn btn-primary" href="{% url 'kfet.account.update' account.trigramme %}">
Modifier
</a>
<a class="btn btn-primary">Recharger par CB</a>
<div class="col-sm-4 col-md-3 col-content-left">
<div class="content-left">
<div class="content-left-top {% if account.is_frozen %}frozen-account{% endif %}">
<div class="line trigramme">{{ account.trigramme }}</div>
<div class="line balance">{{ account.balance|ukf:account.is_cof }} UKF</div>
<div class="block">
<div class="line">{{ account.name }}</div>
{% if perms.kfet.is_team %}
<div class="line">{{ account.nickname }}</div>
{% endif %}
<div class="line">
{% if account.email %}
{{ account.email }}
{% else %}
Pas d'email !
{% endif %}
</div>
<div class="line">
{{ account.departement }} {{ account.promo }}
</div>
<div class="line">Statut COF: {{ account.is_cof }}</div>
</div>
<div class="block block-neg">
{% if account.negative.start %}
<div class="line">En négatif depuis {{ account.negative.start }}</div>
{% endif %}
{% if account.negative.balance_offset %}
<div class="line">Solde réel: {{ account.real_balance }} €</div>
{% endif %}
{% if account.negative.authz_overdraft_amount %}
<div class="line">Découvert autorisé: {{ account.negative.authz_overdraft_amount }} €</div>
{% endif %}
{% if account.negative.authz_overdraft_until %}
<div class="line">Découvert autorisé jusqu'à : {{ account.negative.authz_overdraft_until }}</div>
{% endif %}
</div>
</div>
<div class="buttons">
<a class="btn btn-primary btn-lg" href="{% url 'kfet.account.update' account.trigramme %}">
Modifier
</a>
<a class="btn btn-primary btn-lg" disabled>
Recharger par CB
</a>
</div>
</div>
</div>
<div class="col-sm-8 col-md-9 col-content-right">
{% include "kfet/base_messages.html" %}
</div>
</div>
<p>Prénom: {{ account.first_name }}</p>
<p>Nom: {{ account.last_name }}</p>
{% if perms.kfet.is_team %}
<p>Surnom: {{ account.nickname }}</p>
{% endif %}
<p>Email: {{ account.email }}</p>
<p>Département: {{ account.departement }}</p>
<p>Promo: {{ account.promo }}</p>
<p>Statut COF: {{ account.is_cof }}</p>
<p>Compte gelé: {{ account.is_frozen }}</p>
<p>Solde: {{ account.balance }} €</p>
{% if account.negative.balance_offset %}
<p>Solde réel: {{ account.real_balance }} €</p>
{% endif %}
{% if account.negative.authorized_overdraft %}
<p>Découvert autorisé: {{ account.negative.authorized_overdraft }} €</p>
{% endif %}
{% if account.negative.start %}
<p>En négatif depuis {{ account.negative.start }}</p>
{% endif %}
{% endblock %}

View file

@ -36,7 +36,6 @@
</div>
</div>
{% endblock %}
{% include "kfet/base_messages.html" %}
{% block content %}{% endblock %}
{% include "kfet/base_footer.html" %}
</div>