Skip to content

Commit

Permalink
🐛 fix signage detail indentation blades
Browse files Browse the repository at this point in the history
  • Loading branch information
LePetitTim committed Jan 30, 2023
1 parent 2cb0253 commit ce6d5a3
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ CHANGELOG
**Bug fixes**

- Fix intervention datatable list if one intervention has no target

- Fix signage's blade detail

**Development**

Expand Down
24 changes: 20 additions & 4 deletions geotrek/signage/templates/signage/signage_detail_attributes.html
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,22 @@ <h3>{% trans "Blades" %}</h3>
<td>{{ blade.condition|default_if_none:"" }}</td>
{% for line in blade.order_lines.all %}
{% if not forloop.first %}
</tr><tr {% if not forloop.last %}class="dashed-line"{% endif %}><td></td><td></td><td></td><td></td>
</tr><tr {% if not forloop.last %}class="dashed-line"{% endif %}>
<td></td> <!-- blade -->
<td></td> <!-- type -->
<td></td> <!-- color -->
<td></td> <!-- direction -->
<td></td> <!-- condition -->
{% endif %}
<td>{{ line.text }}</td>
<td>{{ line.pictogram_name|default_if_none:"" }}</td>
<td>{{ line.distance_pretty|default_if_none:"" }}</td>
<td>{{ line.time_pretty|default_if_none:"" }}</td>
{% empty %}
<td></td><td></td><td></td><td></td>
<td></td> <!-- text -->
<td></td> <!-- pictograms -->
<td></td> <!-- distance -->
<td></td> <!-- description -->
{% endfor %}
{% else %}
<td><a href="{% url 'signage:blade_detail' blade.pk %}">{{ blade }}</a></td>
Expand All @@ -118,15 +126,23 @@ <h3>{% trans "Blades" %}</h3>
<td>{{ blade.condition|default_if_none:"" }}</td>
{% for line in blade.order_lines.all %}
{% if not forloop.first %}
</tr><tr {% if not forloop.last %}class="dashed-line"{% endif %}><td></td><td></td><td></td>
</tr><tr {% if not forloop.last %}class="dashed-line"{% endif %}>
<td></td> <!-- blade -->
<td></td> <!-- type -->
<td></td> <!-- color -->
<td></td> <!-- condition -->
{% endif %}
<td>{{ line.direction|default_if_none:"" }}</td>
<td>{{ line.text }}</td>
<td>{{ line.pictogram_name|default_if_none:"" }}</td>
<td>{{ line.distance_pretty|default_if_none:"" }}</td>
<td>{{ line.time_pretty|default_if_none:"" }}</td>
{% empty %}
<td></td><td></td><td></td><td></td>
<td></td> <!-- direction -->
<td></td> <!-- text -->
<td></td> <!-- pictogram -->
<td></td> <!-- distance -->
<td></td> <!-- time -->
{% endfor %}
{% endif %}
</tr>
Expand Down

0 comments on commit ce6d5a3

Please sign in to comment.