Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{% include 'tokens/accordion-toggle-icon.html' %}
</summary>
<div class="filter-group_contents-wrapper">
{% include 'components/filters/lists/filter-list-generic-checkboxes.html' with open=True aggregate_data=results.aggregations.fundingOrganizationTSGType filter_title="Funding Organization Type" %}
{% include 'components/filters/lists/filter-list-generic-checkboxes.html' with open=True aggregate_data=results.aggregations.fundingOrganizationTSGType filter_title="Funding Organisation Type" %}
{% include 'components/filters/lists/filter-list-funding-org.html' %}
{% include 'components/filters/lists/filter-list-programme-title.html' %}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="filter-list filter-list--with-checkboxes">
<details class="filter-list__accordion" {% if results.aggregations.fundingOrganization.clear_url or True %} open{% endif %}>
<summary class="filter-list__label">
<div>Funding Organizations {% if results.aggregations.fundingOrganization.clear_url %} <a href={{results.aggregations.fundingOrganization.clear_url}}> <small>(clear)</small></a> {% endif%}</div>
<div>Funding Organisations {% if results.aggregations.fundingOrganization.clear_url %} <a href={{results.aggregations.fundingOrganization.clear_url}}> <small>(clear)</small></a> {% endif%}</div>
{% include 'tokens/accordion-toggle-icon.html' %}
</summary>
<div class="filter-list__contents-wrapper facet-multiselect">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="filter-list filter-list--with-checkboxes">
<details class="filter-list__accordion" {% if results.aggregations.recipientOrganization.clear_url %} open{% endif %}>
<summary class="filter-list__label">
<div>Recipient Organizations {% if results.aggregations.recipientOrganization.clear_url %} <a href={{results.aggregations.recipientOrganization.clear_url}}> <small>(clear)</small></a> {% endif%}</div>
<div>Recipient Organisations {% if results.aggregations.recipientOrganization.clear_url %} <a href={{results.aggregations.recipientOrganization.clear_url}}> <small>(clear)</small></a> {% endif%}</div>
{% include 'tokens/accordion-toggle-icon.html' %}
</summary>
<div class="filter-list__contents-wrapper facet-multiselect">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="grant-info-highlight grid grid--three-columns">
<div class="grant-info-highlight__funder">
<div class="grant-info-highlight__label">Funding Organization</div>
<div class="grant-info-highlight__label">Funding Organisation</div>

<div>
<a href="{{ funder_url }}">{{ funder_name }}</a>
Expand All @@ -18,7 +18,7 @@
</div>

<div class="grant-info-highlight__recipient">
<div class="grant-info-highlight__label">Recipient Organization</div>
<div class="grant-info-highlight__label">Recipient Organisation</div>

<div>
<a href="{{ recipient_url }}">{{ recipient_name }}</a>
Expand Down
4 changes: 2 additions & 2 deletions grantnav/frontend/templates/grant.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h1 class="heading-in-panel">
<div class="spacer-4">
<div class="grant-info-highlight grid grid--three-columns">
<div class="grant-info-highlight__funder">
<div class="grant-info-highlight__label">Funding Organization</div>
<div class="grant-info-highlight__label">Funding Organisation</div>
<div>
<a href="{% url 'org' grant.source.fundingOrganization.0.id %}"> {{ grant.source.fundingOrganization.0 | get_name }} <small>({{ grant.source.fundingOrganization.0.id }}) </small> </a>
</div>
Expand All @@ -43,7 +43,7 @@ <h1 class="heading-in-panel">
</div>
{% if grant.source.recipientOrganization.0.id %}
<div class="grant-info-highlight__recipient">
<div class="grant-info-highlight__label">Recipient Organization</div>
<div class="grant-info-highlight__label">Recipient Organisation</div>
<div>
<p><a href="{% url 'org' grant.source.recipientOrganization.0.id %}"> {{ grant.source.recipientOrganization.0|get_name|truncatechars:50 }} <small>({{ grant.source.recipientOrganization.0.id|truncatechars:20}}) </small> </a>
</div>
Expand Down
4 changes: 2 additions & 2 deletions grantnav/frontend/templates/search.html
Original file line number Diff line number Diff line change
Expand Up @@ -254,14 +254,14 @@ <h1>Search input is not valid</h1>
templateResult: formatDropdownItem,
templateSelection: formatSelection,
dropdownCssClass: 'filter-list filter-list--with-checkboxes',
placeholder: 'Search for funding organizations',
placeholder: 'Search for funding organisations',
ajax: get_filter_search_ajax('fundingOrganization', 'id_and_name')
};

let recipient_options = $.extend({}, funder_options);

recipient_options = $.extend(recipient_options, {
placeholder: 'Search for recipient organizations',
placeholder: 'Search for recipient organisations',
ajax: get_filter_search_ajax('recipientOrganization', 'id_and_name')
});

Expand Down
4 changes: 2 additions & 2 deletions grantnav/frontend/templates/search_widgets.html
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ <h1>Search input is not valid</h1>
templateResult: formatDropdownItem,
templateSelection: formatSelection,
dropdownCssClass: 'filter-list filter-list--with-checkboxes',
placeholder: 'Search for funding organizations',
placeholder: 'Search for funding organisations',
ajax: get_filter_search_ajax('fundingOrganization', 'id_and_name')
};

Expand Down Expand Up @@ -451,7 +451,7 @@ <h1>Search input is not valid</h1>
let recipient_options = $.extend({}, funder_options);

recipient_options = $.extend(recipient_options, {
placeholder: 'Search for recipient organizations',
placeholder: 'Search for recipient organisations',
ajax: get_filter_search_ajax('recipientOrganization', 'id_and_name')
});

Expand Down
Loading