umap-project 2.5.1__py3-none-any.whl → 2.6.0b0__py3-none-any.whl

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,14 @@
 {% 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 %}
+        <em>{% trans "by" %} <a href="{{ author.get_url }}">{{ author }}</a></em>
+      {% endwith %}
     </div>
   </div>
 {% endfor %}

umap/templates/umap/map_table.html

@@ -1,15 +1,30 @@
 {% load umap_tags i18n %}
+
 <div class="table-wrapper">
   <table>
     <thead>
       <tr>
-        <th>{% blocktrans %}Name{% endblocktrans %}</th>
-        <th>{% blocktrans %}Preview{% endblocktrans %}</th>
-        <th>{% blocktrans %}Who can see{% endblocktrans %}</th>
-        <th>{% blocktrans %}Who can edit{% endblocktrans %}</th>
-        <th>{% blocktrans %}Last save{% endblocktrans %}</th>
-        <th>{% blocktrans %}Owner{% endblocktrans %}</th>
-        <th>{% blocktrans %}Actions{% endblocktrans %}</th>
+        <th>
+          {% blocktrans %}Name{% endblocktrans %}
+        </th>
+        <th>
+          {% blocktrans %}Preview{% endblocktrans %}
+        </th>
+        <th>
+          {% blocktrans %}Who can see{% endblocktrans %}
+        </th>
+        <th>
+          {% blocktrans %}Who can edit{% endblocktrans %}
+        </th>
+        <th>
+          {% blocktrans %}Last save{% endblocktrans %}
+        </th>
+        <th>
+          {% blocktrans %}Owner{% endblocktrans %}
+        </th>
+        <th>
+          {% blocktrans %}Actions{% endblocktrans %}
+        </th>
       </tr>
     </thead>
     <tbody>
@@ -29,16 +44,25 @@
               </button>
               <dialog>
                 <form method="dialog">
-                  <div id="{{ unique_id }}_target" class="map_fragment"></div>
+                  <div id="{{ unique_id }}_target" class="map_fragment">
+                  </div>
                   <p class="close-dialog">
-                    <button class="button" type="submit">Close</button>
+                    <button class="button" type="submit">
+                      Close
+                    </button>
                   </p>
                 </form>
               </dialog>
             </td>
-            <td>{{ map_inst.get_share_status_display }}</td>
-            <td>{{ map_inst.get_edit_status_display }}</td>
-            <td>{{ map_inst.modified_at }}</td>
+            <td>
+              {{ map_inst.get_share_status_display }}
+            </td>
+            <td>
+              {{ map_inst.get_edit_status_display }}
+            </td>
+            <td>
+              {{ map_inst.modified_at }}
+            </td>
             <td>
               <a href="{{ map_inst.owner.get_url }}">{{ map_inst.owner }}</a>
             </td>

umap/templates/umap/messages.html

@@ -1,7 +1,6 @@
 {% load i18n %}
 
 {% include "umap/components/alerts/alert.html" %}
-
 {% for message in messages %}
   <script type="module" defer>
     U.Alert.success("{{ message }}")

umap/templates/umap/navigation.html

@@ -1,4 +1,5 @@
 {% load i18n %}
+
 <nav class="umap-nav">
   <section>
     {% include "umap/branding.html" %}
@@ -21,7 +22,7 @@
         <a href="{% url "about" %}">{% trans "About" %}</a>
       </li>
       <li>
-        <a href="{{ UMAP_FEEDBACK_LINK }}">{% trans "Help" %}</a>
+        <a href="{{ UMAP_HELP_URL }}">{% trans "Help" %}</a>
       </li>
       {% if user.is_authenticated %}
         {% if user.has_usable_password %}

umap/templates/umap/password_change.html

@@ -1,7 +1,11 @@
 {% extends "umap/content.html" %}
+
 {% load i18n %}
+
 {% block content %}
-  <h2 class="section">{% trans "Password change" %}</h2>
+  <h2 class="section">
+    {% trans "Password change" %}
+  </h2>
   <p>
     {% trans "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly." %}
   </p>

umap/templates/umap/password_change_done.html

@@ -1,8 +1,14 @@
 {% extends "umap/content.html" %}
+
 {% load i18n %}
+
 {% block content %}
-  <h2 class="section">{% trans "Password change successful" %}</h2>
-  <p>{% trans "Your password was changed." %}</p>
+  <h2 class="section">
+    {% trans "Password change successful" %}
+  </h2>
+  <p>
+    {% trans "Your password was changed." %}
+  </p>
   <p>
     <a href="{% url 'home' %}">Home</a>
   </p>

umap/templates/umap/search.html

@@ -1,5 +1,7 @@
 {% extends "umap/content.html" %}
+
 {% load i18n %}
+
 {% block messages %}
   {# We don't want maps from the results list to display errors in the main page. #}
 {% endblock messages %}
@@ -18,10 +20,14 @@
           </h2>
           {% include "umap/map_list.html" with prefix="search_map" %}
         {% else %}
-          <h2>{% trans "No map found." %}</h2>
+          <h2>
+            {% trans "No map found." %}
+          </h2>
         {% endif %}
       {% else %}
-        <h2>{% trans "Latest created maps" %}</h2>
+        <h2>
+          {% trans "Latest created maps" %}
+        </h2>
         {% include "umap/map_list.html" with prefix="search_map" %}
       {% endif %}
     </div>

umap/templates/umap/search_bar.html

@@ -1,4 +1,5 @@
 {% load i18n %}
+
 {% url "search" as search_url %}
 {% trans "Search maps" as default_placeholder %}
 <div class="wrapper search_wrapper">

umap/templates/umap/team_confirm_delete.html

@@ -0,0 +1,19 @@
+{% extends "umap/content.html" %}
+
+{% load i18n %}
+
+{% block maincontent %}
+  {% include "umap/dashboard_menu.html" with selected="teams" %}
+  <div class="wrapper">
+    <div class="row">
+      <form method="post">
+        {% csrf_token %}
+        <p>
+          Are you sure you want to delete "{{ object }}"?
+        </p>
+        {{ form }}
+        <input type="submit" value="Confirm">
+      </form>
+    </div>
+  </div>
+{% endblock maincontent %}

umap/templates/umap/team_detail.html

@@ -0,0 +1,27 @@
+{% extends "umap/content.html" %}
+
+{% load i18n %}
+
+{% block maincontent %}
+  <div class="wrapper">
+      <div class="row">
+        <div class="col wide">
+          <h2 class="section">
+            {% blocktrans %}Browse {{ current_team }}'s maps{% endblocktrans %}
+          </h2>
+          {% if current_team.description %}
+            <p>{{ current_team.description }}</p>
+          {% endif %}
+        </div>
+    </div>
+    <div class="map_list row">
+    {% if maps %}
+      {% include "umap/map_list.html" %}
+    {% else %}
+      <div>
+        {% blocktrans %}{{ current_team }} has no public maps.{% endblocktrans %}
+      </div>
+    {% endif %}
+    </div>
+  </div>
+{% endblock maincontent %}

umap/templates/umap/team_form.html

@@ -0,0 +1,60 @@
+{% extends "umap/content.html" %}
+
+{% load i18n %}
+
+{% block maincontent %}
+  {% include "umap/dashboard_menu.html" with selected="teams" %}
+  <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 %}
+        </ul>
+      {% endif %}
+      <form id="team_form" method="post">
+        {% csrf_token %}
+        {{ form }}
+        <input type="submit" value="{% trans "Save" %}" />
+      </form>
+      {% if team.users.count == 1 %}
+        <a href="{% url 'team_delete' team.pk %}">{% trans "Delete this team" %}</a>
+      {% endif %}
+    </div>
+  </div>
+  <script type="module" defer>
+    const form = document.querySelector("#team_form")
+    const select = form.querySelector('#id_members')
+    if (select) {
+      function onSelect({item: {value, label}}) {
+        const option = document.createElement('option')
+        option.value = value
+        option.textContent = label
+        option.selected = "selected"
+        select.appendChild(option)
+      }
+      function onUnselect({item: {value, label}}) {
+        const option = select.querySelector(`[value="${value}"]`)
+        select.removeChild(option)
+      }
+      const options = {
+        className: 'edit-team-members',
+        on_select: onSelect,
+        on_unselect: onUnselect,
+        placeholder: "{% trans "Add user" %}"
+      }
+      const autocomplete = new U.AjaxAutocompleteMultiple(form, options)
+      for (const option of select.options) {
+        autocomplete.displaySelected({
+          item: { value: option.value, label: option.textContent },
+        })
+      }
+      const submit = form.querySelector('input[type="submit"]')
+      // Move it after the autocomplete widget.
+      form.appendChild(submit)
+    }
+  </script>
+{% endblock maincontent %}

umap/templates/umap/user_dashboard.html

@@ -1,23 +1,21 @@
 {% extends "umap/content.html" %}
+
 {% load i18n %}
+
 {% block head_title %}
   {{ SITE_NAME }} - {% trans "My Dashboard" %}
 {% endblock head_title %}
 {% block maincontent %}
   {% trans "Search my maps" as placeholder %}
-  <div class="row">
-    <h2 class="section tabs">
-      <a class="selected" href="{% url 'user_dashboard' %}">{% blocktranslate with count=maps.paginator.count %}My Maps ({{ count }}){% endblocktranslate %}
-      </a>
-      <a href="{% url 'user_profile' %}">{% trans "My profile" %}</a>
-    </h2>
-  </div>
+  {% include "umap/dashboard_menu.html" with selected="maps" %}
   <div class="wrapper">
     <div class="row">
       <div class="table-header">
         <form action="{{ request.get_full_path }}" method="get">
           <span>
-            <label class="sr-only" for="q">{% translate "Map’s title" %}</label>
+            <label class="sr-only" for="q">
+              {% translate "Map’s title" %}
+            </label>
             <input id="q"
                    name="q"
                    type="search"
@@ -55,7 +53,7 @@
           const button = event.target.closest('button')
           button.nextElementSibling.showModal()
           const mapId = button.dataset.mapId
-          if (!document.querySelector(`#${mapId}_target`).hasChildNodes()) {
+          if (!document.querySelector(`#${mapId}_target`).children.length) {
             const previewSettings = JSON.parse(document.getElementById(mapId).textContent)
             const map = new U.Map(`${mapId}_target`, previewSettings)
             CACHE[mapId] = map

umap/templates/umap/user_teams.html

@@ -0,0 +1,51 @@
+{% extends "umap/content.html" %}
+
+{% load i18n %}
+
+{% block maincontent %}
+  {% include "umap/dashboard_menu.html" with selected="teams" %}
+  <div class="wrapper">
+    <div class="row">
+      <div class="table-wrapper">
+        <table>
+          <thead>
+            <tr>
+              <th>
+                {% blocktrans %}Name{% endblocktrans %}
+              </th>
+              <th>
+                {% blocktrans %}Users{% endblocktrans %}
+              </th>
+              <th>
+                {% blocktrans %}Actions{% endblocktrans %}
+              </th>
+            </tr>
+          </thead>
+          <tbody>
+            {% for team in teams %}
+              <tr>
+                <th scope="row">
+                  <a href="{% url 'team_maps' team.pk %}">{{ team }}</a>
+                </th>
+                <td>
+                  {% for user in team.users.all %}
+                    {{ user }}{% if not forloop.last %}, {% endif %}
+                  {% endfor %}
+                </td>
+                <td>
+                  <a href="{% url 'team_update' team.pk %}"
+                     class="icon-link"
+                     title="{% translate "Edit" %}">
+                    <span class="icon-dashboard icon-edit"></span>
+                    <span class="sr-only">{% translate "Edit" %}</span>
+                  </a>
+                </td>
+              </tr>
+            {% endfor %}
+          </tbody>
+        </table>
+      </div>
+      <a class="button" href="{% url 'team_new' %}">{% trans "New team" %}</a>
+    </div>
+  </div>
+{% endblock maincontent %}

umap/tests/base.py

@@ -7,7 +7,7 @@ from django.core.files.base import ContentFile
 from django.urls import reverse
 
 from umap.forms import DEFAULT_CENTER
-from umap.models import DataLayer, Licence, Map, TileLayer
+from umap.models import DataLayer, Licence, Map, Team, TileLayer
 
 User = get_user_model()
 
@@ -58,6 +58,13 @@ class UserFactory(factory.django.DjangoModelFactory):
         model = User
 
 
+class TeamFactory(factory.django.DjangoModelFactory):
+    name = "Awesome Team"
+
+    class Meta:
+        model = Team
+
+
 class MapFactory(factory.django.DjangoModelFactory):
     name = "test map"
     slug = "test-map"

umap/tests/conftest.py

@@ -11,6 +11,7 @@ from .base import (
     DataLayerFactory,
     LicenceFactory,
     MapFactory,
+    TeamFactory,
     TileLayerFactory,
     UserFactory,
 )
@@ -29,6 +30,11 @@ def pytest_runtest_teardown():
     cache.clear()
 
 
+@pytest.fixture
+def team():
+    return TeamFactory()
+
+
 @pytest.fixture
 def user():
     return UserFactory(password="123123")