Skip to content

Iqss/8321 accessibility #8479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kcondon merged 14 commits into from
Mar 17, 2022
Merged

Iqss/8321 accessibility #8479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9f96a2a
avoid empty lang tags (acc. issue)
qqmyers Jan 6, 2022
615e7ca
#87 - breadcrumb carrot contrast
qqmyers Jan 12, 2022
333ecfe
#73 - avoid empty aria-label on first value
qqmyers Jan 12, 2022
e6466f3
#73 fix hostDataverse label reference
qqmyers Jan 12, 2022
d087264
#73 remove unused hiddenReason input (had no label)
qqmyers Jan 12, 2022
82beefc
typo
qqmyers Jan 12, 2022
4590ec8
#73 Terms of Access label
qqmyers Jan 12, 2022
e7ab21e
obsolete worldmap dialog
qqmyers Jan 12, 2022
e1770c6
#73 - thumbnail and prov labels
qqmyers Jan 12, 2022
a532764
#73 - labels for cvv inputs
qqmyers Jan 12, 2022
65eb2f4
#73 render dialog only when needed, fix compute table header
qqmyers Jan 12, 2022
b183494
only render panel when fileMetadata isn't null
qqmyers Jan 12, 2022
7f07032
add label in file upload, fix typo in Terms of access popup
qqmyers Jan 12, 2022
cd23a7b
typo - missing " char
qqmyers Mar 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/propertyFiles/Bundle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1437,6 +1437,7 @@ dataset.compute.computeBatchList=List Batch
dataset.compute.computeBatchAdd=Add to Batch
dataset.compute.computeBatchClear=Clear Batch
dataset.compute.computeBatchRemove=Remove from Batch
dataset.compute.computeBatchChange=Change Compute Batch
dataset.compute.computeBatchCompute=Compute Batch
dataset.compute.computeBatch.success=The list of datasets in your compute batch has been updated.
dataset.compute.computeBatch.failure=The list of datasets in your compute batch failed to be updated. Please try again.
Expand Down
20 changes: 3 additions & 17 deletions src/main/webapp/dataset.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@
<ui:fragment rendered="#{DatasetPage.editMode == 'METADATA' or DatasetPage.editMode == 'CREATE'}">
<p:focus context="datasetForm"/>
<div class="form-group">
<label jsf:for="#{DatasetPage.editMode == 'CREATE' ? 'selectHostDataverse' : 'select_HostDataverse_Static'}" class="col-md-3 control-label">
<label jsf:for="#{DatasetPage.editMode == 'CREATE' ? 'selectHostDataverse_input' : 'select_HostDataverse_Static'}" class="col-md-3 control-label">
#{bundle.hostDataverse}
<span class="glyphicon glyphicon-question-sign tooltip-icon"
data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.host.title']}"></span>
Expand Down Expand Up @@ -1187,7 +1187,6 @@
</button>
</div>
</p:dialog>
<p:inputText id="hiddenReasonInput" style="display:none" widgetVar="hiddenReasonInput"/>
<p:dialog id="compareTwo" header="#{bundle['file.viewDiffDialog.header']}" widgetVar="compareTwo" modal="true">
<p class="help-block"><span class="glyphicon glyphicon-exclamation-sign text-danger"/> <span class="text-danger">#{bundle['file.viewDiffDialog.dialog.warning']}</span></p>
<div class="button-block">
Expand Down Expand Up @@ -1451,17 +1450,6 @@
</div>
</p:dialog>
<!-- END: Request Access Sign Up/Log In Button -->
<p:dialog id="mapDataDialog" header="#{bundle['file.mapData.unpublished.header']}" widgetVar="mapDataDialog" modal="true">
<p class="help-block">
<span class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['file.mapData.unpublished.message']}</span>
</p>
<div class="button-block">
<button type="button" class="btn btn-default" onclick="PF('mapDataDialog').hide();
PF('blockDatasetForm').hide();">
#{bundle.close}
</button>
</div>
</p:dialog>
<p:dialog id="downloadPopup" styleClass="largePopUp" header="#{bundle['file.downloadDialog.header']}" widgetVar="downloadPopup" modal="true">
<o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
<ui:include src="file-download-popup-fragment.xhtml">
Expand Down Expand Up @@ -1588,6 +1576,7 @@
<h:outputText value="#{computeCartDatasetList.value}"/>
</h:column>
<h:column>
<f:facet name="header">#{bundle['dataset.compute.computeBatchChange']}</f:facet>
<p:commandButton value="#{bundle['dataset.compute.computeBatchRemove']}" action="#{DatasetPage.removeCartItem(computeCartDatasetList.key, computeCartDatasetList.value)}" update=":datasetForm,:messagePanel"/>
</h:column>
</h:dataTable>
Expand Down Expand Up @@ -1806,7 +1795,7 @@
</button>
</div>
</p:dialog>
<p:dialog id="maynotPublishParent" header="#{bundle['dataset.publish.header']}" widgetVar="maynotPublishParent" modal="true">
<p:dialog id="maynotPublishParent" header="#{bundle['dataset.publish.header']}" widgetVar="maynotPublishParent" modal="true" rendered="#{DatasetPage.dataset.owner.owner != null}">
<p class="text-danger">
<span class="glyphicon glyphicon-exclamation-sign"/>
<h:outputFormat value="#{bundle['dataset.mayNotPublish.twoGenerations']}" escape="false">
Expand Down Expand Up @@ -1900,9 +1889,6 @@
function updateTemplate() {
$('button[id$="updateTemplate"]').trigger('click');
}
function updateHiddenReason(textArea) {
$('input[id$="hiddenReasonInput"]').val(textArea.value);
}
function updateOwnerDataverse() {
$('button[id$="updateOwnerDataverse"]').trigger('click');
}
Expand Down
25 changes: 19 additions & 6 deletions src/main/webapp/datasetFieldForEditFragment.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
xmlns:jsf="http://xmlns.jcp.org/jsf">

<ui:remove>
<!-- input text start UPDATE: UI:REMOVE applied due to duplicate ID errors, left code as reference incase test scripts complain -->
<!-- input text start UPDATE: UI:REMOVE applied due to duplicate ID errors, left code as reference in case test scripts complain -->
<span id="pre-input-#{dsf.datasetFieldType.name}" class="pre-input-tag"/></ui:remove>
<ui:fragment rendered="#{cvoc==null}">
<p:inputText value="#{dsfv.valueForEdit}" id="inputText" pt:aria-required="#{dsf.required}" pt:aria-label="#{dsfvIndex!=0 ? bundle['dataset.additionalEntry']:''}"
<p:inputText value="#{dsfv.valueForEdit}" id="inputText" pt:aria-required="#{dsf.required}"
styleClass="form-control #{dsfv.datasetField.datasetFieldType.name == 'title' and DatasetPage.editMode == 'CREATE' ? 'datasetfield-title' : ''}"
rendered="#{!dsfv.datasetField.datasetFieldType.controlledVocabulary
and (dsfv.datasetField.datasetFieldType.fieldType == 'TEXT'
Expand All @@ -20,11 +20,14 @@
or dsfv.datasetField.datasetFieldType.fieldType == 'URL'
or dsfv.datasetField.datasetFieldType.fieldType == 'DATE'
or dsfv.datasetField.datasetFieldType.fieldType == 'EMAIL')}">
<c:if test="#{dsfvIndex!=0}">
<f:passThroughAttribute name="aria-label" value="#{bundle['dataset.additionalEntry']}" />
</c:if>
</p:inputText>
<p:watermark for="inputText" value="#{dsfv.datasetField.datasetFieldType.localeWatermark}"></p:watermark>
</ui:fragment>
<ui:fragment rendered="#{cvoc!=null and cvoc.getString('term-uri-field').equals(dsfv.datasetField.datasetFieldType.name)}">
<p:inputText value="#{dsfv.valueForEdit}" id="cvocInputText" pt:aria-required="#{dsf.required}" pt:aria-label="#{dsfvIndex!=0 ? bundle['dataset.additionalEntry']:''}"
<p:inputText value="#{dsfv.valueForEdit}" id="cvocInputText" pt:aria-required="#{dsf.required}"
styleClass="form-control #{dsfv.datasetField.datasetFieldType.name == 'title' and DatasetPage.editMode == 'CREATE' ? 'datasetfield-title' : ''}"
rendered="#{!dsfv.datasetField.datasetFieldType.controlledVocabulary
and (dsfv.datasetField.datasetFieldType.fieldType == 'TEXT'
Expand All @@ -33,6 +36,9 @@
or dsfv.datasetField.datasetFieldType.fieldType == 'URL'
or dsfv.datasetField.datasetFieldType.fieldType == 'DATE'
or dsfv.datasetField.datasetFieldType.fieldType == 'EMAIL')}">
<c:if test="#{dsfvIndex!=0}">
<f:passThroughAttribute name="aria-label" value="#{bundle['dataset.additionalEntry']}" />
</c:if>
<f:passThroughAttribute name="lang" value="#{DatasetPage.getFieldLanguage(cvoc.getString('languages'))}"/>
<f:passThroughAttribute name="data-cvoc-service-url" value="#{cvoc.getString('cvoc-url','')}"/>
<f:passThroughAttribute name="data-cvoc-protocol" value="#{cvoc.getString('protocol','')}"/>
Expand All @@ -44,7 +50,7 @@
</p:inputText>
</ui:fragment>
<ui:fragment rendered="#{cvoc!=null and !cvoc.getString('term-uri-field').equals(dsfv.datasetField.datasetFieldType.name)}">
<p:inputText value="#{dsfv.valueForEdit}" id="cvocInputText2" pt:aria-required="#{dsf.required}" pt:aria-label="#{dsfvIndex!=0 ? bundle['dataset.additionalEntry']:''}"
<p:inputText value="#{dsfv.valueForEdit}" id="cvocInputText2" pt:aria-required="#{dsf.required}"
styleClass="form-control #{dsfv.datasetField.datasetFieldType.name == 'title' and DatasetPage.editMode == 'CREATE' ? 'datasetfield-title' : ''}"
rendered="#{!dsfv.datasetField.datasetFieldType.controlledVocabulary
and (dsfv.datasetField.datasetFieldType.fieldType == 'TEXT'
Expand All @@ -53,13 +59,20 @@
or dsfv.datasetField.datasetFieldType.fieldType == 'URL'
or dsfv.datasetField.datasetFieldType.fieldType == 'DATE'
or dsfv.datasetField.datasetFieldType.fieldType == 'EMAIL')}">
<c:if test="#{dsfvIndex!=0}">
<f:passThroughAttribute name="aria-label" value="#{bundle['dataset.additionalEntry']}" />
</c:if>
<f:passThroughAttribute name="data-cvoc-managed-field" value="#{dsfv.datasetField.datasetFieldType.name}"/>
</p:inputText>
</ui:fragment>

<p:inputTextarea value="#{dsfv.valueForEdit}" id="description" pt:aria-required="#{dsf.required}" pt:aria-label="#{dsfvIndex!=0 ? bundle['dataset.additionalEntry']:''}"
<p:inputTextarea value="#{dsfv.valueForEdit}" id="description" pt:aria-required="#{dsf.required}"
rows="5" cols="60" styleClass="form-control"
rendered="#{dsfv.datasetField.datasetFieldType.fieldType == 'TEXTBOX'}"/>
rendered="#{dsfv.datasetField.datasetFieldType.fieldType == 'TEXTBOX'}">
<c:if test="#{dsfvIndex!=0}">
<f:passThroughAttribute name="aria-label" value="#{bundle['dataset.additionalEntry']}" />
</c:if>
</p:inputTextarea>
<p:watermark for="description" value="#{dsfv.datasetField.datasetFieldType.localeWatermark}"></p:watermark>

<div class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{dsfvIndex eq 0 and !empty dsfv.datasetField.validationMessage}">
Expand Down
12 changes: 7 additions & 5 deletions src/main/webapp/editFilesFragment.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,9 @@
fileLimit="#{EditDatafilesPage.getMaxNumberOfFiles()}"
invalidSizeMessage="#{bundle['file.edit.error.file_exceeds_limit']}"
sequential="true"
widgetVar="fileUploadWidget"/>
widgetVar="fileUploadWidget">
<f:passThroughAttribute name="aria-label" value="#{bundle['file.uploadFiles']}"/>
</p:fileUpload>

<div jsf:id="dropboxBlock" jsf:rendered="#{settingsWrapper.isHasDropBoxKey() and !lockedFromEdits }" class="margin-top">
<!-- Dropbox upload widget -->
Expand Down Expand Up @@ -615,18 +617,18 @@
</p>
<div class="form-horizontal">
<div class="form-group">
<label for="metadata_TermsAccess" class="col-sm-3 control-label">
<label jsf:for="popup_TermsAccess" class="col-sm-3 control-label">
#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
<span class="glyphicon glyphicon-question-sign tooltip-icon"
data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
</label>
<div class="col-sm-9">
<p:inputTextarea styleClass="form-control"
<p:inputTextarea id="popup_TermsAccess" styleClass="form-control"
value="#{EditDatafilesPage.termsOfAccess}" autoResize="false" rows="5"/>
</div>
</div>
<div class="form-group">
<label for="metadata_RequestAccess" class="col-sm-3 control-label">
<label class="col-sm-3 control-label">
#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
<span class="glyphicon glyphicon-question-sign tooltip-icon"
data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}"></span>
Expand Down Expand Up @@ -835,7 +837,7 @@
<p:focus context="fileSetThumbnail"/>
<div class="form-horizontal">
<div class="form-group">
<label for="datasetThumbnailImage" class="col-sm-4 control-label">
<label jsf:for="datasetThumbnailImage_input" class="col-sm-4 control-label">
#{bundle['file.datasetThumbnail']}
</label>
<div class="col-sm-8">
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/file-info-fragment.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
-->
</ui:remove>

<p:outputPanel id="fileInfoInclude-filesTable" styleClass="media">
<p:outputPanel id="fileInfoInclude-filesTable" styleClass="media" rendered="#{fileMetadata != null}">
<div class="media-left col-file-thumb" style="padding-top:4px;">
<div class="media-object thumbnail-block text-center">
<span class="icon-#{dataFileServiceBean.getFileThumbnailClass(fileMetadata.dataFile)} file-thumbnail-icon text-muted" jsf:rendered="#{!fileDownloadHelper.canDownloadFile(fileMetadata) or !dataFileServiceBean.isThumbnailAvailable(fileMetadata.dataFile)}"/>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/metadataFragment.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@
<!-- Primitive fields -->
<p:fragment id="editPrimitiveValueFragment" rendered="#{dsf.datasetFieldType.primitive}">
<p:autoUpdate/>
<h:outputLabel for="fieldvaluelist:0:#{dsf.datasetFieldType.fieldType == 'TEXTBOX' ? 'description' : 'inputText'}" styleClass="col-sm-3 control-label">
<h:outputLabel for="#{dsf.datasetFieldType.controlledVocabulary ? (!dsf.datasetFieldType.allowMultiples ? 'unique1_focus' : 'unique2_focus') : ('fieldvaluelist:0:'.concat(((dsf.datasetFieldType.fieldType == 'TEXTBOX') ? 'description' : 'inputText')))}" styleClass="col-sm-3 control-label">
#{dsf.datasetFieldType.localeTitle}
<span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{dsf.required}"/>
<span class="glyphicon glyphicon-question-sign tooltip-icon"
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/provenance-popups-fragment.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

</p>
</div>
<label for="provenanceBundle" class="col-sm-3 control-label">
<label jsf:for="provUpload_input" class="col-sm-3 control-label">
#{bundle['file.editProvenanceDialog.bundleFile']}
</label>
<div class="col-sm-9">
Expand Down Expand Up @@ -116,7 +116,7 @@
</div>
</div>
<div class="form-group text-left">
<label for="provenanceAddDescription" class="col-sm-3 control-label">
<label jsf:for="provenanceFreeform" class="col-sm-3 control-label">
#{bundle['file.editProvenanceDialog.description']}
</label>
<div class="col-sm-9">
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/resources/css/structure.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ body.widget-view #dataverse-header-block {padding-top:0px;}
#breadcrumbNavBlock a[id^='breadcrumbLnkTree'] span.glyphicon-chevron-down {vertical-align:middle;padding-bottom:2px;}
#breadcrumbNavBlock > .ui-panel-content {overflow:hidden;}
#breadcrumbNavBlock.panelLayoutBlock > .ui-widget-content {border-bottom: 0;}
#breadcrumbNavBlock .breadcrumbCarrot {float:left; margin:0 .4em; color:#B3B3B3;}
#breadcrumbNavBlock .breadcrumbCarrot {float:left; margin:0 .4em; color:#757575;}
#breadcrumbNavBlock div.dropdown-menu {padding-right:.5em; min-width:280px;}
#breadcrumbNavBlock .ui-tree {width: auto;}
#breadcrumbNavBlock div.ui-tree.ui-widget-content {border:0;}
Expand Down
16 changes: 10 additions & 6 deletions src/main/webapp/search-include-fragment.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,11 @@
<p:dataList value="#{facetCategory.facetLabel}" var="facetLabel" rows="#{DataversePage.getNumberOfFacets(facetCategory.name,5)}">
<h:outputLink value="#{widgetWrapper.wrapURL(page)}" rendered="#{!DataversePage.filterQueries.contains(facetLabel.filterQuery)}" styleClass="facetLink">
<h:outputText value="#{facetLabel.name}">
<f:passThroughAttribute name="lang" value="#{DatasetPage.getFieldLanguage(cvocConf.get(facetCategory.datasetFieldTypeId).getString('languages'))}" />
<f:passThroughAttribute name="data-cvoc-service-url" value="#{cvocConf.get(facetCategory.datasetFieldTypeId).getString('cvoc-url','')}" />
<f:passThroughAttribute name="data-cvoc-protocol" value="#{cvocConf.get(facetCategory.datasetFieldTypeId).getString('protocol','')}" />
<c:if test="#{!cvocConf.isEmpty()}">
<f:passThroughAttribute name="lang" value="#{DatasetPage.getFieldLanguage(cvocConf.get(facetCategory.datasetFieldTypeId).getString('languages'))}" />
<f:passThroughAttribute name="data-cvoc-service-url" value="#{cvocConf.get(facetCategory.datasetFieldTypeId).getString('cvoc-url','')}" />
<f:passThroughAttribute name="data-cvoc-protocol" value="#{cvocConf.get(facetCategory.datasetFieldTypeId).getString('protocol','')}" />
</c:if>
</h:outputText>
<h:outputFormat value=" &#40;{0}&#41;">
<f:param value="#{facetLabel.count}"/>
Expand All @@ -215,9 +217,11 @@

<h:outputLink value="#{widgetWrapper.wrapURL(page)}" rendered="#{DataversePage.filterQueries.contains(facetLabel.filterQuery)}" styleClass="facetLink facetSelected">
<h:outputText value="#{facetLabel.name}">
<f:passThroughAttribute name="lang" value="#{DatasetPage.getFieldLanguage(cvocConf.get(facetCategory.datasetFieldTypeId).getString('languages'))}" />
<f:passThroughAttribute name="data-cvoc-service-url" value="#{cvocConf.get(facetCategory.datasetFieldTypeId).getString('cvoc-url','')}" />
<f:passThroughAttribute name="data-cvoc-protocol" value="#{cvocConf.get(facetCategory.datasetFieldTypeId).getString('protocol','')}" />
<c:if test="#{!cvocConf.isEmpty()}">
<f:passThroughAttribute name="lang" value="#{DatasetPage.getFieldLanguage(cvocConf.get(facetCategory.datasetFieldTypeId).getString('languages'))}" />
<f:passThroughAttribute name="data-cvoc-service-url" value="#{cvocConf.get(facetCategory.datasetFieldTypeId).getString('cvoc-url','')}" />
<f:passThroughAttribute name="data-cvoc-protocol" value="#{cvocConf.get(facetCategory.datasetFieldTypeId).getString('protocol','')}" />
</c:if>
</h:outputText>
<h:outputFormat value=" &#40;{0}&#41;">
<f:param value="#{facetLabel.count}"/>
Expand Down