Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move automatically saved note #3415

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion integreat_cms/cms/templates/events/event_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ <h1 class="heading overflow-hidden text-ellipsis">
{% endif %}
</h1>
<div class="flex flex-wrap gap-4 ml-auto mr-0 items-center">
{% if event_form.instance.id and not disabled %}
{% include "generic_auto_save_note.html" with form_instance=event_form.instance %}
{% endif %}
{% if event_form.instance.archived %}
<a href="{% url 'events_archived' region_slug=request.region.slug language_slug=language.slug %}"
class="btn btn-ghost">{% translate "Cancel" %}</a>
Expand All @@ -45,7 +48,6 @@ <h1 class="heading overflow-hidden text-ellipsis">
class="btn btn-ghost">{% translate "Cancel" %}</a>
{% endif %}
{% if not disabled %}
{% include "generic_auto_save_note.html" with form_instance=event_form.instance %}
{% if perms.cms.publish_event %}
<button name="status"
value="{{ DRAFT }}"
Expand Down
4 changes: 3 additions & 1 deletion integreat_cms/cms/templates/pages/page_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ <h1 class="heading">
{% endif %}
</h1>
<div class="flex flex-wrap grow justify-end gap-2 items-center">
{% if page_form.instance.id and not page_form.instance.archived and can_edit_page %}
{% include "generic_auto_save_note.html" with form_instance=page_translation_form.instance %}
{% endif %}
{% if page_form.instance.id and page_form.instance.archived %}
<a href="{% url 'archived_pages' region_slug=request.region.slug language_slug=language.slug %}"
class="btn btn-ghost">{% translate "Cancel" %}</a>
Expand All @@ -53,7 +56,6 @@ <h1 class="heading">
class="btn btn-ghost">{% translate "Cancel" %}</a>
{% endif %}
{% if not page_form.instance.id or not page_form.instance.archived %}
{% include "generic_auto_save_note.html" with form_instance=page_translation_form.instance %}
<button name="preview_page" type="button" data-preview-page data-edit-page-mode data-right-to-left={{ right_to_left }} class="btn btn-ghost">
{% translate "Preview" %}
</button>
Expand Down
4 changes: 3 additions & 1 deletion integreat_cms/cms/templates/pois/poi_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ <h1 class="overflow-hidden heading text-ellipsis">
{% endif %}
</h1>
<div class="flex flex-wrap items-center gap-4 ml-auto mr-0">
{% if poi_form.instance.id and not poi_form.instance.archived and perms.cms.change_poi %}
{% include "generic_auto_save_note.html" with form_instance=poi_translation_form.instance %}
{% endif %}
{% if poi_form.instance.archived %}
<a href="{% url 'archived_pois' region_slug=request.region.slug language_slug=language.slug %}"
class="btn btn-ghost">{% translate "Cancel" %}</a>
Expand All @@ -41,7 +44,6 @@ <h1 class="overflow-hidden heading text-ellipsis">
class="btn btn-ghost">{% translate "Cancel" %}</a>
{% endif %}
{% if not poi_form.instance.archived and perms.cms.change_poi %}
{% include "generic_auto_save_note.html" with form_instance=poi_translation_form.instance %}
<button name="status"
value="{{ DRAFT }}"
class="btn btn-outline no-premature-submission">
Expand Down
2 changes: 2 additions & 0 deletions integreat_cms/release_notes/current/unreleased/3327.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
en: Move note that page was automatically saved
de: Verschiebe den Hinweis, dass die Seite automatisch gespeichert wurde
Loading