diff --git a/users/__pycache__/views.cpython-38.pyc b/users/__pycache__/views.cpython-38.pyc index f2c088d..e075eb1 100644 Binary files a/users/__pycache__/views.cpython-38.pyc and b/users/__pycache__/views.cpython-38.pyc differ 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)