From 0d20384484e96eb5b03124051301ec53b92e7a27 Mon Sep 17 00:00:00 2001 From: Hartmut Holzgraefe Date: Sun, 14 Oct 2018 20:20:24 +0200 Subject: [PATCH] whitespace, indent, and a few html validation fixes --- www/maposmatic/templates/maposmatic/new.html | 553 +++++++++---------- 1 file changed, 276 insertions(+), 277 deletions(-) diff --git a/www/maposmatic/templates/maposmatic/new.html b/www/maposmatic/templates/maposmatic/new.html index e0878bc8..595eda93 100644 --- a/www/maposmatic/templates/maposmatic/new.html +++ b/www/maposmatic/templates/maposmatic/new.html @@ -52,7 +52,7 @@ } -

{% trans "Generate your own map" %}  

+

{% trans "Generate your own map" %}  

@@ -60,27 +60,27 @@
- +

{% trans "Map area" %}

- +

{% trans "Layout" %}

- +

{% trans "Style" %}

- +

{% trans "Overlays" %}

- +

{% trans "Paper" %}

@@ -100,294 +100,293 @@
-
-
-
+ +
+
- - - -
- {{ form.bbox }} + + +
+
+ {{ form.bbox }} +
+ +
+
+ {{ form.administrative_city }} + + + + + {{ form.errors }}
-
-
-
- {{ form.administrative_city }} - - - - - {{ form.errors }} -
- - {{ form.administrative_osmid }} - {{ form.administrative_osmid.errors }} - {{ form.administrative_city.errors }} -
-
-
-
-
- {% blocktrans trimmed %} - Upload a GPX file here. The GPX track stored in this file, - and any named waypoints, will be drawn on top of the created map. - {% endblocktrans %} -
-
- {% blocktrans trimmed %} - Note: The uploaded file will not be made available to anyone, the map created using this - file will be publicly visible though.
Do NOT upload any data you don't want to be publicly - visible. - {% endblocktrans %} -
-
- {% trans "GPX track file" %} - {{ form.track }} -
+ + {{ form.administrative_osmid }} + {{ form.administrative_osmid.errors }} + {{ form.administrative_city.errors }} +
+ +
+
+
+
+ {% blocktrans trimmed %} + Upload a GPX file here. The GPX track stored in this file, + and any named waypoints, will be drawn on top of the created map. + {% endblocktrans %}
+
+ {% blocktrans trimmed %} + Note: The uploaded file will not be made available to anyone, the map created using this + file will be publicly visible though.
Do NOT upload any data you don't want to be publicly + visible. + {% endblocktrans %} +
+
+ {% trans "GPX track file" %} + {{ form.track }} +
-
-
-
-
- {% trans "Upload an Umap file here." %} -

+

+ +
+
+
+
+ {% trans "Upload an Umap file here." %} +

{% blocktrans trimmed %} Markers, lines and shapes that have been placed on that Umap will be printed on top of the generated map. {% endblocktrans %} -

-
- {% blocktrans trimmed %} - Note: The uploaded file will not be made available to anyone, the map created using this - file will be publicly visible though.
Do NOT upload any data you don't want - to be publicly visible. - {% endblocktrans %} -
-
- {% trans "Umap data file" %} - {{ form.umap }} -
+

+
+ {% blocktrans trimmed %} + Note: The uploaded file will not be made available to anyone, the map created using this + file will be publicly visible though.
Do NOT upload any data you don't want + to be publicly visible. + {% endblocktrans %} +
+
+ {% trans "Umap data file" %} + {{ form.umap }} +
-
-
-

{% trans "Geographic area selection" %}

-

- {% blocktrans trimmed %} - Start by choosing the city or geographic area you want to - render. Suggestions will appear as you start typing. If you can't find the city - you want, or if you prefer to choose the exact area you want to render - yourself, select the Geographic area tab and use the mini-map to set - the limits of the rendered area. - {% endblocktrans %} -

-
+
-
- -
- -
- -
-
-
- {% trans "Layout" %} - {{ form.layout }} -
-
-
- -
-
- -
-

{% trans "Map layout" %}

-

- {% blocktrans trimmed %} - The map layout determines how the map and the index are - rendered. The Multi-page layout produces a booklet very suitable for - printing and binding. - {% endblocktrans %} -

-
-
- -
- -
-
-
- {% trans "Stylesheet" %} - {{ form.stylesheet }} -
-
-
- {# TODO: need to pick first style from list here #} -
-
- -
-

{% trans "Map stylesheet" %}

-

- {% blocktrans trimmed %} - The map stylesheet determines the style and appearance of the map itself. - Note that the stylesheet also drives what details will be visible on the map. - {% endblocktrans %} -

-
-
- -
- -
-
-
- {% trans "Overlays" %} - {{ form.overlay }} -
-
-
- {# TODO: select default here, too #} -
-
-
-

{% trans "Map overlays" %}

-

- {% blocktrans trimmed %} - Overlays render extra objects on top of the chosen base style. - Multiple overlays can be selected to add different kinds of additional information on top of the map. - {% endblocktrans %} -

+
+

{% trans "Geographic area selection" %}

+

+ {% blocktrans trimmed %} + Start by choosing the city or geographic area you want to + render. Suggestions will appear as you start typing. If you can't find the city + you want, or if you prefer to choose the exact area you want to render + yourself, select the Geographic area tab and use the mini-map to set + the limits of the rendered area. + {% endblocktrans %} +

+
- -
-
-
-
- {% trans "Paper size" %} - {{ form.papersize }} - {{ form.paper_width_mm }} - {{ form.paper_height_mm }} -
-
-
-
- {% trans "Paper orientation" %} - {{ form.paperorientation }} -
-
-
- -
-
- {% blocktrans %}An error occured while retrieving compatible paper sizes.{% endblocktrans %} -
-
- - {% blocktrans %}Calculating available paper formats for your map...{% endblocktrans %} -
-
- -
-

{% trans "Paper format and size" %}

-

- {% blocktrans %}Select the desired format, size and orientation for your map.{% endblocktrans %} -

-
-
- -
-
-
-
- {% trans "Map title" %} - {{ form.maptitle }} -
-
-
-
- {% trans "Language" %} - {{ form.map_language }} -
-
-
-
-
-
-
- {% trans "Your Email address (for notifications, optional)" %} - {{ form.submittermail }} -
-
-
- -
-
-
- {% trans "Summary" %} - - - - - - - - -
{% trans "Location:" %}
{% trans "Layout:" %}
{% trans "Stylesheet:" %}
{% trans "Overlay:" %}
{% trans "Paper format:" %}
-
- -
+ +
+ +
+ +
+
+
+ {% trans "Layout" %} + {{ form.layout }} +
- -
-

{% trans "Almost there!" %}

-

- {% blocktrans trimmed %} - You're almost ready to request to map rendering! Select the map language, - eventually adjust the title of your map, and you're good to go! - {% endblocktrans %} -

-
+
+ +
+
- +
+

{% trans "Map layout" %}

+

+ {% blocktrans trimmed %} + The map layout determines how the map and the index are + rendered. The Multi-page layout produces a booklet very suitable for + printing and binding. + {% endblocktrans %} +

+
+
+ +
+ +
+
+
+ {% trans "Stylesheet" %} + {{ form.stylesheet }} +
+
+
+ {# TODO: need to pick first style from list here #} +
+
+ +
+

{% trans "Map stylesheet" %}

+

+ {% blocktrans trimmed %} + The map stylesheet determines the style and appearance of the map itself. + Note that the stylesheet also drives what details will be visible on the map. + {% endblocktrans %} +

+
+
+ +
+ +
+
+
+ {% trans "Overlays" %} + {{ form.overlay }} +
+
+
+ {# TODO: select default here, too #} +
+
+ +
+

{% trans "Map overlays" %}

+

+ {% blocktrans trimmed %} + Overlays render extra objects on top of the chosen base style. + Multiple overlays can be selected to add different kinds of additional information on top of the map. + {% endblocktrans %} +

+
+
+ +
+
+
+
+ {% trans "Paper size" %} + {{ form.papersize }} + {{ form.paper_width_mm }} + {{ form.paper_height_mm }} +
+
+
+
+ {% trans "Paper orientation" %} + {{ form.paperorientation }} +
+
+
+ +
+
+ {% blocktrans %}An error occured while retrieving compatible paper sizes.{% endblocktrans %} +
+
+ + {% blocktrans %}Calculating available paper formats for your map...{% endblocktrans %} +
+
+ +
+

{% trans "Paper format and size" %}

+

+ {% blocktrans %}Select the desired format, size and orientation for your map.{% endblocktrans %} +

+
+
+ +
+
+
+
+ {% trans "Map title" %} + {{ form.maptitle }} +
+
+
+
+ {% trans "Language" %} + {{ form.map_language }} +
+
+
+
+
+
+
+ {% trans "Your Email address (for notifications, optional)" %} + {{ form.submittermail }} +
+
+
+ +
+
+
+ {% trans "Summary" %} + + + + + + + + +
{% trans "Location:" %}
{% trans "Layout:" %}
{% trans "Stylesheet:" %}
{% trans "Overlay:" %}
{% trans "Paper format:" %}
+
+ +
+
+ +
+

{% trans "Almost there!" %}

+

+ {% blocktrans trimmed %} + You're almost ready to request to map rendering! Select the map language, + eventually adjust the title of your map, and you're good to go! + {% endblocktrans %} +

+
+
-
- - + {% endblock %}