phil/ezidam
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

renamed avatar macro to user, added user_info, show user info in mobile

Browse source
This commit is contained in:
Philippe Loctaux 2023-04-14 18:15:16 +02:00
parent 011879a19c
commit 12eccde4ea
5 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ezidam/templates/pages/oauth/authorize.html.tera
View file

@ -1,6 +1,6 @@
{% extends "base" %}
{% import "utils/avatar" as avatar %}
{% import "utils/user" as user %}
{% block page %}
<body class=" d-flex flex-column">
@ -27,7 +27,7 @@
<form action="" method="post" autocomplete="off" novalidate class="mt-4">
{% if user %}
<div class="mb-4 text-center">
{{ avatar::avatar(username=user.username, name=user.name, size="xl", css="mb-3") }}
{{ user::avatar(username=user.username, name=user.name, size="xl", css="mb-3") }}
<h3>
{% if user.name %}
{{ user.name }}

4
crates/ezidam/templates/pages/oauth/redirect.html.tera
View file

@ -1,6 +1,6 @@
{% extends "base" %}
{% import "utils/avatar" as avatar %}
{% import "utils/user" as user %}
{% block page %}
<body class=" d-flex flex-column">
@ -19,7 +19,7 @@
<p class="text-muted">Preparing application</p>
</div>
<div class="mb-4">
{{ avatar::avatar(username=username, name=name, size="xl", css="mb-3") }}
{{ user::avatar(username=username, name=name, size="xl", css="mb-3") }}
<h3>
{% if name %}
{{ name }}

2
crates/ezidam/templates/shell.html.tera
View file

@ -1,6 +1,6 @@
{% extends "base" %}
{% import "utils/avatar" as avatar %}
{% import "utils/user" as user %}
{% block page %}
<body>

19
crates/ezidam/templates/shell/header.html.tera
View file

@ -11,20 +11,19 @@
<div class="nav-item dropdown">
<a href="#" class="nav-link d-flex lh-1 text-reset p-0" data-bs-toggle="dropdown"
aria-label="Open user menu">
{{ avatar::avatar(username=user.username, name=user.name, size="sm", css="") }}
{{ user::avatar(username=user.username, name=user.name, size="sm", css="") }}
<div class="d-none d-xl-block ps-2">
{% if user.name %}
<div>{{ user.name }}</div>
{% else %}
<div>{{ user.username }}</div>
{% endif %}
{% if user.email %}
<div class="mt-1 small text-muted">{{ user.email }}</div>
{% endif %}
{{ user::user_info(name=user.name, username=user.username, email=user.email) }}
</div>
</a>
<div class="dropdown-menu dropdown-menu-end dropdown-menu-arrow">
<div class="d-xl-none">
<div class="dropdown-item-text">
{{ user::user_info(name=user.name, username=user.username, email=user.email) }}
</div>
<div class="dropdown-divider"></div>
</div>
{% if user.isAdmin == true %}
<a href="/admin" class="dropdown-item">Admin panel</a>
<div class="dropdown-divider"></div>

12
crates/ezidam/templates/utils/avatar.html.tera → crates/ezidam/templates/utils/user.html.tera
View file

@ -21,3 +21,15 @@
{{ avatar }}
</span>
{% endmacro avatar %}
{% macro user_info(name, username, email) %}
{% if name %}
<div>{{ name }}</div>
{% else %}
<div>{{ username }}</div>
{% endif %}
{% if email %}
<div class="mt-1 small text-muted">{{ email }}</div>
{% endif %}
{% endmacro user_info %}