Skip to content

Commit eff184e

Browse files
philli-mgoapunk
philli-m
authored and
goapunk
committed
apps/users: add new template for user indicator and additional template tag for initiator_indicator to be used in dashboard add to templates update breadcrumb code to remove id which is now added in base
1 parent f22ebe3 commit eff184e

File tree

26 files changed

+309
-279
lines changed

26 files changed

+309
-279
lines changed

‎meinberlin/apps/account/templates/meinberlin_account/account_dashboard.html

+7-9
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,13 @@
44
{% block title %}{% translate "User Dashboard" %} — {{ block.super }}{% endblock %}
55

66
{% block breadcrumbs %}
7-
<div id="layout-grid__area--contentheader">
8-
<div id="content-header">
9-
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
10-
<ol>
11-
<li><a href="/">{% translate 'meinBerlin Homepage' %}</a></li>
12-
<li class="active" aria-current="page">{% translate 'Account Settings' %}</li>
13-
</ol>
14-
</nav>
15-
</div>
7+
<div id="content-header">
8+
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
9+
<ol>
10+
<li><a href="/">{% translate 'meinBerlin Homepage' %}</a></li>
11+
<li class="active" aria-current="page">{% translate 'Account Settings' %}</li>
12+
</ol>
13+
</nav>
1614
</div>
1715
{% endblock %}
1816
{% block content %}

‎meinberlin/apps/budgeting/templates/meinberlin_budgeting/proposal_create_form.html

+12-14
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,18 @@
33

44
{% block title %}{% translate 'Create a new proposal' %} &mdash; {{ block.super }}{% endblock %}
55
{% block breadcrumbs %}
6-
<div id="layout-grid__area--contentheader">
7-
<div id="content-header">
8-
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
9-
<ol>
10-
<li><a href="/">meinBerlin</a></li>
11-
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</a></li>
12-
<li><a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a></li>
13-
{% if module.is_in_module_cluster %}
14-
<li><a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a></li>
15-
{% endif %}
16-
<li class="active" aria-current="page">{% translate 'Submit a new proposal for this project' %}</li>
17-
</ol>
18-
</nav>
19-
</div>
6+
<div id="content-header">
7+
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
8+
<ol>
9+
<li><a href="/">meinBerlin</a></li>
10+
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</a></li>
11+
<li><a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a></li>
12+
{% if module.is_in_module_cluster %}
13+
<li><a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a></li>
14+
{% endif %}
15+
<li class="active" aria-current="page">{% translate 'Submit a new proposal for this project' %}</li>
16+
</ol>
17+
</nav>
2018
</div>
2119
{% endblock %}
2220
{% block content %}

‎meinberlin/apps/budgeting/templates/meinberlin_budgeting/proposal_moderate_form.html

+13-15
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,19 @@
44
{% block title %}{% translate 'Moderate' %} {{ object.name }} &mdash; {{ block.super }}{% endblock %}
55

66
{% block breadcrumbs %}
7-
<div id="layout-grid__area--contentheader">
8-
<div id="content-header">
9-
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
10-
<ol>
11-
<li><a href="/">meinBerlin</a></li>
12-
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</a></li>
13-
<li><a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a></li>
14-
{% if module.is_in_module_cluster %}
15-
<li><a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a></li>
16-
{% endif %}
17-
<li><a href="{{ object.get_absolute_url }}">{% translate 'Proposal' %}</a></li>
18-
<li class="active" aria-current="page">{% translate 'Moderate proposal' %}</li>
19-
</ol>
20-
</nav>
21-
</div>
7+
<div id="content-header">
8+
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
9+
<ol>
10+
<li><a href="/">meinBerlin</a></li>
11+
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</a></li>
12+
<li><a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a></li>
13+
{% if module.is_in_module_cluster %}
14+
<li><a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a></li>
15+
{% endif %}
16+
<li><a href="{{ object.get_absolute_url }}">{% translate 'Proposal' %}</a></li>
17+
<li class="active" aria-current="page">{% translate 'Moderate proposal' %}</li>
18+
</ol>
19+
</nav>
2220
</div>
2321
{% endblock %}
2422

‎meinberlin/apps/budgeting/templates/meinberlin_budgeting/proposal_update_form.html

+13-15
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,19 @@
44
{% block title %}{% blocktranslate with title=object.name %}Edit {{ title }}{% endblocktranslate %} &mdash; {{ block.super }}{% endblock %}
55

66
{% block breadcrumbs %}
7-
<div id="layout-grid__area--contentheader">
8-
<div id="content-header">
9-
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
10-
<ol>
11-
<li><a href="/">meinBerlin</a></li>
12-
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</a></li>
13-
<li><a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a></li>
14-
{% if module.is_in_module_cluster %}
15-
<li><a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a></li>
16-
{% endif %}
17-
<li><a href="{{ object.get_absolute_url }}">{% translate 'Proposal' %}</a></li>
18-
<li class="active" aria-current="page">{% translate 'Edit proposal' %}</li>
19-
</ol>
20-
</nav>
21-
</div>
7+
<div id="content-header">
8+
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
9+
<ol>
10+
<li><a href="/">meinBerlin</a></li>
11+
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</a></li>
12+
<li><a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a></li>
13+
{% if module.is_in_module_cluster %}
14+
<li><a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a></li>
15+
{% endif %}
16+
<li><a href="{{ object.get_absolute_url }}">{% translate 'Proposal' %}</a></li>
17+
<li class="active" aria-current="page">{% translate 'Edit proposal' %}</li>
18+
</ol>
19+
</nav>
2220
</div>
2321
{% endblock %}
2422

‎meinberlin/apps/cms/templates/meinberlin_cms/includes/cms_breadcrumb.html

+13-15
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
{% load wagtailcore_tags i18n %}
22

3-
<div id="layout-grid__area--contentheader">
4-
<div id="content-header">
5-
{% if self.get_ancestors|length > 1 %}
6-
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
7-
<ol>
8-
{% for page in self.get_ancestors.specific %}
9-
{% if page.is_root == False %}
10-
<li><a href="{{ page.url }}">{{ page.title|truncatechars:50 }}</a></li>
11-
{% endif %}
12-
{% endfor %}
13-
<li class="active" aria-current="page">{% if self.page_title %}{{ self.page_title|truncatechars:50 }}{% else %}{{ self.title|truncatechars:50 }}{% endif %}</li>
14-
</ol>
15-
</nav>
16-
{% endif %}
17-
</div>
3+
<div id="content-header">
4+
{% if self.get_ancestors|length > 1 %}
5+
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
6+
<ol>
7+
{% for page in self.get_ancestors.specific %}
8+
{% if page.is_root == False %}
9+
<li><a href="{{ page.url }}">{{ page.title|truncatechars:50 }}</a></li>
10+
{% endif %}
11+
{% endfor %}
12+
<li class="active" aria-current="page">{% if self.page_title %}{{ self.page_title|truncatechars:50 }}{% else %}{{ self.title|truncatechars:50 }}{% endif %}</li>
13+
</ol>
14+
</nav>
15+
{% endif %}
1816
</div>

‎meinberlin/apps/contrib/templates/meinberlin_contrib/item_detail.html

+12-14
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,18 @@
44
{% block title %}{{object.name}} &mdash; {{ block.super }}{% endblock %}
55

66
{% block breadcrumbs %}
7-
<div id="layout-grid__area--contentheader">
8-
<div id="content-header">
9-
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
10-
<ol>
11-
<li><a href="/">meinBerlin</a></li>
12-
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</a></li>
13-
<li><a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a></li>
14-
{% if module.is_in_module_cluster %}
15-
<li><a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a></li>
16-
{% endif %}
17-
<li class="active" aria-current="page">{{ object.name }}</li>
18-
</ol>
19-
</nav>
20-
</div>
7+
<div id="content-header">
8+
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
9+
<ol>
10+
<li><a href="/">meinBerlin</a></li>
11+
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</a></li>
12+
<li><a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a></li>
13+
{% if module.is_in_module_cluster %}
14+
<li><a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a></li>
15+
{% endif %}
16+
<li class="active" aria-current="page">{{ object.name }}</li>
17+
</ol>
18+
</nav>
2119
</div>
2220
{% endblock %}
2321

‎meinberlin/apps/documents/templates/meinberlin_documents/paragraph_detail.html

+14-15
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,20 @@
44
{% block title %}{{ paragraph.name }} &mdash; {{ paragraph.chapter.project.name }} &mdash; {{ block.super }}{% endblock %}
55

66
{% block breadcrumbs %}
7-
<div id="layout-grid__area--contentheader">
8-
<div id="content-header">
9-
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
10-
<ol>
11-
<li><a href="/">meinBerlin</a></li>
12-
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</a></li>
13-
<li><a href="{{ project.get_absolute_url }}">{{ project.name|truncatechars:50 }}</a></li>
14-
<!-- FIXME this doesn't work, it doesn't know it's in a cluster -->
15-
{% if module.is_in_module_cluster %}
16-
<li><a href="{{ chapter.get_absolute_url }}">{{ chapter.name|truncatechars:50 }}</a></li>
17-
{% endif %}
18-
<li class="active" aria-current="page">{{ paragraph.name|truncatechars:50 }}</li>
19-
</ol>
20-
</nav>
21-
</div>
7+
<div id="content-header">
8+
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
9+
<ol>
10+
<li><a href="/">meinBerlin</a></li>
11+
<li><a href="/">meinBerlin</a></li>
12+
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</a></li>
13+
<li><a href="{{ project.get_absolute_url }}">{{ project.name|truncatechars:50 }}</a></li>
14+
<!-- FIXME this doesn't work, it doesn't know it's in a cluster -->
15+
{% if module.is_in_module_cluster %}
16+
<li><a href="{{ chapter.get_absolute_url }}">{{ chapter.name|truncatechars:50 }}</a></li>
17+
{% endif %}
18+
<li class="active" aria-current="page">{{ paragraph.name|truncatechars:50 }}</li>
19+
</ol>
20+
</nav>
2221
</div>
2322
{% endblock %}
2423

‎meinberlin/apps/ideas/templates/meinberlin_ideas/idea_create_form.html

+12-14
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,18 @@
44
{% block title %}{% translate 'Create a new proposal' %} &mdash; {{ block.super }}{% endblock %}
55

66
{% block breadcrumbs %}
7-
<div id="layout-grid__area--contentheader">
8-
<div id="content-header">
9-
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
10-
<ol>
11-
<li><a href="/">meinBerlin</a></li>
12-
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</a></li>
13-
<li><a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a></li>
14-
{% if module.is_in_module_cluster %}
15-
<li><a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a></li>
16-
{% endif %}
17-
<li class="active" aria-current="page">{% translate 'Submit a new idea for this project '%}</li>
18-
</ol>
19-
</nav>
20-
</div>
7+
<div id="content-header">
8+
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
9+
<ol>
10+
<li><a href="/">meinBerlin</a></li>
11+
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</a></li>
12+
<li><a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a></li>
13+
{% if module.is_in_module_cluster %}
14+
<li><a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a></li>
15+
{% endif %}
16+
<li class="active" aria-current="page">{% translate 'Submit a new idea for this project '%}</li>
17+
</ol>
18+
</nav>
2119
</div>
2220
{% endblock %}
2321

‎meinberlin/apps/ideas/templates/meinberlin_ideas/idea_moderate_form.html

+13-15
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,19 @@
33

44
{% block title %}{{ object.name }} &mdash; {% translate 'Give feedback' %}{% endblock %}
55
{% block breadcrumbs %}
6-
<div id="layout-grid__area--contentheader">
7-
<div id="content-header">
8-
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
9-
<ol>
10-
<li><a href="/">meinBerlin</a></li>
11-
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</a></li>
12-
<li><a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a></li>
13-
{% if module.is_in_module_cluster %}
14-
<li><a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a></li>
15-
{% endif %}
16-
<li><a href="{{ object.get_absolute_url }}">{% translate 'Idea' %}</a></li>
17-
<li class="active" aria-current="page">{% translate 'Moderate idea' %}</li>
18-
</ol>
19-
</nav>
20-
</div>
6+
<div id="content-header">
7+
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
8+
<ol>
9+
<li><a href="/">meinBerlin</a></li>
10+
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</a></li>
11+
<li><a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a></li>
12+
{% if module.is_in_module_cluster %}
13+
<li><a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a></li>
14+
{% endif %}
15+
<li><a href="{{ object.get_absolute_url }}">{% translate 'Idea' %}</a></li>
16+
<li class="active" aria-current="page">{% translate 'Moderate idea' %}</li>
17+
</ol>
18+
</nav>
2119
</div>
2220
{% endblock %}
2321
{% block content %}

‎meinberlin/apps/ideas/templates/meinberlin_ideas/idea_update_form.html

+13-15
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,19 @@
44
{% block title %}{% blocktranslate with title=object.name %}Edit {{ title }}{% endblocktranslate %} &mdash; {{ block.super }}{% endblock %}
55

66
{% block breadcrumbs %}
7-
<div id="layout-grid__area--contentheader">
8-
<div id="content-header">
9-
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
10-
<ol>
11-
<li><a href="/">meinBerlin</a></li>
12-
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</a></li>
13-
<li><a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a></li>
14-
{% if module.is_in_module_cluster %}
15-
<li><a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a></li>
16-
{% endif %}
17-
<li><a href="{{ object.get_absolute_url }}">{% translate 'Idea' %}</a></li>
18-
<li class="active" aria-current="page">{% translate 'Edit idea' %}</li>
19-
</ol>
20-
</nav>
21-
</div>
7+
<div id="content-header">
8+
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
9+
<ol>
10+
<li><a href="/">meinBerlin</a></li>
11+
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</a></li>
12+
<li><a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a></li>
13+
{% if module.is_in_module_cluster %}
14+
<li><a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a></li>
15+
{% endif %}
16+
<li><a href="{{ object.get_absolute_url }}">{% translate 'Idea' %}</a></li>
17+
<li class="active" aria-current="page">{% translate 'Edit idea' %}</li>
18+
</ol>
19+
</nav>
2220
</div>
2321
{% endblock %}
2422

‎meinberlin/apps/kiezkasse/templates/meinberlin_kiezkasse/proposal_create_form.html

+12-14
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,18 @@
33

44
{% block title %}{% translate 'Create a new proposal' %}{% endblock %}
55
{% block breadcrumbs %}
6-
<div id="layout-grid__area--contentheader">
7-
<div id="content-header">
8-
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
9-
<ol>
10-
<li><a href="/">meinBerlin</a></li>
11-
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</a></li>
12-
<li><a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a></li>
13-
{% if module.is_in_module_cluster %}
14-
<li><a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a></li>
15-
{% endif %}
16-
<li class="active" aria-current="page">{% translate 'Submit a new proposal for this project' %}</li>
17-
</ol>
18-
</nav>
19-
</div>
6+
<div id="content-header">
7+
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
8+
<ol>
9+
<li><a href="/">meinBerlin</a></li>
10+
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</a></li>
11+
<li><a href="{% url 'project-detail' project.slug %}">{{ project.name|truncatechars:50 }}</a></li>
12+
{% if module.is_in_module_cluster %}
13+
<li><a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a></li>
14+
{% endif %}
15+
<li class="active" aria-current="page">{% translate 'Submit a new proposal for this project' %}</li>
16+
</ol>
17+
</nav>
2018
</div>
2119
{% endblock %}
2220
{% block content %}

0 commit comments

Comments
 (0)