From b9f0dced0a956854066515fb4aa0f4e221f3d373 Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Sun, 19 Apr 2020 14:30:31 +0200
Subject: [PATCH] Editor BITTE QS sollte ALLES gehen

---
 .../__pycache__/settings.cpython-38.pyc       | Bin 3891 -> 3891 bytes
 digitaleagentur/settings.py                   |   1 -
 orga/templates/orga/orga_main.html            |   1 +
 orga/templates/orga/orga_single.html          |   4 ++++
 users/static/users/css/custom.css             |   2 +-
 users/static/users/css/jsLists.css            |   4 +---
 users/templates/users/base.html               |  18 +++++++++---------
 7 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc
index 63e1eb6a19b70af4254b076f785c59ae0000156c..40016397c99132b651c80f008030fefc11e5f903 100644
GIT binary patch
delta 28
icmdliw^@!il$V!_0SF>o=ET`<<PGLyWS*SJcL@MqW(M;B

delta 28
icmdliw^@!il$V!_0SFFQ&55($$Q#VZ$TB&R?-BrH4F^;J

diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py
index 7a5bd52..9b28b17 100644
--- a/digitaleagentur/settings.py
+++ b/digitaleagentur/settings.py
@@ -15,7 +15,6 @@ 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"
diff --git a/orga/templates/orga/orga_main.html b/orga/templates/orga/orga_main.html
index db5490c..3a272ca 100644
--- a/orga/templates/orga/orga_main.html
+++ b/orga/templates/orga/orga_main.html
@@ -2,6 +2,7 @@
 {% load static %}
 {% block content %}
 <link href="{% static 'users/css/custom.css' %}" rel="stylesheet">
+
 <div class="content-section">
   <h3>{{request.user.profile.agency.name}}</h3>
   <hr>
diff --git a/orga/templates/orga/orga_single.html b/orga/templates/orga/orga_single.html
index 7dd668e..96cdff7 100644
--- a/orga/templates/orga/orga_single.html
+++ b/orga/templates/orga/orga_single.html
@@ -1,6 +1,10 @@
 {% extends "users/base.html" %}
 {% load counter_tag %}
+{% load static %}
 {% block content %}
+<script src="{% static 'users/js/jsLists.js' %}"></script>
+  <link href="{% static 'users/css/jsLists.css' %}" rel="stylesheet">
+
 <div class="content-section">
   <h3>Bereiche und Aufgaben von {{user_first_name}} {{user_last_name}}<span style="float: right">
     {% if user|usergperm:"usermanager" %} 
diff --git a/users/static/users/css/custom.css b/users/static/users/css/custom.css
index 26230ea..0523e77 100644
--- a/users/static/users/css/custom.css
+++ b/users/static/users/css/custom.css
@@ -89,7 +89,7 @@ body{
 	max-width: 50px;
 }
 
-* {margin: 0; padding: 0;}
+.sidebar {margin: 0; padding: 0;}
 
 
 
diff --git a/users/static/users/css/jsLists.css b/users/static/users/css/jsLists.css
index 10ba2ee..e54b16f 100644
--- a/users/static/users/css/jsLists.css
+++ b/users/static/users/css/jsLists.css
@@ -1,6 +1,4 @@
-*, *:before, *:after {box-sizing: border-box;}
-ul, ol {margin: 0; padding: 0;}
-li {list-style: none; line-height: 1.6rem;}
+
 
 /* List styling */
 .jslists{
diff --git a/users/templates/users/base.html b/users/templates/users/base.html
index 496fda9..10390f2 100644
--- a/users/templates/users/base.html
+++ b/users/templates/users/base.html
@@ -36,15 +36,12 @@
 
 
   
+  
   <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
-  <script src="{% static 'users/js/jsLists.js' %}"></script>
-  <link href="{% static 'users/css/jsLists.css' %}" rel="stylesheet">
   <!-- CROPPER -->
   <link href="{% static 'users/css/cropper.min.css' %}" rel="stylesheet">
   
-  <!-- TABLE SORT -->
-  <!--<link rel="stylesheet" href="https://cdn.datatables.net/1.10.20/css/jquery.dataTables.min.css">-->
-
+  
   <!-- DATATABLES -->
   <link href="https://cdn.datatables.net/1.10.20/css/jquery.dataTables.min.css" rel="stylesheet">
   <link href="https://cdn.datatables.net/1.10.20/css/dataTables.bootstrap4.min.css" rel="stylesheet">
@@ -54,10 +51,12 @@
   <link href="{% static 'users/css/sb-admin-2.css' %}" rel="stylesheet">
   
   <link href="{% static 'users/css/theme.css' %}" rel="stylesheet">
-  <link href="{% static 'users/css/custom.css' %}" rel="stylesheet">
-
-<link href="https://cdn.jsdelivr.net/npm/summernote@0.8.16/dist/summernote-bs4.css" rel="stylesheet">
+  <link href="https://cdn.jsdelivr.net/npm/summernote@0.8.16/dist/summernote-bs4.css" rel="stylesheet">
   
+  
+  
+
+
 
 
 
@@ -349,6 +348,7 @@
   <script src="{%static 'users/js/sb-admin-2.js' %}"></script>
   <!-- CUSTOM FONT -->
   <!--<link href="{% static 'users/css/custom.css' %}" rel="stylesheet">-->
+
   <script src="https://cdn.jsdelivr.net/npm/summernote@0.8.16/dist/summernote-bs4.js"></script>
   <!-- TABLE SORT -->
   <!--<script src="https://cdn.datatables.net/1.10.20/js/jquery.dataTables.min.js"></script>-->
@@ -361,7 +361,7 @@
   <!--<script src="js/demo/chart-pie-demo.js"></script>-->
 
 
-
+  <link href="{% static 'users/css/custom.css' %}" rel="stylesheet">