Skip to content

Commit eaea110

Browse files
authored
Merge pull request #1130 from sarongebre/1124-web-audit-errors-batch-three
1124 web audit errors batch three
2 parents 4172ec9 + 2ffb7c0 commit eaea110

File tree

7 files changed

+183
-179
lines changed

7 files changed

+183
-179
lines changed

web/themes/custom/unl_five_herbie/templates/node/node--person--teaser-centered.html.twig

Lines changed: 88 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -59,106 +59,108 @@
5959
</div>
6060

6161
{# Address #}
62-
<address class="dcf-mt-4">
63-
<dl class="dcf-txt-sm dcf-mb-0">
64-
<dt class="dcf-sr-only">
65-
Address
66-
</dt>
67-
68-
{# Phone #}
69-
{% if node.n_person_phone.value or node.n_person_unldirectoryreference.entity.ee_unldir_telephonenumber.value %}
70-
<dt class="dcf-sr-only">
71-
Phone
72-
</dt>
73-
<dd class="dcf-d-flex dcf-col-gap-2 dcf-ai-center">
74-
<div class="dcf-h-4 dcf-w-4 unl-gray">
75-
<svg class="dcf-h-100% dcf-w-100% dcf-fill-current" focusable="false" height="16" width="16" viewbox="0 0 24 24" aria-hidden="true">
76-
<path d="M5.001 5h14v14h-14zM5.001 20v1.5A2.501 2.501 0 0 0 7.5 24h9c1.378 0 2.5-1.121 2.5-2.5V20H5.001zM12 22.5a1.001 1.001 0 0 1 0-2 1.001 1.001 0 0 1 0 2zM19 4V2.5C19 1.121 17.878 0 16.5 0h-9a2.501 2.501 0 0 0-2.499 2.5V4H19zM9.5 2h5a.5.5 0 0 1 0 1h-5a.5.5 0 0 1 0-1z" />
77-
<path fill="none" d="M0 0h24v24H0z" />
78-
</svg>
79-
</div>
80-
<span class="type dcf-d-none">
81-
Work
82-
</span>
83-
84-
{# <a class="dcf-txt-decor-hover" href="tel:+14024727211" itemprop="telephone"> #}
85-
{% if node.n_person_phone.value %}
86-
{% set filtered_phone_number = preg_replace('/[^0-9]/', '', node.n_person_phone.value) %}
87-
<a class="dcf-txt-decor-hover" href="tel:{{filtered_phone_number}}" itemprop="telephone">
88-
<span class="dcf-txt-nowrap">{{ node.n_person_phone.value }}</span>
89-
{% if (node.n_person_phone.value|slice(0, 7)) == '402-472' %}
90-
<small class="on-campus-dialing dcf-txt-xs dcf-txt-nowrap" title="For on-campus dialing only. Off-campus, dial {{ node.n_person_phone.value }}">On-campus
91-
{{ node.n_person_phone.value|replace({ '402-472-': '2-' }) }}
92-
</small>
93-
{% endif %}
94-
</a>
95-
{% else %}
96-
<a class="dcf-txt-decor-hover" href="tel:{{ node.n_person_unldirectoryreference.entity.ee_unldir_telephonenumber.value|replace({' ':''}) }}" itemprop="telephone">
97-
<span class="dcf-txt-nowrap">{{ node.n_person_unldirectoryreference.entity.ee_unldir_telephonenumber.value|replace({ '402472': '402-472-' }) }}</span>
98-
{% if (node.n_person_unldirectoryreference.entity.ee_unldir_telephonenumber.value|slice(0, 6)) == '402472' %}
99-
<small class="on-campus-dialing dcf-txt-xs dcf-txt-nowrap" title="For on-campus dialing only. Off-campus, dial {{ node.n_person_unldirectoryreference.entity.ee_unldir_telephonenumber.value|replace({ '402472': '402-472-' }) }}">On-campus
100-
{{ node.n_person_unldirectoryreference.entity.ee_unldir_telephonenumber.value|replace({ '402472': '2-' }) }}
101-
</small>
102-
{% endif %}
103-
</a>
104-
{% endif %}
105-
</dd>
106-
{% endif %}
107-
108-
<!-- Email -->
109-
{% if node.n_person_email.value or node.n_person_unldirectoryreference.entity.ee_unldir_mail.value %}
62+
{% if node.n_person_phone.value or node.n_person_unldirectoryreference.entity.ee_unldir_telephonenumber.value or node.n_person_email.value or node.n_person_unldirectoryreference.entity.ee_unldir_mail.value or node.n_person_website.value %}
63+
<address class="dcf-mt-4">
64+
<dl class="dcf-txt-sm dcf-mb-0">
11065
<dt class="dcf-sr-only">
111-
Email
66+
Address
11267
</dt>
113-
<dd class="dcf-d-flex dcf-col-gap-2 dcf-ai-center">
114-
<div class="dcf-h-4 dcf-w-4 unl-gray">
115-
<svg class="dcf-h-100% dcf-w-100% dcf-fill-current" focusable="false" height="16" width="16" viewbox="0 0 24 24" aria-hidden="true">
116-
<path d="m12.002 12.36 10.095-8.03A1.99 1.99 0 0 0 21.001 4h-18c-.387 0-.746.115-1.053.307l10.054 8.053z" />
117-
<path d="m22.764 5.076-10.468 8.315a.488.488 0 0 1-.594-.001L1.26 5.036c-.16.287-.259.612-.26.964v11c.001 1.103.898 2 2.001 2h17.998c1.103 0 2-.897 2.001-2V6c0-.335-.09-.647-.236-.924z" />
118-
<path fill="none" d="M0 0h24v24H0z" />
119-
</svg>
120-
</div>
121-
122-
{% if node.n_person_email.value %}
123-
<a class="dcf-txt-decor-hover" href="mailto:{{ node.n_person_email.value|lower }}" itemprop="email">
124-
<span class="dcf-txt-nowrap">
125-
{{ node.n_person_email.value|lower }}
126-
</span>
127-
</a>
128-
{% else %}
129-
<a class="dcf-txt-decor-hover" href="mailto:{{ node.n_person_unldirectoryreference.entity.ee_unldir_mail.value|lower }}" itemprop="email">
130-
<span class="dcf-txt-nowrap">
131-
{{ node.n_person_unldirectoryreference.entity.ee_unldir_mail.value|lower }}
132-
</span>
133-
</a>
134-
{% endif %}
135-
</dd>
136-
{% endif %}
13768

69+
{# Phone #}
70+
{% if node.n_person_phone.value or node.n_person_unldirectoryreference.entity.ee_unldir_telephonenumber.value %}
71+
<dt class="dcf-sr-only">
72+
Phone
73+
</dt>
74+
<dd class="dcf-d-flex dcf-col-gap-2 dcf-ai-center">
75+
<div class="dcf-h-4 dcf-w-4 unl-gray">
76+
<svg class="dcf-h-100% dcf-w-100% dcf-fill-current" focusable="false" height="16" width="16" viewbox="0 0 24 24" aria-hidden="true">
77+
<path d="M5.001 5h14v14h-14zM5.001 20v1.5A2.501 2.501 0 0 0 7.5 24h9c1.378 0 2.5-1.121 2.5-2.5V20H5.001zM12 22.5a1.001 1.001 0 0 1 0-2 1.001 1.001 0 0 1 0 2zM19 4V2.5C19 1.121 17.878 0 16.5 0h-9a2.501 2.501 0 0 0-2.499 2.5V4H19zM9.5 2h5a.5.5 0 0 1 0 1h-5a.5.5 0 0 1 0-1z" />
78+
<path fill="none" d="M0 0h24v24H0z" />
79+
</svg>
80+
</div>
81+
<span class="type dcf-d-none">
82+
Work
83+
</span>
13884

85+
{# <a class="dcf-txt-decor-hover" href="tel:+14024727211" itemprop="telephone"> #}
86+
{% if node.n_person_phone.value %}
87+
{% set filtered_phone_number = preg_replace('/[^0-9]/', '', node.n_person_phone.value) %}
88+
<a class="dcf-txt-decor-hover" href="tel:{{filtered_phone_number}}" itemprop="telephone">
89+
<span class="dcf-txt-nowrap">{{ node.n_person_phone.value }}</span>
90+
{% if (node.n_person_phone.value|slice(0, 7)) == '402-472' %}
91+
<small class="on-campus-dialing dcf-txt-xs dcf-txt-nowrap" title="For on-campus dialing only. Off-campus, dial {{ node.n_person_phone.value }}">On-campus
92+
{{ node.n_person_phone.value|replace({ '402-472-': '2-' }) }}
93+
</small>
94+
{% endif %}
95+
</a>
96+
{% else %}
97+
<a class="dcf-txt-decor-hover" href="tel:{{ node.n_person_unldirectoryreference.entity.ee_unldir_telephonenumber.value|replace({' ':''}) }}" itemprop="telephone">
98+
<span class="dcf-txt-nowrap">{{ node.n_person_unldirectoryreference.entity.ee_unldir_telephonenumber.value|replace({ '402472': '402-472-' }) }}</span>
99+
{% if (node.n_person_unldirectoryreference.entity.ee_unldir_telephonenumber.value|slice(0, 6)) == '402472' %}
100+
<small class="on-campus-dialing dcf-txt-xs dcf-txt-nowrap" title="For on-campus dialing only. Off-campus, dial {{ node.n_person_unldirectoryreference.entity.ee_unldir_telephonenumber.value|replace({ '402472': '402-472-' }) }}">On-campus
101+
{{ node.n_person_unldirectoryreference.entity.ee_unldir_telephonenumber.value|replace({ '402472': '2-' }) }}
102+
</small>
103+
{% endif %}
104+
</a>
105+
{% endif %}
106+
</dd>
107+
{% endif %}
139108

140-
<!-- Website -->
141-
{% if node.n_person_website.value %}
142-
{% for i, value in node.n_person_website %}
109+
<!-- Email -->
110+
{% if node.n_person_email.value or node.n_person_unldirectoryreference.entity.ee_unldir_mail.value %}
143111
<dt class="dcf-sr-only">
144-
Website
112+
Email
145113
</dt>
146114
<dd class="dcf-d-flex dcf-col-gap-2 dcf-ai-center">
147115
<div class="dcf-h-4 dcf-w-4 unl-gray">
148116
<svg class="dcf-h-100% dcf-w-100% dcf-fill-current" focusable="false" height="16" width="16" viewbox="0 0 24 24" aria-hidden="true">
149-
<path d="m14.474 10.232-.706-.706a4.004 4.004 0 0 0-5.658-.001l-4.597 4.597a4.004 4.004 0 0 0 0 5.657l.707.706a3.97 3.97 0 0 0 2.829 1.173 3.973 3.973 0 0 0 2.827-1.172l2.173-2.171a.999.999 0 1 0-1.414-1.414l-2.173 2.17c-.755.756-2.071.757-2.828 0l-.707-.706a2.004 2.004 0 0 1 0-2.829l4.597-4.596c.756-.756 2.073-.756 2.828 0l.707.707a1.001 1.001 0 0 0 1.415-1.415z" />
150-
<path d="m20.486 4.221-.707-.706a3.97 3.97 0 0 0-2.829-1.173 3.977 3.977 0 0 0-2.827 1.172L12.135 5.5a.999.999 0 1 0 1.414 1.414l1.988-1.984c.755-.756 2.071-.757 2.828 0l.707.706c.779.78.779 2.049 0 2.829l-4.597 4.596c-.756.756-2.073.756-2.828 0a.999.999 0 0 0-1.414 0 .999.999 0 0 0-.001 1.414 4.001 4.001 0 0 0 5.657.001l4.597-4.597a4.005 4.005 0 0 0 0-5.658z" />
117+
<path d="m12.002 12.36 10.095-8.03A1.99 1.99 0 0 0 21.001 4h-18c-.387 0-.746.115-1.053.307l10.054 8.053z" />
118+
<path d="m22.764 5.076-10.468 8.315a.488.488 0 0 1-.594-.001L1.26 5.036c-.16.287-.259.612-.26.964v11c.001 1.103.898 2 2.001 2h17.998c1.103 0 2-.897 2.001-2V6c0-.335-.09-.647-.236-.924z" />
151119
<path fill="none" d="M0 0h24v24H0z" />
152120
</svg>
153121
</div>
154-
<a class="dcf-txt-decor-hover dcf-url-wrap" href="{{ node.n_person_website.value[i].uri }}" itemprop="url">
155-
{{ node.n_person_website.value[i].title }}
156-
</a>
122+
123+
{% if node.n_person_email.value %}
124+
<a class="dcf-txt-decor-hover" href="mailto:{{ node.n_person_email.value|lower }}" itemprop="email">
125+
<span class="dcf-txt-nowrap">
126+
{{ node.n_person_email.value|lower }}
127+
</span>
128+
</a>
129+
{% else %}
130+
<a class="dcf-txt-decor-hover" href="mailto:{{ node.n_person_unldirectoryreference.entity.ee_unldir_mail.value|lower }}" itemprop="email">
131+
<span class="dcf-txt-nowrap">
132+
{{ node.n_person_unldirectoryreference.entity.ee_unldir_mail.value|lower }}
133+
</span>
134+
</a>
135+
{% endif %}
157136
</dd>
158-
{% endfor %}
159-
{% endif %}
160-
</dl>
161-
</address>
137+
{% endif %}
138+
139+
140+
141+
<!-- Website -->
142+
{% if node.n_person_website.value %}
143+
{% for i, value in node.n_person_website %}
144+
<dt class="dcf-sr-only">
145+
Website
146+
</dt>
147+
<dd class="dcf-d-flex dcf-col-gap-2 dcf-ai-center">
148+
<div class="dcf-h-4 dcf-w-4 unl-gray">
149+
<svg class="dcf-h-100% dcf-w-100% dcf-fill-current" focusable="false" height="16" width="16" viewbox="0 0 24 24" aria-hidden="true">
150+
<path d="m14.474 10.232-.706-.706a4.004 4.004 0 0 0-5.658-.001l-4.597 4.597a4.004 4.004 0 0 0 0 5.657l.707.706a3.97 3.97 0 0 0 2.829 1.173 3.973 3.973 0 0 0 2.827-1.172l2.173-2.171a.999.999 0 1 0-1.414-1.414l-2.173 2.17c-.755.756-2.071.757-2.828 0l-.707-.706a2.004 2.004 0 0 1 0-2.829l4.597-4.596c.756-.756 2.073-.756 2.828 0l.707.707a1.001 1.001 0 0 0 1.415-1.415z" />
151+
<path d="m20.486 4.221-.707-.706a3.97 3.97 0 0 0-2.829-1.173 3.977 3.977 0 0 0-2.827 1.172L12.135 5.5a.999.999 0 1 0 1.414 1.414l1.988-1.984c.755-.756 2.071-.757 2.828 0l.707.706c.779.78.779 2.049 0 2.829l-4.597 4.596c-.756.756-2.073.756-2.828 0a.999.999 0 0 0-1.414 0 .999.999 0 0 0-.001 1.414 4.001 4.001 0 0 0 5.657.001l4.597-4.597a4.005 4.005 0 0 0 0-5.658z" />
152+
<path fill="none" d="M0 0h24v24H0z" />
153+
</svg>
154+
</div>
155+
<a class="dcf-txt-decor-hover dcf-url-wrap" href="{{ node.n_person_website.value[i].uri }}" itemprop="url">
156+
{{ node.n_person_website.value[i].title }}
157+
</a>
158+
</dd>
159+
{% endfor %}
160+
{% endif %}
161+
</dl>
162+
</address>
163+
{% endif %}
162164
</div>
163165
</div>
164166
</li>

web/themes/custom/unl_five_herbie/templates/view/views-view--news-recent.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
{% if display_id == 'block_1' %}
3535
{# Using the {{ more }} link doesn't work because the "More link text" doesn't show for some reason. #}
3636
<div class="dcf-d-flex dcf-jc-flex-end">
37-
<a class="dcf-btn dcf-btn-secondary dcf-capitalize" href="{{ file_url('news') }}">More news</a>
37+
<a class="dcf-btn dcf-btn-secondary dcf-capitalize" href="{{file_url('news')}}/">More news</a>
3838
</div>
3939
</div>
4040
{% endif %}

web/themes/custom/unl_five_herbie/templates/view/views-view--taxonomy-term--tagged-news-items-block.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232

3333
{% if preprocessed_total_rows > 12 and more %}
3434
<div class="dcf-d-flex dcf-jc-flex-end">
35-
<a class="dcf-btn dcf-btn-secondary dcf-capitalize" href="{{more['#url'].toString}}news">More news</a>
35+
<a class="dcf-btn dcf-btn-secondary dcf-capitalize" href="{{more['#url'].toString}}news/">More news</a>
3636
</div>
3737
{% elseif preprocessed_total_rows > 12 %}
3838
<div class="dcf-d-flex dcf-jc-flex-end">
39-
<a class="dcf-btn dcf-btn-secondary dcf-capitalize" href="{{path('<current>')}}news">More news</a>
39+
<a class="dcf-btn dcf-btn-secondary dcf-capitalize" href="{{path('<current>')}}news/">More news</a>
4040
</div>
4141

4242
{% endif %}

web/themes/custom/unl_six_herbie/templates/block/block--block-content-slideshow.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
{{ title_prefix }}
3232
{{ title_suffix }}
3333

34-
<ul>
34+
<ul tabindex="0">
3535
{% block content %}
3636
{{ content.b_slideshow }}
3737
{% endblock %}

0 commit comments

Comments
 (0)