From ab665481fa669941a167aad13036e75f9b3bc95b Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Sun, 8 Dec 2019 23:14:14 +0100 Subject: [PATCH] Schriftart angepasst Dashboard-Link korrigiert --- users/__pycache__/views.cpython-38.pyc | Bin 10149 -> 10138 bytes users/static/users/css/custom.css | 4 +++ users/templates/users/base.html | 11 ++++--- users/templates/users/dashboard.html | 42 +++++-------------------- users/views.py | 3 +- 5 files changed, 19 insertions(+), 41 deletions(-) diff --git a/users/__pycache__/views.cpython-38.pyc b/users/__pycache__/views.cpython-38.pyc index f2c088d737c945fe429d348aaef646af8c9fbdfd..e075eb1f5ddb3983677ca1f260222d90695d4505 100644 GIT binary patch delta 1499 zcmaKs>rc~H7{~kc^0Uy3g%x^1sL)Q*Z9$SbGz@i%7ZQb5={gh<#wcnKl_?lD$~Wvh3BeWY70BQ*0XBoX_vvp7VUq zbDneNle0-r+T*FV$S-&FkG=0KdXmnNHE+!rH>`6+mRwcdl3A9gDO<`Cck)r^M*hw@ z9oi=IRo64DM{TR1qwrx>jMCfD?g83?ULXOy2_%7?g1B9+lTXnY|9C|0H&q`7-Um7X zy}n+$Uz$DqxH>`oeB0ajN=n*rXW9i$vO83Y7XyBta6NoGEnRV&>X46uo%Xa~)1K5W zbZ9pfJPa3(xlJ-kYWb?1WcF>-iJ4PrpMEQ=Qca*T(4QA%j>SA3UU8B87n_VL=9cN<2fdR~g@ z7Kl@;mE`}g;ZUPu)5zb}?4bd6*QPxP>H?Kwo92nyRW5x9Z%Mbvx>eiJr1yRh?J^;l zGgtVlHb90xnk@VLGi^hdIUtDpi}p-*G^en|qT^83%$X{P(WM@~_a8A1qjMK;s0-3T z?yqa7ulZD6GCYoMFK`Ih1ZZ8K@}G6V&;e=BN_iGoJK60{Lmkjj84P!^s&A8B&ed;P zgTqx@1pl9K9v%9a_n=ncRPS>zkn(BIT8MV9(1WUzI4%|sVC57b5#(=G$N6q(ocg#a9H1h1gnwCcLWW<^dJ-Kk)%rUp8u}`0 zh4If)%C(;4-x?N-ES4VT%PVq|&kv>S#_7CXfr-sP4-f%X0j+>l5U(m-TAd2o<}`-B z0KNpi0!{%HvbyN1N}FTK+@Z2Z{$_5B)3h91kbi8v<$}nft$WLRYKkYDQf<$b&S13> zppxd2+>4QBV-i!&acd+>Zr&aVIdC@;>~V&9D)Ksg&fi3K)PzZ*WXOPps>w_0Qo*-U zp0XLf+x&zEnOpX6J|lziV9BHQt@l~xyG16IQe21XESiJBCEzM=hz`*#-;8$CC;V$P zPAhqNY%Sg4?$}Oob}iQK(mS$Y_6$FYt*+U)R9U@M%@_QyKB8{CW(rSBY4@Y3;Zi7_ j+(@_5yQ%YM8cl3lT>!L}JE+Y|at3&7YbOQyL~HCnZv`%w delta 1486 zcmaKsT}+!*7{~jxZ{M|)c2HrZK-WR5q;WwE`^r8tbS`8WP`1K0nXuKpm6Y<8^HygJ zEK~eIMmE^9UF;(<8rkI1bk|Fa7e<%G#dy`-Xu^dtG4V!kjET?xbhAhr-#6#?p7)&R zod5GY=i_E_CFvjZ`>P!C{5AaB@XKHNlb*0S1Ebl+zP@F8G{JCx53ji%ZvnyG$K-jvoa> z^jYB-p{W;OjNNsY+Rwo5v>;JeG_35oyh1QV_juOM+o}P*>*u>)Hx->kBPJaRPG{6a z*0!@#llGbMskD``RE~S9_{F`Wl48vop zEFWm>=g}?g27Kl38@qO3t<_<{(*>VJ19pmf4XCil->^TFs?ok^*R(@=M};x?D=F)R zCFN>XQXMIL9ok0J$7>CH=?9L6Q#55R-WX*e>!q)djvA&V?)OhE6ei z%+EKj?RZaW{|Rai4gVX|uY9QKc;%olcumU2pyv2-)2ca!sn7C4b3RdC;ti)%pND1` zwgA1{7Kz67_R&2HX#5cP2$%;x22wm0iO`=sA4wROq(N4!p1+HH;)7_>)qQwCz0dir zsrIt+BF4QARPy18{2yCe%!{yD;^t_K{M;1{(=rc5kI)DFd9=T_i6mT8EF4rt0aDis z?rm~|E%M!#pJnQ1@E&zQa7$Lg}bE`HV(bQ lDNuSlV<(j^O}!D2N`*T?T?Mo+E2!P!c-t`w^IL84e*kWvE)4(x diff --git a/users/static/users/css/custom.css b/users/static/users/css/custom.css index e69de29..6e4d29d 100644 --- a/users/static/users/css/custom.css +++ b/users/static/users/css/custom.css @@ -0,0 +1,4 @@ +html h1, h2, h3, h4, h5, h6, b, a { + font-family: 'Roboto' !important; + font-size: 1em !important; +} \ No newline at end of file diff --git a/users/templates/users/base.html b/users/templates/users/base.html index f8af09f..e9f849c 100644 --- a/users/templates/users/base.html +++ b/users/templates/users/base.html @@ -24,7 +24,10 @@ + + + @@ -47,9 +50,9 @@ {% if active_link == 'dashboard' %} -
  • - {% else%} -
  • +
  • + {% else %} +
  • {%endif%} @@ -279,7 +282,7 @@ - + diff --git a/users/templates/users/dashboard.html b/users/templates/users/dashboard.html index f81ca31..5a514aa 100644 --- a/users/templates/users/dashboard.html +++ b/users/templates/users/dashboard.html @@ -11,41 +11,13 @@
    {% for item in standards_of_agency %} - {% if item.public or item.created_standard_by == user or perms.users.standard_management %} -
    -
    -
    - - {% if item.public %} -
    {{item.name}}
    - {% else %} -
    {{item.name}}
    - {% endif %} -     - {% if item.created_standard_by == user or perms.users.standard_management %} -
    - -
    - - Bearbeiten -
    - Löschen -
    -
    - {% endif %} -
    -
    -
    {{item.created_standard_by.first_name}} {{item.created_standard_by.last_name}} Zuletzt bearbeitet von {{ item.last_modified_by.first_name }} {{ item.last_modified_by.last_name }} am {{ item.last_modified_on }} -
    -

    {{ item.content|truncatechars:80|safe}}

    -
    -
    -
    - {% endif %} - {% endfor%} -
    + as + + {% endfor %} + + + +
    diff --git a/users/views.py b/users/views.py index 9ec20e5..3a6cf57 100644 --- a/users/views.py +++ b/users/views.py @@ -51,7 +51,6 @@ class AgencyCreateView(CreateView): return super().form_valid(form) - @login_required def dashboard(request): @@ -63,7 +62,7 @@ def dashboard(request): # Change context and return for template-data # # Get all Users of the Same Agency as logged user standards_of_agency = Standards.objects.filter(agency__pk=request.user.profile.agency.pk).order_by('-last_modified_on')[:10] - context.update({'active_link' : 'standards', 'standards_of_agency' : standards_of_agency}) + context.update({'active_link' : 'dashboard', 'standards_of_agency' : standards_of_agency}) #return context return render (request, 'users/dashboard.html', context)