diff --git a/hotel/db.sqlite3 b/hotel/db.sqlite3 index 2d8bc28..6ba8a53 100644 Binary files a/hotel/db.sqlite3 and b/hotel/db.sqlite3 differ diff --git a/hotel/rooms/__pycache__/views.cpython-36.pyc b/hotel/rooms/__pycache__/views.cpython-36.pyc index 90cc44c..0e67c7f 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/static/images/background.jpg b/hotel/rooms/static/images/background1.jpg similarity index 100% rename from hotel/rooms/static/images/background.jpg rename to hotel/rooms/static/images/background1.jpg diff --git a/hotel/rooms/static/images/background2.jpg b/hotel/rooms/static/images/background2.jpg new file mode 100644 index 0000000..19be12c Binary files /dev/null and b/hotel/rooms/static/images/background2.jpg differ diff --git a/hotel/rooms/static/images/background3.jpg b/hotel/rooms/static/images/background3.jpg new file mode 100644 index 0000000..c042d74 Binary files /dev/null and b/hotel/rooms/static/images/background3.jpg differ diff --git a/hotel/rooms/static/images/background4.jpg b/hotel/rooms/static/images/background4.jpg new file mode 100644 index 0000000..6766981 Binary files /dev/null and b/hotel/rooms/static/images/background4.jpg differ diff --git a/hotel/rooms/static/images/background5.jpg b/hotel/rooms/static/images/background5.jpg new file mode 100644 index 0000000..12a7ffe Binary files /dev/null and b/hotel/rooms/static/images/background5.jpg differ diff --git a/hotel/rooms/static/style.css b/hotel/rooms/static/style.css index 71fd2a1..ff3a9a8 100644 --- a/hotel/rooms/static/style.css +++ b/hotel/rooms/static/style.css @@ -22,11 +22,19 @@ color: white; } -html { - background: url(images/background.jpg) no-repeat center center fixed; - -webkit-background-size: cover; - -moz-background-size: cover; - -o-background-size: cover; +#images { + font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; + border-collapse: collapse; + background-color: white; +} + +#images th { + border: 1px solid #ddd; + padding: 12px; +} + +body { + background: url(images/background1.jpg) no-repeat center center fixed; background-size: cover; } diff --git a/hotel/rooms/templates/index.html b/hotel/rooms/templates/index.html index 3e7ad32..76b04c2 100644 --- a/hotel/rooms/templates/index.html +++ b/hotel/rooms/templates/index.html @@ -5,11 +5,21 @@ Hotel INO Scrum +

Hotel INO Scrum

Lista pokoi dostępnych w naszym hotelu

+ + + + @@ -41,6 +51,15 @@ {% endfor %}
Numer pokoju Typ pokoju Cena
- +

+
+ + + + + + +
+
diff --git a/hotel/rooms/views.py b/hotel/rooms/views.py index 0b453ae..19812ac 100644 --- a/hotel/rooms/views.py +++ b/hotel/rooms/views.py @@ -8,6 +8,7 @@ from .models import * def index(request): rooms = Room.objects.all() + rooms = rooms.order_by('room_number') template = loader.get_template('index.html') return HttpResponse(template.render({'rooms': rooms}, request)) @@ -23,4 +24,4 @@ def reservation(request): else: status = "Pokój " + str(room) + " jest już zarezerwowany" - return HttpResponse(template.render({'status': status}, request)) \ No newline at end of file + return HttpResponse(template.render({'status': status}, request))