merge
This commit is contained in:
		| @@ -162,17 +162,17 @@ | ||||
| 						</div> | ||||
| 					{% endif %} | ||||
| 					<div id="log{{ log.id }}"> | ||||
| 						{% if log.destination %} | ||||
| 							{{ log.destination }} | ||||
| 						{% endif %} | ||||
|              {% if log.destination %} | ||||
|                 {{ log.destination }} | ||||
|               {% endif %} | ||||
|  | ||||
| 						{% for user in users %} | ||||
| 							{% if user.id == log.shipmaster %} | ||||
| 								<p> | ||||
| 									<strong>{{ user.name }}</strong> | ||||
| 								</p> | ||||
| 							{% endif %} | ||||
| 						{% endfor %} | ||||
|               {% for user in users %} | ||||
|                 {% if user.id == log.shipmaster %} | ||||
|                   <p> | ||||
|                     <strong>{{ user.name }}</strong> | ||||
|                   </p> | ||||
|                 {% endif %} | ||||
|               {% endfor %} | ||||
|  | ||||
| 						{% for rower in log.rowers %} | ||||
| 							<p>{{ rower.name }}</p> | ||||
| @@ -184,9 +184,9 @@ | ||||
| 							Gäste (ohne Account): {{ amount_guests }} | ||||
| 						{% endif %} | ||||
|  | ||||
| 						{% if allowed_to_close and state == "on_water" %} | ||||
| 							<a href="/log/{{ log.id }}/delete" onclick="return confirm('Willst du diesen Eintrag wirklich löschen? Die Daten gehen verloren :O');">LÖSCHEN</a> | ||||
| 						{% endif %} | ||||
|               {% if allowed_to_close and state == "on_water" %} | ||||
|                 <a href="/log/{{ log.id }}/delete" class="btn btn-alert w-full absolute bottom-0 left-0" style="border-radius: 0;" onclick="return confirm('Willst du diesen Eintrag wirklich löschen? Die Daten gehen verloren');">Löschen</a> | ||||
|               {% endif %} | ||||
| 					</div> | ||||
| 				</div> | ||||
| 			</div> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user