diff --git a/cash/static/signin.css b/cash/static/signin.css new file mode 100644 index 0000000..a6bf9b1 --- /dev/null +++ b/cash/static/signin.css @@ -0,0 +1,40 @@ +body { + padding-top: 40px; + padding-bottom: 40px; + background-color: #eee; +} + +.form-signin { + max-width: 330px; + padding: 15px; + margin: 0 auto; +} +.form-signin .form-signin-heading, +.form-signin .checkbox { + margin-bottom: 10px; +} +.form-signin .checkbox { + font-weight: normal; +} +.form-signin .form-control { + position: relative; + font-size: 16px; + height: auto; + padding: 10px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.form-signin .form-control:focus { + z-index: 2; +} +.form-signin input[type="text"] { + margin-bottom: -1px; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; +} +.form-signin input[type="password"] { + margin-bottom: 10px; + border-top-left-radius: 0; + border-top-right-radius: 0; +} \ No newline at end of file diff --git a/cash/static/style.css b/cash/static/style.css index 55c1b06..38ebeac 100644 --- a/cash/static/style.css +++ b/cash/static/style.css @@ -1,243 +1,28 @@ body { - //background-image: url(bg.png); - //background-color: #ffe082; - //background-repeat: repeat-x; - background-color: #ffcc33; + background-color: #eeeeee; + padding-top: 50px; + padding-bottom: 50px; } -body, td { - font-size: 12px; - font-family: sans-serif; - text-align: center; -} - - -a:hover { - text-decoration: underline; -} - -a, a:visited { - color: #ff9000; - text-decoration: none; -} - - -a.menulink, a.menulink:visited { - //line-height: 20px; - display: block; -} - -a.menulink:hover { - //background-color: #ff00ff; -} - -a.actionlink { - border: 2px solid #dcdcdc; - border-radius: 4px; - padding: 6px; - line-height: 42px; -} - -a.actionlink:hover { - text-decoration: none; - background-color: #ffcc33; - color: #ffffff; -} - -div.menulink { - width: 100%; - padding: 5px; -} - -div.menulink:hover { - background-color: #efefef; -} - - -span.big { - font-size: 17px; -} - -span.small-gray { - font-size: 10px; - color: #a0a0a0; -} - -#outbox { - width: 750px; - margin: auto; - //border: 1px solid black; -} - -#top { - margin-top: 30px; +table { width: 100%; - height: 10px; - background-color: #ffcc33; -} - -#header { - float: left; - width: 460px; - height: 70px; - text-align: left; - padding: 20px; - //border: 1px solid black; -} - -#topmenu { - margin-left: 500px; - background-color: #ffffff; - margin-top: 65px; - padding: 8px; - border-radius: 8px; -} - -ul.topmenu { - padding: 0px; - margin: 0px; -} - -li.topmenu { - display: inline; - padding-right: 10px; -} - -#topclear { - clear: left; - width: 0px; - height: 0px; } -#leftmenu { - float: left; - width: 170px; - text-align: left; - padding: 15px; - background-color: #dcdcdc; - /*margin-top: 20px;*/ - height: 100%; - border-bottom-left-radius: 8px; - border-top-left-radius: 8px; -} - -#content { - margin-left: 200px; - //margin-top: 20px; - text-align: left; - padding: 15px; - background-color: #ffffff; - height: 100%; - border-bottom-right-radius: 8px; - border-top-right-radius: 8px; -} - -#contentclear { - clear: left; - width: 0px; - height: 0px; -} - -#foot { - width: 100%; - color: #D37800; - padding: 3px; - text-align: center; -} - -#content_bg { - border-radius: 8px; - background: url('images/menu_bg.png') repeat-y #ffffff; -} - -#infoboxleft { - background-color: #efefef; - padding: 8px; - border-radius: 8px; -} - -/*#content table { - background: #DCDCDC; - width: 100%; - border-collapse: collapse; -} - -#content table th { - text-align: center; - border: 2px solid #ffffff; -} - -#content table td { - text-align: left; - border: 2px solid #ffffff; -}*/ - -.txt_item { - width: 30px; -} - - -/* ************************* */ -#content table { - border-collapse: collapse; - background-color: inherit; - width: 100%; -} - -#content table td { - border-style: solid; - border-width: 0px; - border-bottom-width: 1px; - border-bottom-color: #dcdcdc; - text-align: center; -} - -#content thead td, #content th { +h1 { font-weight: bold; - color: #a0a0a0; - text-align: center; -} - - -div.error { - background-color: #ff9393; - padding: 15px; - text-align: center; - margin-bottom: 20px; - color: #000000; - font-weight: normal; - border-radius: 5px; } -div.success { - background-color: #93ff93; - padding: 15px; - text-align: center; - margin-bottom: 20px; - color: #000000; - font-weight: normal; - border-radius: 5px; -} - - -#content table.invisibletable { - border: 0px; - background-color: #ffffff; +td,th { + border-bottom: 1px solid #b9b9b9; } -#content table.invisibletable td { - border: none; - color: #000000; - font-weight: normal; -} - -.formtable th { - font-weight: normal; +thead td,th { + border-bottom: 2px solid #b9b9b9; + font-weight: bold; } -.formtable td { - border: none; +tbody tr:hover { + background-color: #dfdfdf; } - diff --git a/cash/templates/cash/base.html b/cash/templates/cash/base.html index 23c32e6..fe507d5 100644 --- a/cash/templates/cash/base.html +++ b/cash/templates/cash/base.html @@ -1,132 +1,81 @@ {% load staticfiles %} {% load url from future %} - - - - - - - - - - - Kassensystem - LUG Saar - - - -{% if debug %} -
-DEVELOPMENT -
-{% endif %} + + + + {% block head %} + + -
+ Kassensystem -
- + + -
- - -
+ {% endblock %} + + +
+
+
+ Kassensystem +
-
+ -
+ -
- {% if user.is_authenticated and user.account %} -
- Username:
- {{ user.username }}

- Guthaben:
- {{ user.account.credit|floatformat:2 }} €
- {% if user.account.credit|add:"35" < 5 %} - Achtung! Nur noch {{ user.account.credit|add:"35"|floatformat:2 }} € bis zum Schuldenlimit. +
+ +
+
+
+
+ {% block content %} + +

Übersicht

+ + Herzlich willkommen, {{ user.first_name }}! + + + + + + {{ user.account.credit|floatformat:2 }} € + +
Username:{{ user.username }}
Realer Name:{{ user.first_name }} {{ user.last_name }}
Ausweis-Nr.:{{ user.account.card_number }}
Guthaben:
Betrag bis Schuldenlimit:{{ user.account.credit|add:"35"|floatformat:2 }} €
+ {% endblock %} +
+
+ +
+ Username: + {{ user.username }}
+ Guthaben: + {{ user.account.credit|floatformat:2 }} €
+ {% if user.account.credit|add:"35" < 5 %} + Achtung!
Nur noch {{ user.account.credit|add:"35"|floatformat:2 }} € bis zum Schuldenlimit. {% endif %} +
- - Funktionen
-
Übersicht
-
Kaufen
-
Kontoauszug
- {% if user.is_staff %} - Administration
-
Administration
- {% endif %} - {% else %} - Einloggen um Menüfunktionen zu benutzen. - {% endif %} -
-
- {% block content %} - -

Konto - Übersicht

- - - - - {{ user.account.credit|floatformat:2 }} € - -
Username:{{ user.username }}
Realer Name:{{ user.first_name }} {{ user.last_name }}
Ausweis-Nr.:{{ user.account.card_number }}
Guthaben:
Betrag bis Schuldenlimit:{{ user.account.credit|add:"35"|floatformat:2 }} €
- - {% endblock %} -
-
-
- - -
+ + diff --git a/cash/templates/cash/buy_confirm.html b/cash/templates/cash/buy_confirm.html index 05192fe..0307d3e 100644 --- a/cash/templates/cash/buy_confirm.html +++ b/cash/templates/cash/buy_confirm.html @@ -13,8 +13,8 @@

Möchten Sie dieses Produkt wirklich kaufen?

-Ja -Nein +Ja +Nein diff --git a/cash/templates/cash/login.html b/cash/templates/cash/login.html index 2bfa7c1..f160c8e 100644 --- a/cash/templates/cash/login.html +++ b/cash/templates/cash/login.html @@ -1,21 +1,37 @@ -{% extends "cash/base.html" %} -{% load url from future %} + + + + + -{% block content %} + Kassensystem -{% if form.errors %} -

Your username and password didn't match. Please try again.

-{% endif %} + + -
-{% csrf_token %} -
-
+ - - -
+ -{% endblock %} +
+ + + +
+ + + + + + diff --git a/cash/templates/cash/product_list.html b/cash/templates/cash/product_list.html index de576fb..4c3c725 100644 --- a/cash/templates/cash/product_list.html +++ b/cash/templates/cash/product_list.html @@ -22,8 +22,8 @@ Kategorie: {{ p.name }} {{ p.price|floatformat:2 }} € - Kaufen - Details + Kaufen + Details {% endfor %} diff --git a/cash/templates/cash/transaction_list.html b/cash/templates/cash/transaction_list.html index 3962126..b0c1b8d 100644 --- a/cash/templates/cash/transaction_list.html +++ b/cash/templates/cash/transaction_list.html @@ -8,14 +8,15 @@ {% if transaction_list %} {% if detailed %} -weniger Details +weniger Details {% else %} -mehr Details +mehr Details {% endif %} +
- + {% for t in transaction_list %} diff --git a/cash/templates/cash/usersettings.html b/cash/templates/cash/usersettings.html index 61d3701..9bbf4d1 100644 --- a/cash/templates/cash/usersettings.html +++ b/cash/templates/cash/usersettings.html @@ -1,5 +1,6 @@ {% extends "cash/base.html" %} {% load url from future %} +{% load bootstrap %} {% block content %} @@ -9,10 +10,8 @@

Der Kontoauszug wird nachts versandt, sofern in den vergangenen 24 Stunden Kontobewegungen stattgefunden haben.

{% csrf_token %} -
DatumBetreffBetrag
DatumBetreffBetrag
-{{ settings_form.as_table }} - -

+{{ settings_form|bootstrap }} +
@@ -21,10 +20,8 @@

Der PIN wird nach dem Einscannen des Mitgliederausweises abgefragt. Wenn das Feld leergelassen wird, wird kein PIN abgefragt.

{% csrf_token %} - -{{ pin_form.as_table }} - -

+{{ pin_form|bootstrap }} +
diff --git a/lugcash2/settings.py b/lugcash2/settings.py index 9fa4395..a7e29da 100644 --- a/lugcash2/settings.py +++ b/lugcash2/settings.py @@ -128,6 +128,7 @@ INSTALLED_APPS = ( # Uncomment the next line to enable admin documentation: # 'django.contrib.admindocs', 'django_evolution', + 'bootstrapform', 'cash' )