Merge pull request IQSS#8322 from QualitativeDataRepository/IQSS/8321…

…-Accessibility IQSS/8321 Accessibility
pkiraly · Jan 14, 2022 · 40c6f30 · 40c6f30
2 parents 6fa131f + 30f48e8
commit 40c6f30
Show file tree

Hide file tree

Showing 25 changed files with 296 additions and 242 deletions.
diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
@@ -922,6 +922,10 @@ dataverse.results.empty.link.technicalDetails=More technical details
 dataverse.search.facet.error=There was an error with your search parameters. Please <a href="/dataverse/{0}">clear your search</a> and try again.
 dataverse.results.count.toofresults={0} to {1} of {2} {2, choice, 0#Results|1#Result|2#Results}
 dataverse.results.paginator.current=(Current)
+dataverse.results.paginator.first=First Page
+dataverse.results.paginator.previous=Previous Page
+dataverse.results.paginator.next=Next Page
+dataverse.results.paginator.last=Last Page
 dataverse.results.btn.sort=Sort
 dataverse.results.btn.sort.option.nameAZ=Name (A-Z)
 dataverse.results.btn.sort.option.nameZA=Name (Z-A)
@@ -996,6 +1000,9 @@ dataverse.widgets.advanced.url.watermark=http://www.example.com/page-name
 dataverse.widgets.advanced.invalid.message=Please enter a valid URL
 dataverse.widgets.advanced.success.message=Successfully updated your Personal Website URL
 dataverse.widgets.advanced.failure.message=The dataverse Personal Website URL has not been updated.
+facet.collection.label=Show Collections
+facet.dataset.label=Show Data Projects
+facet.datafile.label=Show Files
 
 # permissions-manage.xhtml
 dataverse.permissions.title=Permissions
@@ -1570,6 +1577,7 @@ file.zip.download.exceeds.limit.info=The files selected are too large to downloa
 file.zip.download.exceeds.limit.detail=You can select individual files that are below the {2} download limit from the files table, or use the <a href="{0}/{1}/api/dataaccess.html" title="Data Access API" target="_blank">Data Access API</a> for programmatic access to the files.
 file.zip.download.exceeds.limit.header=Download Options
 file.numFilesSelected={0} {0, choice, 0#files are|1#file is|2#files are} currently selected.
+file.select.action=Select
 file.select.tooltip=Select Files
 file.selectAllFiles=Select all {0} files in this dataset.
 file.dynamicCounter.filesPerPage=Files Per Page
@@ -2022,6 +2030,7 @@ ingest.csv.nullStream=Stream can't be null.
 # editdatafile.xhtml
 
 # editFilesFragment.xhtml
+file.tableheader.info=File Info
 file.edit.error.file_exceeds_limit=This file exceeds the size limit.
 # File metadata error
 file.metadata.datafiletag.not_tabular=You cannot add Tabular Data Tags to a non-tabular file.
@@ -2132,6 +2141,7 @@ dataset.access.description=Restricting limits access to published files. You can
 #datasetFieldForEditFragment.xhtml
 dataset.AddReplication=Add "Replication Data for" to Title
 dataset.replicationDataFor=Replication Data for:
+dataset.additionalEntry=Additional Entry
 
 
 #mydata_fragment.xhtml

diff --git a/src/main/webapp/contactFormFragment.xhtml b/src/main/webapp/contactFormFragment.xhtml
@@ -60,7 +60,9 @@
                         <p>
                             <h:outputText styleClass="highlightBold" value="#{bundle['contact.question']}"/> <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
                         </p>
-                        <h:outputFormat value="#{sendFeedbackDialog.op1} + #{sendFeedbackDialog.op2} = "/>
+                        <label for="emailForm:messageSum">
+                            <h:outputFormat value="#{sendFeedbackDialog.op1} + #{sendFeedbackDialog.op2} = "/>
+                        </label>
                         <p:inputText id="messageSum" label="Sum" size="4" value="#{sendFeedbackDialog.userSum}" converterMessage="#{bundle['contact.sum.converterMessage']}"
                                      required="#{param['DO_VALIDATION']}" requiredMessage="#{bundle['contact.sum.required']}"
                                      validatorMessage="#{bundle['contact.sum.invalid']}" validator="#{sendFeedbackDialog.validateUserSum}"

diff --git a/src/main/webapp/dashboard-users.xhtml b/src/main/webapp/dashboard-users.xhtml
@@ -48,7 +48,7 @@
                                 <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
                                     <span class="glyphicon glyphicon-sort"></span> #{bundle['dataverse.results.btn.sort']} <span class="caret"></span>
                                 </button>
-                                <ul class="dropdown-menu pull-right text-left" role="menu">
+                                <ul class="dropdown-menu pull-right text-left">
                                     <ui:repeat value="#{DashboardUsersPage.getSortingMap().entrySet()}" var="sortFieldEntry">
                                         <li>
                                             <p:commandLink action="#{DashboardUsersPage.runUserSearchWithSort(sortFieldEntry.key)}" process="@this @widgetVar(inputSearchTerm)" update="@form" partialSubmit="true">

diff --git a/src/main/webapp/dataset-citation.xhtml b/src/main/webapp/dataset-citation.xhtml
@@ -31,7 +31,7 @@
                     <button type="button" class="btn btn-link dropdown-toggle padding-none downloadCitation" data-toggle="dropdown">
                         #{bundle['dataset.cite.downloadBtn']} <span class="caret"></span>
                     </button>
-                    <ul class="dropdown-menu" role="menu">
+                    <ul class="dropdown-menu">
                         <li>
                             <a jsf:id="endNoteLink" jsf:action="#{DatasetPage.fileDownloadService.downloadDatasetCitationXML(DatasetPage.dataset)}" >
                                 #{bundle['dataset.cite.downloadBtn.xml']}