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/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/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

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

@ -6,7 +6,11 @@
{% translate "Sign In" %}
{% endblock page_title %}
{% endblock html_title %}
{% block card_content %}
{% block content %}
<section class="section">
<div class="card">
<div class="card-content">
<div class="card-body">
{% if SOCIALACCOUNT_ENABLED %}
{% get_providers as socialaccount_providers %}
{% if socialaccount_providers %}
@ -42,4 +46,8 @@
{% include "includes/form.html" %}
</div>
</div>
</div>
</div>
</div>
</section>
{% endblock content %}

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

@ -32,17 +32,6 @@
{% include "includes/message.html" %}
{% endfor %}
{% 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 %}
</div>
<footer>

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

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

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

@ -5,13 +5,15 @@
{% translate "Profile" %}
{% endblock page_title %}
{% endblock html_title %}
{% block card_header %}
{% block content %}
<section class="section">
<div class="card">
<div class="card-header">
<h4 class="card-title">{% translate "Account" %}</h4>
</div>
{% endblock %}
{% block card_content %}
<p>
<div class="card-content">
<div class="card-body">
<p class="card-text">
{% blocktranslate trimmed %}
You are logged in with your VSHN user account. You will be able to change your password and other settings here in the future.
{% endblocktranslate %}
@ -34,4 +36,8 @@
</tbody>
</table>
</div>
</div>
</div>
</div>
</section>
{% 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 %}