From 2679a0fe2754825f96541fab4222d7dda48a563e Mon Sep 17 00:00:00 2001
From: Frank Duncan <frankduncan@opentechstrategies.com>
Date: Fri, 7 Mar 2025 13:10:02 -0600
Subject: [PATCH] Fix small template issues in GFC2024
---
.../ansible/roles/GFC2024/files/GFCProposal | 29 ++++++++++---------
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/competitions/GFC2024/ansible/roles/GFC2024/files/GFCProposal b/competitions/GFC2024/ansible/roles/GFC2024/files/GFCProposal
index 1b312f42..9cffef57 100644
--- a/competitions/GFC2024/ansible/roles/GFC2024/files/GFCProposal
+++ b/competitions/GFC2024/ansible/roles/GFC2024/files/GFCProposal
@@ -266,10 +266,11 @@ data-filter-value="{{ proposal['Primary Subject Area']['Level 4'] }}">
<dt>Where do you intend to implement your proposed project?</dt>
<dd>
{% for location in proposal['Future Work Locations'] %}
-{% if location['State/Province'] -%}
-* <span class="torque--explore-link" data-filter-name="future_work_locations" data-filter-value="{{location['State/Province']}}">[[Special:TorqueExplore|{{location['State/Province'],location['Country']}}]]</span>
+* {% if location['Locality/District/County'] -%}
+{{location['Locality/District/County']}}, {% endif %}{% if location['State/Province'] -%}
+<span class="torque--explore-link" data-filter-name="future_work_locations" data-filter-value="{{location['State/Province']}}">[[Special:TorqueExplore|{{location['State/Province']}}]]</span>
{% else -%}
-* <span class="torque--explore-link" data-filter-name="future_work_locations" data-filter-value="{{location['Country']}}">[[Special:TorqueExplore|{{location['Country']}}]]</span>
+<span class="torque--explore-link" data-filter-name="future_work_locations" data-filter-value="{{location['Country']}}">[[Special:TorqueExplore|{{location['Country']}}]]</span>
{% endif -%}
{% endfor -%}
</dd>
@@ -748,10 +749,11 @@ data-filter-value="{{ proposal['Primary Subject Area']['Level 4'] }}">
<dt>Location of Future Work</dt>
<dd>
{% for location in proposal['Future Work Locations'] %}
-{% if location['State/Province'] -%}
-* {{ location['Locality/District/County'] }} {{ location['State/Province'] }}, {{ location['Country'] }}
+* {% if location['Locality/District/County'] -%}
+{{location['Locality/District/County']}}, {% endif %}{% if location['State/Province'] -%}
+{{ location['Locality/District/County'] }} {{ location['State/Province'] }}, {{ location['Country'] }}
{% else -%}
-* {{ location['Country'] }}
+{{ location['Country'] }}
{% endif -%}
{% endfor -%}
</dd>
@@ -853,7 +855,7 @@ data-filter-value="{{ proposal['Primary Subject Area']['Level 4'] }}">
{% endif -%}
{% if proposal['Organization Location']['Address Line 2'] %}{{ proposal['Organization Location']['Address Line 2'] }}<br />
{% endif -%}
-{% if proposal['Organization Location']['City'] %}{{ proposal['Organization Location']['City'] }}{% if proposal['Organization Location']['State/Province'] %}, <span class="torque--explore-link" data-filter-name="organization_location" data-filter-value="{{proposal['Organization Location']['State/Province']}}">[[Special:TorqueExplore|{{proposal['Organization Location']['State/Province'],proposal['Organization Location']['Country']}}]]</span>{% endif %}{% if proposal['Organization Location']['Zip/Postal Code'] %} {{ proposal['Organization Location']['Zip/Postal Code'] }}{% endif %}<br />
+{% if proposal['Organization Location']['City'] %}{{ proposal['Organization Location']['City'] }}{% if proposal['Organization Location']['State/Province'] %}, <span class="torque--explore-link" data-filter-name="organization_location" data-filter-value="{{proposal['Organization Location']['State/Province']}}">[[Special:TorqueExplore|{{proposal['Organization Location']['State/Province']}}, {{proposal['Organization Location']['Country']}}]]</span>{% endif %}{% if proposal['Organization Location']['Zip/Postal Code'] %} {{ proposal['Organization Location']['Zip/Postal Code'] }}{% endif %}<br />
{% endif -%}
{% if proposal['Organization Location']['Locality/District/County'] %}{{ proposal['Organization Location']['Locality/District/County'] }}<br />
{% endif -%}
@@ -914,10 +916,12 @@ data-filter-value="{{ proposal['Primary Subject Area']['Level 4'] }}">
<dt>Where do you intend to implement your proposed project?</dt>
<dd>
{% for location in proposal['Future Work Locations'] %}
-{% if location['State/Province'] -%}
-* [[Current_Work_Locations#{{ location['State/Province'] }}|{{ location['State/Province'] }}, {{ location['Country'] }}]]
+*
+{%- if location['Locality/District/County'] -%}
+{{location['Locality/District/County']}}, {% endif %}{% if location['State/Province'] -%}
+[[Current_Work_Locations#{{ location['State/Province'] }}|{{ location['State/Province'] }}]]
{% else -%}
-* [[Current_Work_Locations#{{ location['Country'] }}|{{ location['Country'] }}]]
+[[Current_Work_Locations#{{ location['Country'] }}|{{ location['Country'] }}]]
{% endif -%}
{% endfor -%}
</dd>
@@ -927,10 +931,9 @@ data-filter-value="{{ proposal['Primary Subject Area']['Level 4'] }}">
<div class="pair">
<dt>How did you hear about the Gulf Futures Challenge?</dt>
<dd>
-{{proposal["Source"]["Source"]}}
+{{proposal["Source"]["Source"] | join(", ")}}
{% if 'Other' in proposal['Source'] and proposal['Source']['Other'] -%}
-
-{{proposal["Source"]["Other"]}}
+<div>{{proposal["Source"]["Other"]}}</div>
{% endif -%}
</dd>
</div>
--
GitLab