From 272498b4cee430ee0c48bc7ddb7aaee8e8f84cca Mon Sep 17 00:00:00 2001
From: Martin Bley <dev@mb-oss.de>
Date: Sun, 18 Sep 2022 13:26:47 +0200
Subject: [PATCH] Revised templates

---
 templates/about.html              |  2 +-
 templates/base.html               | 10 +++++-----
 templates/md.html                 |  2 +-
 templates/registration/login.html |  5 +++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/templates/about.html b/templates/about.html
index aefb7d6..2621ec1 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -2,7 +2,7 @@
 {% load i18n static %}
 {% load humanize %}
 {% block head %}
-  <script type="text/javascript" src="{{ STATIC_URL }}javascript/tippy.js"></script>
+  <script type="text/javascript" src="{% static 'javascript/tippy.js' %}"></script>
 {% endblock %}
 
 {% block nav %}
diff --git a/templates/base.html b/templates/base.html
index 77140a8..8ca4881 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -16,13 +16,13 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
   <!-- Bootstrap -->
-  <link href="{{ STATIC_URL }}css/bootstrap.min.css" rel="stylesheet">
+  <link href="{% static  'css/bootstrap.min.css' %}" rel="stylesheet">
 
   <!-- Bootstrap-Theme -->
-  <link href="{{ STATIC_URL }}css/bootstrap-theme.min.css" rel="stylesheet">
+  <link href="{% static  'css/bootstrap-theme.min.css' %}" rel="stylesheet">
 
   <!-- Bootstrap-Theme -->
-  <link href="{{ STATIC_URL }}css/tippy-bootstrap.css" rel="stylesheet">
+  <link href="{% static  'css/tippy-bootstrap.css' %}" rel="stylesheet">
 
   <!-- Unterstützung für Media Queries und HTML5-Elemente im Internet Explorer über HTML5 shim und Respond.js -->
   <!-- ACHTUNG: Respond.js funktioniert nicht, wenn du die Seite über file:// aufrufst -->
@@ -38,7 +38,7 @@
   <!-- jQuery (wird für Bootstrap JavaScript-Plugins benötigt) -->
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
   <!-- Binde alle kompilierten Plugins zusammen ein (wie hier unten) oder such dir einzelne Dateien nach Bedarf aus -->
-  <script src="{{ STATIC_URL }}js/bootstrap.min.js"></script>
+  <script src="{% static 'js/bootstrap.min.js'%}"></script>
 
   {% block nav %}{% endblock %}
     
@@ -53,7 +53,7 @@
       <div class="col-md-7">
         <p>
           <div class="pull-left">
-            © Martin Bley, 2014-2016 | Dank an 
+            © Martin Bley, 2014-2022 | Dank an
             <a href="http://openligadb.de">OpenLigaDB</a> für die Bereitstellung der 
             Spielergebnisse.
           </div>
diff --git a/templates/md.html b/templates/md.html
index a1c7ac3..36b260c 100644
--- a/templates/md.html
+++ b/templates/md.html
@@ -2,7 +2,7 @@
 {% load i18n static %}
 {% load humanize %}
 {% block head %}
-  <script type="text/javascript" src="{{ STATIC_URL }}javascript/tippy.js"></script>
+  <script type="text/javascript" src="{% static 'javascript/tippy.js'%}"></script>
 {% endblock %}
 
 {% block nav %}
diff --git a/templates/registration/login.html b/templates/registration/login.html
index 1e8be5c..f9f5cd4 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
-{% load url from future %}
+{% load admin_urls %}
+
 {% comment %}
   Main page to authenticate users.
 {% endcomment %}
@@ -20,7 +21,7 @@
 {% endif %}
 <div class="row">
     <div class="col-md-3">
-        <form class="form-signin" role="form" method="post" action="{% url 'django.contrib.auth.views.login' %}">
+        <form class="form-signin" role="form" method="post" action="{% url 'login' %}">
             <h2 class="form-signin-heading">Bitte melde dich an</h2>
             {% csrf_token %}
             <input class="form-control" type="text" autofocus="" required="" name="{{form.username.html_name}}" placeholder="Anmeldename" />