Skip to content
Snippets Groups Projects
Verified Commit 6ea38b1b authored by Jan Pavlíček's avatar Jan Pavlíček
Browse files

feat: gui enchancements

parent 5e47515a
No related branches found
No related tags found
No related merge requests found
Pipeline #322921 failed
Stage: test
Hide whitespace changes
Inline Side-by-side
Showing
with 32 additions and 61 deletions
perun/proxygui/gui/static/images/circle-check-regular.svg
+ 1
− 1
View file @ 6ea38b1b
<svg xmlns="http://www.w3.org/2000/svg" height="2em" viewBox="0 0 512 512"><!--! Font Awesome Pro 6.4.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><style>svg{fill:#34ad00}</style><path d="M256 48a208 208 0 1 1 0 416 208 208 0 1 1 0-416zm0 464A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM369 209c9.4-9.4 9.4-24.6 0-33.9s-24.6-9.4-33.9 0l-111 111-47-47c-9.4-9.4-24.6-9.4-33.9 0s-9.4 24.6 0 33.9l64 64c9.4 9.4 24.6 9.4 33.9 0L369 209z"/></svg>
\ No newline at end of file
<svg xmlns="http://www.w3.org/2000/svg" height="2.25em" viewBox="0 0 512 512"><!--! Font Awesome Pro 6.4.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><style>svg{fill:#34ad00}</style><path d="M256 48a208 208 0 1 1 0 416 208 208 0 1 1 0-416zm0 464A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM369 209c9.4-9.4 9.4-24.6 0-33.9s-24.6-9.4-33.9 0l-111 111-47-47c-9.4-9.4-24.6-9.4-33.9 0s-9.4 24.6 0 33.9l64 64c9.4 9.4 24.6 9.4 33.9 0L369 209z"/></svg>
\ No newline at end of file
perun/proxygui/gui/static/proxygui.css
+ 9
− 0
View file @ 6ea38b1b
......@@ -6,6 +6,7 @@
display: flex;
flex-direction: column;
align-items: center;
gap: 1em;
}
.my-flex-row {
......@@ -25,4 +26,12 @@
.margin-top-1em {
margin-top: 1em;
}
.margin-bot-1em {
margin-bottom: 1em;
}
.services-box {
text-align: start;
}
\ No newline at end of file
perun/proxygui/gui/templates/ConfirmLogout.html deleted 100644 → 0
+ 0
− 24
View file @ 5e47515a
{% extends 'base.html' %}
{% block contentwrapper %}
<div
class="window {% if cfg.css_framework == 'MUNI' %}framework_muni{% else %}framework_bootstrap5 bg-light{% endif %}">
<div
class="wrap{% if not cfg.css_framework == 'MUNI' %} d-flex flex-column gap-2{% endif %}">
<br>
<h4>{{ _("Do you really want to log out from") }}
{{ logged_out_service }}?
</h4>
<p class="{% if cfg.css_framework == 'MUNI' %}btn-wrap{% else %}d-flex flex-row justify-content-center gap-3{% endif %}">
<button onclick=""
class="btn btn-primary btn-s">
<span class="no-uppercase">{{ _('Yes') }}</span>
</button>
<button onclick=""
class="btn btn-primary btn-s">
<span class="no-uppercase">{{ _('No') }}</span>
</button>
</p>
</div>
</div>
{% endblock %}
perun/proxygui/gui/templates/Logout.html
+ 9
− 17
View file @ 6ea38b1b
......@@ -5,26 +5,18 @@
class="window {% if cfg.css_framework == 'MUNI' %}framework_muni{% else %}framework_bootstrap5 bg-light{% endif %}">
<div
class="wrap{% if not cfg.css_framework == 'MUNI' %} d-flex flex-column gap-2{% endif %}">
{% if logged_out_service %}
{% if cfg.css_framework == 'MUNI' %}
<h2 class="margin-top-1em">{{ _("Logout Successful") }}</h2>
{% else %}
<h1 class="margin-top-1em">{{ _("Logout Successful") }}</h1>
{% endif %}
<h4>{{ _("You have successfully logged out from ") }}
{% if logged_out_service is not none %}
<h1 class="h1 margin-top-1em">{{ _("Logout Successful") }}</h1>
<h2 class="h3">{{ _("You have successfully logged out from ") }}
{{ logged_out_service }}.
</h4>
</h2>
{% else %}
{% if cfg.css_framework == 'MUNI' %}
<h2 class="margin-top-1em">{{ _("Logout Page") }}</h2>
{% else %}
<h1 class="margin-top-1em">{{ _("Logout Page") }}</h1>
{% endif %}
<h1 class="margin-top-1em">{{ _("Logout Page") }}</h1>
{% endif %}
<hr>
<div class="my-flex-column">
<div style="text-align: start">
<h4>{{ _("Would you like to log out from the services below?") }}</h4>
<div class="services-box">
<h2 class="h4">{{ _("Would you like to log out from the services below?") }}</h2>
<p class="{% if cfg.css_framework == 'MUNI' %}btn-wrap{% else %}d-flex flex-row gap-3 ms-3{% endif %}">
<a href="{{ url_for('gui.logout_state', from_devices=False) }}"
class="btn btn-primary btn-s">
......@@ -40,13 +32,13 @@
<span class="no-uppercase">{{ _('No') }}</span>
</a>
</p>
<h4>{{ _("You can log out from the following services:") }}</h4>
<h2 class="h5">{{ _("You can log out from the following services:") }}</h2>
<ul>
{% for service in session_services %}
<li>{{ service.get(lang) }} </li>
{% endfor %}
</ul>
<h4>{{ _("You can log out from these services on your other devices:") }}</h4>
<h2 class="h5">{{ _("You can log out from these services on your other devices:") }}</h2>
<ul>
{% for service in device_services %}
<li>{{ service.get(lang) }} </li>
......
perun/proxygui/gui/templates/Post-logout.html
+ 7
− 9
View file @ 6ea38b1b
......@@ -3,25 +3,23 @@
{% block contentwrapper %}
<div
class="window {% if cfg.css_framework == 'MUNI' %}framework_muni{% else %}framework_bootstrap5 bg-light{% endif %}">
<br>
<div class="my-flex-column">
<div class="my-flex-row">
<img src="{{ url_for("static", filename="images/circle-check-regular.svg") }}">
<h2 class="margin-left-24">{{ _("Logout successful") }}</h2>
<h1 class="nowrap margin-top-1em">
<img src="{{ url_for("static", filename="images/circle-check-regular.svg") }}">
{{ _("Logout successful") }}
</h1>
</div>
</div>
{% if init_logged_out_service.logback_url is not none %}
<div class="my-flex-column">
<div style="text-align: start">
<h4>{{ _("Would you like to log back to") }} {{ init_logged_out_service.labels.get(lang) }}?</h4>
<p class="{% if cfg.css_framework == 'MUNI' %}btn-wrap{% else %}d-flex flex-row gap-3 ms-3{% endif %}">
<div class="my-flex-column margin-bot-1em">
<h2 class="h4">{{ _("Would you like to log back to") }} {{ init_logged_out_service.labels.get(lang) }}?</h2>
<p class="{% if cfg.css_framework == 'MUNI' %}btn-wrap{% else %}d-flex flex-row gap-3{% endif %}">
<a href="{{ init_logged_out_service.logback_url }}"
class="btn btn-primary btn-s">
<span class="no-uppercase">{{ _('Log back') }}</span>
</a>
</p>
<br>
</div>
</div>
{% endif %}
</div>
......
perun/proxygui/gui/templates/logout-state.html
+ 6
− 10
View file @ 6ea38b1b
......@@ -5,22 +5,18 @@
class="window {% if cfg.css_framework == 'MUNI' %}framework_muni{% else %}framework_bootstrap5 bg-light{% endif %}">
<div
class="wrap{% if not cfg.css_framework == 'MUNI' %} d-flex flex-column gap-2{% endif %}">
{% if cfg.css_framework == 'MUNI' %}
<h2 class="margin-top-1em">{{ _("Performing log out") }}</h2>
{% else %}
<h1 class="margin-top-1em">{{ _("Performing log out") }}</h1>
{% endif %}
<hr>
<h1 class="margin-top-1em">{{ _("Performing log out") }}</h1>
<p class="{% if cfg.css_framework == 'MUNI' %}btn-wrap{% else %}d-flex flex-row justify-content-center{% endif %}">
<a href="{{ url_for('gui.post_logout') }}"
class="btn btn-primary btn-s">
<span class="no-uppercase">{{ _('Continue') }}</span>
</a>
</p>
<hr>
<div class="my-flex-column">
<div style="text-align: start">
<div class="services-box">
{% if session_services|length != 0 %}
<h4 class="margin-top-1em">{{ _("Performing logout from following services: ") }}</h4>
<h2 class="h4 margin-top-1em">{{ _("Performing logout from following services: ") }}</h2>
{% for service in session_services %}
<div id="{{ service.id }}"
class="process my-flex-row">
......@@ -40,7 +36,7 @@
{% endfor %}
{% endif %}
{% if device_services|length != 0 %}
<h4 class="margin-top-1em">{{ _("Performing logout from following services on your other devices:") }}</h4>
<h2 class="h4 margin-top-1em">{{ _("Performing logout from following services on your other devices:") }}</h2>
{% for service in device_services %}
<div id="{{ service.id }}"
class="process my-flex-row">
......@@ -63,4 +59,4 @@
</div>
</div>
</div>
{% endblock %}
{% endblock %}
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment