From 16a925b6fc8716c02212312e7757f74d1f9049b4 Mon Sep 17 00:00:00 2001
From: Mike Conway <mike.conway@nih.gov>
Date: Tue, 23 Jan 2018 13:03:59 -0500
Subject: [PATCH 1/2] #53 labels etc

---
 .../resources/i18n/messages_en.properties     |  8 ++-
 .../views/collections/collectionInfo.html     | 24 ++++----
 .../collections/collectionManagement.html     | 58 +++++++++----------
 .../collections/collectionsBreadCrumb.html    | 18 +++---
 .../views/collections/collectionsBrowser.html | 30 +++++-----
 .../collectionsResourcesForReplica.html       |  4 +-
 .../views/collections/editCollectionForm.html |  4 +-
 .../views/collections/editDataObjectForm.html |  2 +-
 .../resources/views/collections/info.html     |  6 +-
 .../templateFieldListForCollections.html      | 14 ++---
 .../templateListForCollections.html           |  4 +-
 .../resources/views/favorites/favorites.html  |  6 +-
 .../views/groups/groupsCollections.html       | 10 ++--
 .../src/main/resources/views/login/index.html | 10 ++--
 .../views/metadata/metadataDisplay.html       | 26 ++++-----
 .../views/metadata/metadataTable.html         |  8 +--
 .../views/permissions/permissionDetails.html  | 19 +++---
 .../resources/views/preferences/index.html    |  8 +--
 .../views/template/templateFieldList.html     | 16 ++---
 .../views/template/templateForm.html          | 10 ++--
 .../views/template/templateList.html          |  6 +-
 .../views/template/templateManagement.html    | 18 +++---
 .../resources/views/tickets/ticketForm.html   |  4 +-
 .../views/tickets/ticketoperations.html       |  4 +-
 .../main/resources/views/tickets/tickets.html | 12 ++--
 .../collectionManagementOldTree.html          |  8 +--
 .../collections/treeViewForGroupForm.html     |  7 ++-
 .../collections/treeViewForUserForm.html      |  5 +-
 28 files changed, 180 insertions(+), 169 deletions(-)

diff --git a/src/emc-metalnx-shared/src/main/resources/i18n/messages_en.properties b/src/emc-metalnx-shared/src/main/resources/i18n/messages_en.properties
index f3f99c96c..5e939d937 100644
--- a/src/emc-metalnx-shared/src/main/resources/i18n/messages_en.properties
+++ b/src/emc-metalnx-shared/src/main/resources/i18n/messages_en.properties
@@ -27,8 +27,13 @@ text.close=Close
 text.modification.date=Modification Date
 text.not.contains=Does Not Contain
 text.path=Path
+text.properties=Properties
 text.replica.number=Replica Number
 text.resource.name=Resource Name
+text.replica=Replica
+text.reset=Reset
+text.root=Root(/)
+text.search=Search
 text.size=Size
 text.owner.name=Owner Name
 
@@ -386,6 +391,7 @@ private.menu.title=Private Library
 user.profile.label=User Profile
 user.preferences.label=Preferences
 user.logout.label=Logout
+template.add.attribute=Add Attribute
 
 # Preferences Page
 preferences.page.title=Preferences
@@ -447,7 +453,7 @@ collections.management.progress.label.permissions=Retrieving permissions...
 collections.management.btn.action.add.collection=Add Collection
 collections.management.btn.action.upload=Upload
 collections.management.btn.action.download=Download
-
+collections.management.upload.upload.status=Upload Status
 collections.management.msg.access.denied=You do not have permissions to access information in the target collection or for the selected object.
 
 ## Collections tooltips
diff --git a/src/emc-metalnx-shared/src/main/resources/views/collections/collectionInfo.html b/src/emc-metalnx-shared/src/main/resources/views/collections/collectionInfo.html
index 2992be201..cfe2c07e4 100755
--- a/src/emc-metalnx-shared/src/main/resources/views/collections/collectionInfo.html
+++ b/src/emc-metalnx-shared/src/main/resources/views/collections/collectionInfo.html
@@ -55,18 +55,18 @@ <h4 class="property-title" th:text="#{text.info}">
 					</div>
 					<div class="row">
 						<div class="text-right col-md-1 col-sm-4 col-xs-4">
-							<label th:text="#{collections.management.table.created.label}"></label>
+							<label for="createdAt" th:text="#{collections.management.table.created.label}"></label>
 						</div>
 						<div class="col-md-9 col-sm-8 col-xs-8">
-							<span th:text="${ dataProfile.getDomainObject().getCreatedAt() }"></span>
+							<span id="createdAt" th:text="${ dataProfile.getDomainObject().getCreatedAt() }"></span>
 						</div>
 					</div>
 					<div class="row">
 						<div class="text-right col-md-1 col-sm-4 col-xs-4">
-							<label th:text="#{collections.management.table.modified.label}"></label>
+							<label for="modifiedAt" th:text="#{collections.management.table.modified.label}"></label>
 						</div>
 						<div class="col-md-9 col-sm-8 col-xs-8">
-							<span
+							<span id="modifiedAt"
 								th:text="${ dataProfile.getDomainObject().getModifiedAt() }"></span>
 						</div>
 					</div>
@@ -101,7 +101,7 @@ <h4 class="property-title" th:text="#{text.info}">
 							th:title="${dataProfile.starred}?#{collections.favorite.unmark.button.tooltip}:#{collections.favorite.button.tooltip}">
 							<i
 							th:class="true? 'fa fa-star bm-checked' : 'fa fa-star bm-unchecked'"
-							aria-hidden="true"></i>
+							aria-label="access the info page for details"></i>
 						</a>
 					</div>
 
@@ -114,26 +114,26 @@ <h4 class="property-title" th:text="#{text.info}">
 					</div>
 					<div class="row">
 						<div class="text-right col-md-1 col-sm-4 col-xs-4">
-							<label th:text="#{collections.management.table.created.label}"></label>
+							<label for="createdAt" th:text="#{collections.management.table.created.label}"></label>
 						</div>
-						<div class="col-md-9 col-sm-8 col-xs-8">
+						<div id="createdAt" class="col-md-9 col-sm-8 col-xs-8">
 							<span th:text="${ dataProfile.getDomainObject().getCreatedAt() }"></span>
 						</div>
 					</div>
 					<div class="row">
 						<div class="text-right col-md-1 col-sm-4 col-xs-4">
-							<label th:text="#{collections.management.table.modified.label}"></label>
+							<label for="updatedAt" th:text="#{collections.management.table.modified.label}"></label>
 						</div>
-						<div class="col-md-9 col-sm-8 col-xs-8">
-							<span th:text="${ dataProfile.getDomainObject().getUpdatedAt() }"></span>
+						<div class="col-md-9 col-sm-8 col-xs-8" >
+							<span id="updatedAt" th:text="${ dataProfile.getDomainObject().getUpdatedAt() }"></span>
 						</div>
 					</div>
 					<div class="row">
 						<div class="text-right col-md-1 col-sm-4 col-xs-4">
-							<label th:text="#{collections.management.checksum.label}"></label>
+							<label for="checksum" th:text="#{collections.management.checksum.label}"></label>
 						</div>
 						<div class="col-md-9 col-sm-8 col-xs-8">
-							<span th:text="${ dataProfile.getDomainObject().getChecksum() }"></span>
+							<span id="checksum" th:text="${ dataProfile.getDomainObject().getChecksum() }"></span>
 						</div>
 					</div>
 				</div>
diff --git a/src/emc-metalnx-shared/src/main/resources/views/collections/collectionManagement.html b/src/emc-metalnx-shared/src/main/resources/views/collections/collectionManagement.html
index 8329f1a24..b09fc74a0 100755
--- a/src/emc-metalnx-shared/src/main/resources/views/collections/collectionManagement.html
+++ b/src/emc-metalnx-shared/src/main/resources/views/collections/collectionManagement.html
@@ -1,4 +1,3 @@
-<!DOCTYPE html>
 <!--
   ~ Copyright (c) 2015-2017, Dell EMC
   ~
@@ -32,17 +31,17 @@
 </head>
 
 <body>
-	<div layout:fragment="content">
-		<h1 class="page-header pull-left" th:text="#{collections.management.page.title}" th:data-content="#{collection.title.popover}"></h1>
-		<a id="collections-page-title" href="#" class="page-hint pull-left"><i class="fa fa-question-circle"></i></a>
+	<div aria-labelledby="collManagement" layout:fragment="content">
+		<h1 id="collManagement" class="page-header pull-left" th:text="#{collections.management.page.title}" th:data-content="#{collection.title.popover}"></h1>
+		<a aria-label="page help" id="collections-page-title" href="#" class="page-hint pull-left"><i class="fa fa-question-circle"></i></a>
 		<ol class="breadcrumb mlx"  th:if="${cameFromMetadataSearch} == true"
 					id="backToMetadataSearch">
-		  <li><a href="/emc-metalnx-web/metadata/?backFromCollections=true">Search Results</a></li>
+		  <li><a href="/emc-metalnx-web/metadata/?backFromCollections=true" aria-hidden="true">Search Results</a></li>
 		  <li class="active">Collections</li>
 		</ol>
 		<ol class="breadcrumb mlx"  th:if="${cameFromFilePropertiesSearch} == true"
 					id="backToFilePropertiesSearch">
-		  <li><a href="/emc-metalnx-web/fileproperty/?backFromCollections=true">Search Results</a></li>
+		  <li><a href="/emc-metalnx-web/fileproperty/?backFromCollections=true" aria-hidden="true">Search Results</a></li>
 		  <li class="active">Collections</li>
 		</ol>
         <div th:if="${unexpectedError}">
@@ -214,7 +213,7 @@ <h4 class="modal-title" id="myCopyModalLabel">Copy item to</h4>
 							<div role="tabpanel" class="tab-pane active" id="copyCollections">
 								<th:block th:if="${userDetails.isAdmin()}">
 									<p>
-										<a href="#" name="/" title="/"
+										<a aria-label="copy collection" href="#" name="/" title="/"
 											onclick="getSubDirectoriesOldTree('iRods', '/');"> <img
 											alt="" class="folder-icon" th:src="@{ /images/folder-16.png }"
 											name="/" /> <span>iRods</span>
@@ -223,7 +222,7 @@ <h4 class="modal-title" id="myCopyModalLabel">Copy item to</h4>
 								</th:block>
 								<th:block th:unless="${userDetails.isAdmin()}">
 									<p>
-										<a href="#" th:name="${homePath}"
+										<a href="#" th:name="${homePath}" area-label="user home directory"
 											th:title="${userDetails.getUsername()}"
 											th:onclick="'javascript:getSubDirectoriesOldTree(\'' + ${userDetails.getUsername()} + '\', \'' + ${homePath} + '\');'">
 
@@ -233,7 +232,7 @@ <h4 class="modal-title" id="myCopyModalLabel">Copy item to</h4>
 										</a>
 									</p>
 									<p>
-										<a href="#" th:name="Public" th:title="Public"
+										<a href="#" th:name="Public" th:title="Public" aria-label="public"
 											th:onclick="'javascript:getSubDirectoriesOldTree(\'Public\', \'' + ${publicPath} + '\');'">
 											<i class="glyphicon glyphicon-globe"></i> <span>Public</span>
 										</a>
@@ -274,7 +273,7 @@ <h4 class="modal-title" id="myCopyModalLabel">Copy item to</h4>
 						</div>
                         <div class="col-xs-12">
                             <input type="checkbox" id="inputCopyWithMetadata" name="replica" value="1" checked="checked"/>
-                            <span th:text="#{copy.with.metadata.label}"></span>
+                            <label for="inputCopyWithMetadata" th:text="#{copy.with.metadata.label}">Copy with metadata</label>
 						</div>
 					</div>
 					<div class="modal-footer">
@@ -303,7 +302,7 @@ <h4 class="modal-title" id="myCopyModalLabel">Copy item to</h4>
 						<button type="button" class="close" data-dismiss="modal">
 							<span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
 						</button>
-						<h4 class="modal-title" id="myMoveModalLabel">Move item to</h4>
+						<h4  class="modal-title" id="myMoveModalLabel">Move item to</h4>
 					</div>
 					<div class="modal-body">
 						<ul class="nav nav-tabs" role="tablist">
@@ -324,7 +323,7 @@ <h4 class="modal-title" id="myMoveModalLabel">Move item to</h4>
 							<div role="tabpanel" class="tab-pane active" id="moveCollections">
 								<th:block th:if="${userDetails.isAdmin()}">
 									<p>
-										<a href="#" name="/" title="/"
+										<a href="#" name="/" title="/" aria-label="Move collection"
 											onclick="getSubDirectoriesOldTree('iRods', '/');"> <img
 											alt="" class="folder-icon" th:src="@{ /images/folder-16.png }"
 											name="/" /> <span>iRods</span>
@@ -333,7 +332,7 @@ <h4 class="modal-title" id="myMoveModalLabel">Move item to</h4>
 								</th:block>
 								<th:block th:unless="${userDetails.isAdmin()}">
 									<p>
-										<a href="#" th:name="${homePath}"
+										<a href="#" th:name="${homePath}" aria-label="User home dir"
 											th:title="${userDetails.getUsername()}"
 											th:onclick="'javascript:getSubDirectoriesOldTree(\'' + ${userDetails.getUsername()} + '\', \'' + ${homePath} + '\');'">
 
@@ -343,7 +342,7 @@ <h4 class="modal-title" id="myMoveModalLabel">Move item to</h4>
 										</a>
 									</p>
 									<p>
-										<a href="#" th:name="Public" th:title="Public"
+										<a href="#" th:name="Public" th:title="Public" aria-label="Public dir"
 											th:onclick="'javascript:getSubDirectoriesOldTree(\'Public\', \'' + ${publicPath} + '\');'">
 											<i class="glyphicon glyphicon-globe"></i> <span>Public</span>
 										</a>
@@ -409,7 +408,7 @@ <h4 class="modal-title" id="myMoveModalLabel">Move item to</h4>
 						<button type="button" class="close" data-dismiss="modal">
 							<span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
 						</button>
-						<h4 class="modal-title" th:text="#{replicate.modal.title}"></h4>
+						<h4 id="myReplicateModalLabel" class="modal-title" th:text="#{replicate.modal.title}"></h4>
 					</div>
 					<div class="modal-body">
 						<form action="/emc-metalnx-web/fileOperation/replicate/"
@@ -439,14 +438,14 @@ <h4 class="modal-title" th:text="#{replicate.modal.title}"></h4>
 
 		<!-- Delete Modal -->
 		<div class="modal fade" id="deleteModal" tabindex="-1" role="dialog"
-			aria-labelledby="myModalLabel" aria-hidden="true">
+			aria-labelledby="deleteModalLabel" aria-hidden="true">
 			<div class="modal-dialog">
 				<div class="modal-content">
 					<div class="modal-header">
 						<button type="button" class="close" data-dismiss="modal">
 							<span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
 						</button>
-						<h4 class="modal-title" th:text="#{confirmation.deletion.title}"></h4>
+						<h4 id="deleteModalLabel" class="modal-title" th:text="#{confirmation.deletion.title}"></h4>
 					</div>
 					<div class="modal-body">
 						<span th:text="#{confirmation.deletion.label}"></span> <span
@@ -465,14 +464,14 @@ <h4 class="modal-title" th:text="#{confirmation.deletion.title}"></h4>
 
 		<!-- Upload Modal -->
 		<div class="modal fade" id="uploadModal" tabindex="-1" role="dialog"
-			aria-labelledby="myModalLabel" aria-hidden="true">
+			aria-labelledby="uploadModalLabel" aria-hidden="true">
 			<div class="modal-dialog">
 				<div class="modal-content">
 					<div class="modal-header">
 						<button type="button" class="close" data-dismiss="modal">
 							<span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
 						</button>
-						<h4 class="modal-title" th:text="#{upload.label}"></h4>
+						<h4 id="uploadModalLabel" class="modal-title" th:text="#{upload.label}"></h4>
 					</div>
 					<div class="modal-body">
 						<div class="hideElement" id="uploadMinMessage">
@@ -492,8 +491,8 @@ <h4 class="modal-title" th:text="#{upload.label}"></h4>
 
 
 							<p class="text-right">
-								<span id="numberFilesUpload">No</span><span>&nbsp;file(s)
-									selected</span>
+								<label id="numberFilesUpload"># file(s)
+									selected</label>
 							</p>
 							<div class="well">
 								<!-- <div class="col-sm-4 col-sm-offset-4" style="align-items: center; display: flex; min-height: 100%;"> -->
@@ -512,14 +511,15 @@ <h4 class="modal-title" th:text="#{upload.label}"></h4>
 
 									<div class="row form-group">
 										<th:block th:if="${dataGridUser.isAdvancedView()}">
-										<div class="col-md-6">Resource</div>
+										<div class="col-md-6" th:text="#{text.resource.name}">Resource</div>
 										<div class="col-md-6">
 												<input type="checkbox" id="inputReplica" name="replica"
-													value="1" /> &nbsp;&nbsp;<span>Replica</span>
+													value="1" />
+													<label for="inputReplica" th:text="#{text.replica}">Replica</label>
 										</div>
 
 										<div class="col-md-6">
-											<select class="form-control" name="resourceToUpload"
+											<select class="form-control" name="resourceToUpload" aria-label="Resource to upload"
 												id="selectResourceToUpload">
 											</select>
 										</div>
@@ -534,14 +534,14 @@ <h4 class="modal-title" th:text="#{upload.label}"></h4>
 
  								<div class="row form-group">
 									<div class="col-md-6">
-										<input type="checkbox" id="inputOverwriteDuplicateFiles"
+										<input type="checkbox" id="inputOverwriteDuplicateFiles" aria-label="overwrite on upload"
 											name="inputOverwriteDuplicateFiles"
 											th:checked="${overwriteFileOption}" /> &nbsp;&nbsp;<span>Overwrite
 											duplicate files</span>
 									</div>
 									<th:block th:if="${dataGridUser.isAdvancedView()}">
 									<div class="col-md-6">
-										<input type="checkbox" id="inputChecksum" name="checksum"
+										<input type="checkbox" id="inputChecksum" name="checksum" aria-label="compute checksum"
 										value="1" /> &nbsp;&nbsp;<span>Checksum</span>
 									</div>
 									</th:block>
@@ -562,8 +562,8 @@ <h4 class="modal-title" th:text="#{upload.label}"></h4>
 									<table class="table">
 										<thead>
 											<tr>
-												<th>File Name</th>
-												<th>Upload Status</th>
+												<th th:text="#{text.file.name}">File Name</th>
+												<th th:text="#{collections.management.upload.upload.status}">Upload Status</th>
 											</tr>
 										</thead>
 										<tbody class="upload-window">
@@ -625,7 +625,7 @@ <h4 class="modal-title" th:text="#{upload.label}"></h4>
 						this.reset();
 					});
 					$('#filesList').html('');
-					$('#numberFilesUpload').html('No');
+					$('#numberFilesUpload').html('Number of files to upload');
 					$('#uploadControlOptions').hide();
 					$('#uploadForm').show();
 					$('#browseButton').show();
diff --git a/src/emc-metalnx-shared/src/main/resources/views/collections/collectionsBreadCrumb.html b/src/emc-metalnx-shared/src/main/resources/views/collections/collectionsBreadCrumb.html
index 7dd77247a..281b14309 100755
--- a/src/emc-metalnx-shared/src/main/resources/views/collections/collectionsBreadCrumb.html
+++ b/src/emc-metalnx-shared/src/main/resources/views/collections/collectionsBreadCrumb.html
@@ -30,12 +30,12 @@
 
           <th:block th:each="historyElement,iterStat : ${collectionPastHistory}">
               <li th:if="${not #strings.isEmpty(historyElement)}" th:onLoad="'javascript:getSubDirectories(\'' + ${historyElement} + '\');'">
-                  <a  href="#" th:text="${historyElement}" th:onclick="'javascript:goBackHistory('+ ${iterStat.count} +');'">Collection</a>
+                  <a  href="#" th:text="${historyElement}" th:onclick="'javascript:goBackHistory('+ ${iterStat.count} +');'" aria-label="history element">Collection</a>
               </li>
           </th:block>
 
           <li role="separator" class="divider"></li>
-          <li><a class="home" th:href="@{${urlMap.URL_HOME_COLLECTION_USER}}" th:text="'Home ('+${homeCollectionName}+')'"></a>
+          <li><a aria-label="user home directory" class="home" th:href="@{${urlMap.URL_HOME_COLLECTION_USER}}" th:text="'Home ('+${homeCollectionName}+')'" aria-label="user home"></a>
           </li>
       </ul>
     </div>
@@ -47,7 +47,7 @@
                 <th:block th:if="${breadcrumb.items.size()} le 3" th:each="breadcrumbItem, iterStat: ${breadcrumb.items}">
                     <th:block th:if="${iterStat.index lt (breadcrumb.items.size()-1)}">
                         <li class="hidden-xs hidden-sm">
-                            <a  href="#"
+                            <a  href="#" aria-label="'path breadcrumb for:' + ${ breadcrumbItem.path }"
                                 th:text="${breadcrumbItem.name}"
                                 th:title="${breadcrumbItem.path}"
                                 th:onclick="'javascript:getSubDirectories(\'' + ${ breadcrumbItem.path } + '\');'"
@@ -67,7 +67,7 @@
                 <th:block th:if="${breadcrumb.items.size()} gt 3">
                     <li>...</li>
                     <li class="hidden-sm hidden-xs hidden-md">
-                        <a  href="#"
+                        <a  href="#" aria-label="'path breadcrumb for:' + ${breadcrumb.items[breadcrumb.items.size()-3].name}"
                             th:text="${breadcrumb.items[breadcrumb.items.size()-3].name}"
                             th:title="${breadcrumb.items[breadcrumb.items.size()-3].path}"
                             th:onclick="'javascript:getSubDirectories(\'' + ${ breadcrumb.items[breadcrumb.items.size()-3].path } + '\');'"
@@ -95,7 +95,7 @@
             <ol class="breadcrumb info">
                 <th:block th:if="${collectionAndDataObject.isCollection()}">
                     <li>
-                        <a class="collection" href="#">
+                        <a class="collection" href="#" aria-label="'info for:' + ${ collectionAndDataObject.name }">
                             <span th:if="${collectionAndDataObject.path != '/'}"
                                   th:text="${ collectionAndDataObject.name }"
                                   th:title="${ collectionAndDataObject.path }">
@@ -111,7 +111,7 @@
         <button href="#" class="pull-right btn btn-sm btn-default hidden" id="navigationBarCancel"><i class="fa fa-remove" aria-hidden="true"></i></button>
     </div>
         <div class="btn-group pull-right" role="group" data-placement="top" id="breadcrumbOptions">
-		<a id="breadcrumbOptionsMenu" href="#" class="btn btn-properties btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+		<a id="breadcrumbOptionsMenu" href="#" class="btn btn-properties btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="breadcrumb options">
 			<i class="fa fa-bars"></i>
 		</a>   
 		<ul class="dropdown-menu">
@@ -128,13 +128,13 @@
                 </a>
             </li>
 		    <li>
-		        <a href="#" th:onclick="'javascript:getMetadata(\'' + ${collectionAndDataObject.path} + '\');'">
+		        <a href="#" th:onclick="'javascript:getMetadata(\'' + ${collectionAndDataObject.path} + '\');'" aria-label="get metadata">
 		            <span><i class="fa fa-tags"></i></span>
 		            <span title="Metadata">Metadata</span>
 		        </a>
 		    </li>
 		    <li>
-		        <a href="#" id="permissions" th:onclick="'javascript:getPermDetails(\'' + ${collectionAndDataObject.path} + '\');'">
+		        <a href="#" id="permissions" th:onclick="'javascript:getPermDetails(\'' + ${collectionAndDataObject.path} + '\');'" aria-label="get permissions">
 		            <span><i class="fa fa-lock"></i></span>
 		            <span title="Permissions">Permissions</span>
 		        </a>
@@ -143,7 +143,7 @@
     </div>
 
 	<a id="breadcrumbStar" class="btn-favorite" th:onclick="${starredPath}? 'javascript:unstarPath(\'' + ${collectionAndDataObject.path} + '\');' : 'javascript:starPath(\'' + ${collectionAndDataObject.path} + '\');'" href="#"
-		data-toggle="popover" data-placement="left" data-trigger="manual" data-content="" th:title="${starredPath}?#{collections.favorite.unmark.button.tooltip}:#{collections.favorite.button.tooltip}" >
+		aria-label="starred object" data-toggle="popover" data-placement="left" data-trigger="manual" data-content="" th:title="${starredPath}?#{collections.favorite.unmark.button.tooltip}:#{collections.favorite.button.tooltip}" >
 		<i th:class="${starredPath}? 'fa fa-star bm-checked' : 'fa fa-star bm-unchecked'" aria-hidden="true"></i>
 	</a>
 </div>
diff --git a/src/emc-metalnx-shared/src/main/resources/views/collections/collectionsBrowser.html b/src/emc-metalnx-shared/src/main/resources/views/collections/collectionsBrowser.html
index c3be694c4..cbf64c430 100755
--- a/src/emc-metalnx-shared/src/main/resources/views/collections/collectionsBrowser.html
+++ b/src/emc-metalnx-shared/src/main/resources/views/collections/collectionsBrowser.html
@@ -204,7 +204,7 @@
 								<small class="help-block hideElement" id="emptyCollectionNameMsg" th:text="#{collections.validation.name.blank}"></small>
 							</div>
 
-							<input type="checkbox" id="inputInheritanceOption" th:field="*{inheritOption}" th:disabled="${inheritanceDisabled}" /> &nbsp;&nbsp;
+							<input aria-label="permission inheritance option" type="checkbox" id="inputInheritanceOption" th:field="*{inheritOption}" th:disabled="${inheritanceDisabled}" /> &nbsp;&nbsp;
 							<span th:unless="${inheritanceDisabled}">
 								<span th:text="#{collections.add.form.collectionname.checkbox.inherit}"></span>
 								[<a href="#" data-toggle="tooltip" th:title="#{collections.management.table.inheritance.tooltip}">?</a>]
@@ -236,7 +236,7 @@
 <div id="directoryPath" class="col-md-10 col-sm-9 col-xs-12" th:include="${'collections/collectionsBreadCrumb'}">
 </div>
 <div class="col-md-2 col-sm-3 col-xs-12">
-	<a href="#" th:if="${isTrash}" id="emptyTrashBtn" th:title="#{collections.empty.trash.button.tooltip}" class="pull-right btn btn-default" data-toggle="modal" data-target="#emptyTrashModal">
+	<a aria-label="empty trash" href="#" th:if="${isTrash}" id="emptyTrashBtn" th:title="#{collections.empty.trash.button.tooltip}" class="pull-right btn btn-default" data-toggle="modal" data-target="#emptyTrashModal">
 		<span class="glyphicon glyphicon-trash"></span>
 		<span th:text="#{empty.trash.label}"></span>
 	</a>
@@ -244,28 +244,28 @@
 	<div id="actionUpload">
         <th:block th:if="${permissionType != 'none' and permissionType != 'read' and #bools.isFalse(isTrash)}">
             <a role="button" href="#" class="btn btn-default pull-right" data-toggle="modal"
-               data-target="#addAndModifyModal" id="showCollectionFormBtn"
+               data-target="#addAndModifyModal" id="showCollectionFormBtn" aria-label="add collection"
                th:title="#{collections.management.add.button}">
 
                   <i class="fa fa-folder"></i>
 
                 <div class="btnLabel"><span th:text="#{collections.add.button.label}"></span></div>
             </a>
-            <a role="button" href="#" class="btn btn-default" data-toggle="modal"
+            <a role="button" href="#" class="btn btn-default" data-toggle="modal" aria-label="upload files"
                data-target="#uploadModal" data-backdrop="static" data-keyboard="false" id="uploadIcon" title="Upload file(s) to iRods">
                 <i class="fa fa-cloud-upload pull-left"></i><div class="btnLabel"><span th:text="#{collections.upload.button.label}"></span></div>
             </a>
         </th:block>
         <th:block th:if="${(permissionType == 'none' or permissionType == 'read') and #bools.isFalse(isTrash)}">
             <a disabled="true" role="button" href="#" class="btn btn-default pull-right" data-toggle="modal"
-               data-target="#addAndModifyModal" id="showCollectionFormBtn"
+               data-target="#addAndModifyModal" id="showCollectionFormBtn" aria-label="add collection"
                th:title="#{collections.management.add.button}">
 
                   <i class="fa fa-folder"></i>
 
                 <div class="btnLabel"><span th:text="#{collections.add.button.label}"></span></div>
-            </a>
-            <a disabled="true" role="button" href="#" class="btn btn-default" data-toggle="modal"
+            </a> 
+            <a disabled="true" role="button" href="#" class="btn btn-default" data-toggle="modal" aria-label="add collection"
                data-target="#uploadModal" id="uploadIcon" title="Upload file(s) to iRods">
                 <i class="fa fa-cloud-upload pull-left"></i><div class="btnLabel"><span th:text="#{collections.upload.button.label}"></span></div>
             </a>
@@ -284,7 +284,7 @@
             <table class="table table-hover" id="treeViewTable">
                 <thead>
                     <tr>
-                        <th class="tableCheckBoxCol"><input type="checkbox" name="selectAllCheckboxes" value="1" th:disabled="${currentPath == '/'}"/></th>
+                        <th class="tableCheckBoxCol"><input type="checkbox" name="selectAllCheckboxes" value="1" th:disabled="${currentPath == '/'}" aria-label="select all items"/></th>
                         <th th:text="#{collections.management.table.collection.name.label}"></th>
                         <th th:text="#{collections.management.table.owner.label}"></th>
                         <th th:text="#{collections.management.table.kind.label}"></th>
@@ -303,7 +303,7 @@
     <div class="text-center" role="alert">
         <span th:text="#{collections.management.msg.access.denied}"></span>
         &nbsp;&nbsp;&nbsp;&nbsp;
-        <a href="#" onclick="javascript:goBackHistory('1');">
+        <a href="#" onclick="javascript:goBackHistory('1');" aria-label="back" th:text="#{text.back}">
             <span>Back</span>
         </a>
     </div>
@@ -311,17 +311,17 @@
 
 <!-- Empty Trash Modal -->
 <div class="modal fade" id="emptyTrashModal" tabindex="-1" role="dialog"
-	 aria-labelledby="myModalLabel" aria-hidden="true">
+	 aria-labelledby="emptyTrashModalTitle" aria-hidden="true">
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">
 				<button type="button" class="close" data-dismiss="modal">
-					<span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
+					<span aria-hidden="true">&times;</span><span class="sr-only" th:text="#{text.close}">Close</span>
 				</button>
-				<h4 class="modal-title" th:text="${'Empty Trash'}"></h4>
+				<h4 id="emptyTrashModalTitle" class="modal-title" th:text="${'Empty Trash'}"></h4>
 			</div>
 			<div class="modal-body">
-				<span th:utext="#{trash.deletion.confirmation(${trashColl})}"></span>
+				<span th:text="#{trash.deletion.confirmation(${trashColl})}"></span>
 			</div>
 			<div class="modal-footer">
 				<button type="button" class="btn btn-default" data-dismiss="modal"
@@ -336,14 +336,14 @@ <h4 class="modal-title" th:text="${'Empty Trash'}"></h4>
 <!-- Ticket Form -->
 <div class="col-md-10 col-sm-9 col-xs-12">
     <div class="modal fade" id="ticketCreationForm" tabindex="-1" role="dialog"
-         aria-labelledby="myModalLabel" aria-hidden="true">
+         aria-labelledby="ticketCreateFormTitle" aria-hidden="true">
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal">
                         <span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
                     </button>
-                    <h4 class="modal-title" th:text="#{ticket.form.title.create}"></h4>
+                    <h4 id="ticketCreateFormTitle" class="modal-title" th:text="#{ticket.form.title.create}"></h4>
                 </div>
                 <div class="modal-body">
                    <div id="ticketFormPanel"></div>
diff --git a/src/emc-metalnx-shared/src/main/resources/views/collections/collectionsResourcesForReplica.html b/src/emc-metalnx-shared/src/main/resources/views/collections/collectionsResourcesForReplica.html
index c140d72fb..4c105fd6a 100755
--- a/src/emc-metalnx-shared/src/main/resources/views/collections/collectionsResourcesForReplica.html
+++ b/src/emc-metalnx-shared/src/main/resources/views/collections/collectionsResourcesForReplica.html
@@ -16,9 +16,9 @@
 
 <th:block th:fragment="collectionsResourcesForReplica">
 
-	<select class="form-control" name="resourcesForReplication" id="" th:if="${ not #lists.isEmpty(resources) }" style="width:66%">
+	<select class="form-control" name="resourcesForReplication" id="" th:if="${ not #lists.isEmpty(resources) }" style="width:66%" aria-label="replica resources">
 		<th:block th:each="resource : ${resources}">
-			<option th:value="${resource.name}"> 
+			<option th:value="${resource.name}" aria-label="resource"> 
 				<span th:text="${resource.name}"></span> 
 			</option>
 		</th:block>	
diff --git a/src/emc-metalnx-shared/src/main/resources/views/collections/editCollectionForm.html b/src/emc-metalnx-shared/src/main/resources/views/collections/editCollectionForm.html
index 4715c18e2..1bf3ee0b9 100755
--- a/src/emc-metalnx-shared/src/main/resources/views/collections/editCollectionForm.html
+++ b/src/emc-metalnx-shared/src/main/resources/views/collections/editCollectionForm.html
@@ -14,7 +14,7 @@
   ~  limitations under the License.
   -->
 
-<div class="modal-header">
+<div class="modal-header" aria-labelledby="myAddAndModifyModalLabel">
 	<button type="button" class="close" data-dismiss="modal">
 		<span aria-hidden="true">&times;</span> <span class="sr-only">Close</span>
 	</button>
@@ -45,7 +45,7 @@
 				<small class="help-block hideElement" id="emptyCollectionNameMsg" th:text="#{collections.validation.name.blank}"></small>
 			</div>
 
-			<input type="checkbox" id="inputInheritanceOption" th:field="*{inheritOption}" /> &nbsp;&nbsp;
+			<input type="checkbox" id="inputInheritanceOption" th:field="*{inheritOption}" aria-label="inheritance option" /> &nbsp;&nbsp;
 			<span for="inheritanceOption" >
 				<span th:text="#{collections.add.form.collectionname.checkbox.inherit}"></span>
 				[<a href="#" data-toggle="tooltip" th:title="#{collections.management.table.inheritance.tooltip}">?</a>]
diff --git a/src/emc-metalnx-shared/src/main/resources/views/collections/editDataObjectForm.html b/src/emc-metalnx-shared/src/main/resources/views/collections/editDataObjectForm.html
index e712f4a19..1955c6fd1 100755
--- a/src/emc-metalnx-shared/src/main/resources/views/collections/editDataObjectForm.html
+++ b/src/emc-metalnx-shared/src/main/resources/views/collections/editDataObjectForm.html
@@ -14,7 +14,7 @@
   ~  limitations under the License.
   -->
 
-<div class="modal-header">
+<div class="modal-header" aria-labelledby="myAddAndModifyModalLabel">
 	<button type="button" class="close" data-dismiss="modal">
 		<span aria-hidden="true">&times;</span> <span class="sr-only">Close</span>
 	</button>
diff --git a/src/emc-metalnx-shared/src/main/resources/views/collections/info.html b/src/emc-metalnx-shared/src/main/resources/views/collections/info.html
index 99fd914f2..de5f2c3ee 100644
--- a/src/emc-metalnx-shared/src/main/resources/views/collections/info.html
+++ b/src/emc-metalnx-shared/src/main/resources/views/collections/info.html
@@ -14,18 +14,18 @@
 
 		<div id="tabs">
 			<ul>
-				<li><a href="#info"
+				<li><a href="#info" aria-label="file information"
 					th:onclick="'javascript:getInfoDetails(\'' + ${dataProfile.absolutePath} + '\');'">
 						<span><i class="fa fa-info-circle"></i></span> <span
 						title="File information">Info</span>
 				</a></li>
 
-				<li><a href="#metadata"
+				<li><a href="#metadata" aria-label="file metadata"
 					th:onclick="'javascript:getMetadata(\'' + ${dataProfile.absolutePath} + '\');'">
 						<span><i class="fa fa-tags"></i></span> <span title="Metadata">Metadata</span>
 				</a></li>
 
-				<li><a href="#permission" id="permissions"
+				<li><a href="#permission" id="permissions" aria-label="file permissions"
 					th:onclick="'javascript:getPermissionDetails(\'' + ${dataProfile.absolutePath} + '\');'">
 						<span><i class="fa fa-lock"></i></span> <span title="Permissions">Permissions</span>
 				</a></li>
diff --git a/src/emc-metalnx-shared/src/main/resources/views/collections/templateFieldListForCollections.html b/src/emc-metalnx-shared/src/main/resources/views/collections/templateFieldListForCollections.html
index 1e2bb52a6..decc16d77 100755
--- a/src/emc-metalnx-shared/src/main/resources/views/collections/templateFieldListForCollections.html
+++ b/src/emc-metalnx-shared/src/main/resources/views/collections/templateFieldListForCollections.html
@@ -14,13 +14,13 @@
   ~  limitations under the License.
   -->
 
-<div class="row template-fields-content templates" id="templateFieldsList">
+<div class="row template-fields-content templates" id="templateFieldsList" aria-labelledby="myCopyModalLabel">
 	<div class="modal-dialog modal-lg">
 	<form th:action="@{${requestMapping}}" th:object="${templateForm}" method="POST" role="form" id="applyTemplateForm">
 		<div class="modal-content">
 			<div class="modal-header">
 				<button type="button" class="close" data-dismiss="modal">
-					<span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
+					<span aria-hidden="true">&times;</span><span class="sr-only" th:text="${text.close}">Close</span>
 				</button>
 				<h4 class="modal-title" id="myCopyModalLabel">Step 2 - Fill-in the values</h4>
 			</div>
@@ -43,17 +43,17 @@ <h4 class="modal-title" id="myCopyModalLabel">Step 2 - Fill-in the values</h4>
 						<tbody id="">
 							<tr th:each="templateField : ${templateFields}" th:id="${templateField.id} ? ${templateField.id} : ${'pos_' + templateField.formListPosition}" th:class="${templateField.id == null} ? 'info'">
 								<td class="text-center" th:unless="${templateField.id != null}">
-									<input type="checkbox" name="templateFieldCheckboxes" th:value="${templateField.formListPosition}"/>
+									<input type="checkbox" name="templateFieldCheckboxes" th:value="${templateField.formListPosition}" aria-label="template field checkbox"/>
 								</td>
 								<td>
-									<span th:text="${templateField.attribute}"></span>
-									<input type="hidden" th:value="${templateField.attribute}" name="avuAttributes"/>
+									<label for="avuAttribute" th:text="${templateField.attribute}"></label>
+									<input id="avuAttribute" type="hidden" th:value="${templateField.attribute}" name="avuAttributes"/>
 								</td>
 								<td>
-									<input class="" type="text" th:value="${templateField.value}" name="avuValues"/>
+									<input class="" type="text" th:value="${templateField.value}" name="avuValues" aria-label="avu value"/>
 								</td>
 								<td>
-									<input class="" type="text" th:value="${templateField.unit}" name="avuUnits"/>
+									<input class="" type="text" th:value="${templateField.unit}" name="avuUnits" aria-label="avu unit"/>
 								</td>
 								<td>
 									<span class="editable" th:text="${templateField.templateName}"></span>
diff --git a/src/emc-metalnx-shared/src/main/resources/views/collections/templateListForCollections.html b/src/emc-metalnx-shared/src/main/resources/views/collections/templateListForCollections.html
index de875e52e..8ae252ff8 100755
--- a/src/emc-metalnx-shared/src/main/resources/views/collections/templateListForCollections.html
+++ b/src/emc-metalnx-shared/src/main/resources/views/collections/templateListForCollections.html
@@ -15,7 +15,7 @@
   -->
 
 <div th:fragment="templateList" class="row templates-content templates" id="templateList">
-	<div class="modal-dialog modal-lg">
+	<div class="modal-dialog modal-lg" aria-labelledby="myCopyModalLabel">
 		<div class="modal-content">
 			<div class="modal-header">
 				<button type="button" class="close" data-dismiss="modal">
@@ -39,7 +39,7 @@ <h4 class="modal-title" id="myCopyModalLabel">Step 1 - Select Template(s)</h4>
 						<tbody id="">
 							<tr th:each="template : ${templates}">
 								<td class="">
-									<input type="checkbox" name="templateCheckboxes" th:value="${template.id}" th:id="${template.templateName}"/>
+									<input type="checkbox" name="templateCheckboxes" th:value="${template.id}" th:id="${template.templateName}" aria-label="template checkboxes"/>
 								</td>
 								<td><span th:text="${template.templateName}"></span></td>
 								<td><span th:text="${template.owner}"></span></td>
diff --git a/src/emc-metalnx-shared/src/main/resources/views/favorites/favorites.html b/src/emc-metalnx-shared/src/main/resources/views/favorites/favorites.html
index d425f183f..c031abbf5 100755
--- a/src/emc-metalnx-shared/src/main/resources/views/favorites/favorites.html
+++ b/src/emc-metalnx-shared/src/main/resources/views/favorites/favorites.html
@@ -28,13 +28,13 @@
 
 <body>
 	<!-- Page Content -->
-	<div layout:fragment="content">
+	<div layout:fragment="content" aria-labelledby="favoritePageTitle">
 		<div class="row">
 			<div class="col-sm-12">
-				<h1 class="page-header pull-left">
+				<h1 id="favoritesPageTitle" class="page-header pull-left">
 					<span th:text="#{favorites.page.title}"></span>
 				</h1>
-				<a id="favorite-page-title"  href="#" class="page-hint pull-left"><i class="fa fa-question-circle"></i></a>
+				<a id="favoritePageTitle"  href="#" class="page-hint pull-left"><i class="fa fa-question-circle"></i></a>
 			</div>
 
             <div class="col-sm-12 hideElement" id="unfavFailMsg">
diff --git a/src/emc-metalnx-shared/src/main/resources/views/groups/groupsCollections.html b/src/emc-metalnx-shared/src/main/resources/views/groups/groupsCollections.html
index d4e559fe8..3cb730948 100755
--- a/src/emc-metalnx-shared/src/main/resources/views/groups/groupsCollections.html
+++ b/src/emc-metalnx-shared/src/main/resources/views/groups/groupsCollections.html
@@ -29,21 +29,21 @@
 <body>
 
 	<!-- Page Content -->
-	<div layout:fragment="content">
+	<div layout:fragment="content" aria-labelledby="sharedLinksTitle">
 		<div class="row">
 			<div class="col-sm-12">
-				<h1 class="page-header pull-left">
+				<h1 id="sharedLinksTitle" class="page-header pull-left">
 					<span th:text="#{group.collections.view.page.title}"></span>
 				</h1>
 				<span class="subtitle" th:text="#{group.collections.view.page.subtitle}"></span>
-				<a id="mygroups-page-title"  href="#" class="page-hint pull-left"><i class="fa fa-question-circle"></i></a>
+				<a id="mygroups-page-title"  href="#" class="page-hint pull-left" aria-label="page help"><i class="fa fa-question-circle"></i></a>
 			</div>
 			<div class="col-sm-12">
-				<a th:href="@{ ${urlMap.URL_GROUPS_BOOKMARKS} }" disabled="" class="btn btn-default btn-sm btn-shared" style="margin-right: 5px;">
+				<a th:href="@{ ${urlMap.URL_GROUPS_BOOKMARKS} }" disabled="" class="btn btn-default btn-sm btn-shared" style="margin-right: 5px;" aria-label="group shared bookmarks">
                    <i class="fa fa-users "></i>
                    	&nbsp; <span th:text="#{collections.management.shared.links.list.by.group}"></span>
                  </a>
-				<a th:href="@{ ${urlMap.URL_USER_BOOKMARKS} }" class="btn btn-default btn-sm btn-shared" style="margin-right: 5px;">
+				<a th:href="@{ ${urlMap.URL_USER_BOOKMARKS} }" class="btn btn-default btn-sm btn-shared" style="margin-right: 5px;" aria-label="user shared bookmarks">
                    <i class="fa fa-user"></i>
                    	&nbsp; <span th:text="#{collections.management.shared.links.list.by.user}"></span>
                  </a>
diff --git a/src/emc-metalnx-shared/src/main/resources/views/login/index.html b/src/emc-metalnx-shared/src/main/resources/views/login/index.html
index d3925891b..b04266e5a 100755
--- a/src/emc-metalnx-shared/src/main/resources/views/login/index.html
+++ b/src/emc-metalnx-shared/src/main/resources/views/login/index.html
@@ -53,19 +53,19 @@
                 <form action="#" th:action="@{/login/authenticate/}" method="POST" id="authLogin">
                     <div class="login_fields_user">
                         <div class="icon"><i class="fa fa-user" aria-hidden="true"></i></div>
-                        <input type="text" placeholder="username" name="username" id="inputUsernameLogin" />
+                        <input type="text" placeholder="username" name="username" id="inputUsernameLogin" aria-label="user name"/>
                         <div class="icon-input-check hidden"><i class="fa fa-check" aria-hidden="true"></i></div>
                     </div>
                     <div class="login_fields_password">
                         <div class="icon"><i class="fa fa-lock" aria-hidden="true"></i></div>
-                        <input type="password" placeholder="password" name="password" id="inputPasswordLogin" />
+                        <input type="password" placeholder="password" name="password" id="inputPasswordLogin" aria-label="password"/>
                         <div class="icon-input-check hidden"><i class="fa fa-check" aria-hidden="true"></i></div>
                     </div>
                     <div class="login_fields_submit">
                         <input type="submit" value="Login" id="loginBtn"/>
 
 				            <th:block th:if="${globalConfig.isTicketsEnabled()}">
-											<a id="haveTicketBtn" href="#" onclick="showAnonymousLogin();" th:text="#{ticket.login.access}"></a>
+											<a id="haveTicketBtn" href="#" onclick="showAnonymousLogin();" th:text="#{ticket.login.access}" aria-label="i have a ticket"></a>
 				            </th:block>
 
                     </div>
@@ -74,12 +74,12 @@
                 <form action="#" th:action="@{/ticketclient/}" method="GET" id="anonymousLogin" class="hidden">
                     <div class="login_fields_user">
                         <div class="icon"><i class="fa fa-ticket" aria-hidden="true"></i></div>
-                        <input type="text" placeholder="ticket string" name="ticketstring" id="inputTicketString" />
+                        <input type="text" placeholder="ticket string" name="ticketstring" id="inputTicketString" aria-label="ticket string"/>
                         <div class="icon-input-check hidden"><i class="fa fa-check" aria-hidden="true"></i></div>
                     </div>
                     <div class="login_fields_password">
                         <div class="icon"><i class="fa fa-map-marker" aria-hidden="true"></i></div>
-                        <input type="text" placeholder="path" name="ticketpath" id="inputTicketPath" />
+                        <input type="text" placeholder="path" name="ticketpath" id="inputTicketPath" aria-label="ticket path"/>
                         <div class="icon-input-check hidden"><i class="fa fa-check" aria-hidden="true"></i></div>
                     </div>
                     <div class="login_fields_submit">
diff --git a/src/emc-metalnx-shared/src/main/resources/views/metadata/metadataDisplay.html b/src/emc-metalnx-shared/src/main/resources/views/metadata/metadataDisplay.html
index 5440b0a57..77404275e 100755
--- a/src/emc-metalnx-shared/src/main/resources/views/metadata/metadataDisplay.html
+++ b/src/emc-metalnx-shared/src/main/resources/views/metadata/metadataDisplay.html
@@ -30,19 +30,19 @@
 		<!-- jQuery UI Timepicker -->
     	<script src="../static/js/jquery-ui-timepicker-addon.js" th:src="@{/js/jquery-ui-timepicker-addon.js}"></script>
 
-    	<title th:text="#{tab.title.search}">Metalnx - Search</title>
+    	<title id="searchTitle" th:text="#{tab.title.search}">Metalnx - Search</title>
 	</head>
 
 	<body>
-		<div layout:fragment="content">
+		<div layout:fragment="content" aria-labelledby="searchTitle">
 			<h1 class="page-header pull-left" th:text="#{metadata.search.page.title}"></h1>
-			<a id="search-page-title" href="#" class="page-hint pull-left"><i class="fa fa-question-circle"></i></a>
+			<a id="search-page-title" href="#" class="page-hint pull-left"><i class="fa fa-question-circle" aria-label="page help"></i></a>
 			<div class="row metadata">
 				<div class="col-xs-12 tree-view-panel">
 					<div class="tabpanel">
 						<ul class="nav nav-tabs" role="tablist">
-							<li class="active" ><a href="#metadata-search" aria-controls="profile" role="tab" data-toggle="tab" th:text="#{metadata.search.title}">Metadata Search</a></li>
-							<li ><a href="#properties-search" aria-controls="profile" role="tab" data-toggle="tab" >Properties</a></li>
+							<li class="active" ><a href="#metadata-search" aria-controls="profile" role="tab" data-toggle="tab" th:text="#{metadata.search.title}" aria-label="metadata search">Metadata Search</a></li>
+							<li ><a href="#properties-search" aria-controls="profile" role="tab" data-toggle="tab" aria-label="properties search" th:text="#{text.properties}">Properties</a></li>
 						</ul>
 						<div class="tab-content" style="border: 1px solid #ddd; background-color: #fff; padding-top: 15px;">
 							<div role="tabpanel" class="tab-pane active" id="metadata-search">
@@ -50,17 +50,17 @@ <h1 class="page-header pull-left" th:text="#{metadata.search.page.title}"></h1>
 									<div class="col-xs-12" ><p th:text="#{metadata.search.prompt}">Search for files and collections that <b>match one or more of the conditions</b> below:</p></div>
 									<form class="metadataSearchForm col-xs-12">
 										<div class="metadataSearchRow ">
-											<input type="text" class="metadataAttr metadataSearchField form-control" name="attribute" placeholder="Attribute" id="metadataAttr0"/>
+											<input type="text" class="metadataAttr metadataSearchField form-control" name="attribute" placeholder="Attribute" id="metadataAttr0" aria-label="metadata attribute"/>
 
-												<select id="" class="metadataOper metadataSearchField form-control" name="operator">
+												<select id="" class="metadataOper metadataSearchField form-control" name="operator" aria-label="search operator">
 													<option value="EQUAL">Is (Equals)</option>
 													<option value="NOT_EQUAL">Is Not (Not Equals)</option>
 													<option selected="" value="LIKE">Contains</option>
 													<option value="NOT_LIKE">Does Not Contain</option>
 												</select>
 
-											<input type="text" class="metadataVal metadataSearchField form-control" name="value" placeholder="Value" id="metadataValue0"/>
-                                            <input type="text" class="metadataUnit metadataSearchField form-control" name="unit" placeholder="Unit" id="metadataUnit0"/>
+											<input type="text" class="metadataVal metadataSearchField form-control" name="value" placeholder="Value" id="metadataValue0" aria-label="search value"/>
+                                            <input type="text" class="metadataUnit metadataSearchField form-control" name="unit" placeholder="Unit" id="metadataUnit0" aria-label="search unit"/>
 											<a role="button" class="btn btn-link btn-xs rmMetadataSearchRow" ><i class="fa fa-minus-circle"></i></a>
 										</div>
 										<div class="">
@@ -68,8 +68,8 @@ <h1 class="page-header pull-left" th:text="#{metadata.search.page.title}"></h1>
 										</div>
 									</form>
 									<div id="metadataSearchActionButtons" class="col-sm-12">
-										<button class="btn btn-primary btn-sm pull-right" id="submitMetadataSearch" type="button">Search</button>
-										<button class="btn btn-default btn-sm pull-right" id="resetMetadataSearch" type="button">Reset Conditions</button>
+										<button class="btn btn-primary btn-sm pull-right" id="submitMetadataSearch" type="button" th:text="#{text.search}">Search</button>
+										<button class="btn btn-default btn-sm pull-right" id="resetMetadataSearch" type="button" th:text="#{text.reset}">Reset</button>
 									</div>
 								</div>
 							</div>
@@ -78,7 +78,7 @@ <h1 class="page-header pull-left" th:text="#{metadata.search.page.title}"></h1>
 									<div class="col-xs-12"><p th:text="#{metadata.search.prompt}">Search for files and collections that <b>match one or more of the conditions</b> below:</p></div>
 									<form class="propertiesSearchForm col-xs-12">
 										<div class="propertiesSearchRow ">
-											<select class="propertiesAttr form-control propertiesSearchField" name="attribute" placeholder="Attribute">
+											<select class="propertiesAttr form-control propertiesSearchField" name="attribute" placeholder="Attribute" aria-label="properties search field">
 												<option value="FILE_NAME" th:text="#{text.file.name}">File Name</option>
 								                <option value="FILE_PATH" th:text="#{text.path}">Path</option>
 								                <option value="RESC_NAME" th:text="#{text.resource.name}">Resource Name</option>
@@ -89,7 +89,7 @@ <h1 class="page-header pull-left" th:text="#{metadata.search.page.title}"></h1>
 								                <option value="REPLICA_NUMBER" th:text="#{text.replica.number}">Replica Number</option>
 								                <option value="CHECKSUM" th:text="#{collections.management.checksum.label}">Checksum</option>
 											</select>
-											<select id="" class="propertiesOper form-control propertiesSearchField" name="operator">
+											<select id="" class="propertiesOper form-control propertiesSearchField" name="operator" aria-label="properties operator">
 												<option  value="EQUAL" th:text="#{text.is.equals}">Is (Equals)</option>
 												<option value="NOT_EQUAL" th:text="#{text.is.not.equals}">Is Not (Not Equals)</option>
 												<option selected="" value="LIKE" th:text="#{text.contains}">Contains</option>
diff --git a/src/emc-metalnx-shared/src/main/resources/views/metadata/metadataTable.html b/src/emc-metalnx-shared/src/main/resources/views/metadata/metadataTable.html
index 780619f42..408ef1981 100755
--- a/src/emc-metalnx-shared/src/main/resources/views/metadata/metadataTable.html
+++ b/src/emc-metalnx-shared/src/main/resources/views/metadata/metadataTable.html
@@ -34,19 +34,19 @@ <h4 class="modal-title" id="addMetadataModalLabel"><span th:text="#{metadata.mod
                                 <input type="hidden" name="oldValue" id="oldValModal" />
                                 <input type="hidden" name="oldUnit" id="oldUnitModal" />
                                 <div class="form-group ">
-                                    <label class="" th:text="#{metadata.modal.add.label.attribute}"></label>
+                                    <label for="newAttrModal" class="" th:text="#{metadata.modal.add.label.attribute}"></label>
                                     <input type="text" class="form-control" placeholder="New Attribute" id="newAttrModal" />
                                     <i class="emptyAttrMetadata form-control-feedback glyphicon glyphicon-remove hideElement" id=""></i>
                                     <small class="emptyAttrMetadata help-block hideElement" id="" th:text="#{collections.management.add.metadata.modal.empty.attribute}"></small>
                                 </div>
                                 <div class="form-group ">
-                                    <label class="" th:text="#{metadata.modal.add.label.value}"></label>
+                                    <label for="newValModal" class="" th:text="#{metadata.modal.add.label.value}"></label>
                                     <input type="text" class="form-control" placeholder="New Value" id="newValModal" />
                                     <i class="emptyValMetadata form-control-feedback glyphicon glyphicon-remove hideElement" id=""></i>
                                     <small class="emptyValMetadata help-block hideElement" id="" th:text="#{collections.management.add.metadata.modal.empty.value}"></small>
                                 </div>
                                 <div class="form-group ">
-                                    <label class="" th:text="#{metadata.modal.add.label.unit}"></label>
+                                    <label for="newUnitModal" class="" th:text="#{metadata.modal.add.label.unit}"></label>
                                     <input type="text" class="form-control" placeholder="New Unit" id="newUnitModal" />
                                 </div>
                             </form>
@@ -60,7 +60,7 @@ <h4 class="modal-title" id="addMetadataModalLabel"><span th:text="#{metadata.mod
             </div>
 
             <!-- Confirmation modal for the delete operation -->
-            <div class="modal fade" id="deleteMetadataModal" tabindex="-1" role="dialog" aria-hidden="true">
+            <div class="modal fade" id="deleteMetadataModal" tabindex="-1" role="dialog" aria-hidden="true" aria-labelledby="deleteMetadataModalLabel">
                 <div class="modal-dialog">
                     <div class="modal-content">
                         <div class="modal-header">
diff --git a/src/emc-metalnx-shared/src/main/resources/views/permissions/permissionDetails.html b/src/emc-metalnx-shared/src/main/resources/views/permissions/permissionDetails.html
index f75d7bfd5..6f8e7a183 100755
--- a/src/emc-metalnx-shared/src/main/resources/views/permissions/permissionDetails.html
+++ b/src/emc-metalnx-shared/src/main/resources/views/permissions/permissionDetails.html
@@ -59,7 +59,7 @@ <h4 class="property-title pull-left"><i class="fa fa-lock"></i><span th:text="#{
                                 <td th:unless="${userCanModify}" th:text="${userPermission.getPermission()}"></td>
                                 <td th:if="${userCanModify}">
                                     <th:block th:if="${collectionAndDataObject.isCollection()}">
-                                        <select class="userOptionForPermission" th:title="#{permission.table.permission.column}">
+                                        <select class="userOptionForPermission" th:title="#{permission.table.permission.column}" aria-label="user permission option">
                                             <option th:each="permission : ${permissions}"
                                                     th:value="${permission + '#' + collectionAndDataObject.getPath() + '#' + userPermission.getUserName()}"
                                                     th:text="${permission}" th:title="${permission}"
@@ -74,7 +74,8 @@ <h4 class="property-title pull-left"><i class="fa fa-lock"></i><span th:text="#{
                                         </div>
                                     </th:block>
                                     <th:block th:unless="${collectionAndDataObject.isCollection()}">
-                                        <select class="userOptionForFilePermission" th:title="#{permission.table.permission.column}">
+                                        <select class="userOptionForFilePermission" th:title="#{permission.table.permission.column}" aria-label="user permission option">
+                                        
                                             <option th:each="permission : ${permissions}"
                                                     th:value="${permission + '#' + collectionAndDataObject.getPath() + '#' + userPermission.getUserName()}"
                                                     th:text="${permission}" th:title="${permission}"
@@ -86,7 +87,7 @@ <h4 class="property-title pull-left"><i class="fa fa-lock"></i><span th:text="#{
                                     <input
                                         type="checkbox"
                                         class="userBookmarkCheckbox"
-                                        th:checked="${#sets.contains(usersWithBookmarks, userPermission.getUserName()) ? 'checked' : 'false' }" />
+                                        th:checked="${#sets.contains(usersWithBookmarks, userPermission.getUserName()) ? 'checked' : 'false' }" aria-label="user bookmark"/>
                                 </td>
                                 <td th:unless="${userCanModify}">
                                     <span aria-hidden="true"
@@ -100,7 +101,7 @@ <h4 class="property-title pull-left"><i class="fa fa-lock"></i><span th:text="#{
                                 <td th:unless="${userCanModify}" th:text="${groupPermission.getPermission()}"></td>
                                 <td th:if="${userCanModify}">
                                     <th:block th:if="${collectionAndDataObject.isCollection()}">
-                                        <select class="groupOptionForPermission" th:title="#{permission.table.permission.column}" th:id="${'groupOptionForPermission_' + groupPermission.getGroupName()}">
+                                        <select class="groupOptionForPermission" th:title="#{permission.table.permission.column}" th:id="${'groupOptionForPermission_' + groupPermission.getGroupName()}" aria-label="group option for permission">
                                             <option th:each="permission : ${permissions}"
                                                 th:value="${permission + '#' + collectionAndDataObject.getPath() + '#' + groupPermission.getGroupName()}"
                                                 th:text="${permission}" th:selected="${groupPermission.getPermission() == permission}"
@@ -115,7 +116,7 @@ <h4 class="property-title pull-left"><i class="fa fa-lock"></i><span th:text="#{
                                         </div>
                                     </th:block>
                                     <th:block th:unless="${collectionAndDataObject.isCollection()}">
-                                        <select class="groupOptionForFilePermission" th:title="#{permission.table.permission.column}" th:id="${'groupOptionForPermission_' + groupPermission.getGroupName()}">
+                                        <select class="groupOptionForFilePermission" th:title="#{permission.table.permission.column}" th:id="${'groupOptionForPermission_' + groupPermission.getGroupName()}" aria-label="group option for permission">
                                             <option th:each="permission : ${permissions}"
                                                     th:value="${permission + '#' + collectionAndDataObject.getPath() + '#' + groupPermission.getGroupName()}"
                                                     th:text="${permission}" th:selected="${groupPermission.getPermission() == permission}"
@@ -127,7 +128,7 @@ <h4 class="property-title pull-left"><i class="fa fa-lock"></i><span th:text="#{
                                     <input
                                         type="checkbox"
                                         class="groupBookmarkCheckbox"
-                                        th:checked="${#sets.contains(groupsWithBookmark, groupPermission.getGroupName()) ? 'checked' : 'false' }" />
+                                        th:checked="${#sets.contains(groupsWithBookmark, groupPermission.getGroupName()) ? 'checked' : 'false' }" aria-label="group bookmark checkbox"/>
                                 </td>
                                 <td th:unless="${userCanModify}">
                                     <span aria-hidden="true"
@@ -187,7 +188,7 @@ <h4 class="modal-title" th:text="#{permissions.modal.group.add.title}"></h4>
                         <div class="checkbox">
                             <label>
                                 <input type="checkbox" id="isBookmarkToBeSet" />
-                                <span th:text="#{collections.management.table.bookmark.label}"></span>
+                                <label for="isBookmarkToBeSet" th:text="#{collections.management.table.bookmark.label}"></label>
                             </label>
                         </div>
                     </div>
@@ -201,14 +202,14 @@ <h4 class="modal-title" th:text="#{permissions.modal.group.add.title}"></h4>
         </div>
 
         <!-- 'Add user permission' modal -->
-        <div class="modal fade" id="newUserPermissionModal" tabindex="-1" role="dialog" aria-labelledby="newUserPermissionModalLabel">
+        <div class="modal fade" id="newUserPermissionModal" tabindex="-1" role="dialog" aria-labelledby="newUserPermissionModalTitle">
             <div class="modal-dialog" role="document">
                 <div class="modal-content">
                     <div class="modal-header">
                         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                             <span aria-hidden="true">&times;</span>
                         </button>
-                        <h4 class="modal-title" th:text="#{permissions.modal.user.add.title}"></h4>
+                        <h4 id="newUserPermissionModalTitle" class="modal-title" th:text="#{permissions.modal.user.add.title}"></h4>
                     </div>
                     <div id="addUsersModalContent" class="modal-body">
 
diff --git a/src/emc-metalnx-shared/src/main/resources/views/preferences/index.html b/src/emc-metalnx-shared/src/main/resources/views/preferences/index.html
index 460d41126..def5802d5 100755
--- a/src/emc-metalnx-shared/src/main/resources/views/preferences/index.html
+++ b/src/emc-metalnx-shared/src/main/resources/views/preferences/index.html
@@ -27,10 +27,10 @@
 </head>
 
 <body>
-	<div layout:fragment="content">
+	<div layout:fragment="content" aria-labelledby="preferencesPageTitle">
 		<div class="row">
 			<div class="col-sm-12">
-				<h1 class="page-header pull-left" th:text="#{preferences.page.title}"></h1>
+				<h1 id="preferencesPageTitle" class="page-header pull-left" th:text="#{preferences.page.title}"></h1>
 			</div>
 			<div class="col-xs-12 col-md-6">
 				<form role="form" class="container-fluid registerForm row" method="POST" th:object="${preferences}" th:action="@{/preferences/action/}">
@@ -50,11 +50,11 @@ <h3 class="panel-title" th:text="#{preferences.panel.title}"></h3>
 							<div class="form-group">
 								<label for="forceFileOverwriting">File Upload</label>
 								<p>
-									<input type="checkbox" id="forceFileOverwriting" th:field="*{forceFileOverwriting}" />
+									<input type="checkbox" id="forceFileOverwriting" th:field="*{forceFileOverwriting}" aria-label="overwrite duplicates"/>
 									<span th:text="#{preferences.index.overwrite.duplicates}"></span>
 								</p>
 								<p>
-									<input type="checkbox" id="advancedView" th:field="*{advancedView}" />
+									<input type="checkbox" id="advancedView" th:field="*{advancedView}" aria-label="advancedView"/>
 									<span th:text="#{preferences.index.advanced.view}"></span>
 								</p>
 							</div>
diff --git a/src/emc-metalnx-shared/src/main/resources/views/template/templateFieldList.html b/src/emc-metalnx-shared/src/main/resources/views/template/templateFieldList.html
index a78c84745..8ec786dab 100755
--- a/src/emc-metalnx-shared/src/main/resources/views/template/templateFieldList.html
+++ b/src/emc-metalnx-shared/src/main/resources/views/template/templateFieldList.html
@@ -36,22 +36,22 @@
 					<tr th:fragment="avuRow" th:each="templateField : ${templateFields}" th:id="${templateField.id} ? ${templateField.id} : ${'pos_' + templateField.formListPosition}" th:class="${templateField.id == null} ? 'info'">
 						<input type="hidden" th:value="${templateField.id} ? ${'id_' + templateField.id} : ${'pos_' + templateField.formListPosition}" name="avuPositions" />
 						<td class="text-center tableCheckBoxCol" th:if="${templateField.id != null}" th:unless="${readonly}">
-							<input type="checkbox" name="templateFieldFromDBCheckboxes" th:value="${templateField.id}"/>
+							<input type="checkbox" name="templateFieldFromDBCheckboxes" th:value="${templateField.id}" aria-label="template field"/>
 						</td>
 						<td class="text-center" th:unless="${templateField.id != null}">
 							<input type="checkbox" name="templateFieldCheckboxes" th:value="${templateField.formListPosition}"/>
 						</td>
 						<td>
 							<span class="editable" th:text="${templateField.attribute}"></span>
-							<input class="hideElement col-sm-12" type="text" th:value="${templateField.attribute}" name="avuAttributes"/>
+							<input class="hideElement col-sm-12" type="text" th:value="${templateField.attribute}" name="avuAttributes" aria-label="avu attribute"/>
 						</td>
 						<td>
 							<span class="editable" th:text="${templateField.value}"></span>
-							<input class="hideElement col-sm-12" type="text" th:value="${templateField.value}" name="avuValues"/>
+							<input class="hideElement col-sm-12" type="text" th:value="${templateField.value}" name="avuValues" aria-label="avu value"/>
 						</td>
 						<td>
 							<span class="editable" th:text="${templateField.unit}"></span>
-							<input class="hideElement col-sm-12" type="text" th:value="${templateField.unit}" name="avuUnits"/>
+							<input class="hideElement col-sm-12" type="text" th:value="${templateField.unit}" name="avuUnits" aria-lavel="avu unit"/>
 						</td>
 					</tr>
 				</tbody>
@@ -63,12 +63,12 @@
 	</div>
 		
 	<!-- Remove Modal -->
-	<div class="modal fade" id="removalModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+	<div class="modal fade" id="removalModal" tabindex="-1" role="dialog" aria-labelledby="removeModalTitle" aria-hidden="true">
 		<div class="modal-dialog">
 			<div class="modal-content">
 				<div class="modal-header">
 				  <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-				  <h4 class="modal-title" id="myModalLabel" th:text="#{confirmation.removal.title}">
+				  <h4 class="modal-title" id="removeModalTitle" th:text="#{confirmation.removal.title}">
 				  </h4>
 				</div>
 				<div class="modal-body">
@@ -89,12 +89,12 @@ <h4 class="modal-title" id="myModalLabel" th:text="#{confirmation.removal.title}
 	</div>
 	
 	<!-- Delete Field -->
-	<div class="modal fade" id="deleteFieldModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+	<div class="modal fade" id="deleteFieldModal" tabindex="-1" role="dialog" aria-labelledby="deleteFieldModalTitle" aria-hidden="true">
 		<div class="modal-dialog">
 			<div class="modal-content">
 				<div class="modal-header">
 				  <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-				  <h4 class="modal-title" th:text="#{confirmation.deletion.title}"></h4>
+				  <h4 id="deleteFieldModalTitle" class="modal-title" th:text="#{confirmation.deletion.title}"></h4>
 				</div>
 				<div class="modal-body">
 					<span th:text="#{confirmation.deletion.label}"></span>
diff --git a/src/emc-metalnx-shared/src/main/resources/views/template/templateForm.html b/src/emc-metalnx-shared/src/main/resources/views/template/templateForm.html
index 38f2543e1..90b48f88f 100755
--- a/src/emc-metalnx-shared/src/main/resources/views/template/templateForm.html
+++ b/src/emc-metalnx-shared/src/main/resources/views/template/templateForm.html
@@ -22,8 +22,8 @@
 	</head>
 	
 	<body>
-		<div layout:fragment="content" th:with="readonly = ${metadataTemplateForm != null and metadataTemplateForm.owner != userDetails.username}">
-			<h1 class="page-header pull-left" th:text="#{metadata.template.management.page.title}"></h1>
+		<div layout:fragment="content" th:with="readonly = ${metadataTemplateForm != null and metadataTemplateForm.owner != userDetails.username}" aria-labelledby="templateFormTitle">
+			<h1 class="page-header pull-left" th:text="#{metadata.template.management.page.title}" id="templateFormTitle"></h1>
 			<div class="row">
                 <div th:if="${templateNotAddedSuccessfully}" 
                     class="alert alert-danger alert-dismissible text-center col-xs-12" role="alert">
@@ -112,11 +112,11 @@ <h3 class="panel-title pull-left" th:text="#{templates.management.table.title}">
 						</div>
 						<div class="panel-body row" id="actionBtnMetadataTemplateFields">	
 							<div class="col-sm-12">
-								<a style="visibility: hidden" id="deleteTemplateFieldsBtn" class="btn btn-link btn-sm" data-toggle="modal" data-target="#deleteFieldModal">
+								<a style="visibility: hidden" id="deleteTemplateFieldsBtn" class="btn btn-link btn-sm" data-toggle="modal" data-target="#deleteFieldModal" aria-label="delete template fields">
 									<span class="glyphicon glyphicon-trash"> </span> 
 									<span th:text="#{template.metadata.new.form.delete.metadata}"></span>
 								</a>
-								<a style="visibility: hidden" id="editTemplateFieldsBtn" class="btn btn-link btn-sm">
+								<a style="visibility: hidden" id="editTemplateFieldsBtn" class="btn btn-link btn-sm" aria-label="edit metadata">
 									<span class="glyphicon glyphicon-pencil"> </span> 
 									<span th:text="#{template.metadata.new.form.edit.metadata}"></span>
 								</a>
@@ -145,7 +145,7 @@ <h3 class="panel-title pull-left" th:text="#{templates.management.table.title}">
 							<button type="button" class="close" data-dismiss="modal" aria-label="Close">
 								<span aria-hidden="true">&times;</span>
 							</button>
-							<h4 class="modal-title" id="">Add Attribute</h4>
+							<h4 class="modal-title" id="" th:text="#{template.add.attribute}">Add Attribute</h4>
 						</div>
 						<div class="modal-body">
 							<form th:object="${templateFieldForm}" id="addTemplateFieldForm">
diff --git a/src/emc-metalnx-shared/src/main/resources/views/template/templateList.html b/src/emc-metalnx-shared/src/main/resources/views/template/templateList.html
index f436926ef..3ba3b597f 100755
--- a/src/emc-metalnx-shared/src/main/resources/views/template/templateList.html
+++ b/src/emc-metalnx-shared/src/main/resources/views/template/templateList.html
@@ -67,7 +67,7 @@
 							<td >
 								<a type="button" class="btn btn-default btn-xs" title="Edit"
 								th:id="${'btn_modify_' + template.templateName}"
-								th:href="'/emc-metalnx-web/templates/modify/?templateId='+${template.id}">
+								th:href="'/emc-metalnx-web/templates/modify/?templateId='+${template.id}" aria-label="edit template">
 									<i class="fa fa-pencil"></i><span th:text="#{templates.edit.button}"></span>
 								</a>
 							</td>
@@ -78,12 +78,12 @@
 		</div>
 
 		<!-- Modal -->
-		<div class="modal fade" id="removalModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+		<div class="modal fade" id="removalModal" tabindex="-1" role="dialog" aria-labelledby="removalModalTitle" aria-hidden="true">
 			<div class="modal-dialog">
 				<div class="modal-content">
 					<div class="modal-header">
 					  <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-					  <h4 class="modal-title" id="myModalLabel" th:text="#{confirmation.removal.title}">
+					  <h4 class="modal-title" id="removalModalTitle" th:text="#{confirmation.removal.title}">
 					  </h4>
 					</div>
 					<div class="modal-body">
diff --git a/src/emc-metalnx-shared/src/main/resources/views/template/templateManagement.html b/src/emc-metalnx-shared/src/main/resources/views/template/templateManagement.html
index 2673f8576..8303c2247 100755
--- a/src/emc-metalnx-shared/src/main/resources/views/template/templateManagement.html
+++ b/src/emc-metalnx-shared/src/main/resources/views/template/templateManagement.html
@@ -23,11 +23,11 @@
 
 <body>
 	<!-- Page Content -->
-	<div layout:fragment="content">
+	<div layout:fragment="content" aria-labelledby="templatePageTitle">
 		<div class="row">
 			<div class="col-sm-12">
-				<h1 class="page-header pull-left" th:text="#{metadata.template.management.page.title}"></h1>
-				<a id="templates-page-title" href="#" class="page-hint pull-left"><i class="fa fa-question-circle"></i></a>
+				<h1 id="templatePageTitle" class="page-header pull-left" th:text="#{metadata.template.management.page.title}"></h1>
+				<a id="templates-page-title" href="#" class="page-hint pull-left" aria-label="page help"><i class="fa fa-question-circle"></i></a>
 				<div th:if="${ templateAddedSuccessfully != null or templateModifiedSuccessfully != null or templateRemovedSuccessfully != null }"
 					class="alert alert-success alert-dismissible text-center clear" role="alert">
 				  	<button type="button" class="close" data-dismiss="alert">
@@ -105,14 +105,14 @@ <h1 class="page-header pull-left" th:text="#{metadata.template.management.page.t
 				<div id="templateListAsync"></div>
 
 				<!-- Upload Modal -->
-				<div class="modal fade" id="uploadModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+				<div class="modal fade" id="uploadModal" tabindex="-1" role="dialog" aria-labelledby="uploadModalTitle" aria-hidden="true">
 					<div class="modal-dialog">
 						<div class="modal-content">
 							<div class="modal-header">
 								<button type="button" class="close" data-dismiss="modal">
 									<span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
 								</button>
-								<h4 class="modal-title" th:text="#{upload.label}"></h4>
+								<h4 id="uploadModalTitle" class="modal-title" th:text="#{upload.label}"></h4>
 							</div>
 							<div class="modal-body">
 
@@ -143,8 +143,8 @@ <h4 class="modal-title" th:text="#{upload.label}"></h4>
 									<div id="uploadControlOptions" class="hideElement">
 										<div class="row">
 											<div class="col-lg-5 col-sm-5 col-xs-6 checkbox">
-												<label>
-													<input type="checkbox" id="addPrefixCheckbox" name="addPrefix" value="1" /> Add prefix to template
+												<label for="prefixInput">
+													<input type="checkbox" id="addPrefixCheckbox" name="addPrefix" value="1" aria-label="add prefix to template" /> Add prefix to template
 				       							</label>
 											</div>
 											<div class="col-lg-7 col-sm-7 col-xs-6 checkbox">
@@ -154,8 +154,8 @@ <h4 class="modal-title" th:text="#{upload.label}"></h4>
 
 										<div class="row">
 											<div class="col-lg-5 col-sm-5 col-xs-6 checkbox">
-												<label>
-													<input type="checkbox" id="addSuffixCheckbox" name="addSuffix" value="1" /> Add suffix to template
+												<label for="suffixInput">
+													<input type="checkbox" id="addSuffixCheckbox" name="addSuffix" value="1" aria-label="add suffix to template" /> Add suffix to template
 				       							</label>
 											</div>
 											<div class="col-lg-7 col-sm-7 col-xs-6 checkbox">
diff --git a/src/emc-metalnx-shared/src/main/resources/views/tickets/ticketForm.html b/src/emc-metalnx-shared/src/main/resources/views/tickets/ticketForm.html
index 053c7e874..4d21d2d9b 100755
--- a/src/emc-metalnx-shared/src/main/resources/views/tickets/ticketForm.html
+++ b/src/emc-metalnx-shared/src/main/resources/views/tickets/ticketForm.html
@@ -3,13 +3,13 @@
     <input type="hidden" class="form-control" id="inputPath" th:field="*{path}"/>
     <input type="hidden" class="form-control" id="usersList"/>
     <div class="form-group">
-        <label class="control-label" th:text="#{ticket.form.path.label}"></label>
+        <label for="selectedPath" class="control-label" th:text="#{ticket.form.path.label}"></label>
         <span id="selectedPath"></span>
     </div>
     <div class="form-group">
         <label for="input-permission" class="control-label" th:text="#{ticket.form.permission.label}"></label>
         <div class="">
-            <select id="input-permission" class="form-control" th:field="*{type}" th:readonly="${!#strings.isEmpty(ticket.ticketString)}">
+            <select id="input-permission" class="form-control" th:field="*{type}" th:readonly="${!#strings.isEmpty(ticket.ticketString)}" aria-label="permission">
                 <option value="READ" th:text="#{ticket.form.permission.option.read.label}"></option>
                 <option value="WRITE" th:text="#{ticket.form.permission.option.write.label}"></option>
             </select>
diff --git a/src/emc-metalnx-shared/src/main/resources/views/tickets/ticketoperations.html b/src/emc-metalnx-shared/src/main/resources/views/tickets/ticketoperations.html
index f8ce62507..23613fb42 100755
--- a/src/emc-metalnx-shared/src/main/resources/views/tickets/ticketoperations.html
+++ b/src/emc-metalnx-shared/src/main/resources/views/tickets/ticketoperations.html
@@ -63,12 +63,12 @@ <h4 class="property-title">
         </h4>
 
         <p>
-            <label th:text="#{ticket.table.string.label}"></label> <br />
+            <label for="ticketString" th:text="#{ticket.table.string.label}"></label> <br />
             <span id="ticketString" th:text="${ticketString}"></span>
         </p>
 
         <p>
-            <label th:text="#{resources.table.path.label}"></label> <br />
+            <label for="ticketPath: th:text="#{resources.table.path.label}"></label> <br />
             <span id="ticketPath" th:text="${path}"></span>
         </p>
 
diff --git a/src/emc-metalnx-shared/src/main/resources/views/tickets/tickets.html b/src/emc-metalnx-shared/src/main/resources/views/tickets/tickets.html
index b5669e7c4..bc6cc3776 100755
--- a/src/emc-metalnx-shared/src/main/resources/views/tickets/tickets.html
+++ b/src/emc-metalnx-shared/src/main/resources/views/tickets/tickets.html
@@ -32,10 +32,10 @@
 
 <body>
     <!-- Page Content -->
-    <div layout:fragment="content">
+    <div layout:fragment="content" aria-labelledby="ticketPageTitle">
         <div class="row">
             <div class="col-sm-12">
-                <h1 class="page-header pull-left">
+                <h1 id="ticketPageTitle" class="page-header pull-left">
                     <span th:text="#{ticket.page.title}"></span>
                 </h1>
                 <a id="tickets-page-title"  href="#" class="page-hint pull-right"><i class="fa fa-question-circle"></i></a>
@@ -141,14 +141,14 @@ <h4 class="modal-title" id="deleteTicketConfirmLabel" th:text="#{ticket.delete.c
             </div>
         </div>
 
-        <div class="modal fade" id="ticketModifyForm" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+        <div class="modal fade" id="ticketModifyForm" tabindex="-1" role="dialog" aria-labelledby="ticketModifyTitle" aria-hidden="true">
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
                         <button type="button" class="close" data-dismiss="modal">
                             <span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
                         </button>
-                        <h4 class="modal-title" th:text="#{ticket.form.title.modify}"></h4>
+                        <h4 id="ticketModifyTitle" class="modal-title" th:text="#{ticket.form.title.modify}"></h4>
                     </div>
                     <div class="modal-body"><div id="ticketFormPanel"></div></div>
                     <div class="modal-footer">
@@ -162,14 +162,14 @@ <h4 class="modal-title" th:text="#{ticket.form.title.modify}"></h4>
             </div>
         </div>
 
-        <div class="modal fade" id="deleteTicketsModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+        <div class="modal fade" id="deleteTicketsModal" tabindex="-1" role="dialog" aria-labelledby="deleteTicketsModalTitle" aria-hidden="true">
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
                         <button type="button" class="close" data-dismiss="modal">
                             <span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
                         </button>
-                        <h4 class="modal-title" th:text="#{tickets.delete.selected.label}"></h4>
+                        <h4 id="deleteTicketsModalTitle" class="modal-title" th:text="#{tickets.delete.selected.label}"></h4>
                     </div>
                     <div class="modal-body">
                         <span th:utext="#{tickets.deletion.confirmation}"></span>
diff --git a/src/emc-metalnx-ui-admin/src/main/resources/views/collections/collectionManagementOldTree.html b/src/emc-metalnx-ui-admin/src/main/resources/views/collections/collectionManagementOldTree.html
index 84291d6c6..65c29330d 100755
--- a/src/emc-metalnx-ui-admin/src/main/resources/views/collections/collectionManagementOldTree.html
+++ b/src/emc-metalnx-ui-admin/src/main/resources/views/collections/collectionManagementOldTree.html
@@ -22,8 +22,8 @@
 
 <body>
 
-	<div layout:fragment="content">
-		<h1 class="page-header" th:text="#{collections.management.page.title}"></h1>
+	<div layout:fragment="content" aria-labelledby="collectionsManagementPageTitle">
+		<h1 id="collectionsManagementPageTitle" class="page-header" th:text="#{collections.management.page.title}"></h1>
 
 		<div class="row">
 			<div class="col-sm-12">
@@ -43,7 +43,7 @@ <h1 class="page-header" th:text="#{collections.management.page.title}"></h1>
 			<!-- Search Box -->
 			<div class="col-sm-6">
 				<div class="form-group input-group">
-					<input id="searchText" type="search" class="form-control"
+					<input id="searchText" type="search" class="form-control" aria-label="search text"
 						th:placeholder="#{search.placeholder}" /> <span class="input-group-addon">
 						<i class="glyphicon glyphicon-search"></i>
 					</span>
@@ -51,7 +51,7 @@ <h1 class="page-header" th:text="#{collections.management.page.title}"></h1>
 			</div>
 
 			<div class="col-sm-6">
-				<a th:href="@{ ${urlMap.URL_ADD_COLLECTION} }"
+				<a th:href="@{ ${urlMap.URL_ADD_COLLECTION} }" 
 					class="btn btn-primary btn-md pull-right"
 					th:text="#{collections.management.add.button}">
 				</a>
diff --git a/src/emc-metalnx-ui-admin/src/main/resources/views/collections/treeViewForGroupForm.html b/src/emc-metalnx-ui-admin/src/main/resources/views/collections/treeViewForGroupForm.html
index 7a3b933a7..292616c4c 100755
--- a/src/emc-metalnx-ui-admin/src/main/resources/views/collections/treeViewForGroupForm.html
+++ b/src/emc-metalnx-ui-admin/src/main/resources/views/collections/treeViewForGroupForm.html
@@ -44,7 +44,7 @@
 				<!-- items underneath root -->
 				<th:block th:each="pathItem, iterationStatus : ${#strings.arraySplit(currentPath, '/')}">
 					<li>
-						<a href="#collectionsViewForGroup"
+						<a href="#collectionsViewForGroup" aria-label="collections view for group"
 							th:if="${ iterationStatus.last == false }"
 							th:text="${ pathItem }"
 							th:with="pathUntilCurrentItem = ${ #strings.substringBefore(currentPath, pathItem) + pathItem }"
@@ -83,7 +83,7 @@
 				<tr th:each="collectionAndDataObject : ${dataGridCollectionAndDataObjectList}">
 					<!-- Collection name -->
 					<td>
-						<a href="#collectionsViewForGroup"
+						<a href="#collectionsViewForGroup"  aria-label="collections view for group"
 							th:if="${ collectionAndDataObject.isCollection() }"
 							th:name="${ collectionAndDataObject.getName() }"
 							th:title="${ collectionAndDataObject.getPath() }"
@@ -131,7 +131,7 @@
 								</div>
 							</div>
 						</div>
-						<select th:id="${'permission_' + collectionAndDataObject.getName() }"
+						<select th:id="${'permission_' + collectionAndDataObject.getName() }" aria-label="${ 'Change permission for ' + collectionAndDataObject.getPath() }"
 						th:title="${ 'Change permission for ' + collectionAndDataObject.getPath() }"
 						th:onchange="${collectionAndDataObject.isCollection()} ? 'javascript:showRecursiveQuestion(\'' + ${collectionAndDataObject.getName()} + '\')' : 'javascript:changePermission(\'' + ${collPath} + '\', \'' + ${collectionAndDataObject.getName()} + '\', false)'">
 							<option value="none">None</option>
@@ -148,6 +148,7 @@
 							th:name='${collPath}'
 							type="checkbox"
 							class="bookmarkCheckbox"
+							aria-label="bookmarkCheckbox"
 							th:checked="${ (#lists.contains(groupBookmarks, collPath) or #sets.contains(addBookmark, collPath)) and !#sets.contains(removeBookmark, collPath) ? 'checked' : 'false' }"
 						/>
 					</td>
diff --git a/src/emc-metalnx-ui-admin/src/main/resources/views/collections/treeViewForUserForm.html b/src/emc-metalnx-ui-admin/src/main/resources/views/collections/treeViewForUserForm.html
index b060fe6aa..b520c2d7e 100755
--- a/src/emc-metalnx-ui-admin/src/main/resources/views/collections/treeViewForUserForm.html
+++ b/src/emc-metalnx-ui-admin/src/main/resources/views/collections/treeViewForUserForm.html
@@ -39,7 +39,7 @@
 		<div id="directoryPath">
 			<ol class="breadcrumb" style="color: #2C95DD;">
 				<!-- root item -->
-				<li><a href="#" title="/" onclick="javascript:getSubDirectoriesForUser('/');">iRods</a></li>
+				<li><a href="#" title="/" onclick="javascript:getSubDirectoriesForUser('/');" th:text="#{text.root}" aria-label="breadcrumb for root">Root(/)</a></li>
 
 				<!-- items underneath root -->
 				<th:block th:each="pathItem, iterationStatus : ${#strings.arraySplit(currentPath, '/')}">
@@ -47,6 +47,7 @@
 						<a href="#collectionsViewForUser"
 							th:if="${ iterationStatus.last == false }"
 							th:text="${ pathItem }"
+							aria-label="${ pathItem }"
 							th:with="pathUntilCurrentItem = ${ #strings.substringBefore(currentPath, pathItem) + pathItem }"
 							th:title="${ pathUntilCurrentItem }"
 							th:onclick="'javascript:getSubDirectoriesForUser(\'' + ${ pathUntilCurrentItem } + '\');'">
@@ -87,6 +88,7 @@
 							th:if="${ collectionAndDataObject.isCollection() }"
 							th:name="${ collectionAndDataObject.getPath() }"
 							th:title="${ collectionAndDataObject.getPath() }"
+							aria-label="${ collectionAndDataObject.getPath() }"
 							th:onclick="'javascript:getSubDirectoriesForUser(\'' + ${collectionAndDataObject.getPath()} + '\');'">
 
 			               	<i th:if="${collectionAndDataObject.isCollection()}" class="fa fa-folder folder-icon"></i>
@@ -134,6 +136,7 @@
 						<!-- <input type="hidden" th:id="${'recursive_' + collectionAndDataObject.getName() }" value="false"/> -->
 						<select th:id="${'permission_' + collectionAndDataObject.getName() }"
 						th:title="${ 'Change permission for ' + collectionAndDataObject.getPath() }"
+						aria-label="${ 'Change permission for ' + collectionAndDataObject.getPath() }"
 						th:onchange="${collectionAndDataObject.isCollection()} ? 'javascript:showRecursiveQuestion(\'' + ${collectionAndDataObject.getName()} + '\')' : 'javascript:changePermission(\'' + ${collPath} + '\', \'' + ${collectionAndDataObject.getName()} + '\', false)'">
 							<option value="none">None</option>
 							<option value="read" th:selected="${#sets.contains(readPermissions, collPath) or #sets.contains(session.addReadPermissionsOnDirs, collPath) ? 'selected' : 'false'}">Read</option>

From 7f054bff7d7995a6f475164817a7f4401eba2d51 Mon Sep 17 00:00:00 2001
From: Mike Conway <mike.conway@nih.gov>
Date: Tue, 23 Jan 2018 13:15:12 -0500
Subject: [PATCH 2/2] #53 508

---
 .../main/resources/views/collections/collectionsBreadCrumb.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/emc-metalnx-shared/src/main/resources/views/collections/collectionsBreadCrumb.html b/src/emc-metalnx-shared/src/main/resources/views/collections/collectionsBreadCrumb.html
index 281b14309..ef367082a 100755
--- a/src/emc-metalnx-shared/src/main/resources/views/collections/collectionsBreadCrumb.html
+++ b/src/emc-metalnx-shared/src/main/resources/views/collections/collectionsBreadCrumb.html
@@ -35,7 +35,7 @@
           </th:block>
 
           <li role="separator" class="divider"></li>
-          <li><a aria-label="user home directory" class="home" th:href="@{${urlMap.URL_HOME_COLLECTION_USER}}" th:text="'Home ('+${homeCollectionName}+')'" aria-label="user home"></a>
+          <li><a aria-label="user home directory" class="home" th:href="@{${urlMap.URL_HOME_COLLECTION_USER}}" th:text="'Home ('+${homeCollectionName}+')'"></a>
           </li>
       </ul>
     </div>