From 69cfcc568cb434aced05c802351c4eaa30e134f2 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Tue, 23 Jun 2020 17:22:53 +0200
Subject: [PATCH] Add aria-hidden to icons in url lists (#8079)

---
 .../content/umb-content-node-info.html        | 19 +++++++++----------
 .../propertyeditors/urllist/urllist.html      |  7 +++----
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
index 2b5bceb11a..9ec8ea9302 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
@@ -5,18 +5,16 @@
         <umb-box ng-if="currentUrls" data-element="node-info-urls">
             <umb-box-header title-key="general_links"></umb-box-header>
             <umb-box-content class="block-form">
-                <ul class="nav nav-stacked" style="margin-bottom: 0;">
+                <ul class="nav nav-stacked mb0">
                     <li ng-repeat="url in currentUrls">
                         <a href="{{url.text}}" target="_blank" ng-if="url.isUrl">
                             <span ng-if="currentUrlsHaveMultipleCultures && url.culture" style="font-size: 13px; color: #cccccc; width: 50px;display: inline-block">{{url.culture}}</span>
-                            <i class="icon icon-out"></i>
+                            <i class="icon icon-out" aria-hidden="true"></i>
                             <span>{{url.text}}</span>
                         </a>
                         <div ng-if="!url.isUrl" style="margin-top: 4px;">
-
                             <span ng-if="currentUrlsHaveMultipleCultures && url.culture" style="font-size: 13px; color: #cccccc; width: 50px;display: inline-block">{{url.culture}}</span>
                             <em>{{url.text}}</em>
-
                         </div>
                     </li>
                 </ul>
@@ -32,7 +30,10 @@
                         <p><localize key="redirectUrls_panelInformation" class="ng-isolate-scope ng-scope">The following URLs redirect to this content item:</localize></p>
                         <ul class="nav nav-stacked" style="margin-bottom: 0;">
                             <li ng-repeat="redirectUrl in redirectUrls">
-                                <a href="{{redirectUrl.originalUrl}}" target="_blank"><i ng-class="value.icon" class="icon-out"></i> {{redirectUrl.originalUrl}}</a>
+                                <a href="{{redirectUrl.originalUrl}}" target="_blank">
+                                    <i ng-class="value.icon" class="icon-out" aria-hidden="true"></i>
+                                    {{redirectUrl.originalUrl}}
+                                </a>
                             </li>
                         </ul>
                     </div>
@@ -42,9 +43,8 @@
 
         <umb-box data-element="node-info-history">
 
-            <umb-box-header
-                title="{{historyLabel}}">
-
+            <umb-box-header title="{{historyLabel}}"> 
+                
                 <umb-button
                     ng-hide="node.trashed"
                     type="button"
@@ -104,8 +104,7 @@
                                 <span>
                                     <localize key="auditTrails_{{ item.logType | lowercase }}" tokens="[item.parameters]">{{ item.comment }}</localize>
                                 </span>
-
-
+                                
                             </div>
 
                         </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.html
index 864ad213a4..65c8c2364c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/urllist/urllist.html
@@ -2,10 +2,9 @@
     <ul class="nav nav-stacked">
         <li ng-repeat="value in renderModel">
             <a href="{{getUrl(value.url)}}" prevent-default="{{value.url.indexOf('/') == -1}}" target="{{value.urlTarget}}">
-                <i ng-class="value.icon"></i>
-                <span ng-if="value.linkText">{{value.linkText}}</span>
-                <span ng-if="!value.linkText">{{value.url}}</span>
+                <i ng-class="value.icon" aria-hidden="true"></i>
+                <span>{{value.linkText || value.url}}</span>
             </a>
         </li>
     </ul>
-</div>
\ No newline at end of file
+</div>