diff --git a/kfet/static/kfet/css/transfers_form.css b/kfet/static/kfet/css/transfers_form.css index f222e490..b2920b5d 100644 --- a/kfet/static/kfet/css/transfers_form.css +++ b/kfet/static/kfet/css/transfers_form.css @@ -1,3 +1,20 @@ +.transfer_general { + margin:15px 0; + height:45px; +} + +.transfer_general input { + height:100%; + border:0; + padding:0 5px; + font-size:16px; +} + +.transfer_general button { + height:100%; + margin-top:-3px; +} + .transfer_formset { background:#FFF; } @@ -11,11 +28,9 @@ text-align:center; } -.transfer_form { - height:50px; -} - .transfer_form td { + height:50px; + vertical-align:middle; padding:0 !important; } @@ -31,13 +46,13 @@ font-weight:bold; text-align:center; + vertical-align:middle; text-transform:uppercase; } .transfer_form .from_acc_data, .transfer_form .to_acc_data { width:30%; text-align:center; - vertical-align:middle; font-size:20px; } diff --git a/kfet/templates/kfet/transfers.html b/kfet/templates/kfet/transfers.html index 4ed58465..5a32527b 100644 --- a/kfet/templates/kfet/transfers.html +++ b/kfet/templates/kfet/transfers.html @@ -6,11 +6,42 @@ {% block content %}
-
- {% csrf_token %} - {{ form }} - -
+
+
+
+
+ +
+
+
+ {% include 'kfet/base_messages.html' %} +
+
+

Liste des transferts

+
+ {% for transfergroup in transfergroups %} +
+ {{ transfergroup.at }} + {{ transfergroup.valid_by.trigramme }} + {{ transfergroup.comment }} +
+ {% for transfer in transfergroup.transfers.all %} +
+ {{ transfer.amount }} € + {{ transfer.from_acc.trigramme }} + --> + {{ transfer.to_acc.trigramme }} +
+ {% endfor %} + {% endfor %} + +
+
+
{% endblock %} diff --git a/kfet/templates/kfet/transfers_create.html b/kfet/templates/kfet/transfers_create.html index a28ab892..294db1e5 100644 --- a/kfet/templates/kfet/transfers_create.html +++ b/kfet/templates/kfet/transfers_create.html @@ -14,6 +14,11 @@ {% csrf_token %}
+
+ + {{ transfer_formset.management_form }} +
@@ -42,12 +47,6 @@ {% endfor %}
-
- - - {{ transfer_formset.management_form }} - -