From 619e0e0f5263875b753334483d9b896194e9a61d Mon Sep 17 00:00:00 2001
From: Andrea Lepori <alepori@student.ethz.ch>
Date: Fri, 19 Jun 2020 15:05:59 +0200
Subject: More data for users

---
 client/templates/client/approve.html | 33 ++++++++++++++++++--------
 client/templates/client/index.html   | 45 ++++++++++++++++++------------------
 2 files changed, 47 insertions(+), 31 deletions(-)

(limited to 'client/templates')

diff --git a/client/templates/client/approve.html b/client/templates/client/approve.html
index 026a66d..e00aedc 100644
--- a/client/templates/client/approve.html
+++ b/client/templates/client/approve.html
@@ -3,16 +3,31 @@
 {% block title %}Approva{% endblock %}
 
 {% block nav %}
-<nav>
-    <div class="nav-wrapper">
-      <div class="col s12">
-        <a style="margin-left: 10px;" href="{% url 'index' %}" class="breadcrumb">Home</a>
-        <a href="#!" class="breadcrumb">Approva</a>
-      </div>
-    </div>
-</nav>
+  <a style="margin-left: 10px;" href="{% url 'index' %}" class="breadcrumb">Home</a>
+  <a style="margin-left: 10px;" href="{% url 'approve' %}" class="breadcrumb hide-on-med-and-down">Approva</a>
 {% endblock %}
 
 {% block content %}
-{{ code }}
+{% if okay %}
+  <div class="row">
+    <div class="col l4 offset-l4 m8 offset-m2 s12">
+      <div class="card">
+        <div class="card-content">
+          <p>Per approvare l'utente invia il seguente codice al capo branca:</p>
+          <h3 class="center-align">{{code}}<h3>
+        </div>
+      </div>
+    </div>
+  </div>
+{% else %}
+  <div class="row">
+    <div class="col l4 offset-l4 m8 offset-m2 s12">
+      <div class="card">
+        <div class="card-content">
+          <p>Per approvare l'utente inserire prima i propri dati personali cliccando il proprio nome in alto a destra.</p>
+        </div>
+      </div>
+    </div>
+  </div>
+{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/client/templates/client/index.html b/client/templates/client/index.html
index 2c55dbc..64b4d42 100644
--- a/client/templates/client/index.html
+++ b/client/templates/client/index.html
@@ -3,34 +3,35 @@
 {% block title %}Home{% endblock %}
 
 {%block nav%}
-<nav>
-  <div class="nav-wrapper">
-    <a style="margin-left: 10px;" href="{% url 'index' %}" class="breadcrumb">Home</a>
-    <ul class="right hide-on-med-and-down">
-      <li>{{ user.username}}</li>
-      <li><a href="{% url 'logout' %}">Logout</a></li>
-    </ul>
-  </div>
-</nav>
+  <a style="margin-left: 10px;" href="{% url 'index' %}" class="breadcrumb">Home</a>
 {% endblock%}
 
 {% block content %}
 {% if user.is_authenticated %}
-  {% if user.is_staff %}
-    Ciao {{ user.username }}!
-    <p><a class="waves-effect waves-light btn" href="{% url 'server' %}">admin</a>
-    <a class="waves-effect waves-light btn" href="{% url 'logout' %}">logout</a></p>
-  {% elif perms.client.approved %}
-    Ciao {{ user.username }}!
-    <p><a class="waves-effect waves-light btn" href="{% url 'logout' %}">logout</a></p>
+  {% if user.is_staff or perms.client.approved %}
   {% else %}
-    Il tuo utente non e` ancora stato approvato.
-    <p><a class="waves-effect waves-light btn" href="{% url 'approve' %}">approva</a>
-    <a class="waves-effect waves-light btn" href="{% url 'logout' %}">logout</a></p>
+    <div class="row">
+      <div class="col l4 offset-l4 m8 offset-m2 s12">
+        <div class="card">
+          <div class="card-content">
+            <p>Il tuo utente non e` ancora stato approvato.</p>
+          </div>
+          <div class="card-action">
+            <a href="{% url 'approve' %}">Come farsi approvare l'utente</a>
+          </div>
+        </div>
+      </div>
+    </div>
   {% endif %}
 {% else %}
-  <p>Non hai fatto il login</p>
-  <p><a class="waves-effect waves-light btn" href="{% url 'login' %}">login</a>
-  <a class="waves-effect waves-light btn" href="{% url 'signup' %}">registrazione</a></p>
+  <div class="row">
+    <div class="col l4 offset-l4 m8 offset-m2 s12">
+      <div class="card">
+        <div class="card-content">
+          <p>Se hai gia` un account clicca login in alto a destra. Altrimenti clicca registrazione</p>
+        </div>
+      </div>
+    </div>
+  </div>
 {% endif %}
 {% endblock %}
\ No newline at end of file
-- 
cgit v1.2.1