From 2488ce0d442374e753601c0735a5a284a3459c5c Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Sun, 8 Dec 2019 21:20:35 +0100
Subject: [PATCH] Settings angepasst Dashboard fertig

---
 .../__pycache__/settings.cpython-38.pyc       | Bin 4304 -> 4278 bytes
 digitaleagentur/settings.py                   |  21 +++++++-------
 users/__pycache__/views.cpython-38.pyc        | Bin 10121 -> 10121 bytes
 users/templates/users/dashboard.html          |  26 +++++++++++-------
 4 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc
index a7b3c66f3b6522b427512b5852c902d8541acf23..0b6c6b3af2f1c2f6e00a3b24d3c38f7402ff7433 100644
GIT binary patch
delta 271
zcmYjKyGq1R6wJBz>>|tFL~Rr`n(RBS0l&dwe?V;x*iBsA^&M?&{Dxp_VZcAQVBuGY
zU}G(4V`nMoC0IDa49qYvPw_)+c8zIx4&U;*mlr0aMlrlf84+T%&_-v>2ZZh|k4X%A
z;-fDC1~Q98=A7oi#q;|$%Mw_YomMcB5K~#rXrk_P<!f23q>^yB;7L?9aTZ}(Drx;s
z`y_1~N$0Pt<Jc{_IFX(^>f=-fIFkhDvhIF{$Ylc;l0t2JD!H^Hl@smQN1bZ>Q5T|-
i-I{sRcC&e}>Feetcnt%lMe<eihij~TV(my371J+vx<>y1

delta 273
zcmdm{ctMdjl$V!_0SMT`-^R91<dtO<o2Xr-tB|6YqLiYXqLQMT&XUQPqBe&moiU0x
zMLmiyMI(woMKekug(XT5h=o!VCSH18uMj1bq7Wqw#4;&aQL?EV6Bvt@rDR9R<yocV
zM9HNxW-%>b29xrstP2?zGN$B;GejwXMHEvNQgRkDMJXZk(io$ZQ}Uuzpkiz(`9Kw_
zDFsn#KugtA3ZpbqilQ`AilelEc53sbltk&Ilt$^MFa<McmTk6TDrRJK+q{lhmzgnS
u^KG^$#?59NPnbD5^ovUpOEQ!7H%sy?WoG;_c|ZRxR&F*%Hm1q51Y`jEI85&V

diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py
index c252e32..e1e5ed9 100644
--- a/digitaleagentur/settings.py
+++ b/digitaleagentur/settings.py
@@ -24,7 +24,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 SECRET_KEY = '_qv2t2lmsctjxpbb4rrp=op%_20_hxzonv^mvty1o85c)l$s^q'
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = False
+DEBUG = True
 
 ALLOWED_HOSTS = ['digitale-agentur.com', 'www.digitale-agentur.com', 'localhost']
 
@@ -169,15 +169,16 @@ LOGIN_REDIRECT_URL = 'users-dashboard'
 #SITE_ROOT = '/var/www/digitale-agentur.com/digitaleagentur/digitaleagentur/../'
 #STATIC_ROOT = (os.path.join(SITE_ROOT, 'static/'))
 
-if DEBUG:
-    STATIC_URL = '/static/'
-else:
-    STATIC_URL = 'users/static/'
-    SITE_ROOT = os.path.dirname(os.path.realpath(__file__)) + '/..'
-    STATIC_ROOT = (os.path.join(SITE_ROOT, 'users/static/'))
-    STATICFILES_DIRS = (
-      os.path.join(SITE_ROOT, 'users/static/'),
-    )
+#DEV-UMBGEUNG
+#STATIC_URL = '/static/'
+
+#SERVER
+STATIC_URL = 'users/static/'
+SITE_ROOT = os.path.dirname(os.path.realpath(__file__)) + '/..'
+STATIC_ROOT = (os.path.join(SITE_ROOT, 'users/static/'))
+STATICFILES_DIRS = (
+    os.path.join(SITE_ROOT, 'users/static/'),
+)
     
 # CRISPY
 CRISPY_TEMPLATE_PACK = 'bootstrap4'
diff --git a/users/__pycache__/views.cpython-38.pyc b/users/__pycache__/views.cpython-38.pyc
index c7f4c72a0e3352845cd0eb3ba76f1807be6798d9..e65735d648c0ec8cb54a969c7fcb074b8cac896e 100644
GIT binary patch
delta 19
YcmeD5@AT&i<>lpK00N_kja>EW04uKq9{>OV

delta 19
YcmeD5@AT&i<>lpK0D^a68@cM$0Wb{&*#H0l

diff --git a/users/templates/users/dashboard.html b/users/templates/users/dashboard.html
index cc52b07..663e1ba 100644
--- a/users/templates/users/dashboard.html
+++ b/users/templates/users/dashboard.html
@@ -4,20 +4,22 @@
   <h3>Willkommen, {{request.user.first_name}} {{request.user.last_name}}!</h3>
   <small>Letzter Login: {{ request.user.last_login }}</small>
   <hr>
-  Agentur: <b>{{ request.user.profile.agency.name }}</b>
-  <div class="">
-  	 <img class="img-profile" width="75%" src="{{ request.user.profile.agency.agencypic.url }}">
-  	 <hr>
+  <h4>Agentur: <b>{{ request.user.profile.agency.name }}</b></h4>
+  <hr>
+  <h5>Neueste Standards</h5>  	
+  <div class="row">
+  	<hr>
+  	<div class="col mt-2">  	 
   	 {% for item in standards_of_agency %}
       {% if item.public or item.created_standard_by == user or perms.users.standard_management %}
-        <div class=" mb-4 col-5">
+        <div class=" mb-4">
         <div class="card">
         <div class="card-header py-3 d-flex flex-row align-items-center justify-content-between">
         <a href="{% url 'standard-single' item.pk%}">
           {% if item.public %}
-            <h4><u>{{item.name}}</u></h4>
+            <h5><u>{{item.name}}</u></h5>
           {% else %}
-            <h4 class="text-warning"><u>{{item.name}}</u></h4>
+            <h5 class="text-warning"><u>{{item.name}}</u></h5>
           {% endif %}
         </a>
          {% if item.created_standard_by == user or perms.users.standard_management %}
@@ -35,14 +37,18 @@
          {% endif %}
          </div>
         <div class="card-body">
-          <h5 class="card-title">{{item.created_standard_by.first_name}} {{item.created_standard_by.last_name}} <h6>Zuletzt bearbeitet von {{ item.last_modified_by.first_name }} {{ item.last_modified_by.last_name }} am {{ item.last_modified_on }}</h6>
-          </h5>
-          <p class="card-text">{{ item.content|truncatechars:250|safe}}</p>      
+          <h6 class="card-title">{{item.created_standard_by.first_name}} {{item.created_standard_by.last_name}} <small>Zuletzt bearbeitet von {{ item.last_modified_by.first_name }} {{ item.last_modified_by.last_name }} am {{ item.last_modified_on }}</small>
+          </h6>
+          <p class="card-text">{{ item.content|truncatechars:80|safe}}</p>      
         </div>
       </div>
       </div>
      {% endif %} 
   {% endfor%}
+	</div>
+	<div class="col">
+  	 <img class="img-profile" width="75%" src="{{ request.user.profile.agency.agencypic.url }}">
+  	</div>
   </div>
 </div>
 {% endblock content %}
\ No newline at end of file