Skip to content

R1-322: ScholarshipsListingPage - Template - always show results with count heading #1145

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

Open
patrickcuagan wants to merge 1 commit into
base: feature/321-home-overseas-filtering
Choose a base branch
from
Open

R1-322: ScholarshipsListingPage - Template - always show results with count heading #1145

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
33 changes: 18 additions & 15 deletions rca/project_styleguide/templates/patterns/pages/scholarships/scholarships_listing_page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ <h2 id="scholarship-listing-title" class="heading heading--two layout__start-one

<form class="section bg bg--{{ page.scholarships_listing_background_color }} js-tabs" method="get" action="#results" id="results">
<div class="section__row">
<nav class="section filter-bar filter-bar--large {% if not results %}filter-bar--no-results-large{% endif %} " data-filter-bar>
<nav class="section filter-bar filter-bar--large {% if result_count == 0 %}filter-bar--no-results-large{% endif %} " data-filter-bar>
<div class="grid">
<div class="layout__start-one layout__span-two layout__@large-start-two layout__@large-span-three">
{% if page.scholarships_has_dark_background %}
Expand All @@ -75,7 +75,7 @@ <h2 id="scholarship-listing-title" class="heading heading--two layout__start-one
</div>
</nav>

<nav class="filter-bar filter-bar--small {% if not results %}filter-bar--no-results-small{% endif %} bg bg--light" data-filter-bar-small>
<nav class="filter-bar filter-bar--small {% if result_count == 0 %}filter-bar--no-results-small{% endif %} bg bg--light" data-filter-bar-small>
<a class="filter-bar__link body body--two" href="#filters-active" data-filter-launcher>
<span class="filter-bar__label">Filters</span>
<svg width="12" height="8" class="filter-bar__icon" aria-hidden="true">
Expand All @@ -97,19 +97,22 @@ <h2 id="scholarship-listing-title" class="heading heading--two layout__start-one
</div>
</div>

{% if results %}
<div class="section__row grid">
<div class="layout__start-one layout__span-two layout__@large-start-two layout__@large-span-three">
{% if programme %}
<p class="body body--one"><b>Scholarship results showing for {{ programme }} programme</b></p>
{% endif %}
<p class="body body--two">{{ page.characteristics_disclaimer }}</p>
</div>
</div>
<div class="section__row section__row--last-small">
{% include "patterns/organisms/accordion-block/accordion-block.html" with accordion_id='1' accordions=results title=results_title section_id=page.results_title|slugify scholarship=True %}
<div class="section__row grid">
<h2 class="results-total results-total__heading heading heading--four layout__start-one layout__span-two layout__@large-start-two">
{% if is_filtered %}
<span class="results-total__type">Showing {{ result_count }} scholarship{{ result_count|pluralize }}</span>
{% else %}
<span class="results-total__type">Showing all scholarships</span>
<span class="results-total__number">({{ result_count }})</span>
{% endif %}
</h2>
<div class="layout__start-one layout__span-two layout__@large-start-two layout__@large-span-three">
<p class="body body--two results-total__disclaimer">{{ page.characteristics_disclaimer }}</p>
</div>
{% endif %}
</div>
<div class="section__row section__row--last-small">
{% include "patterns/organisms/accordion-block/accordion-block.html" with accordion_id='1' accordions=results title=results_title section_id=page.results_title|slugify scholarship=True %}
</div>
</form>

<section class="section bg bg--light">
Expand All @@ -119,7 +122,7 @@ <h2 id="scholarship-listing-title" class="heading heading--two layout__start-one
</div>
{% endif %}

<div class="section__row section__row--last {% if not results %}section__row--first-small{% else %}section__row--first{% endif %} grid">
<div class="section__row section__row--last {% if result_count == 0 %}section__row--first-small{% else %}section__row--first{% endif %} grid">
<div class="streamfield rich-text layout__start-one layout__span-two layout__@large-start-two layout__@large-span-three">
{% include "patterns/molecules/streamfield/stream_block.html" with value=page.body guide_page=True %}
</div>
Expand Down
8 changes: 8 additions & 0 deletions rca/static_src/sass/components/_results-total.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@
$root: &;
position: relative;

&__heading {
line-height: 40px;
}

&__disclaimer {
color: $color--dark-grey;
}

&__anchor {
position: absolute;
top: -20px;
Expand Down
Loading