diff --git a/k4ever/media/css/img/approved.png b/k4ever/media/css/img/approved.png new file mode 100644 index 0000000..6b40447 Binary files /dev/null and b/k4ever/media/css/img/approved.png differ diff --git a/k4ever/media/css/img/cash.png b/k4ever/media/css/img/cash.png new file mode 100644 index 0000000..6201c00 Binary files /dev/null and b/k4ever/media/css/img/cash.png differ diff --git a/k4ever/media/css/img/pending.png b/k4ever/media/css/img/pending.png new file mode 100644 index 0000000..cb7015a Binary files /dev/null and b/k4ever/media/css/img/pending.png differ diff --git a/k4ever/media/css/img/transfer.png b/k4ever/media/css/img/transfer.png new file mode 100644 index 0000000..7e6cdbf Binary files /dev/null and b/k4ever/media/css/img/transfer.png differ diff --git a/k4ever/media/css/style.css b/k4ever/media/css/style.css index fc30a65..eca3036 100644 --- a/k4ever/media/css/style.css +++ b/k4ever/media/css/style.css @@ -155,9 +155,11 @@ a:hover { background-color: #3398cc; } .content { + max-width: 1280px; + min-width: 800px; padding: 5px; } -input { +input, select { padding: 2px 5px; border: 1px solid #E5E5E5; background: url("img/404") white; @@ -554,3 +556,52 @@ table.itemListContainer > tbody > tr:first-child ~ tr > td { vertical-align: middle; margin: 0 10px 0 0; } +.textData thead, .textData tfoot { + background-color: #111111; +} +.textData thead th, .textData tfoot th { + font-weight: bold; + color: white; +} +.textData tr:nth-child(even) td { + background-color: #eaeaea; +} +.textData tr:hover td { + background-color: #9e9e9e; +} +.textData th, .textData td { + padding: 7px 30px; + vertical-align: middle; + text-align: center; +} +.icon { + display: block; + height: 24px; + width: 24px; + text-indent: -10000px; + background-position: 0 0; + background-repeat: no-repeat; + margin: 0 auto; +} +.icon.approved { + background-image: url("img/approved.png"); +} +.icon.pending { + background-image: url("img/pending.png"); +} +.icon.cash { + background-image: url("img/cash.png"); +} +.icon.transfer { + background-image: url("img/transfer.png"); +} +.transaction { + padding: 0 30px; +} +.transaction > * { + float: none; + display: block; +} +.transaction input[type="text"], .transaction select { + font-size: 16px; +} diff --git a/k4ever/media/css/style.less b/k4ever/media/css/style.less index adc3173..5de19e7 100644 --- a/k4ever/media/css/style.less +++ b/k4ever/media/css/style.less @@ -161,10 +161,12 @@ a { } .content { + max-width: 1280px; + min-width: 800px; padding: 5px; } -input { +input, select { padding: 2px 5px; border: 1px solid #E5E5E5; background: url("@{fldImages}/404") white; @@ -560,4 +562,70 @@ table.itemListContainer { vertical-align: middle; margin: 0 10px 0 0; } +} + +.textData { + thead, tfoot { + background-color: @clrDarkGrey; + + th { + font-weight: bold; + color: white; + } + } + + tr { + &:nth-child(even) td { + background-color: @clrLightGrey; + } + + &:hover td { + background-color: darken(@clrLightGrey, 30%); + } + } + + th, td { + padding: 7px 30px; + vertical-align: middle; + text-align: center; + } +} + +.icon { + display: block; + height: 24px; + width: 24px; + text-indent: -10000px; + background-position: 0 0; + background-repeat: no-repeat; + margin: 0 auto; + + &.approved { + background-image: url("@{fldImages}/approved.png"); + } + + &.pending { + background-image: url("@{fldImages}/pending.png"); + } + + &.cash { + background-image: url("@{fldImages}/cash.png"); + } + + &.transfer { + background-image: url("@{fldImages}/transfer.png"); + } +} + +.transaction { + padding: 0 30px; + + > * { + float: none; + display: block; + } + + input[type="text"], select { + font-size: 16px; + } } \ No newline at end of file diff --git a/k4ever/transaction/templates/transaction/overview.html b/k4ever/transaction/templates/transaction/overview.html index 4ff0c7b..b8e391b 100644 --- a/k4ever/transaction/templates/transaction/overview.html +++ b/k4ever/transaction/templates/transaction/overview.html @@ -8,73 +8,51 @@

Du hast Geld aufgeladen.

{% endif %} {% endif %} -

Konto aufladen

-
- {% csrf_token %} - - {{ form.as_table }} +

Konto aufladen

+ + {% csrf_token %} + {{ form.as_table }} + + + +

Vergangene Transaktionen

+
+ + + + + + + + + + + + {% for transaction in history %} + + + + - -
DatumUhrzeitBetragTypStatus
{{ transaction.dateTime|date:"j. F Y" }}{{ transaction.dateTime|date:"H:i" }} Uhr{{ transaction.amount|floatformat:2 }}€{{ transaction.transactionType }} -   - - + {% if not transaction.transactionType.needsCheck or transaction.checked %} + Zahlung eingegangen + {% else %} + Zahlungsbestätigung steht noch aus + {% endif %}
- -
- -

Vergangene Transaktionen:

- - {% comment %} - - - - - - - - {% endcomment %} + {% endfor %} + - {% for transaction in history %} + - - - - - {% if forloop.first and transacted %} - - {% endif %} + + + + + - {% endfor %} +
- Datum - - Uhrzeit - - Betrag - - Typ - - Status -
- {% if forloop.first and transacted %} - - {% endif %} - [ {{ transaction.dateTime|date:"j. M Y" }}, - - {{ transaction.dateTime|date:"H:i" }} Uhr ] - - {{ transaction.amount|floatformat:2 }}€ - - durch {{ transaction.transactionType }} - - {% if not transaction.transactionType.needsCheck or transaction.checked %} - eingegangen - {% else %} - aber noch nicht bestätigt - {% endif %} - DatumUhrzeitBetragTypStatus
-
{% endblock %}