Merged in bugfix/SHIBUI-1543 (pull request #427)

SHIBUI-1543 added toggle text to options/view buttons
TIER · Nov 19, 2019 · e33ed1c · e33ed1c
2 parents ecfe932 + 3fc8632
commit e33ed1c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
@@ -58,6 +58,7 @@ action.back-to-top=Back to Top
 action.restore=Restore
 action.view-only-changes=View Only Changes
 action.user-role=User Role
+action.toggle-view=Toggle view
 
 value.enabled=Enabled
 value.disabled=Disabled

diff --git a/ui/src/app/metadata/configuration/container/metadata-options.component.html b/ui/src/app/metadata/configuration/container/metadata-options.component.html
@@ -20,15 +20,17 @@ <h2 class="mb-4" [ngSwitch]="type$ | async">
                 <translate-i18n key="label.filters">Filters</translate-i18n>
             </button>
         </div>
-        <div class="btn-group" *ngIf="hasXml$ | async">
-            <a class="btn"
-                routerLink="../options"
-                routerLinkActive="btn-primary"
-                translate="action.options">Options</a>
-            <a class="btn"
-                routerLink="../xml"
-                routerLinkActive="btn-primary"
-                translate="action.xml">XML</a>
+        <div *ngIf="hasXml$ | async">
+            <div class="btn-group">
+                <a class="btn" routerLink="../options" routerLinkActive="btn-primary">
+                    <span class="sr-only" translate="action.toggle-view">Toggle view:</span>
+                    Options
+                </a>
+                <a class="btn" routerLink="../xml" routerLinkActive="btn-primary">
+                    <span class="sr-only" translate="action.toggle-view">Toggle view:</span>
+                    XML
+                </a>
+            </div>
         </div>
     </div>
     <ng-container *ngIf="configuration$ | async">

diff --git a/ui/src/app/metadata/configuration/container/metadata-xml.component.html b/ui/src/app/metadata/configuration/container/metadata-xml.component.html
@@ -6,8 +6,14 @@ <h2 class="mb-4" [ngSwitch]="type$ | async">
 <div class="container-fluid">
     <div class="px-3 my-3 d-flex justify-content-end">
         <div class="btn-group">
-            <a class="btn" routerLink="../options" routerLinkActive="btn-primary">Options</a>
-            <a class="btn" routerLink="../xml" routerLinkActive="btn-primary">XML</a>
+            <a class="btn" routerLink="../options" routerLinkActive="btn-primary">
+                <span class="sr-only" translate="action.toggle-view">Toggle view:</span>
+                Options
+            </a>
+            <a class="btn" routerLink="../xml" routerLinkActive="btn-primary">
+                <span class="sr-only" translate="action.toggle-view">Toggle view:</span>
+                XML
+            </a>
         </div>
     </div>
     <div class="px-3 my-3">