Merge pull request #879 from chapter-three/hotfix/forms-search-adjust…

…ments No results fix and revoke state for forms page
chapter-three · Dec 31, 2022 · a4395f3 · a4395f3
2 parents 3566f2b + 5752c7d
commit a4395f3
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 49 deletions.
diff --git a/web/themes/custom/atrium/templates/media/media--jcc-form--full.html.twig b/web/themes/custom/atrium/templates/media/media--jcc-form--full.html.twig
@@ -56,49 +56,55 @@
 
  {# Prepare 'body' for hero.twig #}
  {% set body %}
- <div class="jcc-form--form-links">
- <a href={{ media.field_url.uri }}
- class="jcc-form--link border-primary-vivid"
- aria-label="Get form {{media.field_number.value}} {{media.label}}">
- {# {{ link("View PDF"|t, media.field_url.uri) }} #}
- {% include '@atoms/icons/icon.twig' with {
- icon: {
- name: 'file',
- width: 'width-2',
- height: 'height-2',
- color: 'text-primary-vivid'
- }
- } %}
- <span>Get form {{media.field_number.value}}</span>
- </a>
-
- {% if media.field_form_filling_instructions_.uri %}
- <a href={{ media.field_form_filling_instructions_.uri }}
- class="jcc-form--link border-primary-vivid"
- aria-label="Get instructions for form {{media.field_number.value}} {{media.label}}">
- {% include '@atoms/icons/icon.twig' with {
- icon: {
- name: 'file',
- width: 'width-2',
- height: 'height-2',
- color: 'text-primary-vivid'
- }
- } %}
- <span>Get instructions for form {{media.field_number.value}}</span>
- </a>
+ {% if media.field_revoke_form.value != '1' %}
+ <div class="jcc-form--form-links">
+ <a href="{{ media.field_url.uri }}"
+ class="jcc-form--link border-primary-vivid"
+ aria-label="Get form {{media.field_number.value}} {{media.label}}">
+ {# {{ link("View PDF"|t, media.field_url.uri) }} #}
+ {% include '@atoms/icons/icon.twig' with {
+ icon: {
+ name: 'file',
+ width: 'width-2',
+ height: 'height-2',
+ color: 'text-primary-vivid'
+ }
+ } %}
+ <span>Get form {{media.field_number.value}}</span>
+ </a>
+
+ {% if media.field_form_filling_instructions_.uri %}
+ <a href="{{ media.field_form_filling_instructions_.uri }}"
+ class="jcc-form--link border-primary-vivid"
+ aria-label="Get instructions for form {{media.field_number.value}} {{media.label}}">
+ {% include '@atoms/icons/icon.twig' with {
+ icon: {
+ name: 'file',
+ width: 'width-2',
+ height: 'height-2',
+ color: 'text-primary-vivid'
+ }
+ } %}
+ <span>Get instructions for form {{media.field_number.value}}</span>
+ </a>
+ {% endif %}
+ </div>
+
+ {% if language_links %}
+ <ul class="jcc-form--languages">
+ {% for language_link in language_links %}
+ <li>{{ language_link }}</li>
+ {% endfor %}
+ </ul>
  {% endif %}
- </div>
-
- {% if language_links %}
- <ul class="jcc-form--languages">
- {% for language_link in language_links %}
- <li>{{ language_link }}</li>
- {% endfor %}
- </ul>
  {% endif %}
 
  {% if media.field_date_effective.value %}
- <p class="jcc-form--revision-date">Effective: {{ media.field_date_effective.value|date('F j, Y') }}</p>
+ {% set effective_label = 'Effective' %}
+ {% if media.field_revoke_form.value %}
+ {% set effective_label = 'Revoked' %}
+ {% endif %}
+ <p class="jcc-form--revision-date">{{ effective_label }}: {{ media.field_date_effective.value|date('F j, Y') }}</p>
  {% endif %}
  {% endset %}
 

diff --git a/...hemes/custom/atrium/templates/views/views-view--jcc-forms-search-json-api--page.html.twig b/...hemes/custom/atrium/templates/views/views-view--jcc-forms-search-json-api--page.html.twig
@@ -81,7 +81,7 @@
  {% endif %}
  {% set content %}
  {% if form.name %}<p>{{ form.name }}</p>{% endif %}
- {% if form.effective_date %}<p>Revised: {{ form.effective_date|date('F j, Y') }}</p>{% endif %}
+ {% if form.effective_date %}<p>Effective: {{ form.effective_date|date('F j, Y') }}</p>{% endif %}
  {% if form.languages %}
  {% set avail_languages = [] %}
  {% for language in form.languages %}
@@ -140,15 +140,23 @@
  </div>
  </div>
  {% else %}
- {% include '@organisms/sections/link-list-with-button/link-list-with-button.twig' with {
- link_list_with_button: {
- headergroup: {
- title: 'Popular Topics'
- },
- columns: 2,
- items: popular_topics,
- }
- } %}
+ {% if popular_topics %}
+ {% include '@organisms/sections/link-list-with-button/link-list-with-button.twig' with {
+ link_list_with_button: {
+ headergroup: {
+ title: 'Popular Topics'
+ },
+ columns: 2,
+ items: popular_topics,
+ }
+ } %}
+ {% else %}
+ <div class="jcc-find-forms">
+ <div class="jcc-find-forms__notation">
+ <p>No forms found for the topic or number entered. Try adjusting your search or view <a href="/find-forms/all">all forms</a> or <a href="/find-forms/all-by-category">view by category</a>.</p>
+ </div>
+ </div>
+ {% endif %}
  {% endif %}
  {% endblock %}