Skip to content

Commit

Permalink
adhocracy-plus/templates: fix outdated phone number, fix redirects to
Browse files Browse the repository at this point in the history 
root instead of hardcoded value

- fix template lint errors and reformat
  • Loading branch information
@goapunk @m4ra
goapunk authored and m4ra committed Jun 13, 2024
1 parent ba9bdb7 commit b2ac9b2
Show file tree
Hide file tree
Showing 3 changed files with 73 additions and 52 deletions.
89 changes: 50 additions & 39 deletions adhocracy-plus/templates/500.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<html>
<!DOCTYPE html>
<html lang="en">
<head>
<title>Error — adhocracy+</title>
<style>
Expand All @@ -16,48 +17,58 @@
</style>
<meta charset=utf-8>
</head>

<body>
<div class="u-page-ribbon u-page-ribbon--platform"></div>
<header class="main-header" aria-label="Header">
<div class="wide-wrapper">
<div class="platform-brand">
<a href="https://adhocracy.plus/" class="platform-brand__link">
<svg width="175.14px" height="42.9px" viewBox="0 0 592 145" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 59 (86127) - https://sketch.com -->
<title>adhocracy+</title>
<desc>Created with Sketch.</desc>
<g id="CI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Logo-variante-1-MR" transform="translate(-1228.000000, -1099.000000)">
<g id="a+-logo-wide" transform="translate(1228.000000, 1099.000000)">
<rect id="Rectangle" fill="#6BF2E4" x="0" y="92.4285714" width="306" height="52"></rect>
<polygon id="Combined-Shape" fill="#222222" transform="translate(570.000000, 47.500000) scale(-1, -1) rotate(-360.000000) translate(-570.000000, -47.500000) " points="570.342855 25 592 25 592 49.0622763 592 70 570.935043 70 548 70 548 48.5960825 570.342855 48.5960825"></polygon>
<polygon id="Combined-Shape" fill-opacity="0.85" fill="#6BF2E4" transform="translate(546.000000, 22.500000) rotate(-360.000000) translate(-546.000000, -22.500000) " points="546.342855 5.92361734e-12 568 5.92361734e-12 568 24.0780894 568 45 546.852095 45 524 45 524 23.5960825 546.342855 23.5960825"></polygon>
<path d="M482.981121,69.5714286 L494.649159,95.2171429 L505.993084,69.5714286 L524.251402,69.5714286 L490.759813,145 L472.609533,145 L485.682056,115.367347 L463.21028,69.5714286 L482.981121,69.5714286 Z M26.5771963,68.2783673 C43.431028,68.2783673 51.4257944,75.8212245 51.4257944,91.4457143 L51.4257944,123.556735 L34.1398131,123.556735 L34.1398131,116.444898 C30.7906542,121.617143 25.0646729,124.742041 18.1502804,124.742041 C7.56261682,124.742041 3.19744231e-13,117.630204 3.19744231e-13,107.82449 C3.19744231e-13,98.4497959 6.80635514,91.6612245 17.1779439,90.7991837 L31.7629907,89.5061224 C33.3835514,89.2906122 34.1398131,88.7518367 34.1398131,87.7820408 L34.1398131,87.3510204 C34.1398131,85.1959184 31.3308411,83.9028571 26.2530841,83.9028571 C19.9869159,83.9028571 15.1252336,85.9502041 13.0725234,89.2906122 L0.972336449,79.8081633 C4.96971963,72.4808163 14.1528972,68.2783673 26.5771963,68.2783673 Z M118.408972,48.0204082 L118.408972,123.44898 L101.122991,123.44898 L101.122991,116.121633 C97.1256075,121.724898 90.9674766,124.742041 83.728972,124.742041 C69.6841121,124.742041 60.068785,113.427755 60.068785,96.5102041 C60.068785,79.7004082 69.5760748,68.2783673 83.4048598,68.2783673 C90.8594393,68.2783673 97.4497196,71.6187755 101.122991,77.2220408 L101.122991,48.0204082 L118.408972,48.0204082 Z M221.098505,68.2783673 C237.952336,68.2783673 250.59271,79.2693878 250.59271,96.5102041 C250.59271,113.75102 237.952336,124.742041 221.098505,124.742041 C204.244673,124.742041 191.604299,113.75102 191.604299,96.5102041 C191.604299,79.2693878 204.244673,68.2783673 221.098505,68.2783673 Z M285.164673,68.2783673 C293.483551,68.2783673 301.046168,71.08 306.123925,76.1444898 L296.83271,90.1526531 C293.807664,86.92 289.918318,85.1959184 285.488785,85.1959184 C278.68243,85.1959184 273.71271,89.9371429 273.71271,96.5102041 C273.71271,103.083265 278.68243,107.82449 285.488785,107.82449 C289.918318,107.82449 293.807664,106.100408 296.83271,102.867755 L306.123925,116.875918 C301.046168,121.940408 293.483551,124.742041 285.164673,124.742041 C267.986729,124.742041 255.994579,113.212245 255.994579,96.5102041 C255.994579,79.8081633 267.986729,68.2783673 285.164673,68.2783673 Z M379.049159,68.2783673 C395.902991,68.2783673 403.897757,75.8212245 403.897757,91.4457143 L403.897757,123.556735 L386.611776,123.556735 L386.611776,116.444898 C383.262617,121.617143 377.536636,124.742041 370.622243,124.742041 C360.034579,124.742041 352.471963,117.630204 352.471963,107.82449 C352.471963,98.4497959 359.278318,91.6612245 369.649907,90.7991837 L384.234953,89.5061224 C385.855514,89.2906122 386.611776,88.7518367 386.611776,87.7820408 L386.611776,87.3510204 C386.611776,85.1959184 383.802804,83.9028571 378.725047,83.9028571 C372.458879,83.9028571 367.597196,85.9502041 365.544486,89.2906122 L353.444299,79.8081633 C357.441682,72.4808163 366.62486,68.2783673 379.049159,68.2783673 Z M441.710841,68.2783673 C450.02972,68.2783673 457.592336,71.08 462.670093,76.1444898 L453.378879,90.1526531 C450.353832,86.92 446.464486,85.1959184 442.034953,85.1959184 C435.228598,85.1959184 430.258879,89.9371429 430.258879,96.5102041 C430.258879,103.083265 435.228598,107.82449 442.034953,107.82449 C446.464486,107.82449 450.353832,106.100408 453.378879,102.867755 L462.670093,116.875918 C457.592336,121.940408 450.02972,124.742041 441.710841,124.742041 C424.532897,124.742041 412.540748,113.212245 412.540748,96.5102041 C412.540748,79.8081633 424.532897,68.2783673 441.710841,68.2783673 Z M147.849159,48.0204082 L147.849159,77.6530612 C151.738505,71.4032653 157.464486,68.2783673 164.702991,68.2783673 C176.479065,68.2783673 182.961308,75.6057143 182.961308,88.9673469 L182.961308,123.44898 L165.459252,123.44898 L165.459252,94.8938776 C165.459252,88.2130612 162.758318,84.9804082 157.248411,84.9804082 C151.306355,84.9804082 147.849159,89.5061224 147.849159,97.2644898 L147.849159,123.44898 L130.563178,123.44898 L130.563178,48.0204082 L147.849159,48.0204082 Z M344.585234,68.2783673 C346.637944,68.2783673 348.150467,68.6016327 349.771028,69.1404082 L349.771028,87.7820408 C347.826355,87.0277551 345.125421,86.7044898 342.748598,86.7044898 C334.969907,86.7044898 330.432336,90.2604082 330.432336,99.635102 L330.432336,123.44898 L313.146355,123.44898 L313.146355,69.5714286 L329.784112,69.5714286 L329.784112,78.9461224 C332.485047,72.4808163 337.022617,68.2783673 344.585234,68.2783673 Z M34.1398131,100.712653 L23.2280374,102.005714 C19.7708411,102.436735 17.8261682,104.053061 17.8261682,106.531429 C17.8261682,109.440816 20.0949533,111.164898 23.9842991,111.164898 C29.9263551,111.164898 34.1398131,107.177959 34.1398131,101.682449 L34.1398131,100.712653 Z M386.611776,100.712653 L375.7,102.005714 C372.242804,102.436735 370.298131,104.053061 370.298131,106.531429 C370.298131,109.440816 372.566916,111.164898 376.456262,111.164898 C382.398318,111.164898 386.611776,107.177959 386.611776,101.682449 L386.611776,100.712653 Z M221.098505,85.1959184 C214.832336,85.1959184 209.32243,89.3983673 209.32243,96.5102041 C209.32243,103.622041 214.832336,107.82449 221.098505,107.82449 C227.364673,107.82449 232.874579,103.622041 232.874579,96.5102041 C232.874579,89.3983673 227.364673,85.1959184 221.098505,85.1959184 Z M89.5629907,85.3036735 C82.7566355,85.3036735 77.7869159,89.9371429 77.7869159,96.5102041 C77.7869159,103.083265 82.7566355,107.716735 89.5629907,107.716735 C96.3693458,107.716735 101.339065,103.083265 101.339065,96.5102041 C101.339065,89.9371429 96.3693458,85.3036735 89.5629907,85.3036735 Z" id="Combined-Shape" fill="#222222" fill-rule="nonzero"></path>
</g>
</g>
</g>
adhocracy+
</svg>
</a>
</div>
<header class="main-header" aria-label="Header">
<div class="wide-wrapper">
<div class="platform-brand">
{# djlint:off D018 #}
<a href="/" class="platform-brand__link">
{# djlint:on #}
<svg width="175.14px"
height="42.9px"
viewBox="0 0 592 145"
version="1.1"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 59 (86127) - https://sketch.com -->
<title>adhocracy+</title>
<desc>Created with Sketch.</desc>
<g id="CI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Logo-variante-1-MR" transform="translate(-1228.000000, -1099.000000)">
<g id="a+-logo-wide" transform="translate(1228.000000, 1099.000000)">
<rect id="Rectangle" fill="#6BF2E4" x="0" y="92.4285714" width="306" height="52"></rect>
<polygon id="Combined-Shape" fill="#222222" transform="translate(570.000000, 47.500000) scale(-1, -1) rotate(-360.000000) translate(-570.000000, -47.500000) " points="570.342855 25 592 25 592 49.0622763 592 70 570.935043 70 548 70 548 48.5960825 570.342855 48.5960825"></polygon>
<polygon id="Combined-Shape" fill-opacity="0.85" fill="#6BF2E4" transform="translate(546.000000, 22.500000) rotate(-360.000000) translate(-546.000000, -22.500000) " points="546.342855 5.92361734e-12 568 5.92361734e-12 568 24.0780894 568 45 546.852095 45 524 45 524 23.5960825 546.342855 23.5960825"></polygon>
<path d="M482.981121,69.5714286 L494.649159,95.2171429 L505.993084,69.5714286 L524.251402,69.5714286 L490.759813,145 L472.609533,145 L485.682056,115.367347 L463.21028,69.5714286 L482.981121,69.5714286 Z M26.5771963,68.2783673 C43.431028,68.2783673 51.4257944,75.8212245 51.4257944,91.4457143 L51.4257944,123.556735 L34.1398131,123.556735 L34.1398131,116.444898 C30.7906542,121.617143 25.0646729,124.742041 18.1502804,124.742041 C7.56261682,124.742041 3.19744231e-13,117.630204 3.19744231e-13,107.82449 C3.19744231e-13,98.4497959 6.80635514,91.6612245 17.1779439,90.7991837 L31.7629907,89.5061224 C33.3835514,89.2906122 34.1398131,88.7518367 34.1398131,87.7820408 L34.1398131,87.3510204 C34.1398131,85.1959184 31.3308411,83.9028571 26.2530841,83.9028571 C19.9869159,83.9028571 15.1252336,85.9502041 13.0725234,89.2906122 L0.972336449,79.8081633 C4.96971963,72.4808163 14.1528972,68.2783673 26.5771963,68.2783673 Z M118.408972,48.0204082 L118.408972,123.44898 L101.122991,123.44898 L101.122991,116.121633 C97.1256075,121.724898 90.9674766,124.742041 83.728972,124.742041 C69.6841121,124.742041 60.068785,113.427755 60.068785,96.5102041 C60.068785,79.7004082 69.5760748,68.2783673 83.4048598,68.2783673 C90.8594393,68.2783673 97.4497196,71.6187755 101.122991,77.2220408 L101.122991,48.0204082 L118.408972,48.0204082 Z M221.098505,68.2783673 C237.952336,68.2783673 250.59271,79.2693878 250.59271,96.5102041 C250.59271,113.75102 237.952336,124.742041 221.098505,124.742041 C204.244673,124.742041 191.604299,113.75102 191.604299,96.5102041 C191.604299,79.2693878 204.244673,68.2783673 221.098505,68.2783673 Z M285.164673,68.2783673 C293.483551,68.2783673 301.046168,71.08 306.123925,76.1444898 L296.83271,90.1526531 C293.807664,86.92 289.918318,85.1959184 285.488785,85.1959184 C278.68243,85.1959184 273.71271,89.9371429 273.71271,96.5102041 C273.71271,103.083265 278.68243,107.82449 285.488785,107.82449 C289.918318,107.82449 293.807664,106.100408 296.83271,102.867755 L306.123925,116.875918 C301.046168,121.940408 293.483551,124.742041 285.164673,124.742041 C267.986729,124.742041 255.994579,113.212245 255.994579,96.5102041 C255.994579,79.8081633 267.986729,68.2783673 285.164673,68.2783673 Z M379.049159,68.2783673 C395.902991,68.2783673 403.897757,75.8212245 403.897757,91.4457143 L403.897757,123.556735 L386.611776,123.556735 L386.611776,116.444898 C383.262617,121.617143 377.536636,124.742041 370.622243,124.742041 C360.034579,124.742041 352.471963,117.630204 352.471963,107.82449 C352.471963,98.4497959 359.278318,91.6612245 369.649907,90.7991837 L384.234953,89.5061224 C385.855514,89.2906122 386.611776,88.7518367 386.611776,87.7820408 L386.611776,87.3510204 C386.611776,85.1959184 383.802804,83.9028571 378.725047,83.9028571 C372.458879,83.9028571 367.597196,85.9502041 365.544486,89.2906122 L353.444299,79.8081633 C357.441682,72.4808163 366.62486,68.2783673 379.049159,68.2783673 Z M441.710841,68.2783673 C450.02972,68.2783673 457.592336,71.08 462.670093,76.1444898 L453.378879,90.1526531 C450.353832,86.92 446.464486,85.1959184 442.034953,85.1959184 C435.228598,85.1959184 430.258879,89.9371429 430.258879,96.5102041 C430.258879,103.083265 435.228598,107.82449 442.034953,107.82449 C446.464486,107.82449 450.353832,106.100408 453.378879,102.867755 L462.670093,116.875918 C457.592336,121.940408 450.02972,124.742041 441.710841,124.742041 C424.532897,124.742041 412.540748,113.212245 412.540748,96.5102041 C412.540748,79.8081633 424.532897,68.2783673 441.710841,68.2783673 Z M147.849159,48.0204082 L147.849159,77.6530612 C151.738505,71.4032653 157.464486,68.2783673 164.702991,68.2783673 C176.479065,68.2783673 182.961308,75.6057143 182.961308,88.9673469 L182.961308,123.44898 L165.459252,123.44898 L165.459252,94.8938776 C165.459252,88.2130612 162.758318,84.9804082 157.248411,84.9804082 C151.306355,84.9804082 147.849159,89.5061224 147.849159,97.2644898 L147.849159,123.44898 L130.563178,123.44898 L130.563178,48.0204082 L147.849159,48.0204082 Z M344.585234,68.2783673 C346.637944,68.2783673 348.150467,68.6016327 349.771028,69.1404082 L349.771028,87.7820408 C347.826355,87.0277551 345.125421,86.7044898 342.748598,86.7044898 C334.969907,86.7044898 330.432336,90.2604082 330.432336,99.635102 L330.432336,123.44898 L313.146355,123.44898 L313.146355,69.5714286 L329.784112,69.5714286 L329.784112,78.9461224 C332.485047,72.4808163 337.022617,68.2783673 344.585234,68.2783673 Z M34.1398131,100.712653 L23.2280374,102.005714 C19.7708411,102.436735 17.8261682,104.053061 17.8261682,106.531429 C17.8261682,109.440816 20.0949533,111.164898 23.9842991,111.164898 C29.9263551,111.164898 34.1398131,107.177959 34.1398131,101.682449 L34.1398131,100.712653 Z M386.611776,100.712653 L375.7,102.005714 C372.242804,102.436735 370.298131,104.053061 370.298131,106.531429 C370.298131,109.440816 372.566916,111.164898 376.456262,111.164898 C382.398318,111.164898 386.611776,107.177959 386.611776,101.682449 L386.611776,100.712653 Z M221.098505,85.1959184 C214.832336,85.1959184 209.32243,89.3983673 209.32243,96.5102041 C209.32243,103.622041 214.832336,107.82449 221.098505,107.82449 C227.364673,107.82449 232.874579,103.622041 232.874579,96.5102041 C232.874579,89.3983673 227.364673,85.1959184 221.098505,85.1959184 Z M89.5629907,85.3036735 C82.7566355,85.3036735 77.7869159,89.9371429 77.7869159,96.5102041 C77.7869159,103.083265 82.7566355,107.716735 89.5629907,107.716735 C96.3693458,107.716735 101.339065,103.083265 101.339065,96.5102041 C101.339065,89.9371429 96.3693458,85.3036735 89.5629907,85.3036735 Z" id="Combined-Shape" fill="#222222" fill-rule="nonzero">
</path>
</g>
</g>
</g>
adhocracy+
</svg>
</a>
</div>
</header>
<main id=main>
<div class="small-wrapper">
<div class=error_body>
<h1>500</h1>
<p>Internal server error.</p>
<a href="https://adhocracy.plus/">Back to adhocracy+</a>
</div>
</div>
</main>
</div>
<footer class=footer>
<div class="small-wrapper">
<p><a href="https://liqd.net">Liquid Democracy e.V.</a> Am Sudhaus 2, 12053, Berlin, tel. +49 (0) 30 6298 4840, e-mail. [email protected]</p>
</div>
</header>
<main id="main">
<div class="small-wrapper">
<div class="error_body">
<h1>500</h1>
<p>Internal server error.</p>
{# djlint:off D018 #}
<a href="/">Back to adhocracy+</a>
{# djlint:on #}
</div>
</footer>
</div>
</main>
<footer class="footer">
<div class="small-wrapper">
<p>
<a href="https://liqd.net">Liquid Democracy e.V.</a> Am Sudhaus 2, 12053, Berlin, tel. +49 (0) 30 6293 3553 0, e-mail. [email protected]
</p>
</div>
</footer>
<div class="footer-ribbon u-page-ribbon u-page-ribbon--platform"></div>
</body>
</html>
31 changes: 18 additions & 13 deletions adhocracy-plus/templates/base_errors.html
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
{% extends "base.html" %}
{% load i18n %}

{% block title %}{% translate 'Error' %} &mdash; {{ block.super }}{% endblock %}

{% block title %}
{% translate "Error" %} — {{ block.super }}
{% endblock title %}
{% block content %}
<div class="container py-5">
<div class="row">
<div class="col-md-8 col-lg-6 offset-md-2 offset-lg-3">
<h1>{% block error_status %}{% endblock %}</h1>
<p class="u-font-size-lg">{% block error_description %}{% endblock %}</p>
<a href="/">{% blocktranslate with platformname=settings.a4_candy_cms_settings.OrganisationSettings.platform_name %}Back to {{ platformname }}{% endblocktranslate %}</a>
<div class="container py-5">
<div class="row">
<div class="col-md-8 col-lg-6 offset-md-2 offset-lg-3">
<h1>
{% block error_status %}
{% endblock error_status %}
</h1>
<p class="u-font-size-lg">
{% block error_description %}
{% endblock error_description %}
</p>
<a href="{% url 'wagtail_serve' '' %}">{% blocktranslate with platformname=settings.a4_candy_cms_settings.OrganisationSettings.platform_name %}Back to {{ platformname }}{% endblocktranslate %}</a>
</div>
</div>
</div>
</div>
{% endblock %}

{% endblock content %}
{% block donation_banner %}
{% endblock %}
{% endblock donation_banner %}
5 changes: 5 additions & 0 deletions changelog/_1112.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
### Changed

- fixed outdated telephone number in error templates
- changed link on error templates from hardcoded value to page root
- fix linting errors and reformat the modified templates

0 comments on commit b2ac9b2

Please sign in to comment.