kopia lustrzana https://github.com/hholzgra/maposmatic/
UI improvements
rodzic
67f2decc39
commit
b67dacafb5
|
@ -167,3 +167,27 @@ input[type="submit"]
|
|||
{
|
||||
width: 300px;
|
||||
}
|
||||
|
||||
table.list
|
||||
{
|
||||
margin: 1em;
|
||||
padding-right: 2em;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
table.list tr
|
||||
{
|
||||
background: white;
|
||||
}
|
||||
|
||||
table.list tr.odd
|
||||
{
|
||||
background: #FFF6BF;
|
||||
}
|
||||
|
||||
table.list td
|
||||
{
|
||||
text-align: center;
|
||||
padding: 1em;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
|
|
@ -33,16 +33,20 @@ class="activelink"
|
|||
|
||||
{% block page %}
|
||||
|
||||
<p><b>Job list</b></p>
|
||||
<h1>Job list</h1>
|
||||
|
||||
<p>This page gives the status of all the rendering requests received
|
||||
during the last 24 hours, starting from the most recent one.</p>
|
||||
|
||||
<table class="list">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Title</th>
|
||||
<th>Location</th>
|
||||
<th>Status</th>
|
||||
<th>Submission time</th>
|
||||
<th>Start rendering time</th>
|
||||
<th>End rendering time</th>
|
||||
<th>Submission at</th>
|
||||
<th>Rendering started at</th>
|
||||
<th>Rendering finished at</th>
|
||||
<th>Position in queue</th>
|
||||
<th>ETA before rendering</th>
|
||||
</tr>
|
||||
|
@ -52,33 +56,41 @@ class="activelink"
|
|||
<td>
|
||||
<a href="/jobs/{{ job.id }}">{{ job.maptitle }}</a><br/>
|
||||
</td>
|
||||
<td>
|
||||
{% if job.lat_upper_left %}
|
||||
{{ job.lat_upper_left }}<br/>
|
||||
{{ job.lon_upper_left }} {{job.lon_bottom_right}}<br/>
|
||||
{{ job.lat_bottom_right }}
|
||||
{% else %}
|
||||
{{ job.administrative_city }}
|
||||
{% endif %}
|
||||
<td>
|
||||
{{ job.status|job_status_to_str:job.resultmsg }}
|
||||
</td>
|
||||
<td>{{ job.submission_time|date:"Y-m-d H:i:s" }}</td>
|
||||
<td>
|
||||
{% ifequal job.status 0 %}
|
||||
{% if job.is_waiting %}
|
||||
not started
|
||||
{% else %}
|
||||
{{ job.startofrendering_time|date:"Y-m-d H:i:s" }}
|
||||
{% endifequal %}
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{% ifequal job.status 2 %}
|
||||
{% if job.is_done %}
|
||||
{{ job.endofrendering_time|date:"Y-m-d H:i:s" }}
|
||||
{% else %}
|
||||
not finished
|
||||
{% endifequal %}
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{% ifequal job.status 0 %}
|
||||
{% if job.is_waiting %}
|
||||
{{ job.current_position_in_queue }}
|
||||
{% endifequal %}
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{% ifequal job.status 0 %}
|
||||
{% if job.is_waiting %}
|
||||
{{ job.rendering_estimated_start_time|timeuntil }}
|
||||
{% endifequal %}
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
|
|
|
@ -102,7 +102,7 @@ minutes and get your own map !</p>
|
|||
|
||||
<p style="text-align: right"><a href="/about/">More details</a></p>
|
||||
|
||||
<h2>Generate your own map</h2>
|
||||
<h2 style="clear: right">Generate your own map</h2>
|
||||
|
||||
<p>For the moment <i>MapOSMatic</i> is only available for the
|
||||
metropolitan France. We need contributors to translate and adapt the
|
||||
|
@ -114,11 +114,11 @@ available :</p>
|
|||
<ul>
|
||||
<li>Using an administrative boundary. These boundaries allow to get
|
||||
a map with precise boundaries of the city, but the boundaries are
|
||||
for the moment only available for part of the French cities (about a
|
||||
third). The name of the provided city must exactly match the one
|
||||
available in the OpenStreetMap database (no case or accent
|
||||
difference is allowed). Working examples are: <i>Chavagne</i>,
|
||||
<i>Bénodet</i> or <i>Sanguinet</i>.</li>
|
||||
for the moment only available for part of the Metropolitan French
|
||||
cities (about a third). The name of the provided city must exactly
|
||||
match the one available in the OpenStreetMap database (no case or
|
||||
accent difference is allowed). Working examples are:
|
||||
<i>Chavagne</i>, <i>Bénodet</i> or <i>Sanguinet</i>.</li>
|
||||
<li>Using a traditionnal bounding box.</li>
|
||||
</ul>
|
||||
|
||||
|
|
Ładowanie…
Reference in New Issue