From 4573ad43da0182cccbaf2a4d5ef7718ceb57c53a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alicja=20Ci=C4=99ciwa?= <alicja.cieciwa@gmail.com>
Date: Tue, 27 Oct 2020 15:42:29 +0100
Subject: [PATCH] fixes in login page

---
 .idea/workspace.xml                           |   8 +++-
 .../auth/__pycache__/forms.cpython-38.pyc     | Bin 14951 -> 14951 bytes
 db.sqlite3                                    | Bin 139264 -> 139264 bytes
 static/css/main.css                           |   3 +-
 templates/base.html                           |  35 ++++++++++++++++--
 templates/registration/login.html             |   9 +----
 6 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fd47c48..ae4c663 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="15f590a5-5017-44f1-a85e-17dfe3fc5379" name="Default Changelist" comment="" />
+    <list default="true" id="15f590a5-5017-44f1-a85e-17dfe3fc5379" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/db.sqlite3" beforeDir="false" afterPath="$PROJECT_DIR$/db.sqlite3" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/css/main.css" beforeDir="false" afterPath="$PROJECT_DIR$/static/css/main.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/templates/base.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/base.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/templates/registration/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/registration/login.html" afterDir="false" />
+    </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/Lib/site-packages/django/contrib/auth/__pycache__/forms.cpython-38.pyc b/Lib/site-packages/django/contrib/auth/__pycache__/forms.cpython-38.pyc
index dfb4073e184730c33de4ffab1d2fecdd35fe0932..f32ab238445de7ef797ec0cbe7ff75775eb43718 100644
GIT binary patch
delta 20
acmaD}^1OsQl$V!_0SFF>%-F~sV+8<4#RdBS

delta 20
acmaD}^1OsQl$V!_0SNqlPT$BKV+8<6@&;=F

diff --git a/db.sqlite3 b/db.sqlite3
index abbe948cd907b97efe4f22e75f5a2565fdda8c12..5427c3d74eed78bb2f77bb54baef6760f8e85554 100644
GIT binary patch
delta 299
zcmZoTz|nAkV}dlJ_e2?IM(>RY`T2t83Wi2jCKgu4MtWwZMg~U4n;+z>6mT%|-Dcps
z&F8aOQNf9CvfsO2jV2{VR^R4e$BOLS3NxdO!eS$X%8K;D?9!~H{1o#v<7_kY6vL9T
z!pY3<H+x0+`<Ghf`C6o=rsP!^c>9~Xc$Z|Q_`6jGmic;x6(ptm87EnIc^0LoRi);Z
zh9v_nHqbRR)HO6fa*nyNrJ3=j4=f)z82Rro@ZaITvstiU9sl%Q?-`X0l$m`w2|0y}
nfq{XM{}BWKBmToct-JWAAN$WJBQMMB$cfuR-p!03{>uXZs}5el

delta 299
zcmZoTz|nAkV}dlJ$3z)tMvsjN`T2sT3Wk<eMn+afmU>2Jrlv*~n;+z>6mT#IFfj1l
z=JVOCsNlpm+3#Ji1_J}5s&8|!V|GrdWo~g=VsTk=a(RAfUXF!jRzb2^Woe~FNo9pe
z+GOVUo4vwwl8mh^GgB=6N?gpUk_rm~LoCzF3ahe=BZ8cgi%OFV3KCsB@=Q~c<5R<;
zECP)Tj0|)Q4RsAHkep*_Y-(V(=>y9Luxt45@ZZ@iSg?+N`mXnkN(KxJ3@U`2!Ua?W
g@(BMU{=-16yZEOc`_CvN4-}NcZ6WVw#t;AH0huyfu>b%7

diff --git a/static/css/main.css b/static/css/main.css
index 0b67c29..7224176 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -38,7 +38,6 @@ body {
   -ms-flex-align: center;
   align-items: center;
   padding-top: 40px;
-  padding-bottom: 40px;
   background-color: #f5f5f5;
 
   background-image: url("../img/background.jpg");
@@ -52,7 +51,7 @@ body {
 .form-signin {
   width: 100%;
   max-width: 360px;
-  padding: 30px;
+  padding: 20px;
   margin: auto;
   background-color: rgba(255,255,255,0.7);
   margin-top: 10px;
diff --git a/templates/base.html b/templates/base.html
index b28cfcf..8796e30 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -8,13 +8,42 @@
   <!-- My CSS file -->
   {% load static %}
   <link rel="stylesheet" type="text/css" href="{%static 'css/main.css' %}">
-  <title>{% block title %}Django Auth Tutorial{% endblock %}</title>
+  {% if title %}
+    <title>{{ title }} - Aussen- und Innenausbau</title>
+  {% else %}
+    <title>Aussen- und Innenausbau</title>
+  {% endif %}
 </head>
 <body>
-  <main>
+    <header>
+    <nav class="navbar navbar-light bg-nav navbar-expand-md">
+        <!--Logo-->
+        <a class="navbar-brand" href="#"><img src="{% static "img/logo.png" %} width="300" " id="logo" alt="logo"
+        class="d-inline-block mr-1 align-center"></a>
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainmenu">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+
+        <div class="collapse navbar-collapse" id="mainmenu">
+            <ul class="navbar-nav">
+                <!--Start-->
+                <li class="nav-item">
+                    <a class="nav-link" href="#">Start</a>
+                </li>
+                <!--Start-->
+                <li class="nav-item">
+                    <a class="nav-link" href="#">Dodaj godziny</a>
+                </li>
+
+
+            </ul>
+        </div>
+
+    </nav>
+</header>
     {% block content %}
     {% endblock %}
-  </main>
+
 
 
   <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
diff --git a/templates/registration/login.html b/templates/registration/login.html
index 58ba84d..5eccacf 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -5,11 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="X-Ua-compatible" content="IE=edge">
-    {% if title %}
-    <title>{{ title }} - Aussen- und Innenausbau</title>
-    {% else %}
     <title>Aussen- und Innenausbau</title>
-    {% endif %}
 
     <!-- Bootstrap CSS -->
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" integrity="sha384-JcKb8q3iqJ61gNV9KGb8thSsNjpSL0n8PARn9HuZOnIxN0hoP+VmmDGMN5t9UJ0Z" crossorigin="anonymous">
@@ -35,8 +31,7 @@
   <div class="row">
     <div class="form-signin">
       {% load static %}
-      <img src="{% static "img/logo.png" %}" width="300" alt="Logo">
-      <img class="mb-4" src="static/img/logo.png" alt="" width="72">
+      <img src="{% static 'img/logo.png' %}" width="320" alt="Logo" style="padding-bottom: 10px;">
       <form method="post">
         {% csrf_token %}
         {{ form.as_p }}
@@ -51,7 +46,7 @@
   </div>
   <div class="row">
     <footer><p class="mt-5 mb-3 text-muted">
-      Klicken Sie <a href="http://aussenundinnenausbau.de">hier</a>, um das Angebot des Unternehmens zu sehen. <br><br>
+      Klicken Sie <a href="http://aussenundinnenausbau.de">hier</a>, um das Angebot des Unternehmens zu sehen. <br>
       &copy; Alicja Cięciwa</p></footer>
   </div>
 </div>