diff --git a/umap/templates/registration/login.html b/umap/templates/registration/login.html index a5b850b8..1429ff5a 100644 --- a/umap/templates/registration/login.html +++ b/umap/templates/registration/login.html @@ -8,45 +8,45 @@ login {% endblock body_class %} {% block content %} -
-
- {% include "umap/branding.html" %} -
- {% if ENABLE_ACCOUNT_LOGIN %} -

{% trans "Please log in with your account" %}

-
- {% if form.non_field_errors %} -
+ {% endif %} +
{% endblock content %} diff --git a/umap/templates/umap/css.html b/umap/templates/umap/css.html index 186b1dfa..df51e526 100644 --- a/umap/templates/umap/css.html +++ b/umap/templates/umap/css.html @@ -1,5 +1,4 @@ {% load static %} - + - - + + - - + + - + - + - - + + - + - + {% if locale %} - {% with "umap/locale/"|add:locale|add:".js" as path %} - - {% endwith %} + {% with "umap/locale/"|add:locale|add:".js" as path %} + + {% endwith %} {% endif %} diff --git a/umap/templates/umap/map_detail.html b/umap/templates/umap/map_detail.html index 4252ca60..356a65cf 100644 --- a/umap/templates/umap/map_detail.html +++ b/umap/templates/umap/map_detail.html @@ -8,17 +8,16 @@ {% endblock body_class %} {% block extra_head %} {% if preconnect_domains %} - {% for domain in preconnect_domains %} - - {% endfor %} + {% for domain in preconnect_domains %}{% endfor %} {% endif %} {% umap_css %} {{ block.super }} {% umap_js locale=locale %} {% if object.share_status != object.PUBLIC %}{% endif %} - + {% endblock extra_head %} {% block content %} {% block map_init %} diff --git a/umap/templates/umap/map_fragment.html b/umap/templates/umap/map_fragment.html index 63b07521..6bd17562 100644 --- a/umap/templates/umap/map_fragment.html +++ b/umap/templates/umap/map_fragment.html @@ -1,4 +1,4 @@ {% load umap_tags %} -
+
diff --git a/umap/templates/umap/map_table.html b/umap/templates/umap/map_table.html index 56309a4c..51d01543 100644 --- a/umap/templates/umap/map_table.html +++ b/umap/templates/umap/map_table.html @@ -21,8 +21,9 @@ {{ map_inst.preview_settings|json_script:unique_id }} - @@ -42,35 +43,37 @@ {{ map_inst.owner }} - + {% translate "Share" %} - + {% translate "Edit" %} - + {% translate "Download" %}
{% csrf_token %} -
+ method="post" + class="map-delete"> {% csrf_token %} - @@ -93,13 +96,11 @@ {# djlint:on #} {% endif %} - {% blocktranslate with maps_number=maps.number num_pages=maps.paginator.num_pages trimmed %} Page {{ maps_number }} of {{ num_pages }} {% endblocktranslate %} - {% if maps.has_next %} {% translate "next" %} › {% translate "last" %} » @@ -111,12 +112,12 @@ {% endif %} {% blocktranslate with per_page=maps.paginator.per_page trimmed %} - Lines per page: {{ per_page }} + Lines per page: {{ per_page }} {% endblocktranslate %} {% blocktranslate with count=maps.paginator.count trimmed %} - {{ count }} maps + {{ count }} maps {% endblocktranslate %} {% endif %} diff --git a/umap/templates/umap/user_dashboard.html b/umap/templates/umap/user_dashboard.html index 9e4f5d10..855a79be 100644 --- a/umap/templates/umap/user_dashboard.html +++ b/umap/templates/umap/user_dashboard.html @@ -7,8 +7,7 @@ {% trans "Search my maps" as placeholder %}

- {% blocktranslate with count=maps.paginator.count %}My Maps ({{ count }}){% endblocktranslate %} + {% blocktranslate with count=maps.paginator.count %}My Maps ({{ count }}){% endblocktranslate %} {% trans "My profile" %}

@@ -19,17 +18,18 @@ - {% if maps.object_list|length > 1 %} - {% blocktranslate with count=maps.object_list|length trimmed %} + + {% blocktranslate with count=maps.object_list|length trimmed %} Download {{ count }} maps {% endblocktranslate %} @@ -45,7 +45,6 @@
{% endblock maincontent %} - {% block bottom_js %} {{ block.super }}