psmattas/Employee-Management-Portal
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes in login page

Browse Source
This commit is contained in:
Alicja Cięciwa
2020-10-27 15:42:29 +01:00
parent cb8886666c
commit 4573ad43da
6 changed files with 42 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/workspace.xml generated
View File

@@ -1,7 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <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="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

BIN
Lib/site-packages/django/contrib/auth/__pycache__/forms.cpython-38.pyc
View File

Binary file not shown.

BIN
db.sqlite3
View File

Binary file not shown.

3
static/css/main.css
View File

@@ -38,7 +38,6 @@ body {
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
padding-top: 40px; padding-top: 40px;
padding-bottom: 40px;
background-color: #f5f5f5; background-color: #f5f5f5;
background-image: url("../img/background.jpg"); background-image: url("../img/background.jpg");
@@ -52,7 +51,7 @@ body {
.form-signin { .form-signin {
width: 100%; width: 100%;
max-width: 360px; max-width: 360px;
padding: 30px; padding: 20px;
margin: auto; margin: auto;
background-color: rgba(255,255,255,0.7); background-color: rgba(255,255,255,0.7);
margin-top: 10px; margin-top: 10px;

35
templates/base.html
View File

@@ -8,13 +8,42 @@
<!-- My CSS file --> <!-- My CSS file -->
{% load static %} {% load static %}
<link rel="stylesheet" type="text/css" href="{%static 'css/main.css' %}"> <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> </head>
<body> <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 %} {% block content %}
{% endblock %} {% 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> <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>

9
templates/registration/login.html
View File

@@ -5,11 +5,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta http-equiv="X-Ua-compatible" content="IE=edge"> <meta http-equiv="X-Ua-compatible" content="IE=edge">
{% if title %}
<title>{{ title }} - Aussen- und Innenausbau</title>
{% else %}
<title>Aussen- und Innenausbau</title> <title>Aussen- und Innenausbau</title>
{% endif %}
<!-- Bootstrap CSS --> <!-- Bootstrap CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" integrity="sha384-JcKb8q3iqJ61gNV9KGb8thSsNjpSL0n8PARn9HuZOnIxN0hoP+VmmDGMN5t9UJ0Z" crossorigin="anonymous"> <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="row">
<div class="form-signin"> <div class="form-signin">
{% load static %} {% load static %}
<img src="{% static "img/logo.png" %}" width="300" alt="Logo"> <img src="{% static 'img/logo.png' %}" width="320" alt="Logo" style="padding-bottom: 10px;">
<img class="mb-4" src="static/img/logo.png" alt="" width="72">
<form method="post"> <form method="post">
{% csrf_token %} {% csrf_token %}
{{ form.as_p }} {{ form.as_p }}
@@ -51,7 +46,7 @@
</div> </div>
<div class="row"> <div class="row">
<footer><p class="mt-5 mb-3 text-muted"> <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> &copy; Alicja Cięciwa</p></footer>
</div> </div>
</div> </div>