From 9f96a2a7b491fed4ea3d6089588ceef63d97a7a2 Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Thu, 6 Jan 2022 14:15:06 -0500
Subject: [PATCH 01/14] avoid empty lang tags (acc. issue)

---
 src/main/webapp/search-include-fragment.xhtml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/search-include-fragment.xhtml b/src/main/webapp/search-include-fragment.xhtml
index 2d03349acf1..3981a24667e 100644
--- a/src/main/webapp/search-include-fragment.xhtml
+++ b/src/main/webapp/search-include-fragment.xhtml
@@ -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}"/>
@@ -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}"/>

From 615e7ca9b3def55184508bf7a315e098abbe3fc1 Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Wed, 12 Jan 2022 08:50:34 -0500
Subject: [PATCH 02/14] #87 - breadcrumb carrot contrast

---
 src/main/webapp/resources/css/structure.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 1f3098349f5..d8a3c76e3d6 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -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;}

From 333ecfe0111b187dc29f016e38a078d846ba4ae9 Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Wed, 12 Jan 2022 09:20:33 -0500
Subject: [PATCH 03/14] #73 - avoid empty aria-label on first value

(first value gets the real label, repeat values get the aria label
'Additional Entry')
---
 .../webapp/datasetFieldForEditFragment.xhtml  | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/datasetFieldForEditFragment.xhtml b/src/main/webapp/datasetFieldForEditFragment.xhtml
index b7f61f2cafa..2a0e693f3cd 100644
--- a/src/main/webapp/datasetFieldForEditFragment.xhtml
+++ b/src/main/webapp/datasetFieldForEditFragment.xhtml
@@ -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'
@@ -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'
@@ -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','')}"/>
@@ -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'
@@ -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:inputArea>
     <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}">

From e6466f378e2320cfc559b81e7f91400b3a6f8489 Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Wed, 12 Jan 2022 12:51:21 -0500
Subject: [PATCH 04/14] #73 fix hostDataverse label reference

---
 src/main/webapp/dataset.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index c43232583ac..1bfb3cc4362 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -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>

From d087264a6ff372204e6bf133f9a94caa179e85a7 Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Wed, 12 Jan 2022 13:06:33 -0500
Subject: [PATCH 05/14] #73 remove unused hiddenReason input (had no label)

Conflicts:
	src/main/webapp/dataset.xhtml
---
 src/main/webapp/dataset.xhtml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 1bfb3cc4362..6230785c6a0 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -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">
@@ -1900,9 +1899,6 @@
                     function updateTemplate() {
                         $('button[id$="updateTemplate"]').trigger('click');
                     }
-                    function updateHiddenReason(textArea) {
-                        $('input[id$="hiddenReasonInput"]').val(textArea.value);
-                    }
                     function updateOwnerDataverse() {
                         $('button[id$="updateOwnerDataverse"]').trigger('click');
                     }

From 82beefca86327322d886454e97b77cfc1fd96002 Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Wed, 12 Jan 2022 13:13:41 -0500
Subject: [PATCH 06/14] typo

---
 src/main/webapp/datasetFieldForEditFragment.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/datasetFieldForEditFragment.xhtml b/src/main/webapp/datasetFieldForEditFragment.xhtml
index 2a0e693f3cd..8a5d4e889ec 100644
--- a/src/main/webapp/datasetFieldForEditFragment.xhtml
+++ b/src/main/webapp/datasetFieldForEditFragment.xhtml
@@ -72,7 +72,7 @@
         <c:if test="#{dsfvIndex!=0}">
             <f:passThroughAttribute name="aria-label" value="#{bundle['dataset.additionalEntry']}" />
         </c:if>
-        </p:inputArea>
+        </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}">

From 4590ec803072e7f3697c353dceb9715b76c96ec8 Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Wed, 12 Jan 2022 13:36:53 -0500
Subject: [PATCH 07/14] #73 Terms of Access label

---
 src/main/webapp/editFilesFragment.xhtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/editFilesFragment.xhtml b/src/main/webapp/editFilesFragment.xhtml
index 2687f4a221e..cd114e4d5fc 100644
--- a/src/main/webapp/editFilesFragment.xhtml
+++ b/src/main/webapp/editFilesFragment.xhtml
@@ -615,7 +615,7 @@
         </p>        
         <div class="form-horizontal">
             <div class="form-group">
-                <label for="metadata_TermsAccess" class="col-sm-3 control-label">
+                <label jsf:for="metadata_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>
@@ -626,7 +626,7 @@
                 </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>

From e7ab21ed422f7a83f0a072c36e927dfd380d315a Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Wed, 12 Jan 2022 14:38:28 -0500
Subject: [PATCH 08/14] obsolete worldmap dialog

---
 src/main/webapp/dataset.xhtml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 6230785c6a0..dcdfbf63c30 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -1450,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">

From e1770c6c93bb72ccf3a065fe2f54d7b9d68739f5 Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Wed, 12 Jan 2022 14:39:12 -0500
Subject: [PATCH 09/14] #73 - thumbnail and prov labels

---
 src/main/webapp/editFilesFragment.xhtml          | 2 +-
 src/main/webapp/provenance-popups-fragment.xhtml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/editFilesFragment.xhtml b/src/main/webapp/editFilesFragment.xhtml
index cd114e4d5fc..65d169e0403 100644
--- a/src/main/webapp/editFilesFragment.xhtml
+++ b/src/main/webapp/editFilesFragment.xhtml
@@ -835,7 +835,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">
diff --git a/src/main/webapp/provenance-popups-fragment.xhtml b/src/main/webapp/provenance-popups-fragment.xhtml
index df993f03950..adf5076d13a 100644
--- a/src/main/webapp/provenance-popups-fragment.xhtml
+++ b/src/main/webapp/provenance-popups-fragment.xhtml
@@ -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">
@@ -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">

From a532764cbfa1470f37c629d85657fcbd1c8eed11 Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Wed, 12 Jan 2022 14:39:32 -0500
Subject: [PATCH 10/14] #73 - labels for cvv inputs

---
 src/main/webapp/metadataFragment.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index 53e588705a8..88d66148a56 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -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"

From 65eb2f4cd3ea701cb64a6e27d2e742e38926294d Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Wed, 12 Jan 2022 15:12:54 -0500
Subject: [PATCH 11/14] #73 render dialog only when needed, fix compute table
 header

a link is empty in the dialog if the dataset doesn't have a grandparent
dataverse, which is also the case when you won't need the dialog, so
just don't render it.

for compute - adding a facet gives the header a value
---
 src/main/java/propertyFiles/Bundle.properties | 1 +
 src/main/webapp/dataset.xhtml                 | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index 3a03a45c1ca..9895cffe0e7 100644
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -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.
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index dcdfbf63c30..1503a87600a 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -1576,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>
@@ -1794,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">

From b18349415b3f20bf22c0068994ddc7aa9b52c85c Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Wed, 12 Jan 2022 15:15:02 -0500
Subject: [PATCH 12/14] only render panel when fileMetadata isn't null

since the panel includes info from the fileMetadata which is blank
otherwise, it seems odd to render it when no fileMetadata is sent as a
param. Still possible that something requires that, but haven't seen
anything yet.

Conflicts:
	src/main/webapp/file-info-fragment.xhtml
---
 src/main/webapp/file-info-fragment.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/file-info-fragment.xhtml b/src/main/webapp/file-info-fragment.xhtml
index 4c1cb7578c8..e4003c30e2c 100644
--- a/src/main/webapp/file-info-fragment.xhtml
+++ b/src/main/webapp/file-info-fragment.xhtml
@@ -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)}"/>

From 7f07032025c8f1dd9fdcbb29bd8047353645fff3 Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Wed, 12 Jan 2022 15:41:13 -0500
Subject: [PATCH 13/14] add label in file upload, fix typo in Terms of access
 popup

---
 src/main/webapp/editFilesFragment.xhtml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/editFilesFragment.xhtml b/src/main/webapp/editFilesFragment.xhtml
index 65d169e0403..883949d0441 100644
--- a/src/main/webapp/editFilesFragment.xhtml
+++ b/src/main/webapp/editFilesFragment.xhtml
@@ -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 -->
@@ -615,13 +617,13 @@
         </p>        
         <div class="form-horizontal">
             <div class="form-group">
-                <label jsf: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>

From cd23a7b37d2a10eb0afa7e7948f9d0d9a4b5de47 Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Tue, 15 Mar 2022 16:34:48 -0400
Subject: [PATCH 14/14] typo - missing " char

---
 src/main/webapp/file-info-fragment.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/file-info-fragment.xhtml b/src/main/webapp/file-info-fragment.xhtml
index e4003c30e2c..0423c862290 100644
--- a/src/main/webapp/file-info-fragment.xhtml
+++ b/src/main/webapp/file-info-fragment.xhtml
@@ -25,7 +25,7 @@
     -->            
     </ui:remove>
     
-    <p:outputPanel id="fileInfoInclude-filesTable" styleClass="media" rendered="#{fileMetadata != null}>
+    <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)}"/>