umap-project 2.5.0__py3-none-any.whl → 2.6.0__py3-none-any.whl

umap/storage.py

@@ -8,6 +8,7 @@ from rjsmin import jsmin
 
 class UmapManifestStaticFilesStorage(ManifestStaticFilesStorage):
     support_js_module_import_aggregation = True
+    max_post_process_passes = 15
 
     # We remove `;` at the end of all regexps to match our biome config.
     _js_module_import_aggregation_patterns = (
@@ -32,12 +33,12 @@ class UmapManifestStaticFilesStorage(ManifestStaticFilesStorage):
                 'import"%(url)s"\n',
             ),
             (
-                r"""(?P<matched>import\(["'](?P<url>.*?)["']\))\.then""",
-                """import("%(url)s")""",
+                r"""(?P<matched>import\(["'](?P<url>.*?)["']\)\.then)""",
+                """import("%(url)s").then""",
             ),
             (
                 r"""(?P<matched>await import\(["'](?P<url>.*?)["']\))""",
-                """import("%(url)s")""",
+                """await import("%(url)s")""",
             ),
         ),
     )

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 @@
         <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 %}

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>

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>

umap/templates/auth/user_form.html

@@ -1,17 +1,18 @@
 {% extends "umap/content.html" %}
+
 {% load i18n %}
+
 {% block maincontent %}
-  <div class="row">
-    <h2 class="section tabs">
-      <a href="{% url "user_dashboard" %}">{% trans "My Maps" %}</a>
-      <a class="selected" href="{% url 'user_profile' %}">{% trans "My Profile" %}</a>
-    </h2>
-  </div>
+  {% include "umap/dashboard_menu.html" with selected="profile" %}
   <div class="wrapper">
     <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 +23,21 @@
     </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>

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>

umap/templates/base.html

@@ -1,4 +1,5 @@
 {% load umap_tags i18n static %}
+
 <!DOCTYPE html>
 <html {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
   <head>

umap/templates/registration/login.html

@@ -1,5 +1,12 @@
 {% extends "base.html" %}
+
+{% load i18n %}
+
+{% block head_title %}
+  {% trans "Login" %}
+{% endblock head_title %}
 {% load umap_tags i18n %}
+
 {% block extra_head %}
   {% umap_css %}
   {{ block.super }}
@@ -13,11 +20,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 +47,9 @@
       </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 %}

umap/templates/umap/about.html

@@ -1,4 +1,5 @@
 {% extends "umap/content.html" %}
+
 {% block maincontent %}
   {% include "umap/about_summary.html" %}
 {% endblock maincontent %}

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

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

umap/templates/umap/content.html

@@ -1,5 +1,7 @@
 {% extends "base.html" %}
+
 {% load umap_tags i18n %}
+
 {% block body_class %}
   content
 {% endblock body_class %}

umap/templates/umap/content_footer.html

@@ -1,8 +1,12 @@
 {% load i18n %}
+
 <footer>
   <a href="https://wiki.openstreetmap.org/wiki/UMap" class="branding">uMap</a>
-  an OpenStreetMap project
-  (version <a href="https://umap-project.readthedocs.io/en/master/changelog/">{{ UMAP_VERSION }}</a>)
+  <span>{% trans "An OpenStreetMap project" %}
+  ({% trans "version" %} <a href="https://docs.umap-project.org/en/stable/changelog/">{{ UMAP_VERSION }}</a>)</span>
+  {% if UMAP_HOST_INFOS.url and UMAP_HOST_INFOS.name %}<span>{% trans "Hosted by" %} <a href="{{ UMAP_HOST_INFOS.url }}">{{ UMAP_HOST_INFOS.name }}</a></span>{% endif %}
+  {% if UMAP_HOST_INFOS.email %}<a href="mailto:{{ UMAP_HOST_INFOS.email }}">{% trans "Contact" %}</a>{% endif %}
+  {% if UMAP_HELP_URL %}<a href="{{ UMAP_HELP_URL }}">{% trans "Help" %}</a>{% endif %}
   {% get_language_info_list for LANGUAGES as languages %}
   <form action="{% url "set_language" %}" method="post" class="i18n_switch">
     {% csrf_token %}
@@ -10,7 +14,7 @@
       {% for language in languages %}
         <option value="{{ language.code }}"
                 {% if language.code == LANGUAGE_CODE %}selected="selected"{% endif %}>
-          {{ language.name_local }}
+          {{ language.name_local }} ({{ language.code }})
         </option>
       {% endfor %}
     </select>

umap/templates/umap/css.html

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

umap/templates/umap/dashboard_menu.html

@@ -0,0 +1,15 @@
+{% load i18n %}
+
+<div class="row">
+  <h2 class="section tabs">
+    {% if selected == "maps" %}
+      <a class="selected" href="{% url 'user_dashboard' %}">{% blocktranslate with count=maps.paginator.count %}My Maps ({{ count }}){% endblocktranslate %}</a>
+    {% else %}
+      <a href="{% url 'user_dashboard' %}">{% trans "My Maps" %}</a>
+    {% endif %}
+    <a {% if selected == "profile" %}class="selected"{% endif %}
+       href="{% url 'user_profile' %}">{% trans "My profile" %}</a>
+    <a {% if selected == "teams" %}class="selected"{% endif %}
+       href="{% url 'user_teams' %}">{% trans "My teams" %}</a>
+  </h2>
+</div>

umap/templates/umap/home.html

@@ -1,5 +1,7 @@
 {% extends "umap/content.html" %}
+
 {% load umap_tags i18n %}
+
 {% block messages %}
   {# We don't want maps in the list to display errors. #}
 {% endblock messages %}
@@ -8,14 +10,22 @@
   {% include "umap/about_summary.html" %}
   {% if showcase_map %}
     <div class="wrapper showcase-map">
-      <h2 class="section">{% blocktrans %}Map of the uMaps{% endblocktrans %}</h2>
-      <div class="row">{% map_fragment showcase_map zoomControl=1 %}</div>
+      <h2 class="section">
+        {% blocktrans %}Map of the uMaps{% endblocktrans %}
+      </h2>
+      <div class="row">
+        {% map_fragment showcase_map zoomControl=1 %}
+      </div>
     </div>
   {% endif %}
   <div class="wrapper">
     {% if maps %}
-      <h2 class="section">{% blocktrans %}Get inspired, browse maps{% endblocktrans %}</h2>
-      <div class="map_list row">{% include "umap/map_list.html" %}</div>
+      <h2 class="section">
+        {% blocktrans %}Get inspired, browse maps{% endblocktrans %}
+      </h2>
+      <div class="map_list row">
+        {% include "umap/map_list.html" %}
+      </div>
     {% endif %}
   </div>
 {% endblock maincontent %}

umap/templates/umap/js.html

@@ -1,10 +1,14 @@
 {% load static %}
+
 <script type="module"
         src="{% static 'umap/vendors/leaflet/leaflet-src.esm.js' %}"
         defer></script>
 <script type="module"
         src="{% static 'umap/js/modules/leaflet-configure.js' %}"
         defer></script>
+<script src="{% static 'umap/vendors/markercluster/leaflet.markercluster.js' %}"
+        defer></script>
+<script src="{% static 'umap/vendors/heat/leaflet-heat.js' %}" defer></script>
 {% if locale %}
   {% with "umap/locale/"|add:locale|add:".js" as path %}
     <script src="{% static path %}" defer></script>
@@ -21,14 +25,11 @@
 <script src="{% static 'umap/vendors/csv2geojson/csv2geojson.js' %}" defer></script>
 <script src="{% static 'umap/vendors/osmtogeojson/osmtogeojson.js' %}" defer></script>
 <script src="{% static 'umap/vendors/loading/Control.Loading.js' %}" defer></script>
-<script src="{% static 'umap/vendors/markercluster/leaflet.markercluster.js' %}"
-        defer></script>
 <script src="{% static 'umap/vendors/contextmenu/leaflet.contextmenu.min.js' %}"
         defer></script>
 <script src="{% static 'umap/vendors/photon/leaflet.photon.js' %}" defer></script>
 <script src="{% static 'umap/vendors/georsstogeojson/GeoRSSToGeoJSON.js' %}"
         defer></script>
-<script src="{% static 'umap/vendors/heat/leaflet-heat.js' %}" defer></script>
 <script src="{% static 'umap/vendors/fullscreen/Leaflet.fullscreen.min.js' %}"
         defer></script>
 <script src="{% static 'umap/vendors/toolbar/leaflet.toolbar.js' %}" defer></script>
@@ -43,13 +44,7 @@
 <script src="{% static 'umap/vendors/simple-statistics/simple-statistics.min.js' %}"
         defer></script>
 <script src="{% static 'umap/js/umap.core.js' %}" defer></script>
-<script src="{% static 'umap/js/umap.popup.js' %}" defer></script>
 <script src="{% static 'umap/js/umap.forms.js' %}" defer></script>
-<script src="{% static 'umap/js/umap.icon.js' %}" defer></script>
-<script src="{% static 'umap/js/umap.features.js' %}" defer></script>
-<script src="{% static 'umap/js/umap.permissions.js' %}" defer></script>
-<script src="{% static 'umap/js/umap.datalayer.permissions.js' %}" defer></script>
-<script src="{% static 'umap/js/umap.layer.js' %}" defer></script>
 <script src="{% static 'umap/js/umap.controls.js' %}" defer></script>
 <script src="{% static 'umap/js/umap.js' %}" defer></script>
 <script src="{% static 'umap/js/components/fragment.js' %}" defer></script>

umap/templates/umap/login_popup_end.html

@@ -1,11 +1,17 @@
 {% load i18n %}
-<h3>{% trans "You are logged in. Continuing..." %}</h3>
+
+<h3>
+  {% trans "You are logged in. Continuing..." %}
+</h3>
 <script type="text/javascript">
   function proceed() {
-    if (window.opener && window.opener.umap_proceed) {
-      window.opener.umap_proceed()
+    if (window.opener?.onLogin) {
+      // We are in the normal process login
+      window.opener.onLogin()
+      window.close()
     } else {
-      // Trade off as Twitter does not allow us to access window.opener
+      // we may be in login process that includes a magic link, so user
+      // has opened a new window from this link, and we cannot close it then.
       window.location.href = '{% url "user_dashboard" %}'
     }
   }

umap/templates/umap/map_detail.html

@@ -1,5 +1,7 @@
 {% extends "base.html" %}
+
 {% load umap_tags i18n %}
+
 {% block head_title %}
   {{ map.name }} - {{ SITE_NAME }}
 {% endblock head_title %}
@@ -8,12 +10,16 @@
 {% endblock body_class %}
 {% block extra_head %}
   {% if preconnect_domains %}
-    {% for domain in preconnect_domains %}<link rel="preconnect" href="{{ domain }}" />{% endfor %}
+    {% for domain in preconnect_domains %}
+      <link rel="preconnect" href="{{ domain }}" />
+    {% endfor %}
   {% endif %}
   {% umap_css %}
   {{ block.super }}
   {% umap_js locale=locale %}
-  {% if object.share_status != object.PUBLIC %}<meta name="robots" content="noindex">{% endif %}
+  {% if object.share_status != object.PUBLIC %}
+    <meta name="robots" content="noindex">
+  {% endif %}
   <link rel="alternate"
         type="application/json+oembed"
         href="{{ oembed_absolute_uri }}?url={{ quoted_absolute_uri }}&format=json"

umap/templates/umap/map_fragment.html

@@ -1,4 +1,6 @@
 {% load umap_tags %}
+
 <umap-fragment data-settings='{{ map_settings|escape }}'>
-<div id="{{ unique_id }}" class="map_fragment"></div>
+<div id="{{ unique_id }}" class="map_fragment">
+</div>
 </umap-fragment>

umap/templates/umap/map_init.html

@@ -1,7 +1,8 @@
 {% load umap_tags %}
 
 {% include "umap/messages.html" %}
-<div id="map"></div>
+<div id="map">
+</div>
 <!-- djlint:off -->
 <script defer type="text/javascript">
   window.addEventListener('DOMContentLoaded', (event) => {

umap/templates/umap/map_list.html

@@ -1,13 +1,16 @@
 {% load umap_tags i18n %}
+
 {% for map_inst in maps %}
   <hr />
   <div class="col wide">
     {% map_fragment map_inst prefix=prefix page=request.GET.p %}
     <div class="legend">
       <a href="{{ map_inst.get_absolute_url }}">{{ map_inst.name }}</a>
-      {% if map_inst.owner %}
-        <em>{% trans "by" %} <a href="{{ map_inst.owner.get_url }}">{{ map_inst.owner }}</a></em>
-      {% endif %}
+      {% with author=map_inst.get_author %}
+        {% if author %}
+          <em>{% trans "by" %} <a href="{{ author.get_url }}">{{ author }}</a></em>
+        {% endif %}
+      {% endwith %}
     </div>
   </div>
 {% endfor %}