Browse Source

code editing

newsletter
Esther Kleinhenz 3 years ago
parent
commit
84ea0b4d08
4 changed files with 69 additions and 48 deletions
  1. 3
    3
      application/models.py
  2. 44
    43
      application/templates/base.html
  3. 1
    1
      application/templates/index.html
  4. 21
    1
      user.json

+ 3
- 3
application/models.py View File

@@ -7,10 +7,10 @@ class Post(models.Model):
title = models.CharField(max_length=200)
text = models.TextField()
created_date = models.DateTimeField(
default=timezone.now)
default=timezone.now)
published_date = models.DateTimeField(
blank=True, null=True)
blank=True, null=True)
def publish(self):
self.published_date = timezone.now()
self.save()

+ 44
- 43
application/templates/base.html View File

@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html lang="de">
{% load static %}

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
@@ -8,6 +9,7 @@
<link href="{% static 'css/mysite.css' %}" rel="stylesheet">
<link href="{% static 'bootstrap/css/bootstrap.css' %}" rel="stylesheet">
</head>

<body>


@@ -18,61 +20,59 @@
<img src="{% static 'images/efi.jpg' %}" width="35" height="35" alt="efi">
</a>

<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>

<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
{% if user.is_superuser %}
<li class="nav-item">
<a class="nav-link" href="{% url 'admin:index' %}">Administration</a>
</li>
{% endif %}
{% if user.is_staff %}
<li class="nav-item">
<a class="nav-link" href="{% url 'studis:index' %}">Stammdaten</a>
<a class="nav-link" href="{% url 'admin:index' %}">Administration</a>
</li>
{% endif %}
{% endif %} {% if user.is_staff %}
<li class="nav-item">
<a class="nav-link" href="{% url 'studis:index' %}">Stammdaten von</a>
</li>
{% endif %}
</ul>

<ul class="nav navbar-nav navbar-right">
{% if user.is_authenticated %}
<li class="nav-item">
<a class="nav-link disabled" href="#">{{ user.first_name }} {{ user.last_name }}</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{% url 'logout' %}?next={{ LOGOUT_REDIRECT_URL }}">Abmelden</a>
</li>
{% if user.is_authenticated %}
<li class="nav-item">
<a class="nav-link disabled" href="#">{{ user.first_name }} {{ user.last_name }}</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{% url 'logout' %}?next={{ LOGOUT_REDIRECT_URL }}">Abmelden</a>
</li>
{% else %}
<li class="dropdown">
<a id="login-button" href="#" class="dropdown-toggle nav-link" data-toggle="dropdown">
Anmelden<span class="caret"></span>
</a>
<ul id="login-dp" class="dropdown-menu">
<li>
<form class="form" role="form" method="post" action="{% url 'login' %}" accept-charset="UTF-8" id="login-nav">
{% csrf_token %}
{% if next %}
<input type="hidden" name="next" value="{{ next }}" />
{% endif %}
<div class="form-group">
<label class="sr-only" for="username">Benutzername</label>
<input type="text" class="form-control" id="username" name="username" placeholder="Benutzername" required>
</div>
<div class="form-group">
<label class="sr-only" for="password">Kennwort</label>
<input type="password" class="form-control" id="password" name="password" placeholder="Kennwort" required>
</div>
<div class="form-group">
<button type="submit" class="btn btn-primary btn-block">Anmelden</button>
</div>
</form>
</li>
</ul>
</li>
{% endif %}
<li class="dropdown">
<a id="login-button" href="#" class="dropdown-toggle nav-link" data-toggle="dropdown">
Anmelden
<span class="caret"></span>
</a>
<ul id="login-dp" class="dropdown-menu">
<li>
<form class="form" role="form" method="post" action="{% url 'login' %}" accept-charset="UTF-8" id="login-nav">
{% csrf_token %} {% if next %}
<input type="hidden" name="next" value="{{ next }}" /> {% endif %}
<div class="form-group">
<label class="sr-only" for="username">Benutzername</label>
<input type="text" class="form-control" id="username" name="username" placeholder="Benutzername" required>
</div>
<div class="form-group">
<label class="sr-only" for="password">Kennwort</label>
<input type="password" class="form-control" id="password" name="password" placeholder="Kennwort" required>
</div>
<div class="form-group">
<button type="submit" class="btn btn-primary btn-block">Anmelden</button>
</div>
</form>
</li>
</ul>
</li>
{% endif %}
</ul>
</div>
</nav>
@@ -82,4 +82,5 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
<script src="{% static 'bootstrap/js/bootstrap.bundle.js' %}"></script>
</body>

</html>

+ 1
- 1
application/templates/index.html View File

@@ -6,7 +6,7 @@
<div class="jumbotron">
<h1>efi Medizintechnik Informationssystem</h1>
{% if user.is_authenticated %}
<p>Herzlich Willkommen!</p>
<p>Herzlich Willkommen {{user.get_username}}!</p>
{% else %}
<p>Bitte melden Sie sich mit Ihrer Domänenkennung an.</p>
{% endif %}

+ 21
- 1
user.json View File

@@ -6,7 +6,7 @@
"pk": 1,
"fields": {
"password": "pbkdf2_sha256$100000$pu4yd74Yw8vd$cpecLMlMn0/X2vPqQb2U7QFyjq939RFiXHVECRFtaVU=",
"last_login": "2018-07-01T10:45:39.649Z",
"last_login": "2018-07-01T13:56:56.740Z",
"is_superuser": true,
"username": "esthi",
"first_name": "",
@@ -72,5 +72,25 @@
"groups": [],
"user_permissions": []
}
},
{
"model": "auth.user",
"pk": 5,
"fields": {
"password": "pbkdf2_sha256$100000$JfhBNx94qFkw$b0Zefa6oyWN4P8NoZ0vxUlGJp4HkOKSDOR7mROjHuJQ=",
"last_login": null,
"is_superuser": false,
"username": "willsmith",
"first_name": "",
"last_name": "",
"email": "",
"is_staff": false,
"is_active": true,
"date_joined": "2018-07-01T14:00:11Z",
"groups": [
1
],
"user_permissions": []
}
}
]

Loading…
Cancel
Save