Skip to content

Commit

Permalink
[#3059] Applied fix for search pagination from codereview
Browse files Browse the repository at this point in the history
  • Loading branch information
@jiromaykin
jiromaykin committed Mar 6, 2025
1 parent 71eaba3 commit 8b83a97
Showing 1 changed file with 69 additions and 69 deletions.
138 changes: 69 additions & 69 deletions src/open_inwoner/templates/pages/search.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,28 @@ <h1 class="utrecht-heading-1">{% trans "Zoekresultaten voor " %} "{% firstof sea

{# facets and results section #}
{% render_grid %}
{% if paginator.count %}
{% if search_filter_categories or search_filter_tags or search_filter_organizations %}
{% if paginator.count %}
{% if search_filter_categories or search_filter_tags or search_filter_organizations %}

{% render_column start=1 span=5 %}
<aside class="grid__filters" aria-label="{% trans "Zoekfilters" %}">
<h2 class="utrecht-heading-2">{% trans "Zoekfilters" %}</h2>
{% if search_filter_categories %}
{% include "components/Filter/Filter.html" with field=search_form.categories form_id="search-form" only %}
{% endif %}
{% if search_filter_tags %}
{% include "components/Filter/Filter.html" with field=search_form.tags form_id="search-form" only %}
{% endif %}
{% if search_filter_organizations %}
{% include "components/Filter/Filter.html" with field=search_form.organizations form_id="search-form" only %}
{% endif %}
</aside>
{% endrender_column %}


{% render_column start=1 span=5 %}
<aside class="grid__filters" aria-label="{% trans "Zoekfilters" %}">
<h2 class="utrecht-heading-2">{% trans "Zoekfilters" %}</h2>
{% if search_filter_categories %}
{% include "components/Filter/Filter.html" with field=search_form.categories form_id="search-form" only %}
{% endif %}
{% if search_filter_tags %}
{% include "components/Filter/Filter.html" with field=search_form.tags form_id="search-form" only %}
{% endif %}
{% if search_filter_organizations %}
{% include "components/Filter/Filter.html" with field=search_form.organizations form_id="search-form" only %}
{% endif %}
</aside>
{% endrender_column %}


{% endif %}
{# end search filters #}
{% endif %}
{# end search filters #}
{% endif %}

{% if paginator.count %}
<div class="column column--start-{% if search_filter_categories or search_filter_tags or search_filter_organizations %}6{% else %}1{% endif %} column--span-{% if search_filter_categories or search_filter_tags or search_filter_organizations %}12{% else %}8{% endif %}">
Expand All @@ -55,61 +55,61 @@ <h3 class="utrecht-heading-3 search-results__item-title">{{ hit.name }}</h3>
{% endfor %}
</div>
</div>

{% pagination page_obj=page_obj paginator=paginator request=request %}
</div>

{% pagination page_obj=page_obj paginator=paginator request=request %}

{% if paginator.count and not messages %}
<section class="feedback" aria-label="{% trans "Pagina feedback" %}">
<h4 class="utrecht-heading-4">{% trans "Feedback" %}</h4>
<p class="utrecht-paragraph">{% trans "Heeft u gevonden wat u zocht?" %}</p>
{% render_form form=feedback_form method="POST" form_action=request.get_full_path id="feedback_form" show_notifications=True %}
{% csrf_token %}
{{ feedback_form.errors }}
<div class="feedback__options">
{% spaceless %}
<label class="button-radio" for="positive">
<input class="button-radio__input" type="radio" name="positive" id="positive" value="true" aria-label="{{ _('Ik heb gevonden wat ik zocht.') }}"/>
<span class="button-radio__button">{% icon icon="thumb_up" outlined=True %}</span>
</label>
<label class="button-radio" for="negative">
<input class="button-radio__input" type="radio" name="positive" id="negative" value="false" aria-label="{{ _('Ik heb niet gevonden wat ik zocht.') }}" />
<span class="button-radio__button">{% icon icon="thumb_down" outlined=True %}</span>
</label>
{% endspaceless %}
</div>
<div class="feedback__remark">
{% textarea feedback_form.remark label=_('Toelichting') %}
</div>
<div class="feedback__remark">
{% form_actions primary_text="Feedback versturen" %}
</div>
{% endrender_form %}
</section>
{% endif %}
{% if paginator.count and not messages %}
<section class="feedback" aria-label="{% trans "Pagina feedback" %}">
<h4 class="utrecht-heading-4">{% trans "Feedback" %}</h4>
<p class="utrecht-paragraph">{% trans "Heeft u gevonden wat u zocht?" %}</p>
{% render_form form=feedback_form method="POST" form_action=request.get_full_path id="feedback_form" show_notifications=True %}
{% csrf_token %}
{{ feedback_form.errors }}
<div class="feedback__options">
{% spaceless %}
<label class="button-radio" for="positive">
<input class="button-radio__input" type="radio" name="positive" id="positive" value="true" aria-label="{{ _('Ik heb gevonden wat ik zocht.') }}"/>
<span class="button-radio__button">{% icon icon="thumb_up" outlined=True %}</span>
</label>
<label class="button-radio" for="negative">
<input class="button-radio__input" type="radio" name="positive" id="negative" value="false" aria-label="{{ _('Ik heb niet gevonden wat ik zocht.') }}" />
<span class="button-radio__button">{% icon icon="thumb_down" outlined=True %}</span>
</label>
{% endspaceless %}
</div>
<div class="feedback__remark">
{% textarea feedback_form.remark label=_('Toelichting') %}
</div>
<div class="feedback__remark">
{% form_actions primary_text="Feedback versturen" %}
</div>
{% endrender_form %}
</section>
{% endif %}

{% else %}
{% else %}

{% render_column start=0 span=8 %}
<div class="search-results search-results--no-results">
<div class="search-results--no-results-column">{% icon icon="info" icon_position="before" extra_classes="icon--info" outlined=True %}</div>
<div class="search-results--no-results-column">
<h2 class="utrecht-heading-2 search-results__title">
{% trans "We konden geen zoekresultaten vinden" %}
</h2>
<p class="utrecht-paragraph">{% trans "Probeer het nog eens met deze tips:" %}</p>
{% render_column start=0 span=8 %}
<div class="search-results search-results--no-results">
<div class="search-results--no-results-column">{% icon icon="info" icon_position="before" extra_classes="icon--info" outlined=True %}</div>
<div class="search-results--no-results-column">
<h2 class="utrecht-heading-2 search-results__title">
{% trans "We konden geen zoekresultaten vinden" %}
</h2>
<p class="utrecht-paragraph">{% trans "Probeer het nog eens met deze tips:" %}</p>

<ul class="ul">
<li class="li">{% trans "Zorg ervoor dat alle woorden goed gespeld zijn." %}</li>
<li class="li">{% trans "Probeer andere zoektermen." %}</li>
<li class="li">{% trans "Maak de zoektermen algemener." %}</li>
</ul>
</div>
</div>
{% endrender_column %}
<ul class="ul">
<li class="li">{% trans "Zorg ervoor dat alle woorden goed gespeld zijn." %}</li>
<li class="li">{% trans "Probeer andere zoektermen." %}</li>
<li class="li">{% trans "Maak de zoektermen algemener." %}</li>
</ul>
</div>
</div>
{% endrender_column %}

{% endif %}
{% endif %}

{% endrender_grid %}

{% endblock main_inner %}

0 comments on commit 8b83a97

Please sign in to comment.