diff --git a/pretalx_pages/templates/pretalx_pages/delete.html b/pretalx_pages/templates/pretalx_pages/delete.html index 98228b5..2d98649 100644 --- a/pretalx_pages/templates/pretalx_pages/delete.html +++ b/pretalx_pages/templates/pretalx_pages/delete.html @@ -5,9 +5,11 @@

{% trans "Delete a page" %}

{% csrf_token %} -

{% blocktrans trimmed with name=page.name %} - Are you sure you want to delete the page {{ name }}? - {% endblocktrans %}

+

+ {% blocktrans trimmed with name=page.name %} + Are you sure you want to delete the page {{ name }}? + {% endblocktrans %} +

{% trans "Cancel" %} diff --git a/pretalx_pages/templates/pretalx_pages/form.html b/pretalx_pages/templates/pretalx_pages/form.html index 7c77ac4..e644622 100644 --- a/pretalx_pages/templates/pretalx_pages/form.html +++ b/pretalx_pages/templates/pretalx_pages/form.html @@ -18,7 +18,6 @@

{% trans "Page" %}

{% trans "Page content" %} - {% bootstrap_field form.text layout="event" %}
{% include "orga/includes/submit_row.html" %} @@ -27,9 +26,7 @@

{% trans "Page" %}

-

- {% trans "Page history" %} -

+

{% trans "Page history" %}

{% include "common/logs.html" with entries=page.logged_actions %}
diff --git a/pretalx_pages/templates/pretalx_pages/show.html b/pretalx_pages/templates/pretalx_pages/show.html index 4aab1dd..89f59df 100644 --- a/pretalx_pages/templates/pretalx_pages/show.html +++ b/pretalx_pages/templates/pretalx_pages/show.html @@ -2,15 +2,16 @@ {% load rules %} {% block nav_link %} - {% has_perm 'agenda.view_schedule' request.user request.event as can_view_schedule %}{% if can_view_schedule %}{{ request.event.urls.schedule }}{% else %}{{ request.event.urls.base }}{% endif %} + {% has_perm 'agenda.view_schedule' request.user request.event as can_view_schedule %} + {% if can_view_schedule %} + {{ request.event.urls.schedule }} + {% else %} + {{ request.event.urls.base }} + {% endif %} {% endblock %} {% block title %}{{ page_title }} :: {{ event.name }}{% endblock %} {% block content %} -

{{ page_title }}

-
- {{ content|safe }} -
- +
{{ content|safe }}
{% endblock %}