From aaea98eef1780bd87bcc42412bc8391f8066aa36 Mon Sep 17 00:00:00 2001 From: Fabian Lamprecht Date: Sat, 9 Jun 2018 03:42:03 +0200 Subject: [PATCH] styling for favorites --- roofis2/roomservice/urls.py | 4 ++-- roofis2/roomservice/views.py | 3 ++- roofis2/static/css/style.css | 7 +++++++ roofis2/templates/base.jinja | 2 +- roofis2/templates/favorites.jinja | 24 +++++++++++++++++------- roofis2/templates/search.jinja | 5 ----- 6 files changed, 29 insertions(+), 16 deletions(-) create mode 100644 roofis2/static/css/style.css diff --git a/roofis2/roomservice/urls.py b/roofis2/roomservice/urls.py index e60d212..dfbd2f9 100644 --- a/roofis2/roomservice/urls.py +++ b/roofis2/roomservice/urls.py @@ -3,8 +3,8 @@ from . import views app_name = 'roomservice' urlpatterns = [ - path('', views.home, name='home'), + path('', views.favorites, name='home'), path('adminpage', views.admin, name='admin'), path('booking', views.booking, name='booking'), - path('favorites', views.favorites, name='favorites'), + path('search', views.search, name='search'), ] diff --git a/roofis2/roomservice/views.py b/roofis2/roomservice/views.py index 0a7d683..1eaa631 100644 --- a/roofis2/roomservice/views.py +++ b/roofis2/roomservice/views.py @@ -3,8 +3,9 @@ from roomservice.models import Room import logging logger = logging.getLogger(__name__) + # Create your views here. -def home(request): +def search(request): rooms = Room.objects.all() return render(request, 'search.jinja', {"title":"rooF(i)S is love rooF(i)S is live!!", "rooms":rooms}) diff --git a/roofis2/static/css/style.css b/roofis2/static/css/style.css new file mode 100644 index 0000000..25cad90 --- /dev/null +++ b/roofis2/static/css/style.css @@ -0,0 +1,7 @@ +.fav { + height: 3.5em; + background: #5a6268; + border-radius: 30px; + vertical-align: middle; + padding-left: -1em; +} \ No newline at end of file diff --git a/roofis2/templates/base.jinja b/roofis2/templates/base.jinja index 21c1728..2600cfe 100644 --- a/roofis2/templates/base.jinja +++ b/roofis2/templates/base.jinja @@ -5,7 +5,7 @@ {% block css_extra %}{% endblock %} {% block head %} - + {% block title %}{% endblock %} {% endblock %} diff --git a/roofis2/templates/favorites.jinja b/roofis2/templates/favorites.jinja index 03c1a38..6c70f0e 100644 --- a/roofis2/templates/favorites.jinja +++ b/roofis2/templates/favorites.jinja @@ -1,10 +1,20 @@ {% extends 'base.jinja' %} {% block content %} -

Ressourcenpool Bamberg

-

Impressum

-

Anbieter:
Max Mustermann
Musterstraße 1
96049 Bamberg

-

Kontakt:
Telefon: 0951/12345678
Telefax: 0951/1234567
E-Mail: mail@mustermann.de
Website: www.mustermann.de

-

 

-

Bei redaktionellen Inhalten:

-

Verantwortlich nach § 55 Abs.2 RStV
Moritz Schreiberling
Musterstraße 2
96049 Bamberg

+
+
+
+
+ {% for favorite in favorites %} +
{{favorite.room_number}}
+ {% endfor %} + +
fuck
+
this
+
god
+
damn
+
shit
+ +
+
+
{% endblock %} \ No newline at end of file diff --git a/roofis2/templates/search.jinja b/roofis2/templates/search.jinja index 19e8b79..0fcf368 100644 --- a/roofis2/templates/search.jinja +++ b/roofis2/templates/search.jinja @@ -28,11 +28,6 @@
-
-
- -
-
{% endblock %}