servala/servala-portal
3
0
Fork 0
Code Issues 21 Pull requests 6 Projects 2 Releases Packages 2 Activity Actions

Compare commits

base: servala:7682dc94c7dd64f69d2c978b863ac5a37af721da
Branches Tags
servala:main
servala:renovate/django-template-partials-25.x
servala:renovate/django-5.x
servala:renovate/cryptography-45.x
servala:renovate/coverage-7.x
servala:132-frontend-improvements
servala:renovate/sentry-sdk-2.x
servala:renovate/lock-file-maintenance
servala:renovate/jsonschema-4.x
servala:instance-edit-permi-from-org
servala:2025.04.14-1
..
compare: servala:2baa3fd5ec81fd44a3d678940f5b6cfd6119b796
Branches Tags
servala:renovate/django-template-partials-25.x
servala:renovate/django-5.x
servala:renovate/cryptography-45.x
servala:renovate/coverage-7.x
servala:132-frontend-improvements
servala:renovate/sentry-sdk-2.x
servala:main
servala:renovate/lock-file-maintenance
servala:renovate/jsonschema-4.x
servala:instance-edit-permi-from-org
servala:2025.04.14-1

No commits in common. "7682dc94c7dd64f69d2c978b863ac5a37af721da" and "2baa3fd5ec81fd44a3d678940f5b6cfd6119b796" have entirely different histories.
7682dc94c7 ... 2baa3fd5ec

5 changed files with 87 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

78
src/servala/frontend/templates/account/login.html
View file

@ -6,40 +6,48 @@
{% translate "Sign In" %} {% translate "Sign In" %}
{% endblock page_title %} {% endblock page_title %}
{% endblock html_title %} {% endblock html_title %}
{% block card_content %} {% block content %}
{% if SOCIALACCOUNT_ENABLED %} <section class="section">
{% get_providers as socialaccount_providers %} <div class="card">
{% if socialaccount_providers %} <div class="card-content">
{% for provider in socialaccount_providers %} <div class="card-body">
{% provider_login_url provider process=process scope=scope auth_params=auth_params as href %} {% if SOCIALACCOUNT_ENABLED %}
<form method="post" action="{{ href }}"> {% get_providers as socialaccount_providers %}
{% csrf_token %} {% if socialaccount_providers %}
<button href="{{ href }}" {% for provider in socialaccount_providers %}
class="btn btn-warning btn-lg icon icon-left" {% provider_login_url provider process=process scope=scope auth_params=auth_params as href %}
title="{{ provider.name }}"> <form method="post" action="{{ href }}">
<img src="{% static 'img/keycloak.svg' %}" style="height: 30px"> {% csrf_token %}
<span class="mx-1">{% translate "Sign in with your" %} {{ provider.name }}</span> <button href="{{ href }}"
</button> class="btn btn-warning btn-lg icon icon-left"
</form> title="{{ provider.name }}">
{% endfor %} <img src="{% static 'img/keycloak.svg' %}" style="height: 30px">
{% endif %} <span class="mx-1">{% translate "Sign in with your" %} {{ provider.name }}</span>
{% endif %} </button>
<div class="mt-2"> </form>
<a data-bs-toggle="collapse" {% endfor %}
href="#login-form" {% endif %}
role="button" {% endif %}
aria-controls="login-form" <div class="mt-2">
class="d-flex align-items-center"> <a data-bs-toggle="collapse"
<i class="bi bi-chevron-right me-2 ms-1 mb-2 collapse-icon"></i> href="#login-form"
{% translate "Log in with email and password instead" %} role="button"
</a> aria-controls="login-form"
<div class="collapse mt-3 ms-3" class="d-flex align-items-center">
id="login-form" <i class="bi bi-chevron-right me-2 ms-1 mb-2 collapse-icon"></i>
class="form form-vertical" {% translate "Log in with email and password instead" %}
style="max-width: 400px"> </a>
{% url 'account_login' as form_action %} <div class="collapse mt-3 ms-3"
{% translate "Sign In" as form_submit_label %} id="login-form"
{% include "includes/form.html" %} class="form form-vertical"
style="max-width: 400px">
{% url 'account_login' as form_action %}
{% translate "Sign In" as form_submit_label %}
{% include "includes/form.html" %}
</div>
</div>
</div>
</div>
</div> </div>
</div> </section>
{% endblock content %} {% endblock content %}

11
src/servala/frontend/templates/frontend/base.html
View file

@ -32,17 +32,6 @@
{% include "includes/message.html" %} {% include "includes/message.html" %}
{% endfor %} {% endfor %}
{% block content %} {% block content %}
<section class="section">
<div class="card">
{% block card_header %}{% endblock %}
<div class="card-content">
<div class="card-body">
{% block card_content %}
{% endblock card_content %}
</div>
</div>
</div>
</section>
{% endblock content %} {% endblock content %}
</div> </div>
<footer> <footer>

12
src/servala/frontend/templates/frontend/organizations/create.html
View file

@ -5,6 +5,12 @@
{% translate "Create a new organization" %} {% translate "Create a new organization" %}
{% endblock page_title %} {% endblock page_title %}
{% endblock html_title %} {% endblock html_title %}
{% block card_content %} {% block content %}
{% include "includes/form.html" %} <section class="section">
{% endblock card_content %} <div class="card">
<div class="card-content">
<div class="card-body">{% include "includes/form.html" %}</div>
</div>
</div>
</section>
{% endblock content %}

64
src/servala/frontend/templates/frontend/profile.html
View file

@ -5,33 +5,39 @@
{% translate "Profile" %} {% translate "Profile" %}
{% endblock page_title %} {% endblock page_title %}
{% endblock html_title %} {% endblock html_title %}
{% block card_header %} {% block content %}
<div class="card-header"> <section class="section">
<h4 class="card-title">{% translate "Account" %}</h4> <div class="card">
</div> <div class="card-header">
{% endblock %} <h4 class="card-title">{% translate "Account" %}</h4>
{% block card_content %} </div>
<p> <div class="card-content">
{% blocktranslate trimmed %} <div class="card-body">
You are logged in with your VSHN user account. You will be able to change your password and other settings here in the future. <p class="card-text">
{% endblocktranslate %} {% blocktranslate trimmed %}
</p> You are logged in with your VSHN user account. You will be able to change your password and other settings here in the future.
<div class="table-responsive"> {% endblocktranslate %}
<table class="table table-lg"> </p>
<tbody> <div class="table-responsive">
<tr> <table class="table table-lg">
<th>{% translate "E-mail" %}</th> <tbody>
<td>{{ request.user.email }}</td> <tr>
</tr> <th>{% translate "E-mail" %}</th>
<tr> <td>{{ request.user.email }}</td>
<th>{% translate "First name" %}</th> </tr>
<td>{{ request.user.first_name }}</td> <tr>
</tr> <th>{% translate "First name" %}</th>
<tr> <td>{{ request.user.first_name }}</td>
<th>{% translate "Last name" %}</th> </tr>
<td>{{ request.user.last_name }}</td> <tr>
</tr> <th>{% translate "Last name" %}</th>
</tbody> <td>{{ request.user.last_name }}</td>
</table> </tr>
</div> </tbody>
</table>
</div>
</div>
</div>
</div>
</section>
{% endblock content %} {% endblock content %}

16
src/servala/frontend/templates/socialaccount/signup.html
View file

@ -1,16 +0,0 @@
{% extends "frontend/base.html" %}
{% load i18n %}
{% block html_title %}
{% block page_title %}
{% translate "Sign Up" %}
{% endblock page_title %}
{% endblock html_title %}
{% block card_content %}
<p>
{% blocktrans with provider_name=account.get_provider.name site_name=site.name %}You are about to use your {{provider_name}} account to login to
{{site_name}}. As a final step, please complete the following form:{% endblocktrans %}
</p>
{% url 'socialaccount_signup' as form_action %}
{% translate "Sign Up" as form_submit_label %}
<div style="max-width: 300px">{% include "includes/form.html" %}</div>
{% endblock card_content %}