diff --git a/src/backoffice/templates/backoffice/assembly_auth.html b/src/backoffice/templates/backoffice/assembly_auth.html index 46f08e4615d5e48a443198a2dc454b09e4fdfed4..bcf0da60ed547bbf3eb707359fe52e9c0ca44196 100644 --- a/src/backoffice/templates/backoffice/assembly_auth.html +++ b/src/backoffice/templates/backoffice/assembly_auth.html @@ -37,60 +37,58 @@ </form> </div> </div> - </form> + </div> </div> -</div> -<div class="row mt-3 pb-10rem"> - <div class="col-md-12"> - <div class="card border-primary"> - <div class="card-header bg-primary text-white">{% trans 'authentication__applications' %}</div> - <div class="card-body"> - <table class="table table-striped table-hover"> - <thead> - <tr> - <th>{% trans "Assembly__authentication-name" %}</th> - <th>{% trans "Assembly__authentication-client_type" %}</th> - <th>{% trans "Assembly__authentication-grant_type" %}</th> - </tr> - </thead> - <tbody> - {% for app in applications %} + <div class="row mt-3 pb-10rem"> + <div class="col-md-12"> + <div class="card border-primary"> + <div class="card-header bg-primary text-white">{% trans 'authentication__applications' %}</div> + <div class="card-body"> + <table class="table table-striped table-hover"> + <thead> <tr> - <td> - <a href="{% url 'backoffice:assembly-auth-app' assembly=assembly.pk pk=app.id %}">{{ app.name }}</a> - </td> - <td>{{ app.client_type }}</td> - <td>{{ app.authorization_grant_type }}</td> + <th>{% trans "Assembly__authentication-name" %}</th> + <th>{% trans "Assembly__authentication-client_type" %}</th> + <th>{% trans "Assembly__authentication-grant_type" %}</th> </tr> - {% endfor %} - </tbody> - </table> - </div> - <div class="card-footer"> - <form class="row row-cols-lg-auto g-3 align-items-center" - action="{% url 'backoffice:assembly-auth' assembly=assembly.pk %}" - method="POST"> - {% csrf_token %} - <div class="col-12 form-floating"> - {% render_field form.name class+="form-control" %} - <label for="id_name">{% trans "Assembly__authentication-name" %}</label> - </div> - <div class="col-12 form-floating"> - {% render_field form.client_type class+="form-control" %} - <label for="id_client_type">{% trans "Assembly__authentication-client_type" %}</label> - </div> - <div class="col-12 form-floating"> - {% render_field form.grant_type class+="form-control" %} - <label for="id_grant_type">{% trans "Assembly__authentication-grant_type" %}</label> - </div> - <div class="col-12"> - <button type="submit" class="btn btn-sm btn-primary">{% trans "Assembly__authentication__newapp" %}</button> - </div> - </form> + </thead> + <tbody> + {% for app in applications %} + <tr> + <td> + <a href="{% url 'backoffice:assembly-auth-app' assembly=assembly.pk pk=app.id %}">{{ app.name }}</a> + </td> + <td>{{ app.client_type }}</td> + <td>{{ app.authorization_grant_type }}</td> + </tr> + {% endfor %} + </tbody> + </table> + </div> + <div class="card-footer"> + <form class="row row-cols-lg-auto g-3 align-items-center" + action="{% url 'backoffice:assembly-auth' assembly=assembly.pk %}" + method="POST"> + {% csrf_token %} + <div class="col-12 form-floating"> + {% render_field form.name class+="form-control" %} + <label for="id_name">{% trans "Assembly__authentication-name" %}</label> + </div> + <div class="col-12 form-floating"> + {% render_field form.client_type class+="form-control" %} + <label for="id_client_type">{% trans "Assembly__authentication-client_type" %}</label> + </div> + <div class="col-12 form-floating"> + {% render_field form.grant_type class+="form-control" %} + <label for="id_grant_type">{% trans "Assembly__authentication-grant_type" %}</label> + </div> + <div class="col-12"> + <button type="submit" class="btn btn-sm btn-primary">{% trans "Assembly__authentication__newapp" %}</button> + </div> + </form> + </div> </div> </div> - </form> -</div> -</div> + </div> {% endblock %} diff --git a/src/backoffice/templates/backoffice/assembly_detail.html b/src/backoffice/templates/backoffice/assembly_detail.html index e7aba0be0b7aec2349571f880ecf28732f0176a3..a6be4baee108719254df2bd085e5d3460bf5caa7 100644 --- a/src/backoffice/templates/backoffice/assembly_detail.html +++ b/src/backoffice/templates/backoffice/assembly_detail.html @@ -129,44 +129,43 @@ {% endif %} {% if not forloop.last %},{% endif %} {% endfor %} - </ul> - {% else %} - {% trans 'no_entries' %} - {% endif %} - {% endwith %} + {% else %} + {% trans 'no_entries' %} + {% endif %} + {% endwith %} + </div> </div> </div> - </div> - {% else %} - <div class="col-md-12"> - <div class="card border-primary"> - <div class="card-header">{% trans 'assembly_children' %}</div> - <div class="card-body"> - {% if assembly.children.exists %} - <table class="table table-sm m-0"> - <thead> - <tr> - <th>Name</th> - <th>Beschreibung</th> - </tr> - </thead> - <tbody> - {% for child in assembly.children.all %} + {% else %} + <div class="col-md-12"> + <div class="card border-primary"> + <div class="card-header">{% trans 'assembly_children' %}</div> + <div class="card-body"> + {% if assembly.children.exists %} + <table class="table table-sm m-0"> + <thead> <tr> - <td> - <a href="{% url 'backoffice:assembly' pk=child.pk %}">{{ child.name }}</a> - </td> - <td>{{ child.description|truncatechars:200 }}</td> + <th>Name</th> + <th>Beschreibung</th> </tr> - {% endfor %} - </tbody> - </table> - {% else %} - -/- - {% endif %} + </thead> + <tbody> + {% for child in assembly.children.all %} + <tr> + <td> + <a href="{% url 'backoffice:assembly' pk=child.pk %}">{{ child.name }}</a> + </td> + <td>{{ child.description|truncatechars:200 }}</td> + </tr> + {% endfor %} + </tbody> + </table> + {% else %} + -/- + {% endif %} + </div> </div> - </div> - {% endif %} + {% endif %} + </div> </div> -</div> {% endblock %} diff --git a/src/backoffice/templates/backoffice/assembly_events.html b/src/backoffice/templates/backoffice/assembly_events.html index 0633ab752afb2025800b56499c1cb7b62a627374..4752c5491319b06c04571e2819fa3a81bb2130bd 100644 --- a/src/backoffice/templates/backoffice/assembly_events.html +++ b/src/backoffice/templates/backoffice/assembly_events.html @@ -82,7 +82,6 @@ </table> </div> </div> - </form> + </div> </div> -</div> {% endblock %} diff --git a/src/backoffice/templates/backoffice/assembly_list_export.html b/src/backoffice/templates/backoffice/assembly_list_export.html index 25c2648efcaea25973d58a3148597bd49262f902..dea7ab80548a8bb3e46394e41af06c002534331c 100644 --- a/src/backoffice/templates/backoffice/assembly_list_export.html +++ b/src/backoffice/templates/backoffice/assembly_list_export.html @@ -142,7 +142,6 @@ </div> {% endif %} </div> - </form> + </div> </div> -</div> {% endblock %} diff --git a/src/backoffice/templates/backoffice/assembly_members.html b/src/backoffice/templates/backoffice/assembly_members.html index ab90c26efc608e31563a38d48a4b593f459d286d..ee8bd74fcb6cb0546c0b97c4b62ce08caf5e50b9 100644 --- a/src/backoffice/templates/backoffice/assembly_members.html +++ b/src/backoffice/templates/backoffice/assembly_members.html @@ -133,7 +133,6 @@ </div> {% endif %} </div> - </form> + </div> </div> -</div> {% endblock %} diff --git a/src/backoffice/templates/backoffice/assembly_members_edit.html b/src/backoffice/templates/backoffice/assembly_members_edit.html index 0b248e9ef8350f227cab823bff373709652cc9ac..6ac6bd223da277fa7d5859c596c99fe2750a3f74 100644 --- a/src/backoffice/templates/backoffice/assembly_members_edit.html +++ b/src/backoffice/templates/backoffice/assembly_members_edit.html @@ -20,7 +20,7 @@ <div class="card mb-3"> <div class="card-header"> - {{ assembly.name }} / <strong>{{ object.member.username }} + {{ assembly.name }} / <strong>{{ object.member.username }}</strong> </div> <div class="card-body"> {% for field in form %} diff --git a/src/backoffice/templates/backoffice/assembly_room_wa.html b/src/backoffice/templates/backoffice/assembly_room_wa.html index eca89e3cba84d5bc80a975b090791d6ab3ed592c..7be8fe88a32ea4cd94e691919f7d60a255ef198f 100644 --- a/src/backoffice/templates/backoffice/assembly_room_wa.html +++ b/src/backoffice/templates/backoffice/assembly_room_wa.html @@ -59,65 +59,65 @@ {% endif %} </div> </div> - </form> + </div> </div> -</div> -<div class="row mb-3"> - <div class="col-md-12"> - {% if wa_published.commitHash %} - <div class="card border-{% if wa_published.commitHash != wa_linter.commitHash %}warning{% else %}success{% endif %}"> - <div class="card-header bg-{% if wa_published.commitHash != wa_linter.commitHash %}warning{% else %}success{% endif %} text-white"> - {% trans "Room-workadventure_map-online__title" %} - </div> - <div class="card-body"> - <p> - {% trans "Room-workadventure_map-online" %} - <span title="{{ wa_published.timestamp }}">{{ wa_published.timestamp|naturaltime }}</span>, - Commit <code>{{ wa_published.commitHash }}</code> - </p> + <div class="row mb-3"> + <div class="col-md-12"> + {% if wa_published.commitHash %} + <div class="card border-{% if wa_published.commitHash != wa_linter.commitHash %}warning{% else %}success{% endif %}"> + <div class="card-header bg-{% if wa_published.commitHash != wa_linter.commitHash %}warning{% else %}success{% endif %} text-white"> + {% trans "Room-workadventure_map-online__title" %} + </div> + <div class="card-body"> + <p> + {% trans "Room-workadventure_map-online" %} + <span title="{{ wa_published.timestamp }}">{{ wa_published.timestamp|naturaltime }}</span>, + Commit <code>{{ wa_published.commitHash }}</code> + </p> - {% if wa_published.commitHash != wa_linter.commitHash %} - <p>{% trans "Room-workadventure_map-online__not_up2date_warning" %}</p> - {% endif %} + {% if wa_published.commitHash != wa_linter.commitHash %} + <p>{% trans "Room-workadventure_map-online__not_up2date_warning" %}</p> + {% endif %} + </div> </div> - </div> - {% else %} - <div class="card border-danger"> - <div class="card-header bg-danger text-white">{% trans "Room-workadventure_map-offline__title" %}</div> - <div class="card-body">{% trans "Room-workadventure_map-offline" %}</div> - </div> - {% endif %} + {% else %} + <div class="card border-danger"> + <div class="card-header bg-danger text-white">{% trans "Room-workadventure_map-offline__title" %}</div> + <div class="card-body">{% trans "Room-workadventure_map-offline" %}</div> + </div> + {% endif %} + </div> </div> -</div> - -<div class="row mb-3"> - <div class="col-md-12"> - {% if wa_linter.status == "danger" or wa_linter.status == "error" %} - <div class="card border-danger"> - <div class="card-header bg-default text-danger"> - {% elif wa_linter.status == "warning" %} - <div class="card border-warning"> - <div class="card-header bg-warning"> - {% elif wa_linter.status == "info" %} - <div class="card border-primary"> - <div class="card-header bg-primary text-white"> - {% elif wa_linter.status == "pending" %} - <div class="card border-secondary"> - <div class="card-header bg-default text-secondary"> - {% else %} - <div class="card"> - <div class="card-header"> - {% endif %} - {{ wa_linter.status_title }} - </div> - <div class="card-body"> - <p>{{ wa_linter.status_text }}</p> - {% include "backoffice/assembly_room_wa_linterblock.html" %} + {# Format here cannot be fixed as we open up a lot more tags than we close #} + {# djlint:off H025 #} + <div class="row mb-3"> + <div class="col-md-12"> + {% if wa_linter.status == "danger" or wa_linter.status == "error" %} + <div class="card border-danger"> + <div class="card-header bg-default text-danger"> + {% elif wa_linter.status == "warning" %} + <div class="card border-warning"> + <div class="card-header bg-warning"> + {% elif wa_linter.status == "info" %} + <div class="card border-primary"> + <div class="card-header bg-primary text-white"> + {% elif wa_linter.status == "pending" %} + <div class="card border-secondary"> + <div class="card-header bg-default text-secondary"> + {% else %} + <div class="card"> + <div class="card-header"> + {% endif %} + {{ wa_linter.status_title }} + </div> + <div class="card-body"> + <p>{{ wa_linter.status_text }}</p> + {% include "backoffice/assembly_room_wa_linterblock.html" %} + </div> </div> </div> </div> - </div> - - {% include 'backoffice/assembly_room_mgmt.html' %} - {% endblock %} + {# djlint:on #} + {% include 'backoffice/assembly_room_mgmt.html' %} + {% endblock %} diff --git a/src/backoffice/templates/backoffice/assemblyteam_assembly_detail.html b/src/backoffice/templates/backoffice/assemblyteam_assembly_detail.html index 73fa7882daec3d6e8062bc390cf269c56bc4304a..816d98849d7a07fa94acb0e3ad8737cfcccdadd8 100644 --- a/src/backoffice/templates/backoffice/assemblyteam_assembly_detail.html +++ b/src/backoffice/templates/backoffice/assemblyteam_assembly_detail.html @@ -302,50 +302,49 @@ {% endif %} </div> {% endfor %} - </ul> + </div> </div> </div> </div> -</div> -<div class="modal fade" - id="addCommentModal" - tabindex="-1" - aria-labelledby="addCommentModalLabel" - aria-hidden="true"> - <div class="modal-dialog"> - <div class="modal-content"> - <div class="modal-header"> - <h1 class="modal-title fs-5" id="addCommentModalLabel">{% trans "assemblyteam_addcomment" %}</h1> - <button type="button" - class="btn-close" - data-bs-dismiss="modal" - aria-label="Close"></button> - </div> - <div class="modal-body"> - <p>{% trans "assemblyteam_addcomment_help" %}</p> - <form id="addcomment" - action="{% url 'backoffice:assemblyteam-detail' pk=object.pk %}" - method="POST"> - {% csrf_token %} - <textarea name="comment" class="form-control" placeholder="" required></textarea> - </form> - </div> - <div class="modal-footer"> - <button class="btn btn-primary" form="addcomment"> - <i class="bi bi-chat-left-text"></i> {% trans "assemblyteam_addcomment_do" %} - </button> + <div class="modal fade" + id="addCommentModal" + tabindex="-1" + aria-labelledby="addCommentModalLabel" + aria-hidden="true"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <h1 class="modal-title fs-5" id="addCommentModalLabel">{% trans "assemblyteam_addcomment" %}</h1> + <button type="button" + class="btn-close" + data-bs-dismiss="modal" + aria-label="Close"></button> + </div> + <div class="modal-body"> + <p>{% trans "assemblyteam_addcomment_help" %}</p> + <form id="addcomment" + action="{% url 'backoffice:assemblyteam-detail' pk=object.pk %}" + method="POST"> + {% csrf_token %} + <textarea name="comment" class="form-control" placeholder="" required></textarea> + </form> + </div> + <div class="modal-footer"> + <button class="btn btn-primary" form="addcomment"> + <i class="bi bi-chat-left-text"></i> {% trans "assemblyteam_addcomment_do" %} + </button> + </div> </div> </div> </div> -</div> -<script> + <script> // make "visible log entries" selector visible and click the "w/ msg only" one document.getElementById("visible_logentries").classList.remove("d-none"); document.getElementById("visible_logentries_all").addEventListener("click", function() { for (const el of document.getElementsByClassName("logentry")) { el.classList.remove("d-none"); } }); let btn_msg = document.getElementById("visible_logentries_msg"); btn_msg.addEventListener("click", function() { for (const el of document.getElementsByClassName("logentry")) { if (el.getAttribute("data-has-msg") == "n") el.classList.add("d-none"); } }); btn_msg.click(); -</script> + </script> {% endblock %} diff --git a/src/backoffice/templates/backoffice/assemblyteam_editposition.html b/src/backoffice/templates/backoffice/assemblyteam_editposition.html index 520cf7b5ea3f12357d046854916a68b3324908f4..1c8ac47907a8c37a71ef2de4ad5e05258a64c2bf 100644 --- a/src/backoffice/templates/backoffice/assemblyteam_editposition.html +++ b/src/backoffice/templates/backoffice/assemblyteam_editposition.html @@ -64,10 +64,13 @@ </div> {% if assembly.is_public %} - <!--div class="form-group"> - <input type="checkbox" id=idInformAssembly" name="inform_assembly"> - <label for="idInformAssembly">{% trans "assemblyedit_position_informassembly" %}</label> - </div --> + <!-- + <div class="form-group"> + <input type="checkbox" id=idInformAssembly" name="inform_assembly"> + <label for="idInformAssembly">{% trans "assemblyedit_position_informassembly" %}</label> + </div> + --> + {% endif %} <p>{% trans "assemblyteam_addcomment_field" %}</p> diff --git a/src/backoffice/templates/backoffice/moderation_badge-item.html b/src/backoffice/templates/backoffice/moderation_badge-item.html index f54844f9b42e62a4f56898c76ab0a29c1797b33d..a0cfe81e39b09022483b170e5ff0c333c7164962 100644 --- a/src/backoffice/templates/backoffice/moderation_badge-item.html +++ b/src/backoffice/templates/backoffice/moderation_badge-item.html @@ -9,7 +9,7 @@ <span class="text-muted">{% trans "Badge__state" %}:</span> <span class="text-{% if badge.is_public %}success{% else %}warning{% endif %}">{{ badge.get_state_display }}</span> <div class="vr"></div> - <span class="text-muted">{% trans "Badge__category" %}:</span> {{ badge.category }}</span> + <span class="text-muted">{% trans "Badge__category" %}:</span> <span>{{ badge.category }}</span> <br> </div> </div> diff --git a/src/backoffice/templates/backoffice/moderation_event-detail.html b/src/backoffice/templates/backoffice/moderation_event-detail.html index 4ff4dc0754e615ab2f26f69e4693df4e7486b95b..99b56bffd36a3f6a7882b0443138d940f3180dd6 100644 --- a/src/backoffice/templates/backoffice/moderation_event-detail.html +++ b/src/backoffice/templates/backoffice/moderation_event-detail.html @@ -64,89 +64,89 @@ {% if object.is_imported %} <span class="text-warning"><i class="bi bi-lightning-fill"></i> {{ 1|yesno|upper }}</span> {% else %} - <span class="text-success">{{ false|yesno }} - {% endif %} - </dd> - <dt class="col-sm-3">{% trans "Event__assembly" %}:</dt> - <dd class="col-sm-9"> - {% if object.assembly %} - <a href="{% url "backoffice:moderation-assembly-detail" pk=object.assembly_id %}">{{ object.assembly.slug }}</a> - {% else %} - -/- - {% endif %} - </dd> - <dt class="col-sm-3">{% trans "Event__room" %}:</dt> - <dd class="col-sm-9"> - {{ object.room|default:"-/-" }} - </dd> - <dt class="col-sm-3">{% trans "Event__track" %}:</dt> - <dd class="col-sm-9"> - {{ object.track|default:"-/-" }} - </dd> - <dt class="col-sm-3">{% trans "Event__owner" %}:</dt> - <dd class="col-sm-9"> - {% if object.owner %} - <a href="{% url "backoffice:moderation-user-detail" pk=object.owner.id %}">{{ object.owner.username }}</a> - {% else %} - -/- - {% endif %} - </dd> - <dt class="col-sm-3">{% trans "Event__public_speakers" %}:</dt> - <dd class="col-sm-9"> - {% for speaker in object.public_speakers %} - - <a href="{% url "backoffice:moderation-user-detail" pk=speaker.participant.id %}" + <span class="text-success">{{ false|yesno }}</span> + {% endif %} + </dd> + <dt class="col-sm-3">{% trans "Event__assembly" %}:</dt> + <dd class="col-sm-9"> + {% if object.assembly %} + <a href="{% url "backoffice:moderation-assembly-detail" pk=object.assembly_id %}">{{ object.assembly.slug }}</a> + {% else %} + -/- + {% endif %} + </dd> + <dt class="col-sm-3">{% trans "Event__room" %}:</dt> + <dd class="col-sm-9"> + {{ object.room|default:"-/-" }} + </dd> + <dt class="col-sm-3">{% trans "Event__track" %}:</dt> + <dd class="col-sm-9"> + {{ object.track|default:"-/-" }} + </dd> + <dt class="col-sm-3">{% trans "Event__owner" %}:</dt> + <dd class="col-sm-9"> + {% if object.owner %} + <a href="{% url "backoffice:moderation-user-detail" pk=object.owner.id %}">{{ object.owner.username }}</a> + {% else %} + -/- + {% endif %} + </dd> + <dt class="col-sm-3">{% trans "Event__public_speakers" %}:</dt> + <dd class="col-sm-9"> + {% for speaker in object.public_speakers %} + - <a href="{% url "backoffice:moderation-user-detail" pk=speaker.participant.id %}" title="{{ speaker.participant.username }}">{{ speaker.participant.get_display_name }}</a> - <br> - {% empty %}-/- - {% endfor %} - </dd> - </dl> - </div> - </div> - - <div class="card mb-3"> - <div class="card-header">{% trans "Event__abstract" %}</div> - <div class="card-body">{{ event.abstract }}</div> + <br> + {% empty %}-/- + {% endfor %} + </dd> + </dl> </div> + </div> - <div class="card mb-3"> - <div class="card-header">{% trans "Event__description" %} (de)</div> - <div class="card-body">{{ event.description_html_de|safe }}</div> - </div> + <div class="card mb-3"> + <div class="card-header">{% trans "Event__abstract" %}</div> + <div class="card-body">{{ event.abstract }}</div> + </div> - <div class="card mb-3"> - <div class="card-header">{% trans "Event__description" %} (en)</div> - <div class="card-body">{{ event.description_html_en|safe }}</div> - </div> + <div class="card mb-3"> + <div class="card-header">{% trans "Event__description" %} (de)</div> + <div class="card-body">{{ event.description_html_de|safe }}</div> + </div> + <div class="card mb-3"> + <div class="card-header">{% trans "Event__description" %} (en)</div> + <div class="card-body">{{ event.description_html_en|safe }}</div> </div> - <div class="col-md-3"> - <a class="d-block btn btn-outline-{% if event.is_public %}success{% else %}warning{% endif %} mb-3" - href="{% hub_absolute 'plainui:event' event_slug=event.slug %}"> - {% trans "moderation__public_link" %} - {% if not event.is_public %} - <br> - <small class="text-muted fst-italic">{% trans "moderation__notpublic" %}</small> - {% endif %} - </a> - <div class="card border-primary-subtle"> - <div class="card-header bg-primary-subtle text-bg-primary">{% trans "nav_moderation" %}</div> - <div class="card-body" id="moderation"> - {% if object.is_public %} - <button class="mb-3 w-100 btn btn-outline-warning" - data-action="hide" - data-action-text="Veröffentlichung wird zurück genommen. Diese Aktion kann vom Eigentümer der Veranstaltung selbst rückgängig gemacht werden."> - <i class="bi bi-eye-slash"></i> hide - </button> - {% endif %} - <button class="mb-3 w-100 btn btn-outline-danger" - data-action="delete" - data-action-text="Veranstaltung vollständig entfernen. Diese Aktion kann nicht rückgängig gemacht werden!"> - <i class="bi bi-trash"></i> delete + </div> + <div class="col-md-3"> + <a class="d-block btn btn-outline-{% if event.is_public %}success{% else %}warning{% endif %} mb-3" + href="{% hub_absolute 'plainui:event' event_slug=event.slug %}"> + {% trans "moderation__public_link" %} + {% if not event.is_public %} + <br> + <small class="text-muted fst-italic">{% trans "moderation__notpublic" %}</small> + {% endif %} + </a> + + <div class="card border-primary-subtle"> + <div class="card-header bg-primary-subtle text-bg-primary">{% trans "nav_moderation" %}</div> + <div class="card-body" id="moderation"> + {% if object.is_public %} + <button class="mb-3 w-100 btn btn-outline-warning" + data-action="hide" + data-action-text="Veröffentlichung wird zurück genommen. Diese Aktion kann vom Eigentümer der Veranstaltung selbst rückgängig gemacht werden."> + <i class="bi bi-eye-slash"></i> hide </button> - </div> + {% endif %} + <button class="mb-3 w-100 btn btn-outline-danger" + data-action="delete" + data-action-text="Veranstaltung vollständig entfernen. Diese Aktion kann nicht rückgängig gemacht werden!"> + <i class="bi bi-trash"></i> delete + </button> </div> </div> </div> - {% endblock %} + </div> +{% endblock %} diff --git a/src/backoffice/templates/backoffice/moderation_project-item.html b/src/backoffice/templates/backoffice/moderation_project-item.html index cbfb92edfee2e17df77da928883cddb7ea49e79c..ef5705c8d026050cea99ceea3ee71aa71bf75f00 100644 --- a/src/backoffice/templates/backoffice/moderation_project-item.html +++ b/src/backoffice/templates/backoffice/moderation_project-item.html @@ -10,12 +10,13 @@ <span class="text-muted">{% trans "Project__state" %}:</span> <span class="text-{% if project.blocked %}danger{% elif project.is_public %}success{% else %}warning{% endif %}">{{ project.get_state_display }}</span> <div class="vr"></div> <span class="text-muted">{% trans "Project__type" %}:</span> - {% if project.assembly %} - {% trans "AssemblyProject" %} - {% else %} - {% trans "SelfOrganizedProject" %} - {% endif %} - </span> - <br> -</div> + <span> + {% if project.assembly %} + {% trans "AssemblyProject" %} + {% else %} + {% trans "SelfOrganizedProject" %} + {% endif %} + </span> + <br> + </div> </div> diff --git a/src/backoffice/templates/backoffice/vouchers-list.html b/src/backoffice/templates/backoffice/vouchers-list.html index c47ed349b9c5b85cee467335e18f51048566ddce..47fdbf1d3322e6ed9bbf6344806325389284d01c 100644 --- a/src/backoffice/templates/backoffice/vouchers-list.html +++ b/src/backoffice/templates/backoffice/vouchers-list.html @@ -43,20 +43,19 @@ <td> <a href=" {% if obj.assigned_assembly %} {% url 'backoffice:assembly' pk=obj.target.pk %} {% elif obj.assigned_user %} {% url 'backoffice:user-detail' pk=obj.assigned_user.pk %} {% endif %} ">{{ obj.target }}</a> </td> - </td> - </tr> - {% endfor %} - </tbody> - {% if more_results %} - <tfoot> - <tr> - <td colspan="3"> - <span class="badge badge-warning" title="there are more results">...</span> - </td> - </tr> - </tfoot> - {% endif %} - </table> - </div> -{% endif %} + </tr> + {% endfor %} + </tbody> + {% if more_results %} + <tfoot> + <tr> + <td colspan="3"> + <span class="badge badge-warning" title="there are more results">...</span> + </td> + </tr> + </tfoot> + {% endif %} + </table> + </div> + {% endif %} {% endblock %} diff --git a/src/core/templates/oauth2_provider/out-of-band-display-token.html b/src/core/templates/oauth2_provider/out-of-band-display-token.html index 5e381b614a91a6b5c10006021a6864266d1eb489..69075acc857a6c258a4451675445fc17543bcccc 100644 --- a/src/core/templates/oauth2_provider/out-of-band-display-token.html +++ b/src/core/templates/oauth2_provider/out-of-band-display-token.html @@ -54,7 +54,11 @@ <p> Token: <span id="token"></span> </p> - </div> - </div> - </body> - </html> + </p> + </p> + </div> + </p> + </p> + </div> + </body> +</html> diff --git a/src/plainui/jinja2/plainui/components/logo.html.j2 b/src/plainui/jinja2/plainui/components/logo.html.j2 index 76a14ef69785b5af2c58bb79ab225b9df77dfc38..f3be8f1ed52ae1f716a5e5c4d1ff6c256b4f3975 100644 --- a/src/plainui/jinja2/plainui/components/logo.html.j2 +++ b/src/plainui/jinja2/plainui/components/logo.html.j2 @@ -1,13 +1,6 @@ {% macro logo(conf, link="", alt="Logo", title="Logo", class="", height=50) -%} - {% if link|length %} - <a class="navbar-brand hub-logo" - href="{{ link }}" - style="height: {{ height }}px"> - {% else %} - <a class="navbar-brand hub-logo" - href="{{ url('plainui:index') }}" - style="height: {{ height }}px"> - {% endif %} - {{ conf.logo_html }}{# defaults to content of /src/hub/logos/default.svg #} - </a> - {%- endmacro %} + + <a class="navbar-brand hub-logo" + href="{%- if link|length -%}{{ link }}{%- else -%}{{ url("plainui:index") }}{%- endif -%}" + style="height: {{ height }}px">{{ conf.logo_html }}{# defaults to content of /src/hub/logos/default.svg #}</a> +{%- endmacro %} diff --git a/src/plainui/jinja2/plainui/header.html.j2 b/src/plainui/jinja2/plainui/header.html.j2 index fb1c2169444343504e9b4a3e24ff63aefbe8c825..f2bbfc196db0e9ab9f59e1aed4e8cb2c844bcb34 100644 --- a/src/plainui/jinja2/plainui/header.html.j2 +++ b/src/plainui/jinja2/plainui/header.html.j2 @@ -28,7 +28,7 @@ name="q" type="text" placeholder="{{ _('search') }}" - value="{% if search_query is defined %}{{ search_query }}{% endif %}"> + value="{% if search_query is defined %} {{ search_query }} {% endif %}"> </form> </li> <li class="nav-item dropdown">{{ hbtns.globe() }}</li> @@ -101,14 +101,15 @@ <button class="dropdown-item">{{ _("logout") }}</button> </form> </li> - {% else %} - <li> - <a class="dropdown-item" href="{{ url('plainui:login') }}">Login</a> - </li> - {% endif %} - </ul> - </li> - </ul> - </div> + </li> + {% else %} + <li> + <a class="dropdown-item" href="{{ url('plainui:login') }}">Login</a> + </li> + {% endif %} + </ul> + </li> + </ul> </div> - </nav> + </div> +</nav> diff --git a/src/plainui/jinja2/plainui/static_page_diff.html.j2 b/src/plainui/jinja2/plainui/static_page_diff.html.j2 index 990420c0b71e84c51f28feb8932467e44dc4a62c..469e5432339dc2fb564d70c713d17356e069e94d 100644 --- a/src/plainui/jinja2/plainui/static_page_diff.html.j2 +++ b/src/plainui/jinja2/plainui/static_page_diff.html.j2 @@ -15,20 +15,21 @@ <li class="breadcrumb-item"> <a href="{{ url('plainui:static_page_global_history') }}">{{ _("Global History") }}</a> </li> - </nav> + </ol> + </nav> - <div class="row diff_rev"> - <div class="col"> - <h2> - <a href="{{ url('plainui:static_page', page_slug=page_slug) }}?rev={{ rev_id.rev1 }}">{{ rev_id.rev1 }}</a> - </h2> - </div> - <div class="col"> - <h2> - <a href="">{{ rev_id.rev2 }}</a> - </h2> - </div> + <div class="row diff_rev"> + <div class="col"> + <h2> + <a href="{{ url('plainui:static_page', page_slug=page_slug) }}?rev={{ rev_id.rev1 }}">{{ rev_id.rev1 }}</a> + </h2> </div> - <article class="pb-11">{{ diff |safe }}</article> + <div class="col"> + <h2> + <a href="">{{ rev_id.rev2 }}</a> + </h2> + </div> + </div> + <article class="pb-11">{{ diff |safe }}</article> - {% endblock %} +{% endblock %} diff --git a/src/plainui/jinja2/plainui/static_page_edit.html.j2 b/src/plainui/jinja2/plainui/static_page_edit.html.j2 index c66bc8e2400ae88544a95ed624db56cc7ef13ab2..037d26d97ceafd90701bc03d62b7f2ab9cf094d2 100644 --- a/src/plainui/jinja2/plainui/static_page_edit.html.j2 +++ b/src/plainui/jinja2/plainui/static_page_edit.html.j2 @@ -13,62 +13,63 @@ <li class="breadcrumb-item"> <a href="{{ url('plainui:static_page', page_slug=page_slug) }}">{{ page.title }}</a> </li> - </nav> + </ol> + </nav> - <article class="pb-11"> - {% if not lock_id %} - {% call alert.warning() %} - <strong>{{ _("This page is currently being edited by another user, please try again in a moment.") }}</strong> - {% endcall %} - {% elif not writeable %} + <article class="pb-11"> + {% if not lock_id %} + {% call alert.warning() %} + <strong>{{ _("This page is currently being edited by another user, please try again in a moment.") }}</strong> + {% endcall %} + {% elif not writeable %} + {% call alert.warning() %} + <strong>{{ _("Sorry, you don't have permission to edit this wiki page.") }}</strong> + {{ _("If you think this is an error please use the report functionality on this page and select 'technical issue'.") }} + {% endcall %} + {% elif page.is_localized %} + {% call alert.danger() %} + <strong>{{ _("Localized page.") }}</strong> + {{ _("Please note that this page is present in the current language only. It may have a (translated) copy in other language or not exist there at all.") }} + {% endcall %} + {% endif %} + {% if preview_body is defined %} + <article class="pb-11">{{ markdownMacro.markdown(markdown=preview_body | safe) }}</article> + {% endif %} + <form method="POST" + action="{{ url('plainui:static_page_edit', page_slug=page_slug) }}{{ '?rev=' + revision if revision else '' }}"> + {%- if not_latest_revision %} {% call alert.warning() %} - <strong>{{ _("Sorry, you don't have permission to edit this wiki page.") }}</strong> - {{ _("If you think this is an error please use the report functionality on this page and select 'technical issue'.") }} + {{ _("Careful: You're not editing the latest version of this Page!") }} {% endcall %} - {% elif page.is_localized %} - {% call alert.danger() %} - <strong>{{ _("Localized page.") }}</strong> - {{ _("Please note that this page is present in the current language only. It may have a (translated) copy in other language or not exist there at all.") }} - {% endcall %} - {% endif %} - {% if preview_body is defined %} - <article class="pb-11">{{ markdownMacro.markdown(markdown=preview_body | safe) }}</article> - {% endif %} - <form method="POST" - action="{{ url('plainui:static_page_edit', page_slug=page_slug) }}{{ '?rev=' + revision if revision else '' }}"> - {%- if not_latest_revision %} - {% call alert.warning() %} - {{ _("Careful: You're not editing the latest version of this Page!") }} - {% endcall %} - {%- endif %} - {{ csrf_input }} - {{ formElements.errors(form) }} - {{ formElements.field(form, 'title') }} - {{ formElements.textarea(form, 'body') }} - {{ formElements.hidden(form, 'lock') }} + {%- endif %} + {{ csrf_input }} + {{ formElements.errors(form) }} + {{ formElements.field(form, 'title') }} + {{ formElements.textarea(form, 'body') }} + {{ formElements.hidden(form, 'lock') }} - <div class="row mt-1"> - <div class="col"> - {%- if writeable %} - <button type="submit" class="btn btn-primary"> - {{ _("Save") }} - {% if page.is_localized %}({{ get_language() }}){% endif %} - </button> - <button type="submit" name="preview" value="true" class="btn btn-secondary">{{ _("Preview") }}</button> - {%- endif %} - </div> - <div class="col d-flex justify-content-end"> - <a href="{{ url('plainui:static_page', page_slug=page_slug) }}{% if lock_id %}?release={{ lock_id }}{% endif %}" - class="btn btn-dark">{{ _("Cancel") if writeable else _("Back") }}</a> - </div> + <div class="row mt-1"> + <div class="col"> + {%- if writeable %} + <button type="submit" class="btn btn-primary"> + {{ _("Save") }} + {% if page.is_localized %}({{ get_language() }}){% endif %} + </button> + <button type="submit" name="preview" value="true" class="btn btn-secondary">{{ _("Preview") }}</button> + {%- endif %} + </div> + <div class="col d-flex justify-content-end"> + <a href="{{ url('plainui:static_page', page_slug=page_slug) }}{% if lock_id %}?release={{ lock_id }}{% endif %}" + class="btn btn-dark">{{ _("Cancel") if writeable else _("Back") }}</a> </div> - </form> - </article> - {% endblock %} + </div> + </form> + </article> +{% endblock %} - {% block jstools %} - {% if page_slug and lock_id %} - <script> +{% block jstools %} + {% if page_slug and lock_id %} + <script> const data = new URLSearchParams(); data.append('page_slug', {{ page_slug | tojson }}); data.append('lock_id', {{ lock_id | tojson }}); @@ -81,6 +82,6 @@ }) } setInterval(refresh_lock, {{ lock_refresh_interval | tojson}} * 1000); - </script> - {% endif %} - {% endblock %} + </script> + {% endif %} +{% endblock %} diff --git a/src/plainui/jinja2/plainui/static_page_global_history.html.j2 b/src/plainui/jinja2/plainui/static_page_global_history.html.j2 index 891185b5d49c68d991e616943cc1851cecb6dd92..f9865696a3baf4aa0caa96153569d06ed24a86b7 100644 --- a/src/plainui/jinja2/plainui/static_page_global_history.html.j2 +++ b/src/plainui/jinja2/plainui/static_page_global_history.html.j2 @@ -13,7 +13,9 @@ {% set dmy = timestamp.strftime('%Y-%m-%d') %} {% if dmy != ns.prev %} - </ul> + {# djlint:off H025 #} + {% if loop.first %}</ul>{% endif %} + {# djlint:on #} <h3>{{ dmy }}</h3> <ul> {% endif %} @@ -21,13 +23,17 @@ <a href="{{ url('plainui:static_page', page_slug=history_entry.page.slug) }}?rev={{ history_entry.revision }}">{{ history_entry.page.title }}</a> . . {{ history_entry.timestamp.strftime("%H:%M") }} {%- if history_entry.author %} . . + {# djlint:off H025 #} <a href="{{ url('plainui:user', user_slug=history_entry.author.slug) }}">{{ history_entry.author.display_name if history_entry.author else _("<Unknown User>") }}</a> {%- else %} {{ _("<Unknown User>") }} + {# djlint:on #} {%- endif %} </li> {%- set ns.prev = dmy %} - {% endfor %} - </article> + {% if loop.last %}</ul>{% endif %} + {% endfor %} + </div> +</article> - {% endblock %} +{% endblock %} diff --git a/src/plainui/jinja2/plainui/static_page_history.html.j2 b/src/plainui/jinja2/plainui/static_page_history.html.j2 index ff3ea1e60ce34103b62cd13496664dc169851481..f9a4fe0668f27d32865be6210435d0cd29c47ee5 100644 --- a/src/plainui/jinja2/plainui/static_page_history.html.j2 +++ b/src/plainui/jinja2/plainui/static_page_history.html.j2 @@ -12,27 +12,31 @@ <li class="breadcrumb-item"> <a href="{{ url('plainui:static_page', page_slug=page_slug) }}">{{ page.title }}</a> </li> - </nav> + </ol> + </nav> - <article class="pb-11 staticpage"> - <form method="GET" - action="{{ url('plainui:static_page_diff', page_slug=page_slug) }}"> - <input type="submit" class="btn m-2" value="Compare"> - <ul class="hub-card"> - {% for history_entry in history %} - <li class="list-unstyled"> - <input type="radio" name="rev" value="{{ history_entry.revision }}"> - <input type="radio" name="rev2" value="{{ history_entry.revision }}"> - {%- if loop.first %} - <span class="time"><a href="{{ url('plainui:static_page', page_slug=page_slug) }}">{{ history_entry.timestamp | strftime }}</a></span> - {% else %} - <span class="time"><a href="{{ url('plainui:static_page', page_slug=page_slug) }}?rev={{ history_entry.revision }}">{{ history_entry.timestamp | strftime }}</a></span> - {% endif %} - <a href="{{ url('plainui:user', user_slug=history_entry.author.slug) }}">{{ history_entry.author.display_name if history_entry.author else _("<Unknown User>") }}</a> - </li> - {% endfor %} - </ul> - </form> - </article> + <article class="pb-11 staticpage"> + <form method="GET" + action="{{ url('plainui:static_page_diff', page_slug=page_slug) }}"> + <input type="submit" class="btn m-2" value="Compare"> + <ul class="hub-card"> + {% for history_entry in history %} + <li class="list-unstyled"> + <input type="radio" name="rev" value="{{ history_entry.revision }}"> + <input type="radio" name="rev2" value="{{ history_entry.revision }}"> + {%- if loop.first %} + <span class="time"><a href="{{ url('plainui:static_page', page_slug=page_slug) }}">{{ history_entry.timestamp | strftime }}</a></span> + {% else %} + <span class="time"><a href="{{ url('plainui:static_page', page_slug=page_slug) }}?rev={{ history_entry.revision }}">{{ history_entry.timestamp | strftime }}</a></span> + {% endif %} - {% endblock %} + {# djlint:off H025 #} + <a href="{{ url('plainui:user', user_slug=history_entry.author.slug) }}">{{ history_entry.author.display_name if history_entry.author else _("<Unknown User>") }}</a> + {# djlint:on #} + </li> + {% endfor %} + </ul> + </form> + </article> + +{% endblock %}