From f48b8d7158490d33d37e7406368aba95723df06c Mon Sep 17 00:00:00 2001 From: Maciej Sobkowiak Date: Tue, 22 Jan 2019 18:04:19 +0000 Subject: [PATCH 1/3] Zaktualizuj 'hotel/rooms/templates/index.html' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit zmiana szerokości kolumn --- hotel/rooms/templates/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hotel/rooms/templates/index.html b/hotel/rooms/templates/index.html index 76b04c2..d269430 100644 --- a/hotel/rooms/templates/index.html +++ b/hotel/rooms/templates/index.html @@ -18,8 +18,8 @@ - - + + From 4257fd0567006c41c69a09032cb3df9df13d8dfe Mon Sep 17 00:00:00 2001 From: Maciej Sobkowiak Date: Tue, 22 Jan 2019 18:07:08 +0000 Subject: [PATCH 2/3] =?UTF-8?q?zmiana=20szeroko=C5=9Bci=20kolumn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hotel/rooms/templates/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hotel/rooms/templates/index.html b/hotel/rooms/templates/index.html index d269430..7f46716 100644 --- a/hotel/rooms/templates/index.html +++ b/hotel/rooms/templates/index.html @@ -18,8 +18,8 @@
Numer pokoju Typ pokoju Cena
- - + + From 79787db1a58d1e3a363982eba9f484be10a87aaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20J=C4=99dyk?= Date: Tue, 22 Jan 2019 20:26:44 +0100 Subject: [PATCH 3/3] fix wybor tla + form style + date picker --- hotel/db.sqlite3 | Bin 58368 -> 58368 bytes hotel/rooms/__pycache__/forms.cpython-36.pyc | Bin 0 -> 769 bytes hotel/rooms/__pycache__/models.cpython-36.pyc | Bin 1071 -> 1705 bytes hotel/rooms/__pycache__/urls.cpython-36.pyc | Bin 320 -> 364 bytes hotel/rooms/__pycache__/views.cpython-36.pyc | Bin 1004 -> 1604 bytes hotel/rooms/forms.py | 10 ++++---- .../0005_client_reservation.cpython-36.pyc | Bin 0 -> 1059 bytes hotel/rooms/static/style.css | 9 +++++++ hotel/rooms/templates/form.html | 23 +++++++++++++++--- hotel/rooms/templates/index.html | 17 +++++++++---- hotel/rooms/templates/reservation.html | 13 ++++++++-- 11 files changed, 56 insertions(+), 16 deletions(-) create mode 100644 hotel/rooms/__pycache__/forms.cpython-36.pyc create mode 100644 hotel/rooms/migrations/__pycache__/0005_client_reservation.cpython-36.pyc diff --git a/hotel/db.sqlite3 b/hotel/db.sqlite3 index 90ed5acd6b8325bf5b0c1e069f3526d81556741e..dd3d9e03f6137fd9b6de7495e5e723c227d275e9 100644 GIT binary patch delta 36 scmZoT!Q60yd4e=!{zMsP)_ev%nGG9L*mpB>PR`k##K^h%{BA=H0OmprtpET3 delta 36 scmZoT!Q60yd4e=!?nD`9)?5bNk2^M|uk diff --git a/hotel/rooms/__pycache__/forms.cpython-36.pyc b/hotel/rooms/__pycache__/forms.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..2703626ee89c0a6fe1aa74f02073bbe787def119 GIT binary patch literal 769 zcmZuv-D(su6waBS%XeO*h0M!DJZT*ItqF<2w`f{I^E2qCK+ni%k?D$ zU%>b9DRS#oU%@L+W~;4W;Cy^JIr+YvL$+qK=}WnI_ZbNJNv^C2`7Va>zzGLQI;a6W z4`k4Vb%Z?Rk&NH^Tr6pq)CrIU;gly|2u}p8!#d^Z8&XWpQH2!XCi{vD`CRD^H`$S} zR(!HdHmkF9e1WfkdkFC%R+#tx(w`L~*~Kt-5d^7$lR7{%-~pNi>!1#Kh*puCK9#NL ztvC5c;crX#uP6v?ghL$*iW-0zju@?h$KS#_;S@EK)%8ow`M$7?OBidUWNbC7hEC|5 zt5d~?e4wbk*R?;s=Br87tWI0ARCy7)Ny}M3bO%DasBb#q5;JH|sv>nMW1ceRri^u{ zBR$U;`#3c6;)HHq;9@)%($T|KNNyZ3M`d#$r1?(tO*9|j*P{HOI#C)sa2$mx&Gy#z z&VxtgGhvoios@gktNgWA$6{&ohvf@pg~S^kwNjla$NA4s&RpcXO;OiO5mJaC3Mf#} zw{cq)kPgK7IL)4ZG!Y34#w3Afzzvt71}T{J80l)O>W*{?OgINDa1?W^Q%U t8`;=a_1b>|eZ$w#aSX=MO|ABGA2t7H?$XDbsXp{&_O26$D58O?DiuOhau2=qhLAY4f?E!NkXRvENoFaIT34)74yaNN z?X?H+S8zgn2tVKh7fyTxf*ChLIbdntynVZRo_SyOmoz;{)8zfDqc>Fu@Uup>f%NIY zlf7p^G3hHH?QkAm1~z8JP{K;GQZ#j6K-T;A?sf24jh2r9z=1^qt6VS-2}x0Kt!$?~ zh19u58?Et}B8soTYSQdun&|MPaOL8cVWXFs@)37G6zDKy*a|abE}wM8b;woq0G4n8 zb18hQ*bc{;YQl1I>YBJZ_d?h~^J6dmH;@SHGVF3y;s*G!e>28@o>vQ>=i|(Hwg;aI z^abRhzr|opL3w$8I(6Ph+oIm9zvK3uEvEOmD*2zrKK8Ju{8s%NHdy7;#MCWjt$U zZQ6N3jX9bu+|$CHkWHrUxF~aC!D?4h%hnQWvuk79VUsN`@Dw|8BGNy2(GH0=+aHg>JGN&^~ zv8QkaGiY*8OtF-T;!4iROwB7v%P-2k#hI9r0^#~;a!g#HCSAk{G~^a{X;Dr=Vo6DA eQC{&%h9VxISP{>}J5f9wKo$=Z4>KPlA0q%^>LP9c delta 102 zcmaFEbbv|On3tD}vB5fK4FdziV<3hDHXzFZh>L9|Dw}hqGexnba0D}Ga!xF=WcJf! rpLkSF>=t)vQBFZ(Nl9u^UhztXB5t7aBJRm-j8R-5-8@V@%zTUh3+NO< diff --git a/hotel/rooms/__pycache__/views.cpython-36.pyc b/hotel/rooms/__pycache__/views.cpython-36.pyc index 0e67c7f661818f677ea139e719d1b21e1d6f0c58..95ed9b72802d54a3b9aceb4fdd97520e87bc4d01 100644 GIT binary patch delta 749 zcmZ8fJ8u**5cYWAdyj;GA|MJ%lz_AaPyii5L6Jg(t_jr<6qX%Fx0l`9XwFAOw5O9; z{y>zLzd!*rR8-JYyQSqvFuq6$!q$BAvOVL^{uBIYZ#?L9;_t7Y?S1lu_$~e!lI<;) zF`jNbeB`26gf9dN^oyt;VSwQW(T_30m~{(V*k;|v4t800(BBow!fCMsz0Y4(0a{;w zfri;td)^|0fF+2*=NZD1T$FT^V;R^C4{l{H+pNb23bSzm+9+2?lpg2!^L=&v?j$;>sJu7OWsykZTE}>b zsG_80{8H&bh5dND$kk}3cQ|`qAk4@6Z_^@2<7ESt9h!DlsC1-oA5)#ubuLQw3COX~ zwP0yUJX)~!Ee7Lf_Eb%)HezX|D;Kb27ep!I`I!rx4=-op7)i@o<5+$r$Fzkd2e*vV4p|$`3 delta 144 zcmX@Y^M+m7n3tE!X_<436Eg$DV+JI^1Y|n^ak0xpWfM`h6!sQ|D2^146iy(`nZgy! zpvgV4$8Fq`C?M2=TErnjS~;1iYuAr-?Np@K za?KCn&ac@kr~U;_%-VekM?3juc4qhcW_LH6P3P=e|NGR`v_IOtk9=*1M%E?+8t9Q0 z>jOPz1EwpVMaIB>Gpwl9(F&_j0Sl^7n;FLp>>}boeWsJwxbOJ}G-s@+ zoP&9qsZpJ(T!05Nld=~nW?yQA9^RrQLJro$Mrei2a1I{9;~Arj<^SR1%-(PMLd1p#x%BQF~fsS_`tqi~Ts4 z4(D_|CJ_>DaDF!NBE>{`fMcS7$tb`~Fh#cBEBNoL`y>n%v3n<;*i*`-y-RJshJ6xH zLT4`(82HI2>Zb*vm-wkNGb46E~zu=yvF}hhk zAu@U9W?P$E+nrZ#AG6au9lIY7KCgcfX^5x!de{As<`_|hvPA>jyQkpN^?1pzyD9F@ zsXd+w_3WxNvNbX_!!k{su|<7OUosS0(jEG(=tW-3l6I-34a1@}Wj9uDgYELowQp34 dr?hHOdnc?!FK9y6-js*%Ry8$KR2KA_@ek*`EoA@z literal 0 HcmV?d00001 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 @@ - Title + Formularz rezerwacji + - + +
+
+

Formularz rezerwacji

+
{{ error }} {% csrf_token %} {{ form.as_p }} - + +
+ - \ No newline at end of file + diff --git a/hotel/rooms/templates/index.html b/hotel/rooms/templates/index.html index 7f46716..f5e8294 100644 --- a/hotel/rooms/templates/index.html +++ b/hotel/rooms/templates/index.html @@ -7,12 +7,15 @@ Hotel INO Scrum - +

Hotel INO Scrum

Lista pokoi dostępnych w naszym hotelu

Numer pokoju Typ pokoju Cena
@@ -35,7 +38,9 @@ {% csrf_token %}
- +
+ +
{% else %} @@ -43,7 +48,9 @@ {% csrf_token %}
- +
+ +
{% endif %} diff --git a/hotel/rooms/templates/reservation.html b/hotel/rooms/templates/reservation.html index 3f5000a..1fc2fea 100644 --- a/hotel/rooms/templates/reservation.html +++ b/hotel/rooms/templates/reservation.html @@ -4,9 +4,18 @@ - Zarezerwowano pokój + Rezerwacja + - +