Merged in bugfix/SHIBUI-1443 (pull request #414)

SHIBUI-1443 Fixed labels for admin dropdowns Approved-by: Ryan Mathis <rmathis@unicon.net>
TIER · Nov 13, 2019 · c0dd943 · c0dd943
2 parents f0f7791 + 0265db3
commit c0dd943
Show file tree

Hide file tree

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

diff --git a/ui/src/app/admin/component/user-management.component.html b/ui/src/app/admin/component/user-management.component.html
@@ -17,7 +17,12 @@
             <td>{{ user.firstName }} {{ user.lastName }}</td>
             <td>{{ user.emailAddress }}</td>
             <td>
-                <select [name]="user.username"
+                <label [for]="'role-' + user.username"
+                    translate="action.user-role"
+                    class="sr-only">User role</label>
+                <select
+                    [id]="'role-' + user.username"
+                    [name]="'role-' + user.username"
                     [ngModel]="user.role"
                     class="form-control"
                     (change)="setUserRole(user, $event.target.value)"

diff --git a/ui/src/theme/forms.scss b/ui/src/theme/forms.scss
@@ -20,6 +20,10 @@ Json schema form
     }
 }
 
+select.form-control:disabled {
+    color: #54595E;
+}
+
 /* end json schema form */
 
 .form-section {