diff options
author | Andrea Lepori <alepori@student.ethz.ch> | 2022-01-02 21:00:12 +0100 |
---|---|---|
committer | Andrea Lepori <alepori@student.ethz.ch> | 2022-01-02 21:00:34 +0100 |
commit | 8c4cdc81f993bcf4d088d2356a45da8d883bdf01 (patch) | |
tree | 6f422b46f41eb55c04c856ed64129339d372fc4a /templates | |
parent | Merge branch 'master' into dev (diff) | |
download | scout-subs-8c4cdc81f993bcf4d088d2356a45da8d883bdf01.tar.gz scout-subs-8c4cdc81f993bcf4d088d2356a45da8d883bdf01.zip |
login/register with midata
Diffstat (limited to '')
-rw-r--r-- | templates/registration/base_client.html | 36 | ||||
-rw-r--r-- | templates/registration/login.html | 24 |
2 files changed, 38 insertions, 22 deletions
diff --git a/templates/registration/base_client.html b/templates/registration/base_client.html index 3e78397..d90462c 100644 --- a/templates/registration/base_client.html +++ b/templates/registration/base_client.html @@ -90,28 +90,22 @@ {% block breadcrumb %} {% endblock %} <ul class="right"> - {% if user.is_authenticated %} - {% if group_view %} - <li class="hide-on-small-only"><a class="modal-trigger" href="#modal_capi">Lista documenti</a></li> - {% endif %} - {% 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 %} - {% if group_view %} - <li class="tooltipped hide-on-med-and-up" data-position="bottom" data-tooltip="Lista documenti" class="hide-on-med-and-up"><a class="modal-trigger" href="#modal_capi"><i class="material-icons">list</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> + {% if group_view %} + <li class="hide-on-small-only"><a class="modal-trigger" href="#modal_capi">Lista documenti</a></li> {% endif %} + {% 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 %} + {% if group_view %} + <li class="tooltipped hide-on-med-and-up" data-position="bottom" data-tooltip="Lista documenti" class="hide-on-med-and-up"><a class="modal-trigger" href="#modal_capi"><i class="material-icons">list</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> </ul> </div> {% block toolbar %} diff --git a/templates/registration/login.html b/templates/registration/login.html index 5a24448..8a2b258 100644 --- a/templates/registration/login.html +++ b/templates/registration/login.html @@ -1,4 +1,5 @@ {% extends 'registration/base_simple.html' %} +{% load static %} {% block title %}Login{% endblock %} @@ -14,8 +15,29 @@ <a href={% url 'password_reset' %}>Password dimenticata</a> <br> <br> - <a href={% url 'oauth_login' %} class="btn waves-effect waves-light {{color}}">OAuth</a> <button class="btn waves-effect waves-light {{color}}" type="submit">Login</button> + <br><br><hr><br> + <div class="row"> + <div class="col s12"> + <a href={% url 'oauth_login' %} style="width: 100%; background-color: #99BF62" class="btn waves-effect waves-light"> + <div class="row"> + <div class="col s2"> + <img style="height: 30px; padding-top: 3px" src="{% static 'pbs_logo.svg' %}" alt="PBS Logo"> + </div> + <div class="col s10"> + Login con MiData + </div> + </div> + </a> + </div> + </div> + <div class="row"> + <div class="col s12"> + <a href={% url 'signup' %} style="width: 100%" class="btn waves-effect waves-light {{color}}"> + Registrazione + </a> + </div> + </div> </form> </div> </div> |