From 1b7f010a010fb8ce3c940997d02bbac37e1182fd Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Sun, 19 Apr 2020 19:14:52 +0200
Subject: [PATCH] Buttons richtig und Zeichensatzcheck im Dashboard

---
 .../__pycache__/settings.cpython-38.pyc       | Bin 3891 -> 3842 bytes
 digitaleagentur/settings.py                   |   4 +--
 .../templates/standards/standards_update.html |  23 +++++++++---------
 users/templates/users/dashboard.html          |   3 +++
 users/views.py                                |   7 ++++--
 5 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc
index 0f8659dba989d310cc65f5de1894b575f2fe2acc..24d36b49e0e6855e06ca02062d8643be8c9e20bd 100644
GIT binary patch
delta 353
zcmXX?IZpy%5Z!NCmKFGxTSPfjR75<$8!u42Z$)D=g^h2sSrcm$8xsrr&6ZL?V`;Ok
zzr!ElFR=8JIForZc`tdB88`cq<=341B@sWbty^yM412Om^{S78@DYcG9{5ED5Cm^|
zEk-(Y3L!*cged}*qKF`h7~-ZvF(mBw^0S$uIHoa!GAfwG9OkiLYLvht^<v4Cpkf(S
ztY8&ureZOyw-l365*yTq8tQ_nVY7={U2IrPxTmm9{n()au{A9!gI&sEk8;?jK^)MK
z!S3a@$GG`x!-luRIt+(NiSk`x#K_~QBhx63Y3!d-aUz%kPH9}26>&xrIEO0EEa3u|
zXj)9nlaQNI@yh*RU~a`@X>7`Q3pCvCz=Q1n62DV|nkTI|cY1*-j;)uRwyrv#`r|K{
C^jw+%

delta 404
zcmXYtIZpy%5Qh2K1y<Ny<?uiSJWxbD0L2SY5b@?vB#|kMnwM-=qZSkz3r%dT$hH)c
zSlLqgNBlW{**KGVXYv&9Wad5C4JtK7aawqMYVFHRO9`;oRxF#ANQOiTFBLs-!o^dD
z0<~?^8TF!<`p`#ixXA+tdEtQ<KJ;rM`C4D`H!Ns=>c=ADNFa$NEF*;#O`-v;(je9}
z3mjO-2GZC>MiX_0t+uE!8p1aDkwuP^EOt!Io4Ttr?mmnHjbM*P`PKlhAoeMQ0~*62
zjpK+W8tm5kSr^PU*|2q3hv9h8LSd6kHNrUQSZNwXiu@BhN}SA~Oi^w&iwebX3I{)P
z4ri$1TxWcqhqY>n*1F#eEJOh<4>Ye|R!ZfE!usjW1r<{#*G&}e63OIlR~2-LEf~+P
uyiCsgS-F&}93B_y-5=MzRsQAA7G+5o6+~tv)d;g2S8B|7RPDxx`t%2VqG{s*

diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py
index 9b28b17..22b2e57 100644
--- a/digitaleagentur/settings.py
+++ b/digitaleagentur/settings.py
@@ -15,9 +15,9 @@ import os
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
+
 ############################################## DEV #####################################
 BASE_URL = "https://dev01.digitale-agentur.com/"
-CRONAPIKEY = "gCddsaz6NOnE9QbXZM5LasdEk122D"
 
 # MAIL DEV
 EMAIL_HOST = 'smtp.strato.de'
@@ -57,8 +57,6 @@ DEBUG = True
 
 ALLOWED_HOSTS = ['digitale-agentur.com', 'www.digitale-agentur.com', 'localhost', 'dev01.digitale-agentur.com']
 
-
-
 # Application definition
 INSTALLED_APPS = [
     'notificsys.apps.NotificsysConfig',
diff --git a/standards/templates/standards/standards_update.html b/standards/templates/standards/standards_update.html
index 3030003..0f75ce8 100644
--- a/standards/templates/standards/standards_update.html
+++ b/standards/templates/standards/standards_update.html
@@ -40,8 +40,6 @@
         </div>
       </div>
 
-
-
       <div class="card">
         <div class="card-header" id="st_useraut">
           <h5 class="mb-0">
@@ -197,26 +195,29 @@
           </div>
         </div>
       </div>
+    </div>
 
 
-
-
-
-  </div>
+<div style="float: left;">    
+  
       <p>Wenn ein Standard bearbeitet wurde, kann er nur von einer Person mit dem Recht <i>Standards bearbeiten und freischalten</i> wieder veröffentlicht werden. Ein Standard wird nach Bearbeitung als <i>Nicht veröffentlicht</i> gesetzt.</p>
-    <hr>      
-      <button type="submit" class="btn btn-success"  href="{% url 'standard-update' standard_id %} ">Speichern</button>&nbsp;
+    <hr>   
+    
+      <button type="submit"  class="btn btn-success"  href="{% url 'standard-update' standard_id %} ">Speichern</button>&nbsp;
 
       {% if  perms.users.standard_management %}
         {% if  standard_status == False %}
-          <a class="btn btn-primary"  href="{% url 'standard-status' standard_id %} ">Standard veröffentlichen</a>&nbsp;
+          <a class="btn btn-primary"   href="{% url 'standard-status' standard_id %} ">Standard veröffentlichen</a>&nbsp;
         {% else %}
-          <a class="btn btn-warning"  href="{% url 'standard-status' standard_id %} ">Veröffentlichung aufheben</a>&nbsp;
+          <a class="btn btn-warning"   href="{% url 'standard-status' standard_id %} ">Veröffentlichung aufheben</a>&nbsp;
         {% endif %}
       {% endif %}
-      <a class="btn" href="{% url 'standards' %} ">Abbrechen</a>
+      <a class="btn"  href="{% url 'standards' %} ">Abbrechen</a>
+    
   </form>
 </div>
+</div>
+
 
 <!-- FILE FORBIDDEN DELETE FILE -->
 <div class="modal fade" id="forbiddenFileType" tabindex="-1" role="dialog" data-backdrop="static" aria-labelledby="groupDelFunction" aria-hidden="true">
diff --git a/users/templates/users/dashboard.html b/users/templates/users/dashboard.html
index 6d76808..44bd4a1 100644
--- a/users/templates/users/dashboard.html
+++ b/users/templates/users/dashboard.html
@@ -86,6 +86,9 @@
   
 	
 </div>
+<script type="text/javascript">
+  console.log("{{systemencode}}");
+</script>
 {% endblock content %}
 
 
diff --git a/users/views.py b/users/views.py
index d05b6f4..d2c00e6 100644
--- a/users/views.py
+++ b/users/views.py
@@ -35,7 +35,7 @@ from message.models import Message
 from notificsys.models import UserNotification
 from organizer.models import AGContacts, AGPassword
 import socket
-
+import sys
 
 def randomString(stringLength=10):
     """Generate a random string of fixed length """
@@ -171,8 +171,11 @@ def dashboard(request):
 	toUpdate(request)
 
 	
+	storageinfo = sys.getfilesystemencoding()
+
 	context = {		
-		'active_link' : 'dashboard'
+		'active_link' : 'dashboard',
+		"systemencode" : storageinfo
 	}
 	# Adding active_link
 	# Loading only user same agency