From 8c8981891e1fccc4a4491ffe02c26a9d4279f0e6 Mon Sep 17 00:00:00 2001 From: Andrea Lepori Date: Tue, 28 Jul 2020 20:40:06 +0200 Subject: local font feching, list for non interactive items --- accounts/templates/accounts/index.html | 14 +++--------- accounts/views.py | 6 ++++++ client/templates/client/index.html | 16 +++++++------- server/templates/server/doc_list.html | 20 ++++++----------- server/templates/server/doc_type.html | 20 ++++++----------- server/templates/server/index.html | 14 +++++------- server/templates/server/user_list.html | 8 +++---- server/views.py | 21 ++++++------------ static/fonts/MaterialIcons-Regular.eot | Bin 0 -> 143258 bytes static/fonts/MaterialIcons-Regular.ttf | Bin 0 -> 128180 bytes static/fonts/MaterialIcons-Regular.woff | Bin 0 -> 57620 bytes static/fonts/MaterialIcons-Regular.woff2 | Bin 0 -> 44300 bytes static/material_icons.css | 36 +++++++++++++++++++++++++++++++ templates/registration/base.html | 2 +- templates/registration/base_client.html | 4 ++-- templates/registration/base_custom.html | 2 +- templates/registration/base_simple.html | 2 +- 17 files changed, 87 insertions(+), 78 deletions(-) create mode 100644 static/fonts/MaterialIcons-Regular.eot create mode 100644 static/fonts/MaterialIcons-Regular.ttf create mode 100644 static/fonts/MaterialIcons-Regular.woff create mode 100644 static/fonts/MaterialIcons-Regular.woff2 create mode 100644 static/material_icons.css diff --git a/accounts/templates/accounts/index.html b/accounts/templates/accounts/index.html index 69d0717..e0674a7 100644 --- a/accounts/templates/accounts/index.html +++ b/accounts/templates/accounts/index.html @@ -11,17 +11,9 @@ {% if user.is_staff %}
  • Pannello Admin
    • {% endif %} - {% if user.is_authenticated %} -
  • {{ user.username }}
    • - {% endif %} - {% if user.username != "" %} -
  • - exit_to_app -
    • - {% else %} -
  • Registrazione
    • -
  • Login
    • - {% endif %} +
  • {{ user.username }}
    • +
  • info_outline
    • +
  • exit_to_app
    • diff --git a/accounts/views.py b/accounts/views.py index cc402d2..23f4212 100644 --- a/accounts/views.py +++ b/accounts/views.py @@ -40,12 +40,18 @@ def personal(request): if medic.vac_certificate != None: filename = os.path.basename(medic.vac_certificate.name) filename = filename[filename.find("_")+1:] + if filename.rfind('.') != -1: + filename = filename[:filename.rfind('.')] + filename = filename + ".jpg" return FileResponse(medic.vac_certificate.file, as_attachment=True, filename=filename) if request.POST['action'] == "download_health": if medic.health_care_certificate != None: filename = os.path.basename(medic.health_care_certificate.name) filename = filename[filename.find("_")+1:] + if filename.rfind('.') != -1: + filename = filename[:filename.rfind('.')] + filename = filename + ".jpg" return FileResponse(medic.health_care_certificate.file, as_attachment=True, filename=filename) request.user.first_name = request.POST["first_name"] diff --git a/client/templates/client/index.html b/client/templates/client/index.html index b368630..45a7e90 100644 --- a/client/templates/client/index.html +++ b/client/templates/client/index.html @@ -43,14 +43,14 @@ delete Elimina documento edit Modifica documento
    -
    - file_download Scarica documento per approvazione +
    + file_download Scarica documento per approvazione

    - delete Elimina documento + delete Elimina documento

    - edit Modifica documento + edit Modifica documento


    @@ -72,14 +72,14 @@ deleteElimina documento editModifica documento
    -
    - checkApprova documento +
    + checkApprova documento

    - deleteElimina documento + deleteElimina documento

    - editModifica documento + editModifica documento


    diff --git a/server/templates/server/doc_list.html b/server/templates/server/doc_list.html index fb201d5..3953905 100644 --- a/server/templates/server/doc_list.html +++ b/server/templates/server/doc_list.html @@ -145,25 +145,19 @@

    {% endif %} -
    -
      +
        {% if not doctype.0.group_private %} -
      • -
        - group_work{{doctype.0.group.name}} -
        +
      • + group_work{{doctype.0.group.name}}
        • {% endif %} {% if doctype.0.personal_data %} -
      • -
        - personDati personali -
        +
      • + personDati personali
        • {% endif %} {% if doctype.0.medical_data %} -
      • -
        - healingDati medici -
        +
      • + healingDati medici
        • {% endif %}
      diff --git a/server/templates/server/index.html b/server/templates/server/index.html index a049f4f..57cfc83 100644 --- a/server/templates/server/index.html +++ b/server/templates/server/index.html @@ -18,8 +18,6 @@ Username Nome Cognome - Codice - Stato {% for user in users %} @@ -40,22 +38,20 @@
      -
        +
          {% for doctype in docs %} -
        • -
          +
        • {% if not doctype.0.enabled %} - visibility_off + visibility_off {% endif %} {% if not doctype.0.group_private %} - public + public {% endif %} {% if doctype.0.auto_sign %} - assignment_turned_in + assignment_turned_in {% endif %} {{doctype.0.name}} {{doctype.1}} -
      {% endfor %}
    diff --git a/server/templates/server/user_list.html b/server/templates/server/user_list.html index 1010bd4..26e4b11 100644 --- a/server/templates/server/user_list.html +++ b/server/templates/server/user_list.html @@ -67,11 +67,9 @@ remove_circle_outlineDeapprova utente

    {% endif %} -