From bb392f96a273765371e3a965cddb0fcba7f9251e Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Fri, 30 Jul 2021 16:41:57 +0200
Subject: [PATCH] mh

---
 .../__pycache__/settings.cpython-38.pyc       | Bin 4520 -> 4512 bytes
 digitaleagentur/settings.py                   |   4 +-
 users/templates/users/login.html              |  60 ++++++++++++++++--
 users/templates/users/login.html_LATER        |   8 +++
 users/templates/users/login_SAVE.html         |  56 ----------------
 5 files changed, 64 insertions(+), 64 deletions(-)
 create mode 100644 users/templates/users/login.html_LATER
 delete mode 100644 users/templates/users/login_SAVE.html

diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc
index ec2434c5c0329103849799a2a6b3f18e77a604a4..35c694dda71f55b0736e454981cf3c7d5d448259 100644
GIT binary patch
delta 184
zcmZ3Xyg->Nl$V!_0SGqnZ{#XstWODzQcnqs(nw{@VqL%nCN)zz7BVhmObHifh|&U!
zXs2qWL@Z>A(n*Po(uIm}rbGcn^irau^g*I2K~V-NF;Rvou_=6+j8R4@aVhaB2`Pzl
zn1DRv6sBMX&7?#VMg|5hm#oCR^n8Wl)RL0Syv@HEw{fvYvF7BbXXZ`b$g`EvWOF*N
TIMe1{{vV9Y%q%REI|LN~YbZ59

delta 188
zcmZ3Wyh52Pl$V!_0SHq0HgXj))~BjRX{3ZkX{It}u`XZ(lUk`93mF$Ori6(zL}`OX
zbW*ib!WS|{>83<P=|M#}QzC&P`YBOS1|ZRtpeVzX=qRI<m=wND#wg>I*p#@G_>_b>
zOhBGV3R5tHW@4fVBLf4MOIBiDdcHz&YDr0E-sazo+qfq0;MvM(x;c+moQXS%*UvQ~
X#M#F`)Maxc{~tzXRu-no4T1^)>TNY|

diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py
index 12f98a0..1498651 100644
--- a/digitaleagentur/settings.py
+++ b/digitaleagentur/settings.py
@@ -210,9 +210,9 @@ DEFAULT_CHARSET = 'utf-8'
 LOGIN_REDIRECT_URL = 'users-dashboard'
 
 # LOGIN PAGE FOR LOGIN-REDIRECT
-#LOGIN_URL = 'login'
+LOGIN_URL = 'login'
 # NC Default Login findet im Dashboard statt!
-LOGIN_URL = NEXTCLOUD_URL
+#LOGIN_URL = NEXTCLOUD_URL
 
 STATIC_URL = '/static/'
 
diff --git a/users/templates/users/login.html b/users/templates/users/login.html
index fed304a..d4d0cfa 100644
--- a/users/templates/users/login.html
+++ b/users/templates/users/login.html
@@ -1,8 +1,56 @@
-{% load static %}
-<script src="{%static 'users/js/jquery.js' %}" type="text/javascript"></script>
-<script>
-    $(document).ready(function(){
-        window.location.replace("http://cloud.digitale-agentur.com/external/1");
+{% extends "users/publicbase.html" %}
+<!-- CRISPY -->
+{% load crispy_forms_tags %}
+{% block content %}
+<style type="text/css">
+	#logincard {
+		width: 25%;		
+		margin-top: 7%;
+	}
+</style>
+<div class="card mx-auto" id="logincard">
+  <div class="card-body">
+	<form method="POST">
+		{% csrf_token %}
+		<fieldset class="form-group" >
+			<legend class="border-bottom mb-4" style="text-align: center;">
+				<i class="fas fa-laptop"></i>
+				<h3>Digitale Agentur Login</h3>					
+			</legend>				
+			{% if messages %}
+              {% for message in messages %}
+              <div class="alert alert-{{ message.tags }} alert-dismissible fade show" role="alert" id="message_{{forloop.counter}}">
+                  {{ message }}
+                  <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                  </button>
+                </div>
+              {% endfor %}
+            {% endif %}
+				{{ form|crispy }}				
+		</fieldset>
+		<div class="form-group">
+			<button type="submit" class="btn btn-primary">Anmelden</button>
+
+			<small class="text-muted ml-2">
+				<a href="{% url 'password-reset' %}" class="">Passwort vergessen?</a><br />					
+			</small>				
+		</div>			
+	</form>	
+	<div class="border-top pt-3">
+		<small class="text-muted ml-2">
+			<a href="mailto:support@digitale-agentur.com" class="">Probleme beim anmelden?</a>					
+		</small>
+		<small class="text-muted">				
+			<a class="ml-2" href="{% url 'register' %}">Agentur registrieren</a>
+		</small>			
+	</div>				
+</div>
+</div>
+<script type="text/javascript">
+	$("label[for*='username']").html("E-Mail-Adresse*");
+	$(document).ready(function(){
 		localStorage.clear();		
 	})
-</script>
\ No newline at end of file
+</script>
+{% endblock content %}
\ No newline at end of file
diff --git a/users/templates/users/login.html_LATER b/users/templates/users/login.html_LATER
new file mode 100644
index 0000000..fed304a
--- /dev/null
+++ b/users/templates/users/login.html_LATER
@@ -0,0 +1,8 @@
+{% load static %}
+<script src="{%static 'users/js/jquery.js' %}" type="text/javascript"></script>
+<script>
+    $(document).ready(function(){
+        window.location.replace("http://cloud.digitale-agentur.com/external/1");
+		localStorage.clear();		
+	})
+</script>
\ No newline at end of file
diff --git a/users/templates/users/login_SAVE.html b/users/templates/users/login_SAVE.html
deleted file mode 100644
index d4d0cfa..0000000
--- a/users/templates/users/login_SAVE.html
+++ /dev/null
@@ -1,56 +0,0 @@
-{% extends "users/publicbase.html" %}
-<!-- CRISPY -->
-{% load crispy_forms_tags %}
-{% block content %}
-<style type="text/css">
-	#logincard {
-		width: 25%;		
-		margin-top: 7%;
-	}
-</style>
-<div class="card mx-auto" id="logincard">
-  <div class="card-body">
-	<form method="POST">
-		{% csrf_token %}
-		<fieldset class="form-group" >
-			<legend class="border-bottom mb-4" style="text-align: center;">
-				<i class="fas fa-laptop"></i>
-				<h3>Digitale Agentur Login</h3>					
-			</legend>				
-			{% if messages %}
-              {% for message in messages %}
-              <div class="alert alert-{{ message.tags }} alert-dismissible fade show" role="alert" id="message_{{forloop.counter}}">
-                  {{ message }}
-                  <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                  </button>
-                </div>
-              {% endfor %}
-            {% endif %}
-				{{ form|crispy }}				
-		</fieldset>
-		<div class="form-group">
-			<button type="submit" class="btn btn-primary">Anmelden</button>
-
-			<small class="text-muted ml-2">
-				<a href="{% url 'password-reset' %}" class="">Passwort vergessen?</a><br />					
-			</small>				
-		</div>			
-	</form>	
-	<div class="border-top pt-3">
-		<small class="text-muted ml-2">
-			<a href="mailto:support@digitale-agentur.com" class="">Probleme beim anmelden?</a>					
-		</small>
-		<small class="text-muted">				
-			<a class="ml-2" href="{% url 'register' %}">Agentur registrieren</a>
-		</small>			
-	</div>				
-</div>
-</div>
-<script type="text/javascript">
-	$("label[for*='username']").html("E-Mail-Adresse*");
-	$(document).ready(function(){
-		localStorage.clear();		
-	})
-</script>
-{% endblock content %}
\ No newline at end of file