diff --git a/hotel/db.sqlite3 b/hotel/db.sqlite3 index 90ed5ac..dd3d9e0 100644 Binary files a/hotel/db.sqlite3 and b/hotel/db.sqlite3 differ diff --git a/hotel/rooms/__pycache__/forms.cpython-36.pyc b/hotel/rooms/__pycache__/forms.cpython-36.pyc new file mode 100644 index 0000000..2703626 Binary files /dev/null and b/hotel/rooms/__pycache__/forms.cpython-36.pyc differ diff --git a/hotel/rooms/__pycache__/models.cpython-36.pyc b/hotel/rooms/__pycache__/models.cpython-36.pyc index 3e02ac8..815db6a 100644 Binary files a/hotel/rooms/__pycache__/models.cpython-36.pyc and b/hotel/rooms/__pycache__/models.cpython-36.pyc differ diff --git a/hotel/rooms/__pycache__/urls.cpython-36.pyc b/hotel/rooms/__pycache__/urls.cpython-36.pyc index c5183b7..62808f2 100644 Binary files a/hotel/rooms/__pycache__/urls.cpython-36.pyc and b/hotel/rooms/__pycache__/urls.cpython-36.pyc differ diff --git a/hotel/rooms/__pycache__/views.cpython-36.pyc b/hotel/rooms/__pycache__/views.cpython-36.pyc index 0e67c7f..95ed9b7 100644 Binary files a/hotel/rooms/__pycache__/views.cpython-36.pyc and b/hotel/rooms/__pycache__/views.cpython-36.pyc differ diff --git a/hotel/rooms/forms.py b/hotel/rooms/forms.py index f5a4ce3..617e9e2 100644 --- a/hotel/rooms/forms.py +++ b/hotel/rooms/forms.py @@ -9,7 +9,13 @@ class ClientForm(ModelForm): model = Client fields = '__all__' labels = { +<<<<<<< HEAD 'id_number': 'Numer dowodu: ', 'name': 'Imię: ', 'surname': 'Nazwisko: ' +======= + 'id_number': _('Numer dowodu '), + 'name': _('Imię '), + 'surname': _('Nazwisko ') +>>>>>>> 79787db1a58d1e3a363982eba9f484be10a87aaf } diff --git a/hotel/rooms/migrations/__pycache__/0005_client_reservation.cpython-36.pyc b/hotel/rooms/migrations/__pycache__/0005_client_reservation.cpython-36.pyc new file mode 100644 index 0000000..563c355 Binary files /dev/null and b/hotel/rooms/migrations/__pycache__/0005_client_reservation.cpython-36.pyc differ diff --git a/hotel/rooms/static/style.css b/hotel/rooms/static/style.css index ff3a9a8..35e8a51 100644 --- a/hotel/rooms/static/style.css +++ b/hotel/rooms/static/style.css @@ -56,3 +56,12 @@ a { padding: 30px; border: 2px solid grey; } +#reservationform { + font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; + font-size: 30px; + background-color: white; + color: black; + width: 40%; + padding: 10px; + border: 2px solid grey; +} diff --git a/hotel/rooms/templates/form.html b/hotel/rooms/templates/form.html index 5e78233..3d192b7 100644 --- a/hotel/rooms/templates/form.html +++ b/hotel/rooms/templates/form.html @@ -4,14 +4,29 @@
-