style part 1 + pokoje

2019-01-13 15:17:14 +01:00 · 2019-01-13 15:17:14 +01:00 · c4a5468abb
commit c4a5468abb
parent 2c8293d5a2
30 changed files with 29 additions and 6 deletions
--- a/env/bin/django-admin
+++ b/env/bin/django-admin
--- a/env/bin/django-admin.py
+++ b/env/bin/django-admin.py
--- a/env/bin/easy_install
+++ b/env/bin/easy_install
--- a/env/bin/easy_install-3.5
+++ b/env/bin/easy_install-3.5
--- a/env/bin/pip
+++ b/env/bin/pip
--- a/env/bin/pip3
+++ b/env/bin/pip3
--- a/env/bin/pip3.5
+++ b/env/bin/pip3.5
--- a/env/lib/python3.5/site-packages/django/bin/django-admin.py
+++ b/env/lib/python3.5/site-packages/django/bin/django-admin.py
--- a/env/lib/python3.5/site-packages/django/conf/project_template/manage.py-tpl
+++ b/env/lib/python3.5/site-packages/django/conf/project_template/manage.py-tpl
--- a/env/lib/python3.5/site-packages/django/contrib/admin/static/admin/js/vendor/xregexp/xregexp.js
+++ b/env/lib/python3.5/site-packages/django/contrib/admin/static/admin/js/vendor/xregexp/xregexp.js
--- a/hotel/db.sqlite3
+++ b/hotel/db.sqlite3
--- a/hotel/hotel/pycache/init.cpython-36.pyc
+++ b/hotel/hotel/pycache/init.cpython-36.pyc
--- a/hotel/hotel/pycache/settings.cpython-36.pyc
+++ b/hotel/hotel/pycache/settings.cpython-36.pyc
--- a/hotel/hotel/pycache/urls.cpython-36.pyc
+++ b/hotel/hotel/pycache/urls.cpython-36.pyc
--- a/hotel/hotel/pycache/wsgi.cpython-36.pyc
+++ b/hotel/hotel/pycache/wsgi.cpython-36.pyc
--- a/hotel/hotel/settings.py
+++ b/hotel/hotel/settings.py
@ -37,7 +37,6 @@ INSTALLED_APPS = [
    'django.contrib.contenttypes',
    'django.contrib.sessions',
    'django.contrib.messages',
-    'django.contrib.staticfiles',
 ]

 MIDDLEWARE = [
--- a/hotel/manage.py
+++ b/hotel/manage.py
--- a/hotel/rooms/pycache/init.cpython-36.pyc
+++ b/hotel/rooms/pycache/init.cpython-36.pyc
--- a/hotel/rooms/pycache/admin.cpython-36.pyc
+++ b/hotel/rooms/pycache/admin.cpython-36.pyc
--- a/hotel/rooms/pycache/apps.cpython-36.pyc
+++ b/hotel/rooms/pycache/apps.cpython-36.pyc
--- a/hotel/rooms/pycache/models.cpython-36.pyc
+++ b/hotel/rooms/pycache/models.cpython-36.pyc
--- a/hotel/rooms/pycache/urls.cpython-36.pyc
+++ b/hotel/rooms/pycache/urls.cpython-36.pyc
--- a/hotel/rooms/pycache/views.cpython-36.pyc
+++ b/hotel/rooms/pycache/views.cpython-36.pyc
--- a/hotel/rooms/migrations/pycache/0001_initial.cpython-36.pyc
+++ b/hotel/rooms/migrations/pycache/0001_initial.cpython-36.pyc
--- a/hotel/rooms/migrations/pycache/0002_room_reserved.cpython-36.pyc
+++ b/hotel/rooms/migrations/pycache/0002_room_reserved.cpython-36.pyc
--- a/hotel/rooms/migrations/pycache/0003_auto_20190112_2306.cpython-36.pyc
+++ b/hotel/rooms/migrations/pycache/0003_auto_20190112_2306.cpython-36.pyc
--- a/hotel/rooms/migrations/pycache/0004_auto_20190112_2307.cpython-36.pyc
+++ b/hotel/rooms/migrations/pycache/0004_auto_20190112_2307.cpython-36.pyc
--- a/hotel/rooms/migrations/pycache/init.cpython-36.pyc
+++ b/hotel/rooms/migrations/pycache/init.cpython-36.pyc
--- a/hotel/rooms/static/style.css
+++ b/hotel/rooms/static/style.css
@ -0,0 +1,22 @@
+#hotels {
+  font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 60%;
+  margin-left: 20%;
+  margin-right: 20%;
+}
+
+#hotels td, #hotels th {
+  border: 1px solid #ddd;
+  padding: 8px;
+  text-align: center;
+}
+
+#hotels tr:hover {background-color: #f2f2f2;}
+
+#hotels th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  background-color: #000000;
+  color: white;
+}
--- a/hotel/rooms/templates/index.html
+++ b/hotel/rooms/templates/index.html
@ -1,16 +1,18 @@
+{% load static %}
 <!DOCTYPE html>
 <html lang="en">
 <head>
+    <link rel="stylesheet" type="text/css" href="{% static 'style.css' %}">
    <meta charset="UTF-8">
-    <title>Title</title>
+    <title>Hotel INO Scrum</title>
 </head>
 <body>

-    <table>
+    <table id="hotels">
        <th>Numer pokoju</th>
        <th>Typ pokoju</th>
        <th>Cena</th>
-        <th> </th>
+        <th>Rezerwacja</th>
        {% for room in rooms %}
        <tr>
            <td>{{ room.room_number }}</td>
@ -20,7 +22,7 @@
            {% if room.reserved %}
                ZAREZERWOWANE
            {% else %}
-                Miejsce na przycisk
+                MIEJSCE NA PRZYCISK
            {% endif %}
            </td>
        </tr>