From 1ec1a200b19bba2ffe9485ddb7c5c95bf82f8b9b Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Sun, 3 May 2020 11:04:46 +0200
Subject: [PATCH] Reformat templates
---
aleksis/core/templates/403.html | 43 ++++++++--------
aleksis/core/templates/404.html | 51 ++++++++++---------
aleksis/core/templates/500.html | 27 +++++-----
aleksis/core/templates/503.html | 41 +++++++--------
aleksis/core/templates/components/msgbox.html | 14 ++---
aleksis/core/templates/core/base.html | 6 ++-
.../core/templates/core/data_management.html | 2 +-
aleksis/core/templates/core/index.html | 10 ++--
.../core/templates/core/language_form.html | 3 +-
aleksis/core/templates/offline.html | 35 +++++++------
.../templates/registration/logged_out.html | 4 +-
.../core/templates/two_factor/core/setup.html | 4 +-
12 files changed, 124 insertions(+), 116 deletions(-)
diff --git a/aleksis/core/templates/403.html b/aleksis/core/templates/403.html
index 62ecac052..a07e7da7b 100644
--- a/aleksis/core/templates/403.html
+++ b/aleksis/core/templates/403.html
@@ -3,26 +3,27 @@
{% block content %}
- <div class="container">
- <div class="card red">
- <div class="card white-text">
- <i class="material-icons small">error_outline</i>
- <span class="card-title">{% blocktrans %}Error (403): You are not allowed to access the requested page or object.{% endblocktrans %}</span>
- <p>
- {% blocktrans %}
- If you think this is an error in AlekSIS, please contact your site
- administrators:
- {% endblocktrans %}
- </p>
- <ul>
- {% for admin in ADMINS %}
- <li>
- {{ admin.0 }}
- <<a class="blue-text text-lighten-2" href="mailto:{{ admin.1 }}">{{ admin.1 }}</a>>
- </li>
- {% endfor %}
- </ul>
- </div>
+ <div class="container">
+ <div class="card red">
+ <div class="card white-text">
+ <i class="material-icons small">error_outline</i>
+ <span class="card-title">{% blocktrans %}Error (403): You are not allowed to access the requested page or
+ object.{% endblocktrans %}</span>
+ <p>
+ {% blocktrans %}
+ If you think this is an error in AlekSIS, please contact your site
+ administrators:
+ {% endblocktrans %}
+ </p>
+ <ul>
+ {% for admin in ADMINS %}
+ <li>
+ {{ admin.0 }}
+ <<a class="blue-text text-lighten-2" href="mailto:{{ admin.1 }}">{{ admin.1 }}</a>>
+ </li>
+ {% endfor %}
+ </ul>
+ </div>
+ </div>
</div>
- </div>
{% endblock %}
diff --git a/aleksis/core/templates/404.html b/aleksis/core/templates/404.html
index 4acb9e13f..9b9d7e119 100644
--- a/aleksis/core/templates/404.html
+++ b/aleksis/core/templates/404.html
@@ -3,30 +3,31 @@
{% block content %}
- <div class="container">
- <div class="card red">
- <div class="card-content white-text">
- <i class="material-icons small left">error_outline</i>
- <span class="card-title">{% blocktrans %}Error (404): The requested page or object was not found.{% endblocktrans %}</span>
- <p>
- {% blocktrans %}
- If you were redirected by a link on an external page,
- it is possible that that link was outdated.
- {% endblocktrans %}
- {% blocktrans %}
- If you think this is an error in AlekSIS, please contact your site
- administrators:
- {% endblocktrans %}
- </p>
- <ul>
- {% for admin in ADMINS %}
- <li>
- {{ admin.0 }}
- <<a class="blue-text text-lighten-2" href="mailto:{{ admin.1 }}">{{ admin.1 }}</a>>
- </li>
- {% endfor %}
- </ul>
- </div>
+ <div class="container">
+ <div class="card red">
+ <div class="card-content white-text">
+ <i class="material-icons small left">error_outline</i>
+ <span class="card-title">{% blocktrans %}Error (404): The requested page or object was not
+ found.{% endblocktrans %}</span>
+ <p>
+ {% blocktrans %}
+ If you were redirected by a link on an external page,
+ it is possible that that link was outdated.
+ {% endblocktrans %}
+ {% blocktrans %}
+ If you think this is an error in AlekSIS, please contact your site
+ administrators:
+ {% endblocktrans %}
+ </p>
+ <ul>
+ {% for admin in ADMINS %}
+ <li>
+ {{ admin.0 }}
+ <<a class="blue-text text-lighten-2" href="mailto:{{ admin.1 }}">{{ admin.1 }}</a>>
+ </li>
+ {% endfor %}
+ </ul>
+ </div>
+ </div>
</div>
- </div>
{% endblock %}
diff --git a/aleksis/core/templates/500.html b/aleksis/core/templates/500.html
index 195c43487..96c6d882d 100644
--- a/aleksis/core/templates/500.html
+++ b/aleksis/core/templates/500.html
@@ -3,18 +3,19 @@
{% block content %}
- <div class="container">
- <div class="card red">
- <div class="card-content white-text">
- <div class="material-icons small">error_outline</div>
- <span class="card-title">{% blocktrans %}Error (500): An unexpected error has occured..{% endblocktrans %}</span>
- <p>
- {% blocktrans %}
- Your site administrators will automatically be notified about this
- error.
- {% endblocktrans %}
- </p>
- </div>
+ <div class="container">
+ <div class="card red">
+ <div class="card-content white-text">
+ <div class="material-icons small">error_outline</div>
+ <span class="card-title">{% blocktrans %}Error (500): An unexpected error has
+ occured..{% endblocktrans %}</span>
+ <p>
+ {% blocktrans %}
+ Your site administrators will automatically be notified about this
+ error.
+ {% endblocktrans %}
+ </p>
+ </div>
+ </div>
</div>
- </div>
{% endblock %}
diff --git a/aleksis/core/templates/503.html b/aleksis/core/templates/503.html
index 01f94395e..1df710ced 100644
--- a/aleksis/core/templates/503.html
+++ b/aleksis/core/templates/503.html
@@ -3,25 +3,26 @@
{% block content %}
- <div class="container">
- <div class="card red">
- <div class="card-content white-text">
- <div class="material-icons small">error_outline</div>
- <span class="card-title">{% blocktrans %}The maintenance mode is currently enabled. Please try again later.{% endblocktrans %}</span>
- <p>
- {% blocktrans %}
- This page is currently unavailable. If this error stays, contact your site administrators:
- {% endblocktrans %}
- </p>
- <ul>
- {% for admin in ADMINS %}
- <li>
- {{ admin.0 }}
- <<a class="blue-text text-lighten-2" href="mailto:{{ admin.1 }}">{{ admin.1 }}</a>>
- </li>
- {% endfor %}
- </ul>
- </div>
+ <div class="container">
+ <div class="card red">
+ <div class="card-content white-text">
+ <div class="material-icons small">error_outline</div>
+ <span class="card-title">{% blocktrans %}The maintenance mode is currently enabled. Please try again
+ later.{% endblocktrans %}</span>
+ <p>
+ {% blocktrans %}
+ This page is currently unavailable. If this error stays, contact your site administrators:
+ {% endblocktrans %}
+ </p>
+ <ul>
+ {% for admin in ADMINS %}
+ <li>
+ {{ admin.0 }}
+ <<a class="blue-text text-lighten-2" href="mailto:{{ admin.1 }}">{{ admin.1 }}</a>>
+ </li>
+ {% endfor %}
+ </ul>
+ </div>
+ </div>
</div>
- </div>
{% endblock %}
diff --git a/aleksis/core/templates/components/msgbox.html b/aleksis/core/templates/components/msgbox.html
index 1eb0d0b8c..8903ebd1a 100644
--- a/aleksis/core/templates/components/msgbox.html
+++ b/aleksis/core/templates/components/msgbox.html
@@ -1,10 +1,10 @@
{% if msg %}
- <div class="alert {{ status }}">
- <div>
- {% if icon != "" %}
- <i class="material-icons left">{{ icon }}</i>
- {% endif %}
- {{ msg }}
- </div>
+ <div class="alert {{ status }}">
+ <div>
+ {% if icon != "" %}
+ <i class="material-icons left">{{ icon }}</i>
+ {% endif %}
+ {{ msg }}
</div>
+ </div>
{% endif %}
diff --git a/aleksis/core/templates/core/base.html b/aleksis/core/templates/core/base.html
index b3fc8d66f..391f4e9dc 100644
--- a/aleksis/core/templates/core/base.html
+++ b/aleksis/core/templates/core/base.html
@@ -27,7 +27,8 @@
{# Passing the locale is not necessary for the scripts to work, but prevents caching issues #}
{% get_current_language as LANGUAGE_CODE %}
<script src="{% url "javascript-catalog" %}?locale={{ LANGUAGE_CODE }}" type="text/javascript"></script>
- <script src="{% url "calendarweek_i18n_js" %}?first_day=6&locale={{ LANGUAGE_CODE }}" type="text/javascript"></script>
+ <script src="{% url "calendarweek_i18n_js" %}?first_day=6&locale={{ LANGUAGE_CODE }}"
+ type="text/javascript"></script>
{# Include jQuery to provide $(document).ready #}
{% include_js "jQuery" %}
@@ -66,7 +67,8 @@
<ul id="slide-out" class="sidenav sidenav-fixed">
<li class="logo">
<a id="logo-container" href="/" class="brand-logo">
- <img src="{{ request.site.preferences.theme__logo.url }}" alt="{{ request.site.preferences.general__title }} – Logo">
+ <img src="{{ request.site.preferences.theme__logo.url }}"
+ alt="{{ request.site.preferences.general__title }} – Logo">
</a>
</li>
{% has_perm 'core.search' user as search %}
diff --git a/aleksis/core/templates/core/data_management.html b/aleksis/core/templates/core/data_management.html
index 53293ffd7..520dcb6d5 100644
--- a/aleksis/core/templates/core/data_management.html
+++ b/aleksis/core/templates/core/data_management.html
@@ -3,7 +3,7 @@
{% load i18n menu_generator %}
-{% block browser_title %}{% blocktrans %}Data management{% endblocktrans%}{% endblock %}
+{% block browser_title %}{% blocktrans %}Data management{% endblocktrans %}{% endblock %}
{% block page_title %}{% blocktrans %}Data management{% endblocktrans %}{% endblock %}
{% block content %}
diff --git a/aleksis/core/templates/core/index.html b/aleksis/core/templates/core/index.html
index 2ace14e98..29ed1d395 100644
--- a/aleksis/core/templates/core/index.html
+++ b/aleksis/core/templates/core/index.html
@@ -31,11 +31,11 @@
{% include "core/announcements.html" with announcements=announcements %}
<div class="row" id="live_load">
- {% for widget in widgets %}
- <div class="col s12 m12 l6 xl4">
- {% include_widget widget %}
- </div>
- {% endfor %}
+ {% for widget in widgets %}
+ <div class="col s12 m12 l6 xl4">
+ {% include_widget widget %}
+ </div>
+ {% endfor %}
</div>
<div class="row">
diff --git a/aleksis/core/templates/core/language_form.html b/aleksis/core/templates/core/language_form.html
index e2ad9fab6..ee2637bec 100644
--- a/aleksis/core/templates/core/language_form.html
+++ b/aleksis/core/templates/core/language_form.html
@@ -11,7 +11,8 @@
{% get_available_languages as LANGUAGES %}
{% get_language_info_list for LANGUAGES as languages %}
{% for language in languages %}
- <button type="submit" value="{{ language.code }}" name="language" class="blue-text text-lighten-4 btn-flat {% if language == LANGUAGE_CODE %} disabled {% endif %}">
+ <button type="submit" value="{{ language.code }}" name="language"
+ class="blue-text text-lighten-4 btn-flat {% if language == LANGUAGE_CODE %} disabled {% endif %}">
{{ language.code }}
</button>
{% endfor %}
diff --git a/aleksis/core/templates/offline.html b/aleksis/core/templates/offline.html
index 5256cbcd9..f43a012b4 100644
--- a/aleksis/core/templates/offline.html
+++ b/aleksis/core/templates/offline.html
@@ -3,23 +3,22 @@
{% load i18n %}
{% block content %}
- <h3><i class="material-icons left medium" style="font-size: 2.92rem;">signal_wifi_off</i>{% blocktrans %}No internet connection.{% endblocktrans %}</h3>
+ <h3><i class="material-icons left medium" style="font-size: 2.92rem;">signal_wifi_off</i>{% blocktrans %}No internet
+ connection.{% endblocktrans %}</h3>
- <p class="flow-text">
- {% blocktrans %}
- There was an error accessing this page. You probably don't have an internet connection. Check to see if your WiFi or mobile data is turned on and try again. If you think you are connected, please contact the system administrators:
- {% endblocktrans %}
- <ul>
- {% for admin in ADMINS %}
- <li>
- {{ admin.0 }}
- <
- <a href="mailto:{{ admin.1 }}">
- {{ admin.1 }}
- </a>
- >
- </li>
- {% endfor %}
- </ul>
- </p>
+ <p class="flow-text">
+ {% blocktrans %}
+ There was an error accessing this page. You probably don't have an internet connection. Check to see if your WiFi
+ or mobile data is turned on and try again. If you think you are connected, please contact the system
+ administrators:
+ {% endblocktrans %}
+ <ul>
+ {% for admin in ADMINS %}
+ <li>
+ {{ admin.0 }}
+ <<a href="mailto:{{ admin.1 }}">{{ admin.1 }}</a>>
+ </li>
+ {% endfor %}
+ </ul>
+ </p>
{% endblock %}
diff --git a/aleksis/core/templates/registration/logged_out.html b/aleksis/core/templates/registration/logged_out.html
index 48a7d1535..6deffc3a0 100644
--- a/aleksis/core/templates/registration/logged_out.html
+++ b/aleksis/core/templates/registration/logged_out.html
@@ -1,8 +1,8 @@
{% include 'partials/header.html' %}
<main>
- <p class="flow-text">Du bist nun abgemeldet.</p>
- <a href="{% url 'login' %}">Wieder anmelden?</a>
+ <p class="flow-text">Du bist nun abgemeldet.</p>
+ <a href="{% url 'login' %}">Wieder anmelden?</a>
</main>
{% include 'partials/footer.html' %}
diff --git a/aleksis/core/templates/two_factor/core/setup.html b/aleksis/core/templates/two_factor/core/setup.html
index 304a3eb7f..2eb4ecb28 100644
--- a/aleksis/core/templates/two_factor/core/setup.html
+++ b/aleksis/core/templates/two_factor/core/setup.html
@@ -84,7 +84,9 @@
{% include "two_factor/_wizard_forms.html" %}
{# hidden submit button to enable [enter] key #}
- <div style="margin-left: -9999px"><input type="submit" value=""/></div>
+ <div style="margin-left: -9999px">
+ <input type="submit" value=""/>
+ </div>
{% include "two_factor/_wizard_actions.html" %}
</form>
--
GitLab