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.

Sign up for GitHub

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

Breadcrumbs & Module page <> Project page interaction fixes #6165

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Breadcrumbs & Module page <> Project page interaction fixes #6165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions meinberlin/apps/budgeting/templates/meinberlin_budgeting/proposal_create_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
<li><a href="{% url 'wagtail_serve' '' %}">meinBerlin</a></li>
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Kiezradar' %}</a></li>
<li><a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a></li>
{% if module.is_in_module_cluster %}
<li><a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a></li>
{% endif %}
<li><a href="{{ module.get_absolute_url }}">{{ module.name|truncatechars:50 }}</a></li>
<li class="active" aria-current="page">{% translate 'Submit a new proposal for this project' %}</li>
</ol>
</nav>
Expand All @@ -25,6 +23,6 @@ <h1>{% translate 'Submit a new proposal for this project' %}</h1>
{% include 'meinberlin_contrib/components/alert.html' with alert_message='Error during validation. Please check your entries.' alert_type='danger' %}
{% endif %}

{% include "meinberlin_budgeting/includes/proposal_form.html" with proposal=proposal cancel=module.get_detail_url %}
{% include "meinberlin_budgeting/includes/proposal_form.html" with proposal=proposal cancel=module.get_absolute_url %}
</div>
{% endblock content %}
10 changes: 4 additions & 6 deletions meinberlin/apps/budgeting/templates/meinberlin_budgeting/proposal_moderate_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,14 @@
<a href="{% url 'wagtail_serve' '' %}">meinBerlin</a>
</li>
<li>
<a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</a>
<a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Kiezradar' %}</a>
</li>
<li>
<a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a>
</li>
{% if module.is_in_module_cluster %}
<li>
<a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a>
</li>
{% endif %}
<li>
<a href="{{ module.get_absolute_url }}">{{ module.name|truncatechars:50 }}</a>
</li>
<li>
<a href="{{ object.get_absolute_url }}">{% translate 'Proposal' %}</a>
</li>
Expand Down
12 changes: 5 additions & 7 deletions meinberlin/apps/budgeting/templates/meinberlin_budgeting/proposal_update_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
{% extends "base.html" %}
{% load i18n %}

{% block title %}{% blocktranslate with title=object.name %}Edit {{ title }}{% endblocktranslate %} &mdash; {{ block.super }}{% endblock %}
{% block title %}{% blocktranslate with title=object.name %}Edit {{ title }}{% endblocktranslate %} – {{ block.super }}{% endblock title %}

{% block breadcrumbs %}
<div id="content-header">
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
<ol>
<li><a href="{% url 'wagtail_serve' '' %}">meinBerlin</a></li>
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</a></li>
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Kiezradar' %}</a></li>
<li><a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a></li>
{% if module.is_in_module_cluster %}
<li><a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a></li>
{% endif %}
<li><a href="{{ module.get_absolute_url }}">{{ module.name|truncatechars:50 }}</a></li>
<li><a href="{{ object.get_absolute_url }}">{% translate 'Proposal' %}</a></li>
<li class="active" aria-current="page">{% translate 'Edit proposal' %}</li>
</ol>
</nav>
</div>
{% endblock %}
{% endblock breadcrumbs %}

{% block content %}
<div id="layout-grid__area--maincontent">
Expand All @@ -30,4 +28,4 @@ <h1>{% translate 'Edit proposal' %}</h1>

{% include "meinberlin_budgeting/includes/proposal_form.html" with proposal=proposal cancel=object.get_absolute_url %}
</div>
{% endblock %}
{% endblock content %}
2 changes: 1 addition & 1 deletion meinberlin/apps/budgeting/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ def get_back(self):
are remembered when going back, we check if the referer is a
module or project detail view and add the appropriate back url.
"""
back_link = self.module.get_detail_url
back_link = self.module.get_absolute_url
back_string = _("map")
if "Referer" in self.request.headers:
referer = self.request.headers["Referer"]
Expand Down
10 changes: 4 additions & 6 deletions meinberlin/apps/contrib/templates/meinberlin_contrib/item_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,14 @@
<a href="{% url 'wagtail_serve' '' %}">meinBerlin</a>
</li>
<li>
<a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</a>
<a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Kiezradar' %}</a>
</li>
<li>
<a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a>
</li>
{% if module.is_in_module_cluster %}
<li>
<a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a>
</li>
{% endif %}
<li>
<a href="{{ module.get_absolute_url }}">{{ module.name|truncatechars:50 }}</a>
</li>
<li class="active" aria-current="page">{{ object.name }}</li>
</ol>
</nav>
Expand Down
8 changes: 2 additions & 6 deletions meinberlin/apps/documents/templates/meinberlin_documents/paragraph_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,9 @@
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
<ol>
<li><a href="{% url 'wagtail_serve' '' %}">meinBerlin</a></li>
<li><a href="{% url 'wagtail_serve' '' %}">meinBerlin</a></li>
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</a></li>
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Kiezradar' %}</a></li>
<li><a href="{{ project.get_absolute_url }}">{{ project.name|truncatechars:50 }}</a></li>
<!-- FIXME this doesn't work, it doesn't know it's in a cluster -->
{% if module.is_in_module_cluster %}
<li><a href="{{ chapter.get_absolute_url }}">{{ chapter.name|truncatechars:50 }}</a></li>
{% endif %}
<li><a href="{{ chapter.get_absolute_url }}">{{ chapter.name|truncatechars:50 }}</a></li>
<li class="active" aria-current="page">{{ paragraph.name|truncatechars:50 }}</li>
</ol>
</nav>
Expand Down
8 changes: 3 additions & 5 deletions meinberlin/apps/ideas/templates/meinberlin_ideas/idea_create_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,9 @@
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
<ol>
<li><a href="{% url 'wagtail_serve' '' %}">meinBerlin</a></li>
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</a></li>
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Kiezradar' %}</a></li>
<li><a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a></li>
{% if module.is_in_module_cluster %}
<li><a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a></li>
{% endif %}
<li><a href="{{ module.get_absolute_url }}">{{ module.name|truncatechars:50 }}</a></li>
<li class="active" aria-current="page">{% translate 'Submit a new idea for this project ' %}</li>
</ol>
</nav>
Expand All @@ -35,6 +33,6 @@ <h3>{{ module.name }}</h3>
<p>{{ project.description }}</p>
{% endif %}
</div>
{% include "meinberlin_ideas/includes/idea_form.html" with idea=idea cancel=module.get_detail_url %}
{% include "meinberlin_ideas/includes/idea_form.html" with idea=idea cancel=module.get_absolute_url %}
</div>
{% endblock content %}
10 changes: 4 additions & 6 deletions meinberlin/apps/ideas/templates/meinberlin_ideas/idea_moderate_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,14 @@
<a href="{% url 'wagtail_serve' '' %}">meinBerlin</a>
</li>
<li>
<a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</a>
<a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Kiezradar' %}</a>
</li>
<li>
<a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a>
</li>
{% if module.is_in_module_cluster %}
<li>
<a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a>
</li>
{% endif %}
<li>
<a href="{{ module.get_absolute_url }}">{{ module.name|truncatechars:50 }}</a>
</li>
<li>
<a href="{{ object.get_absolute_url }}">{% translate 'Idea' %}</a>
</li>
Expand Down
6 changes: 2 additions & 4 deletions meinberlin/apps/ideas/templates/meinberlin_ideas/idea_update_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,9 @@
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
<ol>
<li><a href="{% url 'wagtail_serve' '' %}">meinBerlin</a></li>
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</a></li>
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Kiezradar' %}</a></li>
<li><a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a></li>
{% if module.is_in_module_cluster %}
<li><a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a></li>
{% endif %}
<li><a href="{{ module.get_absolute_url }}">{{ module.name|truncatechars:50 }}</a></li>
<li><a href="{{ object.get_absolute_url }}">{% translate 'Idea' %}</a></li>
<li class="active" aria-current="page">{% translate 'Edit idea' %}</li>
</ol>
Expand Down
8 changes: 3 additions & 5 deletions meinberlin/apps/kiezkasse/templates/meinberlin_kiezkasse/proposal_create_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
<ol>
<li><a href="{% url 'wagtail_serve' '' %}">meinBerlin</a></li>
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</a></li>
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Kiezradar' %}</a></li>
<li><a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a></li>
{% if module.is_in_module_cluster %}
<li><a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a></li>
{% endif %}
<li><a href="{{ module.get_absolute_url }}">{{ module.name|truncatechars:50 }}</a></li>
<li class="active" aria-current="page">{% translate 'Submit a new proposal for this project' %}</li>
</ol>
</nav>
Expand All @@ -24,6 +22,6 @@ <h1>{% translate 'Submit a new proposal for this project' %}</h1>
{% include 'meinberlin_contrib/components/alert.html' with alert_message='Error during validation. Please check your entries.' alert_type='danger' %}
{% endif %}

{% include "meinberlin_kiezkasse/includes/proposal_form.html" with proposal=proposal cancel=module.get_detail_url %}
{% include "meinberlin_kiezkasse/includes/proposal_form.html" with proposal=proposal cancel=module.get_absolute_url %}
</div>
{% endblock content %}
8 changes: 3 additions & 5 deletions meinberlin/apps/kiezkasse/templates/meinberlin_kiezkasse/proposal_moderate_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@
<li>
<a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a>
</li>
{% if module.is_in_module_cluster %}
<li>
<a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a>
</li>
{% endif %}
<li>
<a href="{{ module.get_absolute_url }}">{{ module.name|truncatechars:50 }}</a>
</li>
<li>
<a href="{{ object.get_absolute_url }}">{% translate 'Idea' %}</a>
</li>
Expand Down
4 changes: 1 addition & 3 deletions meinberlin/apps/kiezkasse/templates/meinberlin_kiezkasse/proposal_update_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@
<li><a href="{% url 'wagtail_serve' '' %}">meinBerlin</a></li>
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Kiezradar' %}</a></li>
<li><a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a></li>
{% if module.is_in_module_cluster %}
<li><a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a></li>
{% endif %}
<li><a href="{{ module.get_absolute_url }}">{{ module.name|truncatechars:50 }}</a></li>
<li><a href="{{ object.get_absolute_url }}">{% translate 'Proposal' %}</a></li>
<li class="active" aria-current="page">{% translate 'Edit proposal' %}</li>
</ol>
Expand Down
6 changes: 2 additions & 4 deletions meinberlin/apps/mapideas/templates/meinberlin_mapideas/mapidea_create_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
<li><a href="{% url 'wagtail_serve' '' %}">meinBerlin</a></li>
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Kiezradar' %}</a></li>
<li><a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a></li>
{% if module.is_in_module_cluster %}
<li><a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a></li>
{% endif %}
<li><a href="{{ module.get_absolute_url }}">{{ module.name|truncatechars:50 }}</a></li>
<li class="active" aria-current="page">{% translate 'Submit a new idea for this project' %}</li>
</ol>
</nav>
Expand All @@ -34,6 +32,6 @@ <h3>{{ module.name }}</h3>
{% endif %}
</div>

{% include "meinberlin_mapideas/includes/mapidea_form.html" with cancel=module.get_detail_url %}
{% include "meinberlin_mapideas/includes/mapidea_form.html" with cancel=module.get_absolute_url %}
</div>
{% endblock content %}
4 changes: 1 addition & 3 deletions meinberlin/apps/mapideas/templates/meinberlin_mapideas/mapidea_moderate_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
<li><a href="{% url 'wagtail_serve' '' %}">meinBerlin</a></li>
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Kiezradar' %}</a></li>
<li><a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a></li>
{% if module.is_in_module_cluster %}
<li><a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a></li>
{% endif %}
<li><a href="{{ module.get_absolute_url }}">{{ module.name|truncatechars:50 }}</a></li>
<li><a href="{{ object.get_absolute_url }}">{% translate 'Idea' %}</a></li>
<li class="active" aria-current="page">{% translate 'Moderate idea' %}</li>
</ol>
Expand Down
4 changes: 1 addition & 3 deletions meinberlin/apps/mapideas/templates/meinberlin_mapideas/mapidea_update_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@
<li><a href="{% url 'wagtail_serve' '' %}">meinBerlin</a></li>
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Kiezradar' %}</a></li>
<li><a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a></li>
{% if module.is_in_module_cluster %}
<li><a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a></li>
{% endif %}
<li><a href="{{ module.get_absolute_url }}">{{ module.name|truncatechars:50 }}</a></li>
<li><a href="{{ object.get_absolute_url }}">{% translate 'Idea' %}</a></li>
<li class="active" aria-current="page">{% translate 'Edit idea' %}</li>
</ol>
Expand Down
4 changes: 1 addition & 3 deletions meinberlin/apps/maptopicprio/templates/meinberlin_maptopicprio/maptopic_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@
<li><a href="{% url 'wagtail_serve' '' %}">meinBerlin</a></li>
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Kiezradar' %}</a></li>
<li><a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a></li>
{% if module.is_in_module_cluster %}
<li><a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a></li>
{% endif %}
<li><a href="{{ module.get_absolute_url }}">{{ module.name|truncatechars:50 }}</a></li>
<li class="active" aria-current="page">{{ object.name }}</li>
</ol>
</nav>
Expand Down
2 changes: 1 addition & 1 deletion ...tions/templates/meinberlin_notifications/emails/notify_followers_phase_over_soon.de.email
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ die Online-Beteiligung im oben genannten Projekt endet bald.
Sie können noch bis zum {{ action.obj.end_date }} Uhr daran teilnehmen.
{% endblock %}

{% block cta_url %}{{ email.get_host }}{{ action.obj.module.get_detail_url }}{% endblock %}
{% block cta_url %}{{ email.get_host }}{{ action.obj.module.get_absolute_url }}{% endblock %}
{% block cta_label %}Jetzt mitmachen{% endblock %}

{% block reason %}Diese E-Mail wurde an {{ receiver.email }} gesendet. Sie haben die E-Mail erhalten, weil Sie oben genanntem Projekt folgen. Wenn Sie keine Benachrichtigungen mehr erhalten möchten, entfolgen Sie dem <a href="{{ email.get_host }}{{ action.project.get_absolute_url }}">Projekt</a> oder ändern Sie die Einstellungen zu Ihrem <a href="{{ email.get_host }}{% url 'account' %}">Nutzerkonto</a>.{% endblock %}
2 changes: 1 addition & 1 deletion ...tions/templates/meinberlin_notifications/emails/notify_followers_phase_over_soon.en.email
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ the online participation in the above mentioned project will end soon.
You can still participate until {{ action.obj.end_date }}.
{% endblock %}

{% block cta_url %}{{ email.get_host }}{{ action.obj.module.get_detail_url }}{% endblock %}
{% block cta_url %}{{ email.get_host }}{{ action.obj.module.get_absolute_url }}{% endblock %}
{% block cta_label %}Join now{% endblock %}

{% block reason %}This email was sent to {{ receiver.email }}. You have received the e-mail because you are following the above project. If you no longer want to receive notifications, unsubscribe from the <a href="{{ email.get_host }}{{ action.project.get_absolute_url }}">project</a> or change the settings for your <a href="{{ email.get_host }}{% url 'account' %}">account</a>.{% endblock %}
2 changes: 1 addition & 1 deletion ...cations/templates/meinberlin_notifications/emails/notify_followers_phase_started.de.email
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ die Online-Beteiligung im oben genannten Projekt hat begonnen.
Sie können bis zum {{ action.obj.end_date }} Uhr daran teilnehmen.
{% endblock %}

{% block cta_url %}{{ email.get_host }}{{ action.obj.module.get_detail_url }}{% endblock %}
{% block cta_url %}{{ email.get_host }}{{ action.obj.module.get_absolute_url }}{% endblock %}
{% block cta_label %}Jetzt mitmachen{% endblock %}

{% block reason %}Diese E-Mail wurde an {{ receiver.email }} gesendet. Sie haben die E-Mail erhalten, weil Sie oben genanntem Projekt folgen. Wenn Sie keine Benachrichtigungen mehr erhalten möchten, entfolgen Sie dem <a href="{{ email.get_host }}{{ action.project.get_absolute_url }}">Projekt</a> oder ändern Sie die Einstellungen zu Ihrem <a href="{{ email.get_host }}{% url 'account' %}">Nutzerkonto</a>.{% endblock %}
2 changes: 1 addition & 1 deletion ...cations/templates/meinberlin_notifications/emails/notify_followers_phase_started.en.email
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Online participation for the above project has started.
You can participate until {{ action.obj.end_date }}.
{% endblock %}

{% block cta_url %}{{ email.get_host }}{{ action.obj.module.get_detail_url }}{% endblock %}
{% block cta_url %}{{ email.get_host }}{{ action.obj.module.get_absolute_url }}{% endblock %}
{% block cta_label %}Join now{% endblock %}

{% block reason %}This email was sent to {{ receiver.email }}. You have received the e-mail because you are following the above project. If you no longer want to receive notifications, unsubscribe from the <a href="{{ email.get_host }}{{ action.project.get_absolute_url }}">project</a> or change the settings for your <a href="{{ email.get_host }}{% url 'account' %}">account</a>.{% endblock %}
Loading