From 96ea0583ad628789c7b78aeb315317feec85f5f5 Mon Sep 17 00:00:00 2001 From: Nikolai R Kristiansen Date: Sun, 21 Jun 2015 18:25:25 +0200 Subject: [PATCH] Bootstrap themeing, reqs, misc --- README.md | 1 - apps/kassa/forms.py | 8 +- apps/kassa/templates/base.html | 17 + apps/kassa/templates/header.html | 22 + apps/kassa/templates/kassa/register.html | 24 +- .../templates/registration/logged_out.html | 9 +- apps/kassa/templates/registration/login.html | 11 +- .../templates/registration/login_form.html | 26 +- .../registration/password_change_done.html | 9 +- .../registration/password_change_form.html | 20 +- .../registration/password_reset_complete.html | 6 +- .../registration/password_reset_confirm.html | 20 +- .../registration/password_reset_done.html | 10 +- .../registration/password_reset_email.html | 4 +- .../registration/password_reset_form.html | 17 +- .../registration/password_reset_subject.txt | 2 +- apps/kassa/urls.py | 2 +- kassasite/settings.py | 5 + requirements.txt | 7 +- static/app/images/favicon.ico | Bin 0 -> 120016 bytes static/app/images/logo.png | Bin 0 -> 6859 bytes static/app/styles/_settings.scss | 1457 --- static/app/styles/app.scss | 43 +- static/bower.json | 12 +- static/dist/images/favicon.ico | Bin 0 -> 120016 bytes static/dist/images/logo.png | Bin 0 -> 6859 bytes static/dist/scripts/vendor.js | 9456 ++++------------- static/dist/styles/app.css | 2 +- static/dist/styles/vendor.css | 6328 +---------- static/gulpfile.js | 2 +- static/package.json | 2 +- 31 files changed, 2300 insertions(+), 15222 deletions(-) create mode 100644 apps/kassa/templates/header.html create mode 100644 static/app/images/favicon.ico create mode 100644 static/app/images/logo.png delete mode 100644 static/app/styles/_settings.scss create mode 100644 static/dist/images/favicon.ico create mode 100644 static/dist/images/logo.png diff --git a/README.md b/README.md index ba8b48d..4603dc8 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ ## TODO ### Form * tlf field - * type="tel" * validates in javascript with phonenumber-package * onkeyup could shows matching user data from inside (name, expires) * cardnumber field diff --git a/apps/kassa/forms.py b/apps/kassa/forms.py index c5d8644..ea827d8 100644 --- a/apps/kassa/forms.py +++ b/apps/kassa/forms.py @@ -1,6 +1,10 @@ -from django.forms import forms +from django import forms from phonenumber_field.formfields import PhoneNumberField class AddCardForm(forms.Form): - tlf = PhoneNumberField() # Type + phone_number = PhoneNumberField(widget=forms.TextInput(attrs={ + 'type': 'tel', + 'class': 'form-control' + })) + card_number = forms.IntegerField(widget=forms.NumberInput(attrs={'class': 'form-control'})) diff --git a/apps/kassa/templates/base.html b/apps/kassa/templates/base.html index 20829af..3f813a7 100644 --- a/apps/kassa/templates/base.html +++ b/apps/kassa/templates/base.html @@ -3,11 +3,28 @@ + + {% block title %}Registrer medlemskap{% endblock %} + + + +{% block header %} + {% include "header.html" %} +{% endblock %} +
{% block content %}{% endblock %} +
+ \ No newline at end of file diff --git a/apps/kassa/templates/header.html b/apps/kassa/templates/header.html new file mode 100644 index 0000000..14a53d4 --- /dev/null +++ b/apps/kassa/templates/header.html @@ -0,0 +1,22 @@ +{% load i18n %} + \ No newline at end of file diff --git a/apps/kassa/templates/kassa/register.html b/apps/kassa/templates/kassa/register.html index 3c56278..6cda36e 100644 --- a/apps/kassa/templates/kassa/register.html +++ b/apps/kassa/templates/kassa/register.html @@ -1,12 +1,26 @@ {% extends "base.html" %} +{% load i18n bootstrap %} {% block content %}
-
+

Registrer kjøpt medlemskap

- Telefonnummer som allerede er tilknyttet en bruker i Inside vil få kortnummer registrert på sin bruker. - {{ form }} - - +
+
+
+
+

Telefonnummer som allerede er tilknyttet en bruker i Inside vil få kortnummer registrert på sin bruker.

+
+ {{ form|bootstrap }} + +
+
+
+
+
Søkeresultater
+
+ TODO: ... +
+
{% endblock %} \ No newline at end of file diff --git a/apps/kassa/templates/registration/logged_out.html b/apps/kassa/templates/registration/logged_out.html index 7586462..8fdf6fd 100644 --- a/apps/kassa/templates/registration/logged_out.html +++ b/apps/kassa/templates/registration/logged_out.html @@ -1,12 +1,13 @@ {% extends "base.html" %} +{% load i18n %} {% block title %}Logget ut{% endblock %} {% block content %} -
-