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

Jump to bottom

[#8015] re-design moderation form #5594

Merged
merged 3 commits into from
May 21, 2024
Merged

[#8015] re-design moderation form #5594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df80b37
meinberlin_budgeting/proposal_moderate_form: adapt form field to rede…
hom3mad3 Apr 15, 2024
d4c79f5
assets/scss: add ckeditor component and add some overwrites, include …
goapunk Apr 17, 2024
8f92436
meinberlin_contrib/components: create moderator_form.html
hom3mad3 May 13, 2024
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
5 changes: 5 additions & 0 deletions changelog/_8015.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
### Changed

- create reusable `moderator_form.html` snippet and update moderator form templates
- add two new helper/utility classes `.mt-1` `.mb-2`
- increase (overwrite) `.formgroup__help` font-size to 14px
62 changes: 28 additions & 34 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
@@ -1,49 +1,43 @@
{% extends "base.html" %}
{% load i18n %}

{% block title %}{% translate 'Moderate' %} {{ object.name }} — {{ block.super }}{% endblock %}
{% block title %}
{% translate 'Moderate' %}
{{ object.name }}
—
{{ block.super }}
{% endblock title %}

{% block breadcrumbs %}
<div id="content-header">
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
<ol>
<li><a href="/">meinBerlin</a></li>
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</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>
<li>
<a href="/">meinBerlin</a>
</li>
<li>
<a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</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="{{ object.get_absolute_url }}">{% translate 'Proposal' %}</a></li>
<li>
<a href="{{ object.get_absolute_url }}">{% translate 'Proposal' %}</a>
</li>
<li class="active" aria-current="page">{% translate 'Moderate proposal' %}</li>
</ol>
</nav>
</div>
{% endblock %}
{% endblock breadcrumbs %}

{% block content %}
<div id="layout-grid__area--maincontent">
<h1>{% translate 'Moderate proposal' %}</h1>

<form enctype="multipart/form-data" action="{{ request.path }}" method="post">
{% csrf_token %}
{% for form in forms.values %}
{{ form.media }}
{% endfor %}

{% include 'meinberlin_contrib/includes/form_field.html' with field=forms.moderateable.moderator_status %}
{% include 'meinberlin_contrib/includes/form_field.html' with field=forms.feedback_text.feedback_text %}
{% include 'meinberlin_contrib/includes/form_checkbox_field.html' with field=forms.moderateable.is_archived %}
{% if forms.moderateable.show_tasks %}
{% include 'meinberlin_contrib/includes/form_field.html' with field=forms.moderateable.completed_tasks add_class='u-top-divider' %}
{% include 'meinberlin_contrib/includes/form_field.html' with field=forms.remark.remark %}
{% else %}
{% include 'meinberlin_contrib/includes/form_field.html' with field=forms.remark.remark add_class='u-top-divider' %}
{% endif %}

<div class="u-spacer-bottom">
<input type="submit" class="btn btn--primary" value="{% translate 'Save' %}" />
<a href="{{ object.get_absolute_url }}" class="btn btn--light">{% translate 'Cancel' %}</a>
</div>
</form>
</div>
{% endblock %}
<div id="layout-grid__area--maincontent">
<h1>{% translate 'Moderate proposal' %}</h1>
{% include "meinberlin_contrib/components/moderator_form.html" %}
</div>
{% endblock content %}
27 changes: 27 additions & 0 deletions meinberlin/apps/contrib/templates/meinberlin_contrib/components/moderator_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{% load i18n item_tags contrib_tags moderatorremark_tags %}

<form enctype="multipart/form-data" action="{{ request.path }}" method="post">
{% csrf_token %}
{% for form in forms.values %}
{{ form.media }}
{% endfor %}

{% include 'meinberlin_contrib/includes/form_field_select.html' with field=forms.moderateable.moderator_status %}
{% include 'meinberlin_contrib/includes/form_field.html' with field=forms.feedback_text.feedback_text %}
{% include 'meinberlin_contrib/includes/form_checkbox_field.html' with field=forms.moderateable.is_archived %}
{% if forms.moderateable.show_tasks %}
{% include 'meinberlin_contrib/includes/form_field.html' with field=forms.moderateable.completed_tasks add_class='u-top-divider' %}
{% include 'meinberlin_contrib/includes/form_field.html' with field=forms.remark.remark %}
{% else %}
{% include 'meinberlin_contrib/includes/form_field.html' with field=forms.remark.remark add_class='u-top-divider' %}
{% endif %}

<div class="form-actions">
<div class="form-actions__left">
<a href="{{ object.get_absolute_url }}" class="link--back">{% translate 'Cancel' %}</a>
</div>
<div class="form-actions__right">
<button type="submit" class="button">{% translate 'Save' %}</button>
</div>
</div>
</form>
34 changes: 18 additions & 16 deletions meinberlin/apps/contrib/templates/meinberlin_contrib/includes/form_checkbox_field.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
{% load i18n widget_tweaks %}

<div class="form-check">
<label class="form-check-label">
{{ field|add_error_attr:"aria-invalid:true" }}
{{ field.label }}
{% if field.help_text %}
<div class="form-hint">
{{ field.help_text }}
</div>
<div class="form-group {% if add_class %}{{ add_class }}{% endif %} mb-2">
<div class="form-check">
<label class="form-check-label">
{{ field|add_error_attr:"aria-invalid:true" }}
{{ field.label }}
{% if field.help_text %}
<div class="formgroup__help mt-1">
{{ field.help_text }}
</div>
{% endif %}
</label>
{% if field.errors %}
<ul class="errorlist" aria-live="assertive" aria-atomic="true">
{% for error in field.errors %}
<li>{{ error|escape }}</li>
{% endfor %}
</ul>
{% endif %}
</label>
{% if field.errors %}
<ul class="errorlist" aria-live="assertive" aria-atomic="true">
{% for error in field.errors %}
<li>{{ error|escape }}</li>
{% endfor %}
</ul>
{% endif %}
</div>
</div>
2 changes: 1 addition & 1 deletion meinberlin/apps/contrib/templates/meinberlin_contrib/includes/form_field.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% load i18n widget_tweaks %}

<div class="form-group {% if add_class %}{{ add_class }}{% endif %}">
<div class="form-group {% if add_class %}{{ add_class }}{% endif %} mb-2">
<label for="{{ field.id_for_label }}" {% if tabindex %} tabindex="{{ tabindex }}" {% endif %} class="form-label">
{{ field.label }}
{% if field.field.required %}
Expand Down
14 changes: 14 additions & 0 deletions meinberlin/apps/contrib/templates/meinberlin_contrib/includes/form_field_select.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{% extends "meinberlin_contrib/includes/form_field.html" %}
{% load widget_tweaks %}

{% block field %}
<div class="widget widget--{{ field|widget_type }} input-group">
{% if before %}
<span class="input-group__before">{{ before }}</span>
{% endif %}
{{ field|add_class:'form-control'|add_error_attr:"aria-invalid:true" }}
{% if after %}
<span class="input-group__after">{{ after }}</span>
{% endif %}
</div>
{% endblock field %}
56 changes: 29 additions & 27 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
@@ -1,40 +1,42 @@
{% extends "base.html" %}
{% load i18n %}

{% block title %}{{ object.name }} &mdash; {% translate 'Give feedback' %}{% endblock %}
{% block title %}
{{ object.name }}
—
{% translate 'Give feedback' %}
{% endblock title %}

{% block breadcrumbs %}
<div id="content-header">
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
<ol>
<li><a href="/">meinBerlin</a></li>
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</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>
<li>
<a href="/">meinBerlin</a>
</li>
<li>
<a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</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="{{ object.get_absolute_url }}">{% translate 'Idea' %}</a></li>
<li>
<a href="{{ object.get_absolute_url }}">{% translate 'Idea' %}</a>
</li>
<li class="active" aria-current="page">{% translate 'Moderate idea' %}</li>
</ol>
</nav>
</div>
{% endblock %}
{% block content %}
<div id="layout-grid__area--maincontent">
<h1>{% translate 'Feedback on this idea' %}</h1>
<form novalidate enctype="multipart/form-data" action="{{ request.path }}" method="post">
{% csrf_token %}
{% for form in forms.values %}
{{ form.media }}
{% endfor %}

{% include 'meinberlin_contrib/includes/form_field.html' with field=forms.moderateable.moderator_status %}
{% include 'meinberlin_contrib/includes/form_field.html' with field=forms.feedback_text.feedback_text %}
{% endblock breadcrumbs %}


<div class="u-spacer-bottom">
<input type="submit" class="btn btn--primary" value="{% translate 'Save' %}" />
<a href="{{ object.get_absolute_url }}" class="btn btn--light">{% translate 'Cancel' %}</a>
</div>
</form>
</div>
{% endblock %}
{% block content %}
<div id="layout-grid__area--maincontent">
<h1>{% translate 'Feedback on this idea' %}</h1>
{% include "meinberlin_contrib/components/moderator_form.html" %}
</div>
{% endblock content %}
52 changes: 26 additions & 26 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
@@ -1,41 +1,41 @@
{% extends "base.html" %}
{% load i18n %}

{% block title %}{% blocktranslate with name=object.name %}Moderate {{ name }}{% endblocktranslate %}{% endblock %}
{% block title %}
{% blocktranslate with name=object.name %}
Moderate {{ name }}
{% endblocktranslate %}
{% endblock title %}

{% block breadcrumbs %}
<div id="layout-grid__area--contentheader">
<div id="content-header">
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
<ol>
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</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>
<li>
<a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</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="{{ object.get_absolute_url }}">{% translate 'Idea' %}</a></li>
<li>
<a href="{{ object.get_absolute_url }}">{% translate 'Idea' %}</a>
</li>
<li class="active" aria-current="page">{% translate 'Moderate proposal' %}</li>
</ol>
</nav>
</div>
</div>
{% endblock %}
{% block content %}
<div class="container">
<h1>{% translate 'Moderate proposal' %}</h1>
<form enctype="multipart/form-data" action="{{ request.path }}" method="post">
{% csrf_token %}
{% for form in forms.values %}
{{ form.media }}
{% endfor %}

{% include 'meinberlin_contrib/includes/form_field.html' with field=forms.moderateable.moderator_status %}
{% include 'meinberlin_contrib/includes/form_field.html' with field=forms.feedback_text.feedback_text %}

{% endblock breadcrumbs %}

<div class="u-spacer-bottom">
<input type="submit" class="btn btn--primary" value="{% translate 'Save' %}" />
<a href="{{ object.get_absolute_url }}" class="btn btn--light">{% translate 'Cancel' %}</a>
</div>
</form>
</div>
{% endblock %}
{% block content %}
<div class="container">
<h1>{% translate 'Moderate proposal' %}</h1>
{% include "meinberlin_contrib/components/moderator_form.html" %}
</div>
{% endblock content %}
38 changes: 15 additions & 23 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
@@ -1,40 +1,32 @@
{% extends "base.html" %}
{% load i18n %}

{% block title %}{% blocktranslate with name=object.name %}Moderate {{ name }}{% endblocktranslate %}{% endblock %}
{% block title %}
{% blocktranslate with name=object.name %}
Moderate {{ name }}
{% endblocktranslate %}
{% endblock title %}

{% block breadcrumbs %}
<div id="content-header">
<nav class="breadcrumb" aria-label="{% translate 'You are here:' %}">
<ol>
<li><a href="/">meinBerlin</a></li>
<li><a href="{% url 'meinberlin_plans:plan-list' %}">{% translate 'Project Overview' %}</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>
{% if module.is_in_module_cluster %}
<li><a href="{{ module.get_detail_url }}">{{ module.name|truncatechars:50 }}</a></li>
{% endif %}
<li><a href="{{ object.get_absolute_url }}">{% translate 'Idea' %}</a></li>
<li class="active" aria-current="page">{% translate 'Moderate idea' %}</li>
</ol>
</nav>
</div>
{% endblock %}
{% block content %}
<div id="layout-grid__area--maincontent">
<h1>{% translate 'Moderate idea' %}</h1>
<form novalidate enctype="multipart/form-data" action="{{ request.path }}" method="post">
{% csrf_token %}
{% for form in forms.values %}
{{ form.media }}
{% endfor %}

{% include 'meinberlin_contrib/includes/form_field.html' with field=forms.moderateable.moderator_status %}
{% include 'meinberlin_contrib/includes/form_field.html' with field=forms.feedback_text.feedback_text %}
{% endblock breadcrumbs %}


<div class="u-spacer-bottom">
<input type="submit" class="btn btn--primary" value="{% translate 'Save' %}" />
<a href="{{ object.get_absolute_url }}" class="btn btn--light">{% translate 'Cancel' %}</a>
</div>
</form>
</div>
{% endblock %}
{% block content %}
<div id="layout-grid__area--maincontent">
<h1>{% translate 'Moderate idea' %}</h1>
{% include "meinberlin_contrib/components/moderator_form.html" %}
</div>
{% endblock content %}
13 changes: 13 additions & 0 deletions ...ets/scss/components/_ck_embed_iframe.scss → ...lin/assets/scss/components/_ckeditor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,16 @@
width: 100%;
}
}

.ck-word-count {
@extend .formgroup__help !optional;
}

.ck .ck-toolbar {
border: 2px solid black !important;
border-bottom: none !important;
}

.ck .ck-editor__editable {
border: 2px solid black !important;
}
2 changes: 1 addition & 1 deletion meinberlin/assets/scss/style_dashboard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
@import "components_dashboard/control-bar";

// @import "components/copyright";
@import "components/ck_embed_iframe";
@import "components/ckeditor";
@import "components_dashboard/dashboard_nav";
@import "components_dashboard/datepicker";
@import "components/detail_info";
Expand Down
Loading