chore: reformat templates with djlint

umap-project · Jul 29, 2024 · 5ba1c28 · 5ba1c28
1 parent 8fc0614
commit 5ba1c28
Show file tree

Hide file tree

Showing 29 changed files with 225 additions and 69 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -98,3 +98,6 @@ max-line-length = 88
 profile="django"
 indent=2
 format_css=true
+blank_line_after_tag="load,extends"
+line_break_after_multiline_tag=true
+
diff --git a/umap/templates/404.html b/umap/templates/404.html
@@ -1,5 +1,7 @@
 {% extends "base.html" %}
+
 {% load i18n static %}
+
 {% block content %}
   <div class="content404">
     <a href="{% url "home" %}"
@@ -9,7 +11,9 @@ <h1>
         <img alt="0" width="128px" height="128px" src="{% static "umap/img/logo.svg" %}">
         4
       </h1>
-      <h2>Not Found</h2>
+      <h2>
+        Not Found
+      </h2>
     </a>
   </div>
 {% endblock content %}
diff --git a/umap/templates/500.html b/umap/templates/500.html
@@ -22,7 +22,9 @@
            width="128px"
            height="128px"
            src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjwhLS0gQ3JlYXRlZCB3aXRoIElua3NjYXBlIChodHRwOi8vd3d3Lmlua3NjYXBlLm9yZy8pIC0tPgoKPHN2ZwogICB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iCiAgIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiCiAgIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyIKICAgeG1sbnM6c3ZnPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIgogICB4bWxuczpzb2RpcG9kaT0iaHR0cDovL3NvZGlwb2RpLnNvdXJjZWZvcmdlLm5ldC9EVEQvc29kaXBvZGktMC5kdGQiCiAgIHhtbG5zOmlua3NjYXBlPSJodHRwOi8vd3d3Lmlua3NjYXBlLm9yZy9uYW1lc3BhY2VzL2lua3NjYXBlIgogICB3aWR0aD0iMTI4IgogICBoZWlnaHQ9IjEyOCIKICAgaWQ9InN2ZzIiCiAgIHZlcnNpb249IjEuMSIKICAgaW5rc2NhcGU6dmVyc2lvbj0iMC40OC40IHI5OTM5IgogICBzb2RpcG9kaTpkb2NuYW1lPSJsb2dvLnN2ZyIKICAgaW5rc2NhcGU6ZXhwb3J0LWZpbGVuYW1lPSIvaG9tZS95Ym9uL0NvZGUvcHJvamVjdHMvdW1hcC91bWFwL3N0YXRpYy91bWFwL2ltZy9sb2dvX2ZpbGlncmVlLnBuZyIKICAgaW5rc2NhcGU6ZXhwb3J0LXhkcGk9IjExNS4yIgogICBpbmtzY2FwZTpleHBvcnQteWRwaT0iMTE1LjIiPgogIDxkZWZzCiAgICAgaWQ9ImRlZnM0IiAvPgogIDxzb2RpcG9kaTpuYW1lZHZpZXcKICAgICBpZD0iYmFzZSIKICAgICBwYWdlY29sb3I9IiNmZmZmZmYiCiAgICAgYm9yZGVyY29sb3I9IiM2NjY2NjYiCiAgICAgYm9yZGVyb3BhY2l0eT0iMS4wIgogICAgIGlua3NjYXBlOnBhZ2VvcGFjaXR5PSIwLjAiCiAgICAgaW5rc2NhcGU6cGFnZXNoYWRvdz0iMiIKICAgICBpbmtzY2FwZTp6b29tPSI0IgogICAgIGlua3NjYXBlOmN4PSI1OC40MDU5NTIiCiAgICAgaW5rc2NhcGU6Y3k9IjYwLjAxMTEyMiIKICAgICBpbmtzY2FwZTpkb2N1bWVudC11bml0cz0icHgiCiAgICAgaW5rc2NhcGU6Y3VycmVudC1sYXllcj0ibGF5ZXIxIgogICAgIHNob3dncmlkPSJ0cnVlIgogICAgIGlua3NjYXBlOnNuYXAtcGFnZT0iZmFsc2UiCiAgICAgaW5rc2NhcGU6d2luZG93LXdpZHRoPSIxMzY2IgogICAgIGlua3NjYXBlOndpbmRvdy1oZWlnaHQ9Ijc0NCIKICAgICBpbmtzY2FwZTp3aW5kb3cteD0iMCIKICAgICBpbmtzY2FwZTp3aW5kb3cteT0iMjQiCiAgICAgaW5rc2NhcGU6d2luZG93LW1heGltaXplZD0iMSI+CiAgICA8aW5rc2NhcGU6Z3JpZAogICAgICAgdHlwZT0ieHlncmlkIgogICAgICAgaWQ9ImdyaWQyOTg1IgogICAgICAgZW1wc3BhY2luZz0iNCIKICAgICAgIHZpc2libGU9InRydWUiCiAgICAgICBlbmFibGVkPSJ0cnVlIgogICAgICAgc25hcHZpc2libGVncmlkbGluZXNvbmx5PSJ0cnVlIgogICAgICAgZW1wY29sb3I9IiMwMDAwM2IiCiAgICAgICBlbXBvcGFjaXR5PSIwLjI1MDk4MDM5IiAvPgogIDwvc29kaXBvZGk6bmFtZWR2aWV3PgogIDxtZXRhZGF0YQogICAgIGlkPSJtZXRhZGF0YTciPgogICAgPHJkZjpSREY+CiAgICAgIDxjYzpXb3JrCiAgICAgICAgIHJkZjphYm91dD0iIj4KICAgICAgICA8ZGM6Zm9ybWF0PmltYWdlL3N2Zyt4bWw8L2RjOmZvcm1hdD4KICAgICAgICA8ZGM6dHlwZQogICAgICAgICAgIHJkZjpyZXNvdXJjZT0iaHR0cDovL3B1cmwub3JnL2RjL2RjbWl0eXBlL1N0aWxsSW1hZ2UiIC8+CiAgICAgICAgPGRjOnRpdGxlIC8+CiAgICAgIDwvY2M6V29yaz4KICAgIDwvcmRmOlJERj4KICA8L21ldGFkYXRhPgogIDxnCiAgICAgaW5rc2NhcGU6bGFiZWw9IkxheWVyIDEiCiAgICAgaW5rc2NhcGU6Z3JvdXBtb2RlPSJsYXllciIKICAgICBpZD0ibGF5ZXIxIgogICAgIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAsLTkyNC4zNjIxOCkiPgogICAgPGcKICAgICAgIHN0eWxlPSJzdHJva2U6bm9uZTtkaXNwbGF5OmJsb2NrIgogICAgICAgaWQ9ImxheWVyNCIKICAgICAgIHRyYW5zZm9ybT0ibWF0cml4KDAuMDg3OTg0MDUsMCwwLDAuMDg1OTUyMTIsLTExMS44MDEzNywxMDIzLjI4NzkpIgogICAgICAgaW5rc2NhcGU6ZXhwb3J0LWZpbGVuYW1lPSIvaG9tZS95Ym9uL1dvcmsvb3NtdG91Y2g2NC5wbmciCiAgICAgICBpbmtzY2FwZTpleHBvcnQteGRwaT0iMjguNzk5OTk5IgogICAgICAgaW5rc2NhcGU6ZXhwb3J0LXlkcGk9IjI4Ljc5OTk5OSIgLz4KICAgIDxwYXRoCiAgICAgICBzdHlsZT0iZmlsbDojMzIzZTU2O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgZD0iTSAzNi41MzEyNSA2LjE4NzUgQyAxNC45MzEzMTUgMTYuNDY3NjY5IDAgMzguNDg1OTA4IDAgNjQgQyAwIDk5LjM0NjIyNCAyOC42NTM3NzYgMTI4IDY0IDEyOCBDIDE0LjUzMTY5NyA4MS44Mjk1ODQgMy4xNDE4OTY1IDI0Ljc5MTUyIDM2LjUzMTI1IDYuMTg3NSB6IE0gNjQgMTI4IEMgOTkuMzQ2MjI0IDEyOCAxMjggOTkuMzQ2MjI0IDEyOCA2NCBDIDEyOCAzOC40ODU5MDggMTEzLjA2ODY4IDE2LjQ2NzY2OSA5MS40Njg3NSA2LjE4NzUgQyAxMjQuODU4MSAyNC43OTE1MiAxMTMuNDY4MyA4MS44Mjk1ODQgNjQgMTI4IHogIgogICAgICAgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCw5MjQuMzYyMTgpIgogICAgICAgaWQ9InBhdGgyOTg3IiAvPgogICAgPGcKICAgICAgIGlkPSJnNDkxMiIKICAgICAgIHRyYW5zZm9ybT0ibWF0cml4KDIuNTYsMCwwLDIuNTYsLTE4MS4xMiwtMTM2Ny43NjUpIgogICAgICAgc3R5bGU9ImZpbGw6I2ZmZmZmZjtzdHJva2U6bm9uZSIgLz4KICAgIDxwYXRoCiAgICAgICBzb2RpcG9kaTp0eXBlPSJhcmMiCiAgICAgICBzdHlsZT0iZmlsbDojMzIzZTU2O2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIgogICAgICAgaWQ9InBhdGg1MjYzIgogICAgICAgc29kaXBvZGk6Y3g9IjcwIgogICAgICAgc29kaXBvZGk6Y3k9IjE4IgogICAgICAgc29kaXBvZGk6cng9IjE4IgogICAgICAgc29kaXBvZGk6cnk9IjE4IgogICAgICAgZD0iTSA4OCwxOCBDIDg4LDI3Ljk0MTEyNSA3OS45NDExMjUsMzYgNzAsMzYgNjAuMDU4ODc1LDM2IDUyLDI3Ljk0MTEyNSA1MiwxOCA1Miw4LjA1ODg3NDUgNjAuMDU4ODc1LDAgNzAsMCA3OS45NDExMjUsMCA4OCw4LjA1ODg3NDUgODgsMTggeiIKICAgICAgIHRyYW5zZm9ybT0ibWF0cml4KDEuMzE0MjY5NywwLDAsMS4zMTQyNjk3LC0yNy45OTg4NzgsOTM0LjUyODU1KSIgLz4KICA8L2c+Cjwvc3ZnPgo=" />
-      <h1>Oops, Server error…</h1>
+      <h1>
+        Oops, Server error…
+      </h1>
     </div>
   </body>
 </html>
diff --git a/umap/templates/auth/user_detail.html b/umap/templates/auth/user_detail.html
@@ -1,15 +1,21 @@
 {% extends "umap/content.html" %}
+
 {% load i18n %}
+
 {% block maincontent %}
   <div class="col wide">
-    <h2 class="section">{% blocktrans %}Browse {{ current_user }}'s maps{% endblocktrans %}</h2>
+    <h2 class="section">
+      {% blocktrans %}Browse {{ current_user }}'s maps{% endblocktrans %}
+    </h2>
   </div>
   <div class="wrapper">
     <div class="map_list row">
       {% if maps %}
         {% include "umap/map_list.html" %}
       {% else %}
-        <div>{% blocktrans %}{{ current_user }} has no maps.{% endblocktrans %}</div>
+        <div>
+          {% blocktrans %}{{ current_user }} has no maps.{% endblocktrans %}
+        </div>
       {% endif %}
     </div>
   </div>

diff --git a/umap/templates/auth/user_form.html b/umap/templates/auth/user_form.html
@@ -1,5 +1,7 @@
 {% extends "umap/content.html" %}
+
 {% load i18n %}
+
 {% block maincontent %}
   <div class="row">
     <h2 class="section tabs">
@@ -11,7 +13,11 @@ <h2 class="section tabs">
     <div class="row">
       {% if form.non_field_errors %}
         <ul class="form-errors">
-          {% for error in form.non_field_errors %}<li>{{ error }}</li>{% endfor %}
+          {% for error in form.non_field_errors %}
+            <li>
+              {{ error }}
+            </li>
+          {% endfor %}
         </ul>
       {% endif %}
       <form id="user_form" method="post">
@@ -22,13 +28,21 @@ <h2 class="section tabs">
     </div>
     {% if backends.backends|length %}
       <div class="row">
-        <h3>{% trans "Your current providers" %}</h3>
+        <h3>
+          {% trans "Your current providers" %}
+        </h3>
         <ul>
-          {% for name in providers %}<li>{{ name|title }}</li>{% endfor %}
+          {% for name in providers %}
+            <li>
+              {{ name|title }}
+            </li>
+          {% endfor %}
         </ul>
       </div>
       <div class="row">
-        <h3>{% trans "Connect to another provider" %}</h3>
+        <h3>
+          {% trans "Connect to another provider" %}
+        </h3>
         <p>
           {% blocktrans %}It's a good habit to connect your account to more than one provider, in case one provider becomes unavailable, temporarily or even permanently.{% endblocktrans %}
         </p>

diff --git a/umap/templates/auth/user_stars.html b/umap/templates/auth/user_stars.html
@@ -1,15 +1,21 @@
 {% extends "umap/content.html" %}
+
 {% load i18n %}
+
 {% block maincontent %}
   <div class="col wide">
-    <h2 class="section">{% blocktrans %}Browse {{ current_user }}'s starred maps{% endblocktrans %}</h2>
+    <h2 class="section">
+      {% blocktrans %}Browse {{ current_user }}'s starred maps{% endblocktrans %}
+    </h2>
   </div>
   <div class="wrapper">
     <div class="map_list row">
       {% if maps %}
         {% include "umap/map_list.html" %}
       {% else %}
-        <div>{% blocktrans %}{{ current_user }} has no starred maps yet.{% endblocktrans %}</div>
+        <div>
+          {% blocktrans %}{{ current_user }} has no starred maps yet.{% endblocktrans %}
+        </div>
       {% endif %}
     </div>
   </div>

diff --git a/umap/templates/base.html b/umap/templates/base.html
@@ -1,4 +1,5 @@
 {% load umap_tags i18n static %}
+
 <!DOCTYPE html>
 <html {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
   <head>

diff --git a/umap/templates/registration/login.html b/umap/templates/registration/login.html
@@ -1,5 +1,7 @@
 {% extends "base.html" %}
+
 {% load umap_tags i18n %}
+
 {% block extra_head %}
   {% umap_css %}
   {{ block.super }}
@@ -13,11 +15,17 @@
       {% include "umap/branding.html" %}
     </header>
     {% if ENABLE_ACCOUNT_LOGIN %}
-      <h2>{% trans "Please log in with your account" %}</h2>
+      <h2>
+        {% trans "Please log in with your account" %}
+      </h2>
       <div>
         {% if form.non_field_errors %}
           <ul class="form-errors">
-            {% for error in form.non_field_errors %}<li>{{ error }}</li>{% endfor %}
+            {% for error in form.non_field_errors %}
+              <li>
+                {{ error }}
+              </li>
+            {% endfor %}
           </ul>
         {% endif %}
         <form id="login_form" action="{% url "login" %}" method="post">
@@ -34,7 +42,9 @@ <h2>{% trans "Please log in with your account" %}</h2>
       </div>
     {% endif %}
     {% if backends.backends|length %}
-      <h2>{% trans "Please choose a provider" %}</h2>
+      <h2>
+        {% trans "Please choose a provider" %}
+      </h2>
       <div>
         <ul class="login-grid block-grid">
           {% for name in backends.backends %}

diff --git a/umap/templates/umap/about.html b/umap/templates/umap/about.html
@@ -1,4 +1,5 @@
 {% extends "umap/content.html" %}
+
 {% block maincontent %}
   {% include "umap/about_summary.html" %}
 {% endblock maincontent %}
diff --git a/umap/templates/umap/about_summary.html b/umap/templates/umap/about_summary.html
@@ -1,4 +1,5 @@
 {% load i18n static %}
+
 <div class="wrapper about_summary  highlights">
   <div class="row">
     <div class="col quarter mwide">
@@ -18,13 +19,27 @@
            width="128px"
            height="128px" />
       <ul>
-        <li>{% trans "Choose the layers of your map" %}</li>
-        <li>{% trans "Add POIs: markers, lines, polygons..." %}</li>
-        <li>{% trans "Manage POIs colours and icons" %}</li>
-        <li>{% trans "Manage map options: display a minimap, locate user on load…" %}</li>
-        <li>{% trans "Batch import geostructured data (geojson, gpx, kml, osm...)" %}</li>
-        <li>{% trans "Choose the license for your data" %}</li>
-        <li>{% trans "Embed and share your map" %}</li>
+        <li>
+          {% trans "Choose the layers of your map" %}
+        </li>
+        <li>
+          {% trans "Add POIs: markers, lines, polygons..." %}
+        </li>
+        <li>
+          {% trans "Manage POIs colours and icons" %}
+        </li>
+        <li>
+          {% trans "Manage map options: display a minimap, locate user on load…" %}
+        </li>
+        <li>
+          {% trans "Batch import geostructured data (geojson, gpx, kml, osm...)" %}
+        </li>
+        <li>
+          {% trans "Choose the license for your data" %}
+        </li>
+        <li>
+          {% trans "Embed and share your map" %}
+        </li>
       </ul>
     </div>
     <div class="col quarter mwide">

diff --git a/umap/templates/umap/components/alerts/alert.html b/umap/templates/umap/components/alerts/alert.html
@@ -1,33 +1,39 @@
 {% load i18n static %}
 
 <style type="text/css">
-  @import "{% static 'umap/js/components/alerts/alert.css' %}";
+    @import "{% static 'umap/js/components/alerts/alert.css' %}";
 </style>
-
 <template id="umap-alert-template">
   <div role="dialog" class="dark window umap-alert">
     <div>
-      <p role="alert"></p>
+      <p role="alert">
+      </p>
     </div>
     <ul class="buttons">
       <li>
-        <button class="icon icon-16 icon-close" aria-label="{% translate "Close" %}" data-close></button>
+        <button class="icon icon-16 icon-close"
+                aria-label="{% translate "Close" %}"
+                data-close>
+        </button>
       </li>
     </ul>
   </div>
 </template>
-
 <umap-alert></umap-alert>
-
 <template id="umap-alert-creation-template">
   <div role="dialog" class="dark window umap-alert">
     <div>
-      <h3 role="alert"></h3>
+      <h3 role="alert">
+      </h3>
       {% url "login" as login_url %}
-      <p><em>{% blocktranslate %}Pro-tip: to easily find back your maps, <a href="{{ login_url }}" target="_blank">create an account</a> or <a href="{{ login_url }}" target="_blank">log in</a>.{% endblocktranslate %}</em></p>
+      <p>
+        <em>{% blocktranslate %}Pro-tip: to easily find back your maps, <a href="{{ login_url }}" target="_blank">create an account</a> or <a href="{{ login_url }}" target="_blank">log in</a>.{% endblocktranslate %}</em>
+      </p>
       <div id="link-wrapper">
         <form>
-          <label for="url">{% translate "Here is your secret link to edit the map, please keep it safe:" %}</label>
+          <label for="url">
+            {% translate "Here is your secret link to edit the map, please keep it safe:" %}
+          </label>
           <fieldset role="group">
             <input type="url" name="url" id="url">
             <input type="button" value="{% translate "Copy link" %}">
@@ -36,46 +42,61 @@ <h3 role="alert"></h3>
       </div>
       <div id="form-wrapper" hidden>
         <form>
-          <label for="email">{% translate "Enter your email address to receive the secret link:" %}</label>
+          <label for="email">
+            {% translate "Enter your email address to receive the secret link:" %}
+          </label>
           <fieldset role="group">
-            <input type="email" name="email" id="email" placeholder="{% translate "Email" %}" required>
-            <input type="submit" value="{% translate "Send me the link" %}" class="umap-action">
+            <input type="email"
+                   name="email"
+                   id="email"
+                   placeholder="{% translate "Email" %}"
+                   required>
+            <input type="submit"
+                   value="{% translate "Send me the link" %}"
+                   class="umap-action">
           </fieldset>
         </form>
       </div>
     </div>
     <ul class="buttons">
       <li>
-        <button class="icon icon-16 icon-close" aria-label="{% translate "Close" %}" data-close></button>
+        <button class="icon icon-16 icon-close"
+                aria-label="{% translate "Close" %}"
+                data-close>
+        </button>
       </li>
     </ul>
   </div>
 </template>
-
 <umap-alert-creation></umap-alert-creation>
-
 <template id="umap-alert-conflict-template">
   <div role="dialog" class="dark window umap-alert">
     <div>
-      <p role="alert"></p>
+      <p role="alert">
+      </p>
       <div id="conflict-wrapper">
         <form>
           <a href="#" onclick="document.url" target="_blank">{% translate "See their edits in another tab" %}</a>
-          <input id="your-changes" type="submit" value="{% translate "Keep your changes and loose theirs" %}">
-          <input id="their-changes" type="submit" value="{% translate "Keep their changes and loose yours" %}">
+          <input id="your-changes"
+                 type="submit"
+                 value="{% translate "Keep your changes and loose theirs" %}">
+          <input id="their-changes"
+                 type="submit"
+                 value="{% translate "Keep their changes and loose yours" %}">
         </form>
       </div>
     </div>
     <ul class="buttons">
       <li>
-        <button class="icon icon-16 icon-close" aria-label="{% translate "Close" %}" data-close></button>
+        <button class="icon icon-16 icon-close"
+                aria-label="{% translate "Close" %}"
+                data-close>
+        </button>
       </li>
     </ul>
   </div>
 </template>
-
 <umap-alert-conflict></umap-alert-conflict>
-
 <script type="module">
   import { register } from '{% static 'umap/js/components/base.js' %}'
   import {

diff --git a/umap/templates/umap/content.html b/umap/templates/umap/content.html
@@ -1,5 +1,7 @@
 {% extends "base.html" %}
+
 {% load umap_tags i18n %}
+
 {% block body_class %}
   content
 {% endblock body_class %}

diff --git a/umap/templates/umap/content_footer.html b/umap/templates/umap/content_footer.html
@@ -1,4 +1,5 @@
 {% load i18n %}
+
 <footer>
   <a href="https://wiki.openstreetmap.org/wiki/UMap" class="branding">uMap</a>
   an OpenStreetMap project

diff --git a/umap/templates/umap/css.html b/umap/templates/umap/css.html
@@ -1,4 +1,5 @@
 {% load static %}
+
 <link rel="stylesheet"
       href="{% static 'umap/vendors/leaflet/leaflet.css' %}" />
 <link rel="stylesheet"