graghics improvement for mobile, and more modular

author: Andrea Lepori <alepori@student.ethz.ch> 2020-08-31 13:46:00 +0200
committer: Andrea Lepori <alepori@student.ethz.ch> 2020-08-31 13:46:00 +0200
commit: c46671ed9306eebb66322487ab600e070b2a81c6 (patch)
tree: 9fb917db87c003642f94c459a172fe36b19fea82 /templates
parent: dynamicaly check for commit id (diff)
download: scout-subs-c46671ed9306eebb66322487ab600e070b2a81c6.tar.gz
scout-subs-c46671ed9306eebb66322487ab600e070b2a81c6.zip
4 files changed, 82 insertions, 85 deletions
diff --git a/templates/registration/base.html b/templates/registration/base.html
deleted file mode 100644
index e2885cd..0000000
--- a/templates/registration/base.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  {% load static %}
-  <link rel="stylesheet" type="text/css" href="{% static 'material_icons.css' %}">
-  <link rel="stylesheet" type="text/css" href="{% static 'materialize.min.css' %}">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-  <meta charset="utf-8">
-  <title>{% block title %}Scout Brega{% endblock %}</title>
-</head>
-<body>
-  <nav>
-    <div class="nav-wrapper red lighten-1">
-      {% block nav %}
-      {% endblock %}
-      <ul class="right">
-          {% if user.is_staff or perms.client.staff %}
-            <li><a href="{% url 'server' %}">Pannello Admin</a></li>
-          {% endif %}
-          {% if user.is_authenticated %}
-            <li><a href="{% url 'personal' %}">{{ user.username }}</a></li>
-          {% endif %}
-          {% if user.username != "" %}
-            <li>
-            <a href="{% url 'logout' %}"><i class="material-icons">exit_to_app</i></a>
-            </li>
-          {% else %}
-            <li><a href="{% url 'signup' %}">Registrazione</a></li>
-            <li><a href="{% url 'login' %}">Login</a></li>
-          {% endif %}
-      </ul>
-    </div>
-  </nav>
-  <main style="margin-left: 10px;margin-right: 10px;margin-top: 10px;">
-    {% block content %}
-    {% endblock %}
-  </main>
-  <script type="text/javascript" src="{% static 'jquery-3.5.1.min.js' %}"></script>
-  <script type="text/javascript" src="{% static 'materialize.min.js' %}"></script>
-  <script>
-  {% block script %}
-  {% endblock%}
-  </script>
-</body>
-</html>
-\ No newline at end of file
diff --git a/templates/registration/base_admin.html b/templates/registration/base_admin.html
new file mode 100644
index 0000000..a06c54d
--- /dev/null
+++ b/templates/registration/base_admin.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html>
+<head>
+  {% load static %}
+  <link rel="stylesheet" type="text/css" href="{% static 'material_icons.css' %}">
+  <link rel="stylesheet" type="text/css" href="{% static 'materialize.min.css' %}">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+  <meta charset="utf-8">
+  <title>{% block title %}Scout Brega{% endblock %}</title>
+</head>
+<body>
+  <nav class="nav-extended">
+    <div class="nav-wrapper red lighten-1">
+      <a style="margin-left: 10px;" href="{% url 'index' %}" class="breadcrumb hide-on-small-only">Home</a>
+      <ul class="left hide-on-med-and-up">
+      <li><a href="{% url 'index' %}"><i class="material-icons">home</i></a></li>
+      </ul>
+      {% block breadcrumb %}
+      {% endblock %}
+      <ul class="right">
+        {% if user.is_authenticated %}
+          {% if user.is_staff or perms.client.staff %}
+            <li class="hide-on-small-only"><a href="{% url 'server' %}">Pannello Admin</a></li>
+          {% endif %}
+          <li class="hide-on-small-only tooltipped" data-position="bottom" data-tooltip="Dati personali"><a href="{% url 'personal' %}">{{ user.username }}</a></li>
+          <li class="hide-on-med-and-up tooltipped" data-position="bottom" data-tooltip="Dati personali"><a href="{% url 'personal' %}"><i class="material-icons">person</i></a></li>
+          {% if user.is_staff or perms.client.staff %}
+            <li class="tooltipped hide-on-med-and-up" data-position="bottom" data-tooltip="Pannello Admin" class="hide-on-med-and-up"><a href="{% url 'server' %}"><i class="material-icons">build</i></a></li>
+          {% endif %}
+          <li class="tooltipped" data-position="bottom" data-tooltip="Informazioni"><a href="{% url 'about' %}"><i class="material-icons">info_outline</i></a></li>
+          <li class="tooltipped" data-position="bottom" data-tooltip="Logout"><a href="{% url 'logout' %}"><i class="material-icons">exit_to_app</i></a></li>
+        {% else %}
+          <li><a href="{% url 'about' %}"><i class="material-icons">info_outline</i></a></li>
+          <li><a href="{% url 'signup' %}">Registrazione</a></li>
+          <li><a href="{% url 'login' %}">Login</a></li>
+        {% endif %}
+      </ul>
+    </div>
+    {% block toolbar %}
+    {% endblock %}
+  </nav>
+
+  <main style="margin-left: 10px;margin-right: 10px;margin-top: 10px;">
+    {% block content %}
+    {% endblock %}
+  </main>
+  <script type="text/javascript" src="{% static 'jquery-3.5.1.min.js' %}"></script>
+  <script type="text/javascript" src="{% static 'materialize.min.js' %}"></script>
+  <script>
+  $(document).ready(function(){
+    $('.tooltipped').tooltip();
+  });
+  {% block script %}
+  {% endblock%}
+  </script>
+</body>
+</html>
+\ No newline at end of file
diff --git a/templates/registration/base_client.html b/templates/registration/base_client.html
index b526c84..241f7ce 100644
--- a/templates/registration/base_client.html
+++ b/templates/registration/base_client.html
@@ -9,30 +9,37 @@
   <title>{% block title %}Scout Brega{% endblock %}</title>
 </head>
 <body>
-  <nav>
+  <nav class="nav-extended">
     <div class="nav-wrapper teal">
-      {% block nav %}
+      <a style="margin-left: 10px;" href="{% url 'index' %}" class="breadcrumb hide-on-small-only">Home</a>
+      <ul class="left hide-on-med-and-up">
+      <li><a href="{% url 'index' %}"><i class="material-icons">home</i></a></li>
+      </ul>
+      {% block breadcrumb %}
       {% endblock %}
       <ul class="right">
+        {% if user.is_authenticated %}
           {% if user.is_staff or perms.client.staff %}
-            <li><a href="{% url 'server' %}">Pannello Admin</a></li>
-          {% endif %}
-          {% if user.is_authenticated %}
-            <li><a class="tooltipped" data-position="bottom" data-tooltip="Preferenze" href="{% url 'personal' %}">{{ user.username }}</a></li>
+            <li class="hide-on-small-only"><a href="{% url 'server' %}">Pannello Admin</a></li>
           {% endif %}
-          {% if user.username != "" %}
-            <li><a class="tooltipped" data-position="bottom" data-tooltip="Informazioni" href="{% url 'about' %}"><i class="material-icons">info_outline</i></a></li>
-            <li>
-            <a class="tooltipped" data-position="bottom" data-tooltip="Logout" href="{% url 'logout' %}"><i class="material-icons">exit_to_app</i></a>
-            </li>
-          {% else %}
-            <li><a class="tooltipped" data-position="bottom" data-tooltip="Informazioni" href="{% url 'about' %}"><i class="material-icons">info_outline</i></a></li>
-            <li><a href="{% url 'signup' %}">Registrazione</a></li>
-            <li><a href="{% url 'login' %}">Login</a></li>
+          <li class="hide-on-small-only tooltipped" data-position="bottom" data-tooltip="Dati personali"><a href="{% url 'personal' %}">{{ user.username }}</a></li>
+          <li class="hide-on-med-and-up tooltipped" data-position="bottom" data-tooltip="Dati personali"><a href="{% url 'personal' %}"><i class="material-icons">person</i></a></li>
+          {% if user.is_staff or perms.client.staff %}
+            <li class="tooltipped hide-on-med-and-up" data-position="bottom" data-tooltip="Pannello Admin" class="hide-on-med-and-up"><a href="{% url 'server' %}"><i class="material-icons">build</i></a></li>
           {% endif %}
+          <li class="tooltipped" data-position="bottom" data-tooltip="Informazioni"><a href="{% url 'about' %}"><i class="material-icons">info_outline</i></a></li>
+          <li class="tooltipped" data-position="bottom" data-tooltip="Logout"><a href="{% url 'logout' %}"><i class="material-icons">exit_to_app</i></a></li>
+        {% else %}
+          <li><a href="{% url 'about' %}"><i class="material-icons">info_outline</i></a></li>
+          <li><a href="{% url 'signup' %}">Registrazione</a></li>
+          <li><a href="{% url 'login' %}">Login</a></li>
+        {% endif %}
       </ul>
     </div>
+    {% block toolbar %}
+    {% endblock %}
   </nav>
+
   <main style="margin-left: 10px;margin-right: 10px;margin-top: 10px;">
     {% block content %}
     {% endblock %}
@@ -40,6 +47,9 @@
   <script type="text/javascript" src="{% static 'jquery-3.5.1.min.js' %}"></script>
   <script type="text/javascript" src="{% static 'materialize.min.js' %}"></script>
   <script>
+  $(document).ready(function(){
+    $('.tooltipped').tooltip();
+  });
   {% block script %}
   {% endblock%}
   </script>
diff --git a/templates/registration/base_custom.html b/templates/registration/base_custom.html
deleted file mode 100644
index 89c665a..0000000
--- a/templates/registration/base_custom.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  {% load static %}
-  <link rel="stylesheet" type="text/css" href="{% static 'material_icons.css' %}">
-  <link rel="stylesheet" type="text/css" href="{% static 'materialize.min.css' %}">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-  <meta charset="utf-8">
-  <title>{% block title %}Scout Brega{% endblock %}</title>
-</head>
-<body>
-  {% block nav %}
-  {% endblock %}
-  <main id="main" style="margin-left: 10px;margin-right: 10px;margin-top: 10px;">
-    {% block content %}
-    {% endblock %}
-  </main>
-  <script type="text/javascript" src="{% static 'jquery-3.5.1.min.js' %}"></script>
-  <script type="text/javascript" src="{% static 'materialize.min.js' %}"></script>
-  <script type="text/javascript">
-  {% block script %}
-  {% endblock %}
-  </script>
-</body>
-</html>
-\ No newline at end of file
author	Andrea Lepori <alepori@student.ethz.ch>	2020-08-31 13:46:00 +0200
committer	Andrea Lepori <alepori@student.ethz.ch>	2020-08-31 13:46:00 +0200
commit	c46671ed9306eebb66322487ab600e070b2a81c6 (patch)
tree	9fb917db87c003642f94c459a172fe36b19fea82 /templates
parent	dynamicaly check for commit id (diff)
download	scout-subs-c46671ed9306eebb66322487ab600e070b2a81c6.tar.gz scout-subs-c46671ed9306eebb66322487ab600e070b2a81c6.zip