From 8749cb2df2c0a1616ea45271168e7804131e4f6d Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Mon, 7 Oct 2019 14:25:57 -0400
Subject: [PATCH 01/35] Added Add Data dropdown to navbar, plus code cleanup
 for dataverse header, edit dataverse form [ref #5615]

---
 src/main/webapp/dataverse.xhtml             | 133 +++++++-------------
 src/main/webapp/dataverse_header.xhtml      |  56 ++++-----
 src/main/webapp/resources/css/structure.css |  12 ++
 3 files changed, 85 insertions(+), 116 deletions(-)

diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index 39107a8acfa..8e605cb247a 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -10,7 +10,6 @@
       xmlns:jsf="http://xmlns.jcp.org/jsf">
     <h:head>
     </h:head>
-
     <h:body>
         <ui:composition template="/dataverse_template.xhtml">
             <ui:param name="pageTitle" value="#{empty DataversePage.dataverse.name ? bundle.new : DataversePage.dataverse.name}"/>
@@ -48,63 +47,60 @@
                     <f:viewParam name="adjustFacetNumber" value="#{SearchIncludeFragment.adjustFacetNumber}"/>
                     <f:viewAction action="#{SearchIncludeFragment.search()}" />
                 </f:metadata>
-
                 <h:form id="dataverseForm">
                     <!-- Edit Mode -->
                     <ui:fragment rendered="#{DataversePage.editMode == 'INFO' or DataversePage.editMode == 'CREATE'}">
                         <p:focus context="dataverseForm"/>
-                        <!-- Sample Block -->
-                        <!-- Name Panel -->
                         <!-- Edit Info Panel -->
                         <div class="row">
-                            <div class="col-xs-6 form-group form-col-container">
-                                <label class="col-sm-3 control-label" for="name">
+                            <div class="col-md-6 form-group form-col-container">
+                                <label class="control-label" for="name">
                                     #{bundle.dataverse} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.title']}"></span>
                                 </label>
-                                <div class="col-sm-9 form-col-container">
-                                    <p:inputText id="name" tabindex="1" styleClass="form-control" value="#{DataversePage.dataverse.name}"/>
+                                <div class="form-col-container">
+                                    <p:inputText id="name" styleClass="form-control" value="#{DataversePage.dataverse.name}"/>
                                 </div>
                             </div>
-                            <div class="col-xs-6 form-group form-col-container">
-                                <label class="col-sm-3 control-label" for="affiliation">
+                            <div class="col-md-6 form-group form-col-container">
+                                <label class="control-label" for="affiliation">
                                     #{bundle.affiliation}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.affiliation.title']}"></span>
                                 </label>
-                                <div class="col-sm-9 form-col-container">
-                                    <p:inputText id="affiliation" tabindex="2" styleClass="form-control" value="#{DataversePage.dataverse.affiliation}"/>
+                                <div class="form-col-container">
+                                    <p:inputText id="affiliation" styleClass="form-control" value="#{DataversePage.dataverse.affiliation}"/>
                                     <p:message for="affiliation" display="text"/>
                                 </div>
                             </div>
                         </div>
                         <div class="row">
-                            <div class="col-xs-6 form-group form-col-container">
-                                <label class="col-sm-3 control-label" for="identifier">
+                            <div class="col-md-6 form-group form-col-container">
+                                <label class="control-label" for="identifier">
                                     #{bundle.identifier} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.identifier.title']}"></span>
                                 </label>
-                                <div class="col-sm-9 form-col-container">
+                                <div class="form-col-container">
                                     <div class="input-group">
                                         <div class="input-group-addon"><span class="small">#{systemConfig.dataverseSiteUrl}/dataverse/</span></div>
-                                        <p:inputText id="identifier" tabindex="3" styleClass="form-control" validator="#{DataversePage.validateAlias}" value="#{DataversePage.dataverse.alias}"/>
+                                        <p:inputText id="identifier" styleClass="form-control" validator="#{DataversePage.validateAlias}" value="#{DataversePage.dataverse.alias}"/>
                                     </div>
                                     <p:message for="identifier" display="text"/>
                                 </div>
                             </div>
-                            <div class="col-xs-6 form-group" jsf:rendered="#{DataversePage.ownerId != null}">
-                                <label class="col-sm-3 control-label" for="hostDataverse">
+                            <div class="col-md-6 form-group" jsf:rendered="#{DataversePage.ownerId != null}">
+                                <label class="control-label" for="hostDataverse">
                                     #{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>
                                 </label>
-                                <div class="col-sm-9 form-col-container">
+                                <div class="form-col-container">
                                     <p class="form-control-static">#{DataversePage.dataverse.getOwner().name}</p>
                                     <h:inputHidden value="#{DataversePage.ownerId}" id="hostDataverse" />
                                     <ui:remove><!-- removed for beta -->
-                                        <p:selectOneMenu id="hostDataverse" tabindex="2" value="#{DataversePage.ownerId}" filter="true" filterMatchMode="startsWith" effect="none">
+                                        <p:selectOneMenu id="hostDataverse" value="#{DataversePage.ownerId}" filter="true" filterMatchMode="startsWith" effect="none">
                                             <f:selectItems value="#{dataverseServiceBean.findAll()}" var="dv" itemLabel="#{dv.name}" itemValue="#{dv.id}"
                                                            itemDisabled="#{dv eq DataversePage.dataverse or dv.owners.contains(DataversePage.dataverse)}" />
                                         </p:selectOneMenu>
@@ -113,15 +109,15 @@
                             </div>
                         </div>
                         <div class="row">
-                            <div class="col-xs-6 form-group form-col-container">
+                            <div class="col-md-6 form-group form-col-container">
                                 <div class="form-group clearfix">
-                                    <label class="col-sm-3 control-label" for="dataverseCategory">
+                                    <label class="control-label" for="dataverseCategory">
                                         #{bundle['dataverse.category']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
                                         <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                               data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.category.title']}"></span>
                                     </label>
-                                    <div class="col-sm-9 form-col-container">
-                                        <h:selectOneMenu id="dataverseCategory" tabindex="5" styleClass="form-control" value="#{DataversePage.dataverse.dataverseType}">
+                                    <div class="form-col-container">
+                                        <h:selectOneMenu id="dataverseCategory" styleClass="form-control" value="#{DataversePage.dataverse.dataverseType}">
                                             <f:selectItem id="dvSelect" itemLabel="#{bundle['dataverse.type.selectTab.top']}" itemValue="" />
                                             <f:selectItem id="dvDepartment" itemLabel="#{bundle['dataverse.type.selectTab.department']}" itemValue="DEPARTMENT" />
                                             <f:selectItem id="dvJournals" itemLabel="#{bundle['dataverse.type.selectTab.journals']}" itemValue="JOURNALS" />
@@ -139,22 +135,22 @@
                                 <div class="form-group clearfix">
                                     <p:fragment>
                                        <p:autoUpdate />
-                                        <label class="col-sm-3 control-label" for="contactEmail">
+                                        <label class="control-label" for="contactEmail">
                                             #{bundle['dataverse.email']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
                                             <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.email.title']}"></span>
                                         </label>
-                                        <div class="col-sm-9 form-col-container edit-compound-field">
+                                        <div class="form-col-container edit-compound-field">
                                             <ui:repeat value="#{DataversePage.dataverse.dataverseContacts}" var="contacts" varStatus="valCount">
                                                 <div class="form-group">
-                                                    <div class="col-sm-8 form-col-container">
-                                                        <p:inputText id="contactEmail" tabindex="7" styleClass="form-control" value="#{contacts.contactEmail}">
+                                                    <div class="col-xs-10 col-sm-9 form-col-container">
+                                                        <p:inputText id="contactEmail" styleClass="form-control" value="#{contacts.contactEmail}">
                                                             <f:validateBean disabled="#{param['SKIP_VALIDATION']}"/>
                                                         </p:inputText>
                                                         <p:message for="contactEmail" display="text"/>
                                                     </div>
                                                     <!-- Add / Remove buttons -->
-                                                    <div class="col-sm-4 form-col-container field-add-delete">
+                                                    <div class="col-xs-2 col-sm-3 form-col-container field-add-delete">
                                                         <p:commandLink styleClass="btn btn-default btn-sm bootstrap-button-tooltip" title="#{bundle.add}"
                                                                          actionListener="#{DataversePage.dataverse.addDataverseContact(valCount.index + 1)}"
                                                                          oncomplete="javascript:bind_bsui_components();">
@@ -175,19 +171,19 @@
                                     </p:fragment>
                                 </div>
                             </div>
-                            <div class="col-xs-6 form-group form-col-container">
-                                <label class="col-sm-3 control-label" for="description">
+                            <div class="col-md-6 form-group form-col-container">
+                                <label class="control-label" for="description">
                                     #{bundle.description}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.description.title']}"></span>
                                 </label>
-                                <div class="col-sm-9 form-col-container">
+                                <div class="form-col-container">
                                     <p class="help-block">
                                         <h:outputFormat value="#{bundle.htmlAllowedMsg}" escape="false">
                                             <f:param value="#{bundle.htmlAllowedTags}"/>
                                         </h:outputFormat>
                                     </p>
-                                    <p:inputTextarea id="description" tabindex="6" styleClass="form-control" value="#{DataversePage.dataverse.description}"
+                                    <p:inputTextarea id="description" styleClass="form-control" value="#{DataversePage.dataverse.description}"
                                                     rows="6" cols="50"
                                                     autoResize="false">
                                     </p:inputTextarea>
@@ -195,30 +191,25 @@
                                 </div>
                             </div>
                         </div>
-
                         <hr class="margin-top-half margin-bottom-half"/>
-
                         <!-- Metadata Panel -->
-                        <p:panel styleClass="panelLayoutBlock"  widgetVar="optionBlock" id="optionBlock">
+                        <p:panel styleClass="panelLayoutBlock" widgetVar="optionBlock" id="optionBlock">
                             <p:commandButton id="hiddenRefresh" value="back" style="display:none"
                                              actionListener="#{DataversePage.refresh}"
-                                             update="@widgetVar(optionBlock)" />
-
+                                             update="@widgetVar(optionBlock)"/>
                             <div class="row">
                                 <div class="col-sm-12 form-group">
                                     <label class="col-sm-3 control-label" for="mdbSelect">#{bundle['dataverse.metadataElements']}</label>
                                     <div class="col-sm-9">
                                         <p class="help-block">#{bundle['dataverse.metadataElements.tip']}</p>
-
                                         <label class="metadata-blocks-default" for="metadataRoot" jsf:rendered="#{DataversePage.dataverse.owner != null}">
-                                            <h:selectBooleanCheckbox id="metadataRoot" tabindex="7" styleClass="metadata-blocks-default"
+                                            <h:selectBooleanCheckbox id="metadataRoot" styleClass="metadata-blocks-default"
                                                                      value="#{DataversePage.inheritMetadataBlockFromParent}" onclick="updateMetadata(this);">
                                             </h:selectBooleanCheckbox>
                                             <h:outputFormat value="#{bundle['dataverse.metadataElements.from.tip']}">
                                                 <f:param value="#{DataversePage.dataverse.metadataRootDataverseName}"/>
                                             </h:outputFormat>
                                         </label>
-
                                         <p:commandButton value="Direct" id="updateMetadataButton"
                                                          style="display:none"
                                                          update="@widgetVar(optionBlock)"
@@ -230,7 +221,6 @@
                                                          update="@all"
                                                          action="#{DataversePage.resetToInherit()}">
                                         </p:commandButton>
-
                                         <ui:repeat value="#{DataversePage.allMetadataBlocks}" var="mdb">
                                             <div class="checkbox">
                                                 <label for="#{mdb.idString}">
@@ -244,7 +234,6 @@
                                                            name="mdbSelectOptional" jsf:rendered="#{!mdb.required and !DataversePage.inheritMetadataBlockFromParent}">
                                                         <p:ajax update="@widgetVar(optionBlock)" />
                                                     </input>
-
                                                     <h:outputText value="#{mdb.localeDisplayName} #{mdb.required ? bundle['dataverse.field.required']: ''}"
                                                                   styleClass="#{DataversePage.inheritMetadataBlockFromParent ? 'text-muted' : ''}"/>
                                                     <p:commandLink id="showDSFT" style="margin-left:1em;"
@@ -265,7 +254,6 @@
                                                      </p:commandLink>
                                                 </label>
                                             </div>
-
                                             <div id="metadataFieldOptionsPanel-Block" jsf:rendered="#{mdb.showDatasetFieldTypes}">
                                                 <div class="panel panel-default">
                                                     <div id="metadataFieldOptionsPanel-Body" class="panel-body">
@@ -290,7 +278,6 @@
                                                                                               rendered="#{!dsft.hasChildren and !((!dsft.hasChildren  and dsft.required) or (dsft.hasChildren and dsft.hasRequiredChildren))}">
                                                                                 <f:selectItems value="#{dsft.optionSelectItems}"/>
                                                                             </p:selectOneRadio>
-
                                                                             <span class="text-muted" jsf:rendered="#{(!dsft.hasChildren and dsft.required) or (dsft.hasChildren and dsft.hasRequiredChildren)}">
                                                                                 #{bundle['dataverse.field.requiredByDataverse']}
                                                                             </span>
@@ -320,9 +307,8 @@
                                     <label class="col-sm-3 control-label" for="facetPickListCreate">#{bundle['dataverse.facetPickList.text']}</label>
                                     <div class="col-sm-9">
                                         <p class="help-block">#{bundle['dataverse.facetPickList.tip']}</p>
-
                                         <label class="metadata-blocks-default" for="facetsRoot" jsf:rendered="#{DataversePage.dataverse.owner != null}">
-                                            <h:selectBooleanCheckbox id="facetsRoot" tabindex="8" styleClass="facets-blocks-default"
+                                            <h:selectBooleanCheckbox id="facetsRoot" styleClass="facets-blocks-default"
                                                                      value="#{DataversePage.inheritFacetFromParent}">
                                                 <p:ajax update="editFacets" listener="#{DataversePage.toggleFacetRoot}"/>
                                             </h:selectBooleanCheckbox>
@@ -330,7 +316,6 @@
                                                 <f:param value="#{DataversePage.dataverse.facetRootDataverseName}"/>
                                             </h:outputFormat>
                                         </label>
-
                                         <p:pickList id="facetPickListCreate" value="#{DataversePage.facets}" var="facet" converter="facetConverter"
                                                     itemLabel="#{facet.displayName}" itemValue="#{facet}"
                                                     disabled="#{!DataversePage.dataverse.facetRoot and DataversePage.dataverse.owner != null}"
@@ -471,7 +456,6 @@
                                     </div>
                                     <!-- END: Edit Button -->
                             </div>
-
                             <!-- END: Edit/Publish Button Group -->
                             <!-- Email/Link/Share Button Group -->
                             <div class="btn-group pull-right" role="group">
@@ -490,17 +474,6 @@
                                     <span class="glyphicon glyphicon-share"/> #{bundle['share']}
                                 </p:commandLink>
                             </div>
-                            <p:dialog id="shareDialog" header="#{bundle['dataverse.share.dataverseShare']}" widgetVar="shareDialog" modal="true">
-                                <p class="help-block">#{bundle['dataverse.share.dataverseShare.tip']}</p>
-
-                                <div id="sharrre-widget" data-url="#{systemConfig.dataverseSiteUrl}/dataverse/#{DataversePage.dataverse.alias}" data-text="#{bundle['dataverse.share.dataverseShare.shareText']}"></div>
-
-                                <div class="button-block">
-                                    <button class="btn btn-default" onclick="PF('shareDialog').hide()" type="button">
-                                        #{bundle.close}
-                                    </button>
-                                </div>
-                            </p:dialog>
                             <!-- END: Email/Link/Share Button Group -->
                             <!-- Metrics for Root Dataverse -->
                             <div id="metrics-block" class="col-xs-3" jsf:rendered="#{DataversePage.isRootDataverse() and !settingsWrapper.rsyncOnly}">
@@ -520,7 +493,6 @@
                             </div>
                             <!-- END: Metrics for Root Dataverse-->
                         </div>
-
                         <ui:fragment rendered="#{SearchIncludeFragment.filterQueries.size() == 0 and SearchIncludeFragment.mode != SearchIncludeFragment.searchModeString}">
                             <o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
                             <ui:fragment rendered="#{!empty DataversePage.dataverse.description and !widgetWrapper.widgetView}">
@@ -559,16 +531,14 @@
                             <!-- END: Featured Dataverses Carousel -->
                         </ui:fragment>
                     </ui:fragment>
-
                     <!-- Save / Cancel Button Panel -->
                     <div class="button-block" jsf:rendered="#{!empty DataversePage.editMode}">
-                        <p:commandButton id="save" styleClass="btn btn-default" tabindex="9" value="#{DataversePage.dataverse.id == null ? bundle.createDataverse : bundle.saveChanges}" action="#{DataversePage.save}" update="@all">
+                        <p:commandButton id="save" styleClass="btn btn-default" value="#{DataversePage.dataverse.id == null ? bundle.createDataverse : bundle.saveChanges}" action="#{DataversePage.save}" update="@all">
                             <f:ajax onerror="window.scrollTo(0, 0)" />
                         </p:commandButton>
-                        <p:commandButton id="cancel" styleClass="btn btn-link" tabindex="10" value="#{bundle.cancel}" actionListener="#{DataversePage.cancel}" process="@this" update="@form,:searchResults,:messagePanel" rendered="#{DataversePage.dataverse.id != null}" oncomplete="javascript:bind_bsui_components();initCarousel();"/>
-                        <p:button id="cancelCreate" styleClass="btn btn-link" tabindex="10" value="#{bundle.cancel}" outcome="/dataverse.xhtml?alias=#{DataversePage.dataverse.owner.alias}" rendered="#{DataversePage.dataverse.id == null and DataversePage.ownerId != null}"/>
+                        <p:commandButton id="cancel" styleClass="btn btn-link" value="#{bundle.cancel}" actionListener="#{DataversePage.cancel}" process="@this" update="@form,:searchResults,:messagePanel" rendered="#{DataversePage.dataverse.id != null}" oncomplete="javascript:bind_bsui_components();initCarousel();"/>
+                        <p:button id="cancelCreate" styleClass="btn btn-link" value="#{bundle.cancel}" outcome="/dataverse.xhtml?alias=#{DataversePage.dataverse.owner.alias}" rendered="#{DataversePage.dataverse.id == null and DataversePage.ownerId != null}"/>
                     </div>
-
                     <!-- POPUPS -->
                     <!-- Featured Dataverses Popup -->
                     <p:dialog id="browseOptsForm" header="#{bundle['dataverse.option.featuredDataverse']}" widgetVar="browseOptsForm" modal="true">
@@ -599,7 +569,6 @@
                             </div>
                         </ui:fragment>
                     </p:dialog>
-
                     <!-- Publish Confirmation Popup -->
                     <p:dialog id="publishDvConfirm" header="#{bundle['dataverse.publish.header']}" widgetVar="confirmation" modal="true">
                         <p class="text-warning">
@@ -612,7 +581,6 @@
                             </button>
                         </div>
                     </p:dialog>
-
                     <p:dialog id="mayNotRelease" header="#{bundle['dataverse.publish.header']}" widgetVar="mayNotRelease" modal="true">
                         <p class="text-danger">
                             <span class="glyphicon glyphicon-exclamation-sign"/> #{bundle['dataverse.publish.failed.tip']}
@@ -623,7 +591,6 @@
                             </button>
                         </div>
                     </p:dialog>
-
                     <p:dialog id="deleteDvConfirm" header="#{bundle['dataverse.delete']}" widgetVar="deleteConfirmation" modal="true">
                         <p class="text-warning">
                             <span class="glyphicon glyphicon-warning-sign"/> #{bundle['dataverse.delete.tip']}
@@ -636,14 +603,23 @@
                         </div>
                     </p:dialog>
                 </h:form>
-
                 <!-- Search/Browse Facets Panel -->
                 <p:fragment id="searchResults">
                     <ui:fragment rendered="#{empty DataversePage.editMode}">
                         <ui:include src="search-include-fragment.xhtml"/>
                     </ui:fragment>
                 </p:fragment>
-
+                <!-- END Search/Browse Facets Panel -->
+                <!-- POPUPS -->
+                <p:dialog id="shareDialog" header="#{bundle['dataverse.share.dataverseShare']}" widgetVar="shareDialog" modal="true">
+                    <p class="help-block">#{bundle['dataverse.share.dataverseShare.tip']}</p>
+                    <div id="sharrre-widget" data-url="#{systemConfig.dataverseSiteUrl}/dataverse/#{DataversePage.dataverse.alias}" data-text="#{bundle['dataverse.share.dataverseShare.shareText']}"></div>
+                    <div class="button-block">
+                        <button class="btn btn-default" onclick="PF('shareDialog').hide()" type="button">
+                            #{bundle.close}
+                        </button>
+                    </div>
+                </p:dialog>
                 <!-- Link Dataverse Popup -->
                 <p:dialog id="linkDataverseForm" header="#{DataversePage.linkMode == 'SAVEDSEARCH' ? bundle['dataverse.savedsearch.link'] : bundle['dataverse.link']}" widgetVar="linkDataverseForm" modal="true">
                     <h:form styleClass="form-horizontal" rendered="#{DataversePage.dataversesForLinking.size() > 1}">
@@ -675,7 +651,6 @@
                                         <div>
                                             <strong>#{u.id}</strong><br/>
                                             <em>#{u.affiliation}</em>
-
                                         </div>
                                     </f:facet>
                                 </p:autoComplete>
@@ -746,7 +721,6 @@
                         </div>
                     </ui:fragment>
                 </p:dialog>
-
                 <!-- Metadata Resest Modifications Popup -->
                 <p:dialog id="resetModifications" header="#{bundle['dataverse.resetModifications']}" widgetVar="resetModifications" modal="true" closable="false">
                     <p class="text-warning">
@@ -759,19 +733,15 @@
                         </button>
                     </div>
                 </p:dialog>
-
                 <script>
                     //<![CDATA[
                     var scrollPos=0;
-
                     $(document).ready(function () {
                         initCarousel();
                         popoverHTML('#{bundle.htmlAllowedTitle}');
                     });
-
                     function initCarousel() {
                         var owl1 = $("#featuredDataversesList");
-
                         owl1.owlCarousel({
                             pagination: false,
                             navigation: false,
@@ -794,20 +764,16 @@
                         }
                         $('#featuredDataversesList .item').matchHeight();
                     }
-
                     function callOnError(){
                         alert("in js");
                         window.scrollTo(0, 0);
                     }
-
                     function updateInclude() {
                         $('button[id$="hiddenRefresh"]').trigger('click');
                     }
-                    
                     function scrollAfterUpdate() {
                         document.getElementById('metadataFieldOptionsPanel-Body').scrollTop = scrollPos;
                     }
-
                     function updateMetadata(checkbox) {
                         var checked = checkbox.checked;
                         if (checked === false){
@@ -816,18 +782,15 @@
                             PF('resetModifications').show();
                         }
                     }
-
                     function check() {
                         $('button[id$="resetToInherit"]').trigger('click');
                     }
-
                     function uncheck() {
                         $('input:checkbox[id$="metadataRoot"]').prop('checked', false);
                     }
                     //]]>                                     
                 </script>
-
             </ui:define>
         </ui:composition>
     </h:body>
-</html>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
index 6a91f8e1136..0c7b2a82f43 100644
--- a/src/main/webapp/dataverse_header.xhtml
+++ b/src/main/webapp/dataverse_header.xhtml
@@ -9,12 +9,10 @@
                 xmlns:o="http://omnifaces.org/ui"
                 xmlns:of="http://omnifaces.org/functions"
                 xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
-
     <o:resourceInclude path="/CustomizationFilesServlet?customFileType=header" rendered="#{!widgetWrapper.widgetView}"/>
-    
     <div id="dataverse-header-block">
         <!-- Navbar Panel -->
-        <nav id="navbarFixed" class="navbar navbar-default navbar-fixed-top" jsf:rendered="#{!widgetWrapper.widgetView}" role="navigation">
+        <nav id="navbarFixed" class="navbar navbar-default navbar-fixed-top" jsf:rendered="#{!widgetWrapper.widgetView}">
             <div class="container">
                 <div class="navbar-header">
                     <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#topNavBar" aria-pressed="false">
@@ -22,7 +20,7 @@
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
-                    </button>                       
+                    </button>
                     <a href="/">
                         <ui:fragment rendered="#{empty settingsWrapper.get(':LogoCustomizationFile')}">
                             <span class="navbar-brand" tabindex="1"><span id="icon-dataverse" class="icon-dataverse"></span> #{bundle.dataverse}</span>
@@ -33,9 +31,26 @@
                 </div>
                 <div class="collapse navbar-collapse" id="topNavBar">
                     <ul class="nav navbar-nav navbar-right">
+                        <!-- ADD DATA -->
+                        <li class="dropdown">
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">#{bundle['dataverse.results.btn.addData']} <b class="caret"></b></a>
+                            <ul class="dropdown-menu">
+                                <li>
+                                    <h:outputLink value="#">
+                                        <h:outputText value="#{bundle['dataverse.results.btn.addData.newDataverse']}"/>
+                                    </h:outputLink>
+                                </li>
+                                <li>
+                                    <h:outputLink value="#">
+                                        <h:outputText value="#{bundle['dataverse.results.btn.addData.newDataset']}"/>
+                                    </h:outputLink>
+                                </li>
+                            </ul>
+                        </li>
+                        <!-- END ADD DATA -->
                         <li class="dropdown">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown">#{bundle.search} <b class="caret"></b></a>
-                            <ul class="dropdown-menu" style="padding:12px;min-width:350px;">
+                            <ul class="dropdown-menu navbar-search">
                                 <form class="form-inline" role="search">
                                     <label class="sr-only" for="navbarsearch">#{bundle.search}</label>
                                     <div class="input-group">
@@ -50,25 +65,21 @@
                                 </form>
                             </ul>
                         </li>
-                        
                         <li jsf:rendered="#{!empty settingsWrapper.get(':NavbarAboutUrl')}">
                             <h:outputLink value="#{settingsWrapper.get(':NavbarAboutUrl')}" target="_blank">
                                 <h:outputText value="#{bundle['header.about']}"/>
                             </h:outputLink>
                         </li>
-
                         <li>
                             <h:outputLink value="#{settingsWrapper.guidesBaseUrl}/#{systemConfig.guidesVersion}/user" target="_blank">
                                 <h:outputText value="#{bundle['header.guides.user']}"/>
                             </h:outputLink>
                         </li>
-                        
                         <li jsf:rendered="#{!empty settingsWrapper.get(':NavbarSupportUrl')}">
                             <h:outputLink value="#{settingsWrapper.get(':NavbarSupportUrl')}" target="_blank">
                                 <h:outputText value="#{bundle['header.support']}"/>
                             </h:outputLink>
                         </li>
-                        
                         <ui:fragment rendered="#{empty settingsWrapper.get(':NavbarSupportUrl')}">
                             <o:form useRequestURI="true" class="navbar-form navbar-left navbar-form-link">
                                 <p:commandLink oncomplete="PF('contactForm').show()" update=":contactDialog" actionListener="#{sendFeedbackDialog.initUserInput}">
@@ -80,28 +91,18 @@
                                 </p:commandLink>
                             </o:form>
                         </ui:fragment>
-                        
                         <li class="dropdown" jsf:rendered="#{settingsWrapper.localesConfigured}">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown" title="#{bundle.language}">#{dataverseSession.localeTitle} <b class="caret"></b></a>
-                            <ul class="dropdown-menu">
+                            <ul class="dropdown-menu navbar-language">
                                 <h:form class="form-inline">
                                     <ui:repeat value="#{settingsWrapper.configuredLocales.entrySet().toArray()}" var="language">
                                         <li class="#{dataverseSession.localeTitle == language.value ? 'active' : ''}">
-                                            <h:commandLink value="#{language.value}" actionListener="#{dataverseSession.updateLocaleInViewRootAndRedirect(language.key)}" action="submit()"
-                                                           style="padding: 3px 20px;
-                                                                    clear: both;
-                                                                    font-weight: 400;
-                                                                    line-height: 1.42857143;
-                                                                    color: rgb(51, 51, 51);
-                                                                    white-space: nowrap;
-                                                                    text-decoration: none;
-                                                                    display: block;"/>
+                                            <h:commandLink value="#{language.value}" styleClass="language-menu-link" actionListener="#{dataverseSession.updateLocaleInViewRootAndRedirect(language.key)}" action="submit()"/>
                                         </li>
                                     </ui:repeat>
                                 </h:form>
                             </ul>
                         </li>
-
                         <ui:fragment rendered="#{!dataverseSession.user.authenticated}">
                             <li>
                                 <h:outputLink rendered="#{dataverseHeaderFragment.signupAllowed}"
@@ -115,7 +116,6 @@
                                 </h:outputLink>
                             </li>
                         </ui:fragment>
-                        
                         <ui:fragment rendered="#{dataverseSession.user.authenticated}">
                             <li class="dropdown accountName">
                                 <a href="#" id="lnk_header_account_dropdown" class="dropdown-toggle" data-toggle="dropdown" role="menu" aria-haspopup="true" aria-expanded="false">
@@ -124,7 +124,8 @@
                                     </ui:fragment>
                                     <h:outputText styleClass="#{dataverseSession.user.superuser ? 'text-danger' : ''}" value="#{dataverseSession.user.displayInfo.title}" id="userDisplayInfoTitle"/>
                                     <h:outputText styleClass="label label-danger" rendered="#{ dataverseHeaderFragment.getUnreadNotificationCount(dataverseSession.user.id) > 0 }"
-                                                  value="#{ dataverseHeaderFragment.getUnreadNotificationCount(dataverseSession.user.id) }" />                                    <b class="caret"></b>
+                                                  value="#{dataverseHeaderFragment.getUnreadNotificationCount(dataverseSession.user.id)}"/>
+                                    <b class="caret"></b>
                                 </a>
                                 <ul class="dropdown-menu">
                                     <li tabindex="-1">
@@ -233,7 +234,6 @@
                 </div>
             </div>
         </div>
-
         <div id="breadcrumbNavBlock" class="container" jsf:rendered="#{dataverseHeaderFragment.breadcrumbs.size() > 1}">
             <ui:repeat value="#{dataverseHeaderFragment.breadcrumbs}" var="breadcrumb" varStatus="status">
                 <h:outputText value=" > " styleClass="breadcrumbCarrot" rendered="#{!status.first}"/>
@@ -269,7 +269,6 @@
                 </div>
             </ui:repeat>
         </div>
-
         <ui:remove>
             <!-- Removing this temporarily until we can fix the performance issues with it;
                  replaced with generic bookmarks; will have to see how to best make this work
@@ -283,7 +282,6 @@
                         <h:outputText value="#{dv.name}"/>
                     </a>
                 </ui:fragment>
-
                 <ui:fragment rendered="#{dataverseHeaderFragment.hasVisibleChildren(dv)}">
                     <a id="dataverse" styleClass="#{dataverse.id == dv.id ? 'breadcrumbActive' : ''}" role="button">
                         <span class="glyphicon glyphicon-chevron-down"></span>
@@ -301,10 +299,6 @@
                 </p:tree>
             </div>
         </ui:remove>
-
-        
-
-        
         <!-- Message Panel -->
         <p:fragment id="messagePanel" rendered="#{showMessagePanel}">
             <div class="container messagePanel">
@@ -315,4 +309,4 @@
             </div>
         </p:fragment>
     </div>
-</ui:composition>
+</ui:composition>
\ No newline at end of file
diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 4b3a340d958..6e1fbf60aec 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -39,6 +39,18 @@ body .ui-widget {font-size: inherit;}
 #navbarFixed form.navbar-form-link a.ui-commandlink, #navbarFixed ul.navbar-nav li.dropdown span.dropdown-toggle {display:block; padding:15px; color: #777;}
 #navbarFixed form.navbar-form-link a.ui-commandlink:hover, #navbarFixed form.navbar-form-link a.ui-commandlink:focus,
 #navbarFixed ul.navbar-nav li.dropdown span.dropdown-toggle:hover, #navbarFixed ul.navbar-nav li.dropdown span.dropdown-toggle:focus {color: #262626; text-decoration: none;}
+#navbarFixed .dropdown-menu.navbar-search {padding:12px; min-width:350px;}
+#navbarFixed .dropdown-menu.navbar-language a.language-menu-link {display: block; clear: both; padding: 3px 20px; font-weight: 400; line-height: 1.42857143; color: rgb(51, 51, 51); white-space: nowrap; text-decoration: none;}
+#navbarFixed .dropdown-menu.navbar-language a.language-menu-link:hover,
+#navbarFixed .dropdown-menu.navbar-language a.language-menu-link:focus {color: #262626;text-decoration: none;background-color: #f5f5f5;}
+#navbarFixed .dropdown-menu.navbar-language .active a.language-menu-link,
+#navbarFixed .dropdown-menu.navbar-language .active a.language-menu-link:hover,
+#navbarFixed .dropdown-menu.navbar-language .active a.language-menu-link:focus {/*color: #fff;text-decoration: none;background-color: #337ab7;outline: 0;*/}
+#navbarFixed .dropdown-menu.navbar-language .disabled a.language-menu-link,
+#navbarFixed .dropdown-menu.navbar-language .disabled a.language-menu-link:hover,
+#navbarFixed .dropdown-menu.navbar-language .disabled a.language-menu-link:focus {color: #777777;}
+#navbarFixed .dropdown-menu.navbar-language .disabled a.language-menu-link:hover,
+#navbarFixed .dropdown-menu.navbar-language .disabled a.language-menu-link:focus {text-decoration: none; cursor: not-allowed; background-color: transparent; background-image: none; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);}
 #navbarFixed #navbar-search-toggle, #navbarFixed #dataverseSupportLink, #navbarFixed #lnk_header_account_dropdown {cursor: pointer; cursor: hand;}
 #navbarFixed .dropdown.accountName #lnk_header_account_dropdown span.glyphicon {margin-right:8px;}
 #navbarFixed .dropdown.accountName .label.label-danger {margin-left:.5em; line-height:normal; vertical-align:text-top;}

From 2e49ff04ccc9dca70d227fd2a65bbce93993740f Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Mon, 7 Oct 2019 14:35:21 -0400
Subject: [PATCH 02/35] Added rel=noopener

---
 src/main/webapp/dataverse_footer.xhtml | 14 +++++---------
 src/main/webapp/dataverse_header.xhtml | 20 +++++++++-----------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/main/webapp/dataverse_footer.xhtml b/src/main/webapp/dataverse_footer.xhtml
index 36a524af196..adbba159d67 100644
--- a/src/main/webapp/dataverse_footer.xhtml
+++ b/src/main/webapp/dataverse_footer.xhtml
@@ -9,7 +9,6 @@
                 xmlns:o="http://omnifaces.org/ui"
                 xmlns:of="http://omnifaces.org/functions"
                 xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
-
     <div id="dataverseFooter" jsf:rendered="#{!widgetWrapper.widgetView and !dataverseHeaderFragment.isRootDataverseThemeDisabled(dataverse) and !empty dataverse.dataverseTheme.logoFooter}">
         <div class="container">
             <div class="row">
@@ -24,19 +23,18 @@
             <div class="row">
                 <div class="col-sm-8 small" jsf:rendered="#{!widgetView}">
                     <p>
-                        <h:outputText value="#{systemConfig.footerCopyrightAndYear}#{settingsWrapper.get(':FooterCopyright')}" escape="false"/> <ui:fragment rendered="#{!empty settingsWrapper.get(':ApplicationPrivacyPolicyUrl')}">&#160;|&#160; <h:outputLink value="#{settingsWrapper.get(':ApplicationPrivacyPolicyUrl')}" target="_blank">#{bundle['footer.privacyPolicy']}</h:outputLink></ui:fragment>
+                        <h:outputText value="#{systemConfig.footerCopyrightAndYear}#{settingsWrapper.get(':FooterCopyright')}" escape="false"/> <ui:fragment rendered="#{!empty settingsWrapper.get(':ApplicationPrivacyPolicyUrl')}">&#160;|&#160; <h:outputLink value="#{settingsWrapper.get(':ApplicationPrivacyPolicyUrl')}" target="_blank" rel="noopener">#{bundle['footer.privacyPolicy']}</h:outputLink></ui:fragment>
                     </p>
                 </div>
                 <div class="col-xs-7 small" jsf:rendered="#{widgetView}">
                     <span class="widgetBrandMsg">
                         <h:outputFormat value="#{bundle['footer.widget.datastored']}" escape="false">
                             <o:param>
-                                <a href="/" target="_blank" title="#{dataverseServiceBean.findRootDataverse().displayName}">#{dataverseServiceBean.findRootDataverse().displayName}</a>
+                                <a href="/" target="_blank" rel="noopener" title="#{dataverseServiceBean.findRootDataverse().displayName}">#{dataverseServiceBean.findRootDataverse().displayName}</a>
                             </o:param>
                         </h:outputFormat>
-
                         <ui:fragment rendered="#{!dataverseSession.user.authenticated}">
-                            <h:outputLink styleClass="margin-sides highlightBold" value="/loginpage.xhtml?#{loginRedirectPage}" target="_blank" title="#{bundle['footer.widget.login']} #{dataverseServiceBean.findRootDataverse().displayName}">
+                            <h:outputLink styleClass="margin-sides highlightBold" value="/loginpage.xhtml?#{loginRedirectPage}" target="_blank" rel="noopener" title="#{bundle['footer.widget.login']} #{dataverseServiceBean.findRootDataverse().displayName}">
                                 #{bundle.login}
                             </h:outputLink>
                         </ui:fragment>
@@ -45,14 +43,12 @@
                 <div class="#{widgetView ? 'col-xs-5' : 'col-sm-4'} text-right">
                     <div class="poweredbylogo">
                         <span>#{bundle['footer.poweredby']}</span>
-                        <a href="http://dataverse.org/" title="#{bundle['footer.dataverseProject']}" target="_blank"><img src="/resources/images/dataverse_project_logo.svg" width="118" height="40" onerror="this.src='/resources/images/dataverseproject_logo.png'" alt="#{of:format1(bundle['alt.logo'], bundle['footer.dataverseProject'])}"/></a>
+                        <a href="http://dataverse.org/" title="#{bundle['footer.dataverseProject']}" target="_blank" rel="noopener"><img src="/resources/images/dataverse_project_logo.svg" width="118" height="40" onerror="this.src='/resources/images/dataverseproject_logo.png'" alt="#{of:format1(bundle['alt.logo'], bundle['footer.dataverseProject'])}"/></a>
                         <h:outputText class="version" value="v. #{systemConfig.getVersion(true)}" rendered="#{!widgetView}"/>
                     </div>
                 </div>
             </div>
         </div>
     </div>
-    
     <o:resourceInclude path="/CustomizationFilesServlet?customFileType=footer" rendered="#{!widgetWrapper.widgetView}"/>
-    
-</ui:composition>
+</ui:composition>
\ No newline at end of file
diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
index 0c7b2a82f43..3b6e6bc0518 100644
--- a/src/main/webapp/dataverse_header.xhtml
+++ b/src/main/webapp/dataverse_header.xhtml
@@ -31,23 +31,21 @@
                 </div>
                 <div class="collapse navbar-collapse" id="topNavBar">
                     <ul class="nav navbar-nav navbar-right">
-                        <!-- ADD DATA -->
                         <li class="dropdown">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown">#{bundle['dataverse.results.btn.addData']} <b class="caret"></b></a>
                             <ul class="dropdown-menu">
                                 <li>
-                                    <h:outputLink value="#">
+                                    <h:outputLink value="/dataverse.xhtml?ownerId=#{dataverseServiceBean.findRootDataverse().id}">
                                         <h:outputText value="#{bundle['dataverse.results.btn.addData.newDataverse']}"/>
                                     </h:outputLink>
                                 </li>
                                 <li>
-                                    <h:outputLink value="#">
+                                    <h:outputLink value="/dataset.xhtml?ownerId=#{dataverseServiceBean.findRootDataverse().id}">
                                         <h:outputText value="#{bundle['dataverse.results.btn.addData.newDataset']}"/>
                                     </h:outputLink>
                                 </li>
                             </ul>
                         </li>
-                        <!-- END ADD DATA -->
                         <li class="dropdown">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown">#{bundle.search} <b class="caret"></b></a>
                             <ul class="dropdown-menu navbar-search">
@@ -66,17 +64,17 @@
                             </ul>
                         </li>
                         <li jsf:rendered="#{!empty settingsWrapper.get(':NavbarAboutUrl')}">
-                            <h:outputLink value="#{settingsWrapper.get(':NavbarAboutUrl')}" target="_blank">
+                            <h:outputLink value="#{settingsWrapper.get(':NavbarAboutUrl')}" target="_blank" rel="noopener">
                                 <h:outputText value="#{bundle['header.about']}"/>
                             </h:outputLink>
                         </li>
                         <li>
-                            <h:outputLink value="#{settingsWrapper.guidesBaseUrl}/#{systemConfig.guidesVersion}/user" target="_blank">
+                            <h:outputLink value="#{settingsWrapper.guidesBaseUrl}/#{systemConfig.guidesVersion}/user" target="_blank" rel="noopener">
                                 <h:outputText value="#{bundle['header.guides.user']}"/>
                             </h:outputLink>
                         </li>
                         <li jsf:rendered="#{!empty settingsWrapper.get(':NavbarSupportUrl')}">
-                            <h:outputLink value="#{settingsWrapper.get(':NavbarSupportUrl')}" target="_blank">
+                            <h:outputLink value="#{settingsWrapper.get(':NavbarSupportUrl')}" target="_blank" rel="noopener">
                                 <h:outputText value="#{bundle['header.support']}"/>
                             </h:outputLink>
                         </li>
@@ -228,7 +226,7 @@
                     <h:outputText escape="false" style="color:##{!empty dataverse.dataverseTheme.textColor ? dataverse.dataverseTheme.textColor : '888888'};" value="#{StringEscapeUtils:escapeHtml(dataverse.dataverseTheme.tagline)}" />
                 </div>
                 <div class="dataverseHeaderCell dataverseHeaderLink" jsf:rendered="#{!empty dataverse.dataverseTheme.tagline and !empty dataverse.dataverseTheme.linkUrl}">
-                    <h:outputLink value="#{dataverse.dataverseTheme.linkUrl}" style="color:##{!empty dataverse.dataverseTheme.linkColor ? dataverse.dataverseTheme.linkColor : '428bca'};" target="_blank">
+                    <h:outputLink value="#{dataverse.dataverseTheme.linkUrl}" style="color:##{!empty dataverse.dataverseTheme.linkColor ? dataverse.dataverseTheme.linkColor : '428bca'};" target="_blank" rel="noopener">
                         <h:outputText value="#{StringEscapeUtils:escapeHtml(dataverse.dataverseTheme.tagline)}" escape="false"/>
                     </h:outputLink>
                 </div>
@@ -249,19 +247,19 @@
                         </ui:fragment>
                         <ui:fragment rendered="#{breadcrumb.dvObject.instanceofDataverse}">
                             <c:set var="dvUrl" value="/dataverse/#{breadcrumb.dvObject.alias}"/>
-                            <a id="breadcrumbLnk#{status.index}" href="#{widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? widgetWrapper.wrapURL(dvUrl) : dvUrl}" target="#{!widgetWrapper.widgetView or widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? '' : '_blank'}">
+                            <a id="breadcrumbLnk#{status.index}" href="#{widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? widgetWrapper.wrapURL(dvUrl) : dvUrl}" target="#{!widgetWrapper.widgetView or widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? '' : '_blank'}" rel="#{!widgetWrapper.widgetView or widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? '' : 'noopener'}">
                                 <h:outputText value="#{breadcrumb.breadcrumbText}"/>
                             </a>
                         </ui:fragment>
                         <ui:fragment rendered="#{breadcrumb.dvObject.instanceofDataset}">
                             <c:set var="dsUrl" value="/dataset.xhtml?persistentId=#{breadcrumb.dvObject.globalIdString}#{breadcrumb.optionalUrlExtension }"/>
-                            <a id="breadcrumbLnk#{status.index}" href="#{widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? widgetWrapper.wrapURL(dsUrl) : dsUrl}" target="#{!widgetWrapper.widgetView or widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? '' : '_blank'}">
+                            <a id="breadcrumbLnk#{status.index}" href="#{widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? widgetWrapper.wrapURL(dsUrl) : dsUrl}" target="#{!widgetWrapper.widgetView or widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? '' : '_blank'}" rel="#{!widgetWrapper.widgetView or widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? '' : 'noopener'}">
                                 <h:outputText value="#{breadcrumb.breadcrumbText}"/>
                             </a>
                         </ui:fragment>
                         <ui:fragment rendered="#{breadcrumb.dvObject.instanceofDataFile}">
                             <c:set var="dsUrl" value="/file.xhtml?fileId=#{breadcrumb.dvObject.id}#{breadcrumb.optionalUrlExtension }"/>
-                            <a id="breadcrumbLnk#{status.index}" href="#{widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? widgetWrapper.wrapURL(dsUrl) : dsUrl}" target="#{!widgetWrapper.widgetView or widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? '' : '_blank'}">
+                            <a id="breadcrumbLnk#{status.index}" href="#{widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? widgetWrapper.wrapURL(dsUrl) : dsUrl}" target="#{!widgetWrapper.widgetView or widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? '' : '_blank'}" rel="#{!widgetWrapper.widgetView or widgetWrapper.isWidgetTarget(breadcrumb.dvObject) ? '' : 'noopener'}">
                                 <h:outputText value="#{breadcrumb.breadcrumbText}"/>
                             </a>
                         </ui:fragment>

From 912427eb16c08029a7bc00008a970bb96b489b31 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Mon, 7 Oct 2019 16:37:01 -0400
Subject: [PATCH 03/35] Additional responsive layout fixes for edit dataverse
 form [ref 5616]

---
 src/main/webapp/dataverse.xhtml | 124 ++++++++++++++++----------------
 1 file changed, 63 insertions(+), 61 deletions(-)

diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index 8e605cb247a..8ed08545f77 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -53,7 +53,7 @@
                         <p:focus context="dataverseForm"/>
                         <!-- Edit Info Panel -->
                         <div class="row">
-                            <div class="col-md-6 form-group form-col-container">
+                            <div class="col-md-6 form-group">
                                 <label class="control-label" for="name">
                                     #{bundle.dataverse} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
@@ -63,7 +63,7 @@
                                     <p:inputText id="name" styleClass="form-control" value="#{DataversePage.dataverse.name}"/>
                                 </div>
                             </div>
-                            <div class="col-md-6 form-group form-col-container">
+                            <div class="col-md-6 form-group">
                                 <label class="control-label" for="affiliation">
                                     #{bundle.affiliation}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
@@ -76,7 +76,7 @@
                             </div>
                         </div>
                         <div class="row">
-                            <div class="col-md-6 form-group form-col-container">
+                            <div class="col-md-6 form-group">
                                 <label class="control-label" for="identifier">
                                     #{bundle.identifier} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
@@ -109,69 +109,71 @@
                             </div>
                         </div>
                         <div class="row">
-                            <div class="col-md-6 form-group form-col-container">
-                                <div class="form-group clearfix">
-                                    <label class="control-label" for="dataverseCategory">
-                                        #{bundle['dataverse.category']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
-                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.category.title']}"></span>
-                                    </label>
-                                    <div class="form-col-container">
-                                        <h:selectOneMenu id="dataverseCategory" styleClass="form-control" value="#{DataversePage.dataverse.dataverseType}">
-                                            <f:selectItem id="dvSelect" itemLabel="#{bundle['dataverse.type.selectTab.top']}" itemValue="" />
-                                            <f:selectItem id="dvDepartment" itemLabel="#{bundle['dataverse.type.selectTab.department']}" itemValue="DEPARTMENT" />
-                                            <f:selectItem id="dvJournals" itemLabel="#{bundle['dataverse.type.selectTab.journals']}" itemValue="JOURNALS" />
-                                            <f:selectItem id="dvLab" itemLabel="#{bundle['dataverse.type.selectTab.laboratory']}" itemValue="LABORATORY" />
-                                            <f:selectItem id="dvOrgInst" itemLabel="#{bundle['dataverse.type.selectTab.organizationsAndInsitutions']}" itemValue="ORGANIZATIONS_INSTITUTIONS" />
-                                            <f:selectItem id="dvResearch" itemLabel="#{bundle['dataverse.type.selectTab.researchers']}" itemValue="RESEARCHERS" />
-                                            <f:selectItem id="dvResearchGrp" itemLabel="#{bundle['dataverse.type.selectTab.researchGroup']}" itemValue="RESEARCH_GROUP" />
-                                            <f:selectItem id="dvResearchProj" itemLabel="#{bundle['dataverse.type.selectTab.researchProjects']}" itemValue="RESEARCH_PROJECTS" />
-                                            <f:selectItem id="dvTeaching" itemLabel="#{bundle['dataverse.type.selectTab.teachingCourses']}" itemValue="TEACHING_COURSES" />
-                                            <f:selectItem id="dvUncategorized" itemLabel="#{bundle['dataverse.type.selectTab.uncategorized']}" itemValue="UNCATEGORIZED" />
-                                        </h:selectOneMenu>
-                                        <p:message for="dataverseCategory" display="text"/>
-                                    </div>
-                                </div>
-                                <div class="form-group clearfix">
-                                    <p:fragment>
-                                       <p:autoUpdate />
-                                        <label class="control-label" for="contactEmail">
-                                            #{bundle['dataverse.email']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
+                            <div class="col-md-6 form-group">
+                                <div class="row">
+                                    <div class="col-xs-12 form-group">
+                                        <label class="control-label" for="dataverseCategory">
+                                            #{bundle['dataverse.category']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
                                             <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                  data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.email.title']}"></span>
+                                                  data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.category.title']}"></span>
                                         </label>
-                                        <div class="form-col-container edit-compound-field">
-                                            <ui:repeat value="#{DataversePage.dataverse.dataverseContacts}" var="contacts" varStatus="valCount">
-                                                <div class="form-group">
-                                                    <div class="col-xs-10 col-sm-9 form-col-container">
-                                                        <p:inputText id="contactEmail" styleClass="form-control" value="#{contacts.contactEmail}">
-                                                            <f:validateBean disabled="#{param['SKIP_VALIDATION']}"/>
-                                                        </p:inputText>
-                                                        <p:message for="contactEmail" display="text"/>
-                                                    </div>
-                                                    <!-- Add / Remove buttons -->
-                                                    <div class="col-xs-2 col-sm-3 form-col-container field-add-delete">
-                                                        <p:commandLink styleClass="btn btn-default btn-sm bootstrap-button-tooltip" title="#{bundle.add}"
-                                                                         actionListener="#{DataversePage.dataverse.addDataverseContact(valCount.index + 1)}"
-                                                                         oncomplete="javascript:bind_bsui_components();">
-                                                            <f:param name="SKIP_VALIDATION" value="true"/>
-                                                            <h:outputText styleClass="glyphicon glyphicon-plus no-text"/>
-                                                        </p:commandLink>
-                                                        <p:commandLink styleClass="btn btn-default btn-sm bootstrap-button-tooltip" title="#{bundle.delete}"
-                                                                         rendered="#{DataversePage.dataverse.dataverseContacts.size() > 1}"
-                                                                         actionListener="#{DataversePage.dataverse.removeDataverseContact(valCount.index)}"
-                                                                         oncomplete="javascript:bind_bsui_components();">
-                                                            <f:param name="SKIP_VALIDATION" value="true"/>
-                                                            <h:outputText styleClass="glyphicon glyphicon-minus no-text"/>
-                                                        </p:commandLink>
-                                                    </div>
-                                                </div>
-                                            </ui:repeat>
+                                        <div class="form-col-container">
+                                            <h:selectOneMenu id="dataverseCategory" styleClass="form-control" value="#{DataversePage.dataverse.dataverseType}">
+                                                <f:selectItem id="dvSelect" itemLabel="#{bundle['dataverse.type.selectTab.top']}" itemValue="" />
+                                                <f:selectItem id="dvDepartment" itemLabel="#{bundle['dataverse.type.selectTab.department']}" itemValue="DEPARTMENT" />
+                                                <f:selectItem id="dvJournals" itemLabel="#{bundle['dataverse.type.selectTab.journals']}" itemValue="JOURNALS" />
+                                                <f:selectItem id="dvLab" itemLabel="#{bundle['dataverse.type.selectTab.laboratory']}" itemValue="LABORATORY" />
+                                                <f:selectItem id="dvOrgInst" itemLabel="#{bundle['dataverse.type.selectTab.organizationsAndInsitutions']}" itemValue="ORGANIZATIONS_INSTITUTIONS" />
+                                                <f:selectItem id="dvResearch" itemLabel="#{bundle['dataverse.type.selectTab.researchers']}" itemValue="RESEARCHERS" />
+                                                <f:selectItem id="dvResearchGrp" itemLabel="#{bundle['dataverse.type.selectTab.researchGroup']}" itemValue="RESEARCH_GROUP" />
+                                                <f:selectItem id="dvResearchProj" itemLabel="#{bundle['dataverse.type.selectTab.researchProjects']}" itemValue="RESEARCH_PROJECTS" />
+                                                <f:selectItem id="dvTeaching" itemLabel="#{bundle['dataverse.type.selectTab.teachingCourses']}" itemValue="TEACHING_COURSES" />
+                                                <f:selectItem id="dvUncategorized" itemLabel="#{bundle['dataverse.type.selectTab.uncategorized']}" itemValue="UNCATEGORIZED" />
+                                            </h:selectOneMenu>
+                                            <p:message for="dataverseCategory" display="text"/>
                                         </div>
-                                    </p:fragment>
+                                    </div>
+                                    <div class="col-xs-12 form-group">
+                                        <p:fragment>
+                                            <p:autoUpdate/>
+                                            <label class="control-label" for="contactEmail">
+                                                #{bundle['dataverse.email']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
+                                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.email.title']}"></span>
+                                            </label>
+                                            <div class="form-col-container edit-compound-field">
+                                                <ui:repeat value="#{DataversePage.dataverse.dataverseContacts}" var="contacts" varStatus="valCount">
+                                                    <div class="row col-xs-12 form-group">
+                                                        <div class="col-xs-9 form-col-container">
+                                                            <p:inputText id="contactEmail" styleClass="form-control" value="#{contacts.contactEmail}">
+                                                                <f:validateBean disabled="#{param['SKIP_VALIDATION']}"/>
+                                                            </p:inputText>
+                                                            <p:message for="contactEmail" display="text"/>
+                                                        </div>
+                                                        <!-- Add / Remove buttons -->
+                                                        <div class="col-xs-3 form-col-container field-add-delete">
+                                                            <p:commandLink styleClass="btn btn-default btn-sm bootstrap-button-tooltip" title="#{bundle.add}"
+                                                                             actionListener="#{DataversePage.dataverse.addDataverseContact(valCount.index + 1)}"
+                                                                             oncomplete="javascript:bind_bsui_components();">
+                                                                <f:param name="SKIP_VALIDATION" value="true"/>
+                                                                <h:outputText styleClass="glyphicon glyphicon-plus no-text"/>
+                                                            </p:commandLink>
+                                                            <p:commandLink styleClass="btn btn-default btn-sm bootstrap-button-tooltip" title="#{bundle.delete}"
+                                                                             rendered="#{DataversePage.dataverse.dataverseContacts.size() > 1}"
+                                                                             actionListener="#{DataversePage.dataverse.removeDataverseContact(valCount.index)}"
+                                                                             oncomplete="javascript:bind_bsui_components();">
+                                                                <f:param name="SKIP_VALIDATION" value="true"/>
+                                                                <h:outputText styleClass="glyphicon glyphicon-minus no-text"/>
+                                                            </p:commandLink>
+                                                        </div>
+                                                    </div>
+                                                </ui:repeat>
+                                            </div>
+                                        </p:fragment>
+                                    </div>
                                 </div>
                             </div>
-                            <div class="col-md-6 form-group form-col-container">
+                            <div class="col-md-6 form-group">
                                 <label class="control-label" for="description">
                                     #{bundle.description}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"

From 58d4ee3606a5f533c68e604be7e021c776e6f8b9 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Tue, 8 Oct 2019 14:18:02 -0400
Subject: [PATCH 04/35] Returned Host Dataverse component to create dataverse
 and dataset forms [ref #5615]

---
 src/main/webapp/dataset.xhtml   | 23 ++++++++++++-----------
 src/main/webapp/dataverse.xhtml | 19 ++++++++++---------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 7e893dd3dc3..b2e6b7f7082 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -503,28 +503,29 @@
                     <ui:fragment rendered="#{DatasetPage.editMode == 'METADATA' or DatasetPage.editMode == 'CREATE'}">
                         <p:focus context="datasetForm"/>
                         <div class="form-group">
-                            <label for="select_HostDataverse" class="col-sm-2 control-label">
+                            <label for="#{DatasetPage.editMode == 'CREATE' ? 'select_HostDataverse' : ''}" 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>
                             </label>
-                            <div class="col-sm-10">
-                                <h:outputText styleClass="highlightBold" value="#{DatasetPage.dataset.owner.name}"/>
-                                <h:inputHidden value="#{DatasetPage.ownerId}" id="select_HostDataverse" />
-                                <ui:remove><!-- removed for beta -->
-                                    <p:selectOneMenu id="select_HostDataverse" value="#{DatasetPage.ownerId}" filter="true" filterMatchMode="startsWith" effect="none">
-                                        <f:selectItems value="#{dataverseServiceBean.findAll()}" var="dv" itemLabel="#{dv.name}" itemValue="#{dv.id}"/>
-                                    </p:selectOneMenu>
-                                </ui:remove>
+                            <div class="col-md-7">
+                                <ui:fragment rendered="#{DatasetPage.editMode == 'METADATA'}">
+                                    <p class="form-control-static">#{DatasetPage.dataset.owner.name}</p>
+                                    <h:inputHidden value="#{DatasetPage.ownerId}" id="select_HostDataverseStatic"/>
+                                </ui:fragment>
+                                <p:selectOneMenu id="select_HostDataverse" rendered="#{DatasetPage.editMode == 'CREATE'}"
+                                                 value="#{DatasetPage.ownerId}" filter="true" filterMatchMode="startsWith" effect="none">
+                                    <f:selectItems value="#{dataverseServiceBean.findAll()}" var="dv" itemLabel="#{dv.name}" itemValue="#{dv.id}"/>
+                                </p:selectOneMenu>
                             </div>
                         </div>
                         <div class="form-group" jsf:rendered="#{!empty DatasetPage.dataverseTemplates and DatasetPage.editMode == 'CREATE'}">
-                            <label for="select_DatasetTemplate" class="col-sm-2 control-label">
+                            <label for="select_DatasetTemplate" class="col-md-3 control-label">
                                 #{bundle['dataset.manageTemplates.tab.action.btn.view.dialog.datasetTemplate']}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.manageTemplates.tab.action.btn.view.dialog.datasetTemplate.title']}"></span>
                             </label>
-                            <div class="col-sm-6">
+                            <div class="col-md-7">
                                 <p class="help-block">
                                     #{bundle['dataset.template.tip']}
                                 </p>
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index 8ed08545f77..efed48bc9ea 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -91,20 +91,21 @@
                                 </div>
                             </div>
                             <div class="col-md-6 form-group" jsf:rendered="#{DataversePage.ownerId != null}">
-                                <label class="control-label" for="hostDataverse">
+                                <label class="control-label" for="#{DataversePage.editMode == 'CREATE' ? 'hostDataverse' : ''}">
                                     #{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>
                                 </label>
                                 <div class="form-col-container">
-                                    <p class="form-control-static">#{DataversePage.dataverse.getOwner().name}</p>
-                                    <h:inputHidden value="#{DataversePage.ownerId}" id="hostDataverse" />
-                                    <ui:remove><!-- removed for beta -->
-                                        <p:selectOneMenu id="hostDataverse" value="#{DataversePage.ownerId}" filter="true" filterMatchMode="startsWith" effect="none">
-                                            <f:selectItems value="#{dataverseServiceBean.findAll()}" var="dv" itemLabel="#{dv.name}" itemValue="#{dv.id}"
-                                                           itemDisabled="#{dv eq DataversePage.dataverse or dv.owners.contains(DataversePage.dataverse)}" />
-                                        </p:selectOneMenu>
-                                    </ui:remove>
+                                    <ui:fragment rendered="#{DataversePage.editMode == 'INFO'}">
+                                        <p class="form-control-static">#{DataversePage.dataverse.getOwner().name}</p>
+                                        <h:inputHidden value="#{DataversePage.ownerId}" id="hostDataverseStatic"/>
+                                    </ui:fragment>
+                                    <p:selectOneMenu id="hostDataverse" rendered="#{DataversePage.editMode == 'CREATE'}"
+                                                     value="#{DataversePage.ownerId}" filter="true" filterMatchMode="startsWith" effect="none">
+                                        <f:selectItems value="#{dataverseServiceBean.findAll()}" var="dv" itemLabel="#{dv.name}" itemValue="#{dv.id}"
+                                                       itemDisabled="#{dv eq DataversePage.dataverse or dv.owners.contains(DataversePage.dataverse)}"/>
+                                    </p:selectOneMenu>
                                 </div>
                             </div>
                         </div>

From 52ed565b85cf413d6262b1fa6e30d5913d55a820 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Tue, 15 Oct 2019 11:16:41 -0400
Subject: [PATCH 05/35] Fixed label and input references in dataverse and
 contact forms [ref #5615]

---
 src/main/webapp/contactFormFragment.xhtml   |  8 +--
 src/main/webapp/dataverse.xhtml             | 56 ++++++++++-----------
 src/main/webapp/resources/css/structure.css |  2 +
 3 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/src/main/webapp/contactFormFragment.xhtml b/src/main/webapp/contactFormFragment.xhtml
index 04300983572..8a5725981d7 100644
--- a/src/main/webapp/contactFormFragment.xhtml
+++ b/src/main/webapp/contactFormFragment.xhtml
@@ -28,17 +28,17 @@
                 <ui:fragment rendered="#{!sendFeedbackDialog.isLoggedIn()}">
                 <!-- from email (not logged in) -->
                     <div class="form-group">
-                        <label for="userEmail" class="col-sm-3 control-label">#{bundle['contact.from']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/></label>
+                        <label jsf:for="userEmail" class="col-sm-3 control-label">#{bundle['contact.from']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/></label>
                         <div class="col-sm-9">
                             <p:inputText id="userEmail" styleClass="form-control" size="30" value="#{sendFeedbackDialog.userEmail}"
                                          validator="#{sendFeedbackDialog.validateUserEmail}" validatorMessage="#{bundle['contact.from.invalid']}" requiredMessage="#{bundle['contact.from.required']}" required="#{param['DO_VALIDATION']}"/>
-                        <h:message for="userEmail" styleClass="bg-danger text-danger"/>
+                            <h:message for="userEmail" styleClass="bg-danger text-danger"/>
                         </div>
                     </div>
                 </ui:fragment>
                 <!-- subject -->
                 <div class="form-group">
-                    <label for="messageSubject" class="col-sm-3 control-label">#{bundle['contact.subject']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/></label>
+                    <label jsf:for="messageSubject" class="col-sm-3 control-label">#{bundle['contact.subject']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/></label>
                     <div class="col-sm-9">
                         <p:inputText id="messageSubject" styleClass="form-control" value="#{sendFeedbackDialog.messageSubject}"
                                      requiredMessage="#{bundle['contact.subject.required']}" required="#{param['DO_VALIDATION']}"/>                        
@@ -47,7 +47,7 @@
                 </div>   
                 <!-- message -->
                 <div class="form-group">
-                    <label for="userMessage" class="col-sm-3 control-label">#{bundle['contact.msg']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/></label>
+                    <label jsf:for="userMessage" class="col-sm-3 control-label">#{bundle['contact.msg']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/></label>
                     <div class="col-sm-9">
                         <p:inputTextarea id="userMessage" styleClass="form-control" value="#{sendFeedbackDialog.userMessage}"
                             required="#{param['DO_VALIDATION']}" requiredMessage="#{bundle['contact.msg.required']}" autoResize="false" rows="10"/>
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index efed48bc9ea..56f0a81f3e5 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -54,21 +54,21 @@
                         <!-- Edit Info Panel -->
                         <div class="row">
                             <div class="col-md-6 form-group">
-                                <label class="control-label" for="name">
+                                <h:outputLabel for="name" styleClass="control-label">
                                     #{bundle.dataverse} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.title']}"></span>
-                                </label>
+                                </h:outputLabel>
                                 <div class="form-col-container">
                                     <p:inputText id="name" styleClass="form-control" value="#{DataversePage.dataverse.name}"/>
                                 </div>
                             </div>
                             <div class="col-md-6 form-group">
-                                <label class="control-label" for="affiliation">
-                                    #{bundle.affiliation}
+                                <h:outputLabel for="affiliation" styleClass="control-label">
+                                    #{bundle.affiliation} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.affiliation.title']}"></span>
-                                </label>
+                                </h:outputLabel>
                                 <div class="form-col-container">
                                     <p:inputText id="affiliation" styleClass="form-control" value="#{DataversePage.dataverse.affiliation}"/>
                                     <p:message for="affiliation" display="text"/>
@@ -77,11 +77,11 @@
                         </div>
                         <div class="row">
                             <div class="col-md-6 form-group">
-                                <label class="control-label" for="identifier">
+                                <h:outputLabel for="identifier" styleClass="control-label">
                                     #{bundle.identifier} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.identifier.title']}"></span>
-                                </label>
+                                </h:outputLabel>
                                 <div class="form-col-container">
                                     <div class="input-group">
                                         <div class="input-group-addon"><span class="small">#{systemConfig.dataverseSiteUrl}/dataverse/</span></div>
@@ -91,14 +91,14 @@
                                 </div>
                             </div>
                             <div class="col-md-6 form-group" jsf:rendered="#{DataversePage.ownerId != null}">
-                                <label class="control-label" for="#{DataversePage.editMode == 'CREATE' ? 'hostDataverse' : ''}">
+                                <h:outputLabel for="#{DataversePage.editMode == 'CREATE' ? 'hostDataverse' : 'hostDataverseStatic'}" styleClass="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>
-                                </label>
+                                </h:outputLabel>
                                 <div class="form-col-container">
                                     <ui:fragment rendered="#{DataversePage.editMode == 'INFO'}">
-                                        <p class="form-control-static">#{DataversePage.dataverse.getOwner().name}</p>
+                                        <p id="hostDataverseStatic" class="form-control-static">#{DataversePage.dataverse.getOwner().name}</p>
                                         <h:inputHidden value="#{DataversePage.ownerId}" id="hostDataverseStatic"/>
                                     </ui:fragment>
                                     <p:selectOneMenu id="hostDataverse" rendered="#{DataversePage.editMode == 'CREATE'}"
@@ -113,11 +113,11 @@
                             <div class="col-md-6 form-group">
                                 <div class="row">
                                     <div class="col-xs-12 form-group">
-                                        <label class="control-label" for="dataverseCategory">
+                                        <h:outputLabel for="dataverseCategory" styleClass="control-label">
                                             #{bundle['dataverse.category']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
                                             <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.category.title']}"></span>
-                                        </label>
+                                        </h:outputLabel>
                                         <div class="form-col-container">
                                             <h:selectOneMenu id="dataverseCategory" styleClass="form-control" value="#{DataversePage.dataverse.dataverseType}">
                                                 <f:selectItem id="dvSelect" itemLabel="#{bundle['dataverse.type.selectTab.top']}" itemValue="" />
@@ -137,11 +137,11 @@
                                     <div class="col-xs-12 form-group">
                                         <p:fragment>
                                             <p:autoUpdate/>
-                                            <label class="control-label" for="contactEmail">
+                                            <h:outputLabel for="contactEmail" styleClass="control-label">
                                                 #{bundle['dataverse.email']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
                                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.email.title']}"></span>
-                                            </label>
+                                            </h:outputLabel>
                                             <div class="form-col-container edit-compound-field">
                                                 <ui:repeat value="#{DataversePage.dataverse.dataverseContacts}" var="contacts" varStatus="valCount">
                                                     <div class="row col-xs-12 form-group">
@@ -175,11 +175,11 @@
                                 </div>
                             </div>
                             <div class="col-md-6 form-group">
-                                <label class="control-label" for="description">
+                                <h:outputLabel for="description" styleClass="control-label">
                                     #{bundle.description}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.description.title']}"></span>
-                                </label>
+                                </h:outputLabel>
                                 <div class="form-col-container">
                                     <p class="help-block">
                                         <h:outputFormat value="#{bundle.htmlAllowedMsg}" escape="false">
@@ -196,23 +196,23 @@
                         </div>
                         <hr class="margin-top-half margin-bottom-half"/>
                         <!-- Metadata Panel -->
-                        <p:panel styleClass="panelLayoutBlock" widgetVar="optionBlock" id="optionBlock">
+                        <p:panel id="optionBlock" styleClass="panelLayoutBlock padding-none margin-bottom-half" widgetVar="optionBlock">
                             <p:commandButton id="hiddenRefresh" value="back" style="display:none"
                                              actionListener="#{DataversePage.refresh}"
                                              update="@widgetVar(optionBlock)"/>
                             <div class="row">
-                                <div class="col-sm-12 form-group">
-                                    <label class="col-sm-3 control-label" for="mdbSelect">#{bundle['dataverse.metadataElements']}</label>
-                                    <div class="col-sm-9">
+                                <div class="col-sm-12 form-group padding-none">
+                                    <div class="col-md-3 control-label highlightBold">#{bundle['dataverse.metadataElements']}</div>
+                                    <div class="col-md-9">
                                         <p class="help-block">#{bundle['dataverse.metadataElements.tip']}</p>
-                                        <label class="metadata-blocks-default" for="metadataRoot" jsf:rendered="#{DataversePage.dataverse.owner != null}">
+                                        <h:outputLabel styleClass="metadata-blocks-default" for="metadataRoot" rendered="#{DataversePage.dataverse.owner != null}">
                                             <h:selectBooleanCheckbox id="metadataRoot" styleClass="metadata-blocks-default"
                                                                      value="#{DataversePage.inheritMetadataBlockFromParent}" onclick="updateMetadata(this);">
                                             </h:selectBooleanCheckbox>
                                             <h:outputFormat value="#{bundle['dataverse.metadataElements.from.tip']}">
                                                 <f:param value="#{DataversePage.dataverse.metadataRootDataverseName}"/>
                                             </h:outputFormat>
-                                        </label>
+                                        </h:outputLabel>
                                         <p:commandButton value="Direct" id="updateMetadataButton"
                                                          style="display:none"
                                                          update="@widgetVar(optionBlock)"
@@ -304,13 +304,13 @@
                             </div>
                         </p:panel>
                         <!-- Facets Panel -->
-                        <p:panel id="editFacets" styleClass="panelLayoutBlock" widgetVar="editFacets">
+                        <p:panel id="editFacets" styleClass="panelLayoutBlock padding-none" widgetVar="editFacets">
                             <div class="row">
-                                <div class="col-sm-12 form-group">
-                                    <label class="col-sm-3 control-label" for="facetPickListCreate">#{bundle['dataverse.facetPickList.text']}</label>
-                                    <div class="col-sm-9">
+                                <div class="col-sm-12 form-group padding-none">
+                                    <div class="col-md-3 control-label highlightBold">#{bundle['dataverse.facetPickList.text']}</div>
+                                    <div class="col-md-9">
                                         <p class="help-block">#{bundle['dataverse.facetPickList.tip']}</p>
-                                        <label class="metadata-blocks-default" for="facetsRoot" jsf:rendered="#{DataversePage.dataverse.owner != null}">
+                                        <h:outputLabel styleClass="metadata-blocks-default" for="facetsRoot" rendered="#{DataversePage.dataverse.owner != null}">
                                             <h:selectBooleanCheckbox id="facetsRoot" styleClass="facets-blocks-default"
                                                                      value="#{DataversePage.inheritFacetFromParent}">
                                                 <p:ajax update="editFacets" listener="#{DataversePage.toggleFacetRoot}"/>
@@ -318,7 +318,7 @@
                                             <h:outputFormat value="#{bundle['dataverse.facetPickList.facetsFromHost.text']}">
                                                 <f:param value="#{DataversePage.dataverse.facetRootDataverseName}"/>
                                             </h:outputFormat>
-                                        </label>
+                                        </h:outputLabel>
                                         <p:pickList id="facetPickListCreate" value="#{DataversePage.facets}" var="facet" converter="facetConverter"
                                                     itemLabel="#{facet.displayName}" itemValue="#{facet}"
                                                     disabled="#{!DataversePage.dataverse.facetRoot and DataversePage.dataverse.owner != null}"
diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 4419107a182..629ce6be178 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -80,6 +80,8 @@ body .ui-widget {font-size: inherit;}
 .panelLayoutButtonBlock button {/*margin-right:2em;*/}
 
 .panelLayoutBlock > .ui-widget-content {border-bottom:1px solid #DDDDDD;}
+.panelLayoutBlock.ui-panel.padding-none > .ui-widget-content.ui-panel-content {padding:0;}
+
 .panelLayoutBlock.breadcrumbNavBlock > .ui-widget-content {border-bottom:0;}
 .panelLayoutTitleBlock > .ui-widget-content {border:0;}
 

From e6d410945a2e0024c7f6e7069197dadf2b8abc2b Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Thu, 17 Oct 2019 11:01:24 -0400
Subject: [PATCH 06/35] Cleaned up code and added accessibility improvements to
 edit dataset form [ref #5615]

---
 src/main/webapp/dataset.xhtml                 |   6 +-
 .../webapp/datasetFieldForEditFragment.xhtml  |  21 +-
 src/main/webapp/metadataFragment.xhtml        | 261 +++++++++---------
 3 files changed, 146 insertions(+), 142 deletions(-)

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index b2e6b7f7082..804727ce651 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -503,14 +503,14 @@
                     <ui:fragment rendered="#{DatasetPage.editMode == 'METADATA' or DatasetPage.editMode == 'CREATE'}">
                         <p:focus context="datasetForm"/>
                         <div class="form-group">
-                            <label for="#{DatasetPage.editMode == 'CREATE' ? 'select_HostDataverse' : ''}" class="col-md-3 control-label">
+                            <label jsf:for="#{DatasetPage.editMode == 'CREATE' ? 'select_HostDataverse' : '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>
                             </label>
                             <div class="col-md-7">
                                 <ui:fragment rendered="#{DatasetPage.editMode == 'METADATA'}">
-                                    <p class="form-control-static">#{DatasetPage.dataset.owner.name}</p>
+                                    <p jsf:id="select_HostDataverse_Static" class="form-control-static">#{DatasetPage.dataset.owner.name}</p>
                                     <h:inputHidden value="#{DatasetPage.ownerId}" id="select_HostDataverseStatic"/>
                                 </ui:fragment>
                                 <p:selectOneMenu id="select_HostDataverse" rendered="#{DatasetPage.editMode == 'CREATE'}"
@@ -520,7 +520,7 @@
                             </div>
                         </div>
                         <div class="form-group" jsf:rendered="#{!empty DatasetPage.dataverseTemplates and DatasetPage.editMode == 'CREATE'}">
-                            <label for="select_DatasetTemplate" class="col-md-3 control-label">
+                            <label jsf:for="select_DatasetTemplate" class="col-md-3 control-label">
                                 #{bundle['dataset.manageTemplates.tab.action.btn.view.dialog.datasetTemplate']}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataset.manageTemplates.tab.action.btn.view.dialog.datasetTemplate.title']}"></span>
diff --git a/src/main/webapp/datasetFieldForEditFragment.xhtml b/src/main/webapp/datasetFieldForEditFragment.xhtml
index aa6ff0b9d59..dcc4a0142f6 100644
--- a/src/main/webapp/datasetFieldForEditFragment.xhtml
+++ b/src/main/webapp/datasetFieldForEditFragment.xhtml
@@ -1,15 +1,17 @@
-<div
+<ui:composition
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:f="http://java.sun.com/jsf/core"
     xmlns:ui="http://java.sun.com/jsf/facelets"
     xmlns:c="http://java.sun.com/jsp/jstl/core"
     xmlns:p="http://primefaces.org/ui"
+    xmlns:pt="http://java.sun.com/jsf/passthrough"
     xmlns:jsf="http://xmlns.jcp.org/jsf">
 
-    <!-- input text start -->
-    <span id="pre-input-#{dsf.datasetFieldType.name}" class="pre-input-tag"/>
-
-    <p:inputText value="#{dsfv.valueForEdit}" id="inputText"
+    <ui:remove>
+    <!-- input text start UPDATE: UI:REMOVE applied due to duplicate ID errors, left code as reference incase test scripts complain -->
+    <span id="pre-input-#{dsf.datasetFieldType.name}" class="pre-input-tag"/></ui:remove>
+    
+    <p:inputText value="#{dsfv.valueForEdit}" id="inputText" pt:aria-required="#{dsf.required ? 'true' : 'false'}"
                  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'
@@ -18,15 +20,13 @@
                              or dsfv.datasetField.datasetFieldType.fieldType == 'URL'
                              or dsfv.datasetField.datasetFieldType.fieldType == 'DATE'
                              or dsfv.datasetField.datasetFieldType.fieldType == 'EMAIL')}"/>
-
     <p:watermark for="inputText" value="#{dsfv.datasetField.datasetFieldType.localeWatermark}"></p:watermark>
 
-    <p:inputTextarea value="#{dsfv.valueForEdit}" id="description"
+    <p:inputTextarea value="#{dsfv.valueForEdit}" id="description" pt:aria-required="#{dsf.required ? 'true' : 'false'}"
                      rows="5" cols="60" styleClass="form-control"
                      rendered="#{dsfv.datasetField.datasetFieldType.fieldType == 'TEXTBOX'}"/>
-
     <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}">
         <span class="ui-message-error-detail">#{dsfv.datasetField.validationMessage}</span>
     </div>
@@ -40,7 +40,6 @@
         <input type="button" id="replicationDataButton"
                class="btn btn-default" value="#{bundle['dataset.AddReplication']}"
                onclick="replicationFor();return false;"/>
-
         <script>
             //<![CDATA[
             function replicationFor() {
@@ -50,4 +49,4 @@
             //]]>
         </script>
     </ui:fragment>
-</div>
\ No newline at end of file
+</ui:composition>
\ No newline at end of file
diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index 3193a7f1c36..67448a78799 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -103,144 +103,149 @@
                     <div id="panelCollapse#{block.index}" class="collapse #{block.first || editMode == 'CREATE' ? 'in' : ''}">
                         <div class="panel-body">
                             <ui:repeat value="#{metadataBlockVal.value}" var="dsf">
-                                <ui:fragment rendered="#{((editMode == 'METADATA'
+                                <div class="form-group" role="group" aria-labelledby="metadata_#{dsf.datasetFieldType.name}"
+                                     jsf:rendered="#{((editMode == 'METADATA'
                                                          or dsf.datasetFieldType.displayOnCreate or !dsf.isEmpty() or dsf.required or dsf.datasetFieldType.hasRequiredChildren) and dsf.include)
                                                          or (!datasetPage and dsf.include)}">
-                                    <div class="form-group">
-                                        <label for="metadata_#{dsf.datasetFieldType.name}" class="col-sm-3 control-label">
+                                    <!-- Primitive fields -->
+                                    <p:fragment id="editPrimitiveValueFragment" rendered="#{dsf.datasetFieldType.primitive}">
+                                        <p:autoUpdate/>
+                                        <h:outputLabel for="#{dsf.datasetFieldType.fieldType == 'TEXTBOX' ? 'description' : 'inputText'}" styleClass="col-sm-3 control-label">
                                             #{dsf.datasetFieldType.localeTitle}
-                                            <h:outputText styleClass="glyphicon glyphicon-asterisk text-danger" value="" rendered="#{dsf.required  or dsf.datasetFieldType.hasRequiredChildren }" />
+                                            <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{dsf.required or dsf.datasetFieldType.hasRequiredChildren}"/>
                                             <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{dsf.datasetFieldType.localeDescription}"></span>
-                                        </label>
-                                        <!-- Primitive fields -->
-                                        <p:fragment id="editPrimitiveValueFragment" rendered="#{dsf.datasetFieldType.primitive}">
-                                            <p:autoUpdate/>
-                                            <div class="form-group">
-                                                <ui:remove><!-- There is an issue with the dynamic +/- and the primefaces autoupdate where they are not working
-                                                    well together for the primitive fields, but are for the compound fields. So as a workaround for the primitive,
-                                                    we wrap them in a ui:repeat that iterates on a single list. Note: dummyVar is never used--></ui:remove>
-                                                <ui:repeat value="#{Collections:singletonList('')}" var="dummyVar">
-                                                    <div class="form-col-container col-sm-12">
-                                                        <ui:repeat value="#{dsf.datasetFieldValues}" var="dsfv" varStatus="valCount">
-                                                            <div class="form-group dataset-field-values">
-                                                                <div class="form-col-container col-sm-9 edit-field">
-                                                                    <ui:include src="datasetFieldForEditFragment.xhtml">
-                                                                        <ui:param name="dsfv" value="#{dsfv}"/>
-                                                                        <ui:param name="dsfvIndex" value="#{valCount.index}"/>
-                                                                    </ui:include>
-                                                                </div>
-                                                                <!-- Add / Remove buttons -->
-                                                                <div class="col-xs-3 field-add-delete" jsf:rendered="#{dsf.datasetFieldType.allowMultiples and !dsf.datasetFieldType.controlledVocabulary}">
-                                                                    <p:commandLink title="#{bundle.add}"
-                                                                                   styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
-                                                                                   actionListener="#{dsf.addDatasetFieldValue(valCount.index + 1)}"
-                                                                                   update=":#{p:resolveClientIds('@id(editPrimitiveValueFragment)', view)}"
-                                                                                   oncomplete="javascript:bind_bsui_components();">
-                                                                        <span class="glyphicon glyphicon-plus no-text"/>
-                                                                    </p:commandLink>
-                                                                    <p:commandLink title="#{bundle.delete}"
-                                                                                   styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
-                                                                                   rendered="#{dsf.datasetFieldValues.size() > 1}"
-                                                                                   actionListener="#{dsf.removeDatasetFieldValue(valCount.index)}"
-                                                                                   update=":#{p:resolveClientIds('@id(editPrimitiveValueFragment)', view)}"
-                                                                                   oncomplete="javascript:bind_bsui_components();">
-                                                                        <span class="glyphicon glyphicon-minus no-text"/>
-                                                                    </p:commandLink>
-                                                                </div>
-                                                            </div>
-                                                        </ui:repeat>
-                                                        <ui:fragment rendered="#{dsf.datasetFieldType.controlledVocabulary}">
-                                                            <p:selectOneMenu value="#{dsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;" styleClass="form-control primitive"
-                                                                             rendered="#{!dsf.datasetFieldType.allowMultiples}">
-                                                                <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
-                                                                <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
-                                                            </p:selectOneMenu>
-                                                            <div class="ui-inputfield form-control select-scroll-block" jsf:rendered="#{dsf.datasetFieldType.allowMultiples}">
-                                                                <p:selectManyCheckbox value="#{dsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter"
-                                                                                      layout="pageDirection">
-                                                                    <f:selectItem itemLabel="#{bundle.select}" class="chkbox-label-margin" itemValue="" noSelectionOption="true"/>
-                                                                    <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
-                                                                </p:selectManyCheckbox>
+                                        </h:outputLabel>
+                                        <div class="form-group">
+                                            <ui:remove><!-- There is an issue with the dynamic +/- and the primefaces autoupdate where they are not working
+                                                well together for the primitive fields, but are for the compound fields. So as a workaround for the primitive,
+                                                we wrap them in a ui:repeat that iterates on a single list. Note: dummyVar is never used--></ui:remove>
+                                            <ui:repeat value="#{Collections:singletonList('')}" var="dummyVar">
+                                                <div class="form-col-container col-sm-12">
+                                                    <ui:repeat value="#{dsf.datasetFieldValues}" var="dsfv" varStatus="valCount">
+                                                        <div class="form-group dataset-field-values">
+                                                            <div class="form-col-container col-sm-9 edit-field">
+                                                                <ui:include src="datasetFieldForEditFragment.xhtml">
+                                                                    <ui:param name="dsfv" value="#{dsfv}"/>
+                                                                    <ui:param name="dsfvIndex" value="#{valCount.index}"/>
+                                                                </ui:include>
                                                             </div>
-                                                            <div class="alert-danger" jsf:rendered="#{!empty dsf.validationMessage}">
-                                                                <strong>#{dsf.validationMessage}</strong>
+                                                            <!-- Add / Remove buttons -->
+                                                            <div class="col-xs-3 field-add-delete" jsf:rendered="#{dsf.datasetFieldType.allowMultiples and !dsf.datasetFieldType.controlledVocabulary}">
+                                                                <p:commandLink title="#{bundle.add}"
+                                                                               styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
+                                                                               actionListener="#{dsf.addDatasetFieldValue(valCount.index + 1)}"
+                                                                               update=":#{p:resolveClientIds('@id(editPrimitiveValueFragment)', view)}"
+                                                                               oncomplete="javascript:bind_bsui_components();">
+                                                                    <span class="glyphicon glyphicon-plus no-text"/>
+                                                                </p:commandLink>
+                                                                <p:commandLink title="#{bundle.delete}"
+                                                                               styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
+                                                                               rendered="#{dsf.datasetFieldValues.size() > 1}"
+                                                                               actionListener="#{dsf.removeDatasetFieldValue(valCount.index)}"
+                                                                               update=":#{p:resolveClientIds('@id(editPrimitiveValueFragment)', view)}"
+                                                                               oncomplete="javascript:bind_bsui_components();">
+                                                                    <span class="glyphicon glyphicon-minus no-text"/>
+                                                                </p:commandLink>
                                                             </div>
-                                                        </ui:fragment>
-                                                    </div>
-                                                </ui:repeat>
-                                            </div>
-                                        </p:fragment>
-                                        <!-- Compound fields -->
-                                        <p:fragment id="editCompoundValueFragment" rendered="#{dsf.datasetFieldType.compound}">
-                                            <p:autoUpdate/>
-                                            <div class="form-group form-col-container col-sm-9 dataset-field-values">
-                                                <ui:repeat value="#{dsf.datasetFieldCompoundValues}" var="compoundValue" varStatus="valCount">
-                                                    <div class="form-group form-col-container col-sm-9 edit-compound-field">
-                                                        <!-- Sub Fields -->
-                                                        <ui:repeat value="#{compoundValue.childDatasetFields}" var="subdsf">
-                                                            <div class="form-col-container #{(subdsf.datasetFieldType.fieldType == 'TEXTBOX') ? 'col-sm-12' : 'col-sm-6'}">
-                                                                <ui:fragment rendered="#{subdsf.datasetFieldType.name == 'dsDescriptionValue'}">
-                                                                    <p class="help-block">
-                                                                        <h:outputFormat value="#{bundle.htmlAllowedMsg}" escape="false">
-                                                                            <f:param value="#{bundle.htmlAllowedTags}"/>
-                                                                        </h:outputFormat>
-                                                                    </p>
-                                                                </ui:fragment>
-                                                                <label class="control-label" for="metadata_#{subdsf.datasetFieldType.name}">
-                                                                    #{subdsf.datasetFieldType.localeTitle}
-                                                                    <h:outputText styleClass="glyphicon glyphicon-asterisk text-danger" value="" rendered="#{subdsf.required}" />
-                                                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{subdsf.datasetFieldType.localeDescription}"></span>
-                                                                </label>
-                                                                <ui:fragment rendered="#{!subdsf.datasetFieldType.controlledVocabulary}">
-                                                                    <ui:include src="datasetFieldForEditFragment.xhtml">
-                                                                        <ui:param name="dsfv" value="#{subdsf.singleValue}"/>
-                                                                        <ui:param name="dsfvIndex" value="0"/>
-                                                                    </ui:include>
-                                                                </ui:fragment>
-                                                                <!-- MOVED SELECT ONE TO dataFieldForEdit -->
-                                                                <div jsf:rendered="#{subdsf.datasetFieldType.controlledVocabulary}">
-                                                                    <p:selectOneMenu value="#{subdsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;"
-                                                                                     rendered="#{!subdsf.datasetFieldType.allowMultiples}">
-                                                                        <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
+                                                        </div>
+                                                    </ui:repeat>
+                                                    <ui:fragment rendered="#{dsf.datasetFieldType.controlledVocabulary}">
+                                                        <p:selectOneMenu value="#{dsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;" styleClass="form-control primitive"
+                                                                         id="unique1" rendered="#{!dsf.datasetFieldType.allowMultiples}">
+                                                            <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
+                                                            <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
+                                                        </p:selectOneMenu>
+                                                        <div class="ui-inputfield form-control select-scroll-block" jsf:rendered="#{dsf.datasetFieldType.allowMultiples}">
+                                                            <p:selectManyCheckbox value="#{dsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter" layout="pageDirection"
+                                                                                  id="unique2">
+                                                                <f:selectItem itemLabel="#{bundle.select}" class="chkbox-label-margin" itemValue="" noSelectionOption="true"/>
+                                                                <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
+                                                            </p:selectManyCheckbox>
+                                                        </div>
+                                                        <div class="alert-danger" jsf:rendered="#{!empty dsf.validationMessage}">
+                                                            <strong>#{dsf.validationMessage}</strong>
+                                                        </div>
+                                                    </ui:fragment>
+                                                </div>
+                                            </ui:repeat>
+                                        </div>
+                                    </p:fragment>
+                                    <!-- Compound fields -->
+                                    <p:fragment id="editCompoundValueFragment" rendered="#{dsf.datasetFieldType.compound}">
+                                        <p:autoUpdate/>
+                                        <div id="metadata_#{dsf.datasetFieldType.name}" class="col-sm-3 control-label highlightBold">
+                                            #{dsf.datasetFieldType.localeTitle}
+                                            <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{dsf.required or dsf.datasetFieldType.hasRequiredChildren}"/>
+                                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                  data-toggle="tooltip" data-placement="auto right" data-original-title="#{dsf.datasetFieldType.localeDescription}"></span>
+                                        </div>
+                                        <div class="form-group form-col-container col-sm-9 dataset-field-values">
+                                            <ui:repeat value="#{dsf.datasetFieldCompoundValues}" var="compoundValue" varStatus="valCount">
+                                                <div class="form-group form-col-container col-sm-9 edit-compound-field">
+                                                    <!-- Sub Fields -->
+                                                    <ui:repeat value="#{compoundValue.childDatasetFields}" var="subdsf">
+                                                        <div class="form-col-container #{subdsf.datasetFieldType.fieldType == 'TEXTBOX' ? 'col-sm-12' : 'col-sm-6'}">
+                                                            <ui:fragment rendered="#{subdsf.datasetFieldType.name == 'dsDescriptionValue'}">
+                                                                <p class="help-block">
+                                                                    <h:outputFormat value="#{bundle.htmlAllowedMsg}" escape="false">
+                                                                        <f:param value="#{bundle.htmlAllowedTags}"/>
+                                                                    </h:outputFormat>
+                                                                </p>
+                                                            </ui:fragment>
+                                                            <label jsf:for="#{subdsf.datasetFieldType.fieldType == 'TEXTBOX' ? 'description' : 'inputText'}" class="control-label">
+                                                                #{subdsf.datasetFieldType.localeTitle}
+                                                                <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{subdsf.required}"/>
+                                                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{subdsf.datasetFieldType.localeDescription}"></span>
+                                                            </label>
+                                                            <ui:fragment rendered="#{!subdsf.datasetFieldType.controlledVocabulary}">
+                                                                <ui:include src="datasetFieldForEditFragment.xhtml">
+                                                                    <ui:param name="dsfv" value="#{subdsf.singleValue}"/>
+                                                                    <ui:param name="dsfvIndex" value="0"/>
+                                                                </ui:include>
+                                                            </ui:fragment>
+                                                            <!-- MOVED SELECT ONE TO dataFieldForEdit -->
+                                                            <div jsf:rendered="#{subdsf.datasetFieldType.controlledVocabulary}">
+                                                                <p:selectOneMenu value="#{subdsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;"
+                                                                                 rendered="#{!subdsf.datasetFieldType.allowMultiples}">
+                                                                    <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
+                                                                    <f:selectItems value="#{subdsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}" />
+                                                                </p:selectOneMenu>
+                                                                <div class="ui-inputfield form-control select-scroll-block" jsf:rendered="#{subdsf.datasetFieldType.allowMultiples}">
+                                                                    <p:selectManyCheckbox value="#{subdsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter"
+                                                                                          layout="pageDirection">
                                                                         <f:selectItems value="#{subdsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}" />
-                                                                    </p:selectOneMenu>
-                                                                    <div class="ui-inputfield form-control select-scroll-block" jsf:rendered="#{subdsf.datasetFieldType.allowMultiples}">
-                                                                        <p:selectManyCheckbox value="#{subdsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter"
-                                                                                              layout="pageDirection">
-                                                                            <f:selectItems value="#{subdsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}" />
-                                                                        </p:selectManyCheckbox>
-                                                                    </div>
-                                                                    <div class="alert-danger" jsf:rendered="#{!empty subdsf.validationMessage}">
-                                                                        <strong>#{subdsf.validationMessage}</strong>
-                                                                    </div>
+                                                                    </p:selectManyCheckbox>
+                                                                </div>
+                                                                <div class="alert-danger" jsf:rendered="#{!empty subdsf.validationMessage}">
+                                                                    <strong>#{subdsf.validationMessage}</strong>
                                                                 </div>
                                                             </div>
-                                                        </ui:repeat>
-                                                    </div>
-                                                    <div class="col-sm-3 field-add-delete" jsf:rendered="#{dsf.datasetFieldType.allowMultiples and !dsf.datasetFieldType.controlledVocabulary}">
-                                                        <p:commandLink title="#{bundle.add}"
-                                                                       styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
-                                                                       actionListener="#{dsf.addDatasetFieldCompoundValue(valCount.index + 1)}"   
-                                                                       update=":#{p:resolveClientIds('@id(editCompoundValueFragment)', view)}"
-                                                                       oncomplete="javascript:bind_bsui_components();">
-                                                            <span class="glyphicon glyphicon-plus no-text"/>
-                                                        </p:commandLink>
-                                                        <p:commandLink title="#{bundle.delete}"
-                                                                       styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
-                                                                       rendered="#{dsf.datasetFieldCompoundValues.size() > 1}"
-                                                                       actionListener="#{dsf.removeDatasetFieldCompoundValue(valCount.index)}"
-                                                                       update=":#{p:resolveClientIds('@id(editCompoundValueFragment)', view)}"
-                                                                       oncomplete="javascript:bind_bsui_components();">
-                                                            <span class="glyphicon glyphicon-minus no-text"/>
-                                                        </p:commandLink>
-                                                    </div>
-                                                </ui:repeat>
-                                            </div>
-                                        </p:fragment>
-                                    </div>
-                                </ui:fragment>
+                                                        </div>
+                                                    </ui:repeat>
+                                                </div>
+                                                <div class="col-sm-3 field-add-delete" jsf:rendered="#{dsf.datasetFieldType.allowMultiples and !dsf.datasetFieldType.controlledVocabulary}">
+                                                    <p:commandLink title="#{bundle.add}"
+                                                                   styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
+                                                                   actionListener="#{dsf.addDatasetFieldCompoundValue(valCount.index + 1)}"   
+                                                                   update=":#{p:resolveClientIds('@id(editCompoundValueFragment)', view)}"
+                                                                   oncomplete="javascript:bind_bsui_components();">
+                                                        <span class="glyphicon glyphicon-plus no-text"/>
+                                                    </p:commandLink>
+                                                    <p:commandLink title="#{bundle.delete}"
+                                                                   styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
+                                                                   rendered="#{dsf.datasetFieldCompoundValues.size() > 1}"
+                                                                   actionListener="#{dsf.removeDatasetFieldCompoundValue(valCount.index)}"
+                                                                   update=":#{p:resolveClientIds('@id(editCompoundValueFragment)', view)}"
+                                                                   oncomplete="javascript:bind_bsui_components();">
+                                                        <span class="glyphicon glyphicon-minus no-text"/>
+                                                    </p:commandLink>
+                                                </div>
+                                            </ui:repeat>
+                                        </div>
+                                    </p:fragment>
+                                </div>
                             </ui:repeat>
                         </div>
                     </div>

From 695a5c16ffefcc323319a0cd5265136260803f0c Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Thu, 17 Oct 2019 16:43:46 -0400
Subject: [PATCH 07/35] Fixed render logic used for required attributes on edit
 dataset form [ref 5615]

---
 src/main/webapp/datasetFieldForEditFragment.xhtml |  4 ++--
 src/main/webapp/metadataFragment.xhtml            | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/datasetFieldForEditFragment.xhtml b/src/main/webapp/datasetFieldForEditFragment.xhtml
index dcc4a0142f6..9733d34f26f 100644
--- a/src/main/webapp/datasetFieldForEditFragment.xhtml
+++ b/src/main/webapp/datasetFieldForEditFragment.xhtml
@@ -11,7 +11,7 @@
     <!-- input text start UPDATE: UI:REMOVE applied due to duplicate ID errors, left code as reference incase test scripts complain -->
     <span id="pre-input-#{dsf.datasetFieldType.name}" class="pre-input-tag"/></ui:remove>
     
-    <p:inputText value="#{dsfv.valueForEdit}" id="inputText" pt:aria-required="#{dsf.required ? 'true' : 'false'}"
+    <p:inputText value="#{dsfv.valueForEdit}" id="inputText" required="#{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'
@@ -22,7 +22,7 @@
                              or dsfv.datasetField.datasetFieldType.fieldType == 'EMAIL')}"/>
     <p:watermark for="inputText" value="#{dsfv.datasetField.datasetFieldType.localeWatermark}"></p:watermark>
 
-    <p:inputTextarea value="#{dsfv.valueForEdit}" id="description" pt:aria-required="#{dsf.required ? 'true' : 'false'}"
+    <p:inputTextarea value="#{dsfv.valueForEdit}" id="description" required="#{required}"
                      rows="5" cols="60" styleClass="form-control"
                      rendered="#{dsfv.datasetField.datasetFieldType.fieldType == 'TEXTBOX'}"/>
     <p:watermark for="description" value="#{dsfv.datasetField.datasetFieldType.localeWatermark}"></p:watermark>
diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index 67448a78799..f72b8f5284d 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -128,6 +128,7 @@
                                                                 <ui:include src="datasetFieldForEditFragment.xhtml">
                                                                     <ui:param name="dsfv" value="#{dsfv}"/>
                                                                     <ui:param name="dsfvIndex" value="#{valCount.index}"/>
+                                                                    <ui:param name="required" value="#{dsf.required}"/>
                                                                 </ui:include>
                                                             </div>
                                                             <!-- Add / Remove buttons -->
@@ -152,13 +153,13 @@
                                                     </ui:repeat>
                                                     <ui:fragment rendered="#{dsf.datasetFieldType.controlledVocabulary}">
                                                         <p:selectOneMenu value="#{dsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;" styleClass="form-control primitive"
-                                                                         id="unique1" rendered="#{!dsf.datasetFieldType.allowMultiples}">
+                                                                         id="unique1" required="#{dsf.required}" rendered="#{!dsf.datasetFieldType.allowMultiples}">
                                                             <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
                                                             <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
                                                         </p:selectOneMenu>
                                                         <div class="ui-inputfield form-control select-scroll-block" jsf:rendered="#{dsf.datasetFieldType.allowMultiples}">
                                                             <p:selectManyCheckbox value="#{dsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter" layout="pageDirection"
-                                                                                  id="unique2">
+                                                                                  id="unique2" required="#{dsf.required}">
                                                                 <f:selectItem itemLabel="#{bundle.select}" class="chkbox-label-margin" itemValue="" noSelectionOption="true"/>
                                                                 <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
                                                             </p:selectManyCheckbox>
@@ -203,18 +204,19 @@
                                                                 <ui:include src="datasetFieldForEditFragment.xhtml">
                                                                     <ui:param name="dsfv" value="#{subdsf.singleValue}"/>
                                                                     <ui:param name="dsfvIndex" value="0"/>
+                                                                    <ui:param name="required" value="#{subdsf.required}"/>
                                                                 </ui:include>
                                                             </ui:fragment>
                                                             <!-- MOVED SELECT ONE TO dataFieldForEdit -->
                                                             <div jsf:rendered="#{subdsf.datasetFieldType.controlledVocabulary}">
                                                                 <p:selectOneMenu value="#{subdsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;"
-                                                                                 rendered="#{!subdsf.datasetFieldType.allowMultiples}">
+                                                                                 required="#{subdsf.required}" rendered="#{!subdsf.datasetFieldType.allowMultiples}">
                                                                     <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
                                                                     <f:selectItems value="#{subdsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}" />
                                                                 </p:selectOneMenu>
                                                                 <div class="ui-inputfield form-control select-scroll-block" jsf:rendered="#{subdsf.datasetFieldType.allowMultiples}">
                                                                     <p:selectManyCheckbox value="#{subdsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter"
-                                                                                          layout="pageDirection">
+                                                                                          required="#{subdsf.required}" layout="pageDirection">
                                                                         <f:selectItems value="#{subdsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}" />
                                                                     </p:selectManyCheckbox>
                                                                 </div>

From 8bb1adb25a4e21bb733105906eb12d3c1aead568 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Thu, 17 Oct 2019 16:50:08 -0400
Subject: [PATCH 08/35] Added required attribute to edit dataverse form [ref
 #5615]

---
 src/main/webapp/dataverse.xhtml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index 56f0a81f3e5..52266e3e181 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -60,7 +60,7 @@
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.title']}"></span>
                                 </h:outputLabel>
                                 <div class="form-col-container">
-                                    <p:inputText id="name" styleClass="form-control" value="#{DataversePage.dataverse.name}"/>
+                                    <p:inputText id="name" styleClass="form-control" value="#{DataversePage.dataverse.name}" required="true"/>
                                 </div>
                             </div>
                             <div class="col-md-6 form-group">
@@ -70,7 +70,7 @@
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.affiliation.title']}"></span>
                                 </h:outputLabel>
                                 <div class="form-col-container">
-                                    <p:inputText id="affiliation" styleClass="form-control" value="#{DataversePage.dataverse.affiliation}"/>
+                                    <p:inputText id="affiliation" styleClass="form-control" value="#{DataversePage.dataverse.affiliation}" required="true"/>
                                     <p:message for="affiliation" display="text"/>
                                 </div>
                             </div>
@@ -85,7 +85,7 @@
                                 <div class="form-col-container">
                                     <div class="input-group">
                                         <div class="input-group-addon"><span class="small">#{systemConfig.dataverseSiteUrl}/dataverse/</span></div>
-                                        <p:inputText id="identifier" styleClass="form-control" validator="#{DataversePage.validateAlias}" value="#{DataversePage.dataverse.alias}"/>
+                                        <p:inputText id="identifier" styleClass="form-control" validator="#{DataversePage.validateAlias}" value="#{DataversePage.dataverse.alias}" required="true"/>
                                     </div>
                                     <p:message for="identifier" display="text"/>
                                 </div>
@@ -119,7 +119,7 @@
                                                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.category.title']}"></span>
                                         </h:outputLabel>
                                         <div class="form-col-container">
-                                            <h:selectOneMenu id="dataverseCategory" styleClass="form-control" value="#{DataversePage.dataverse.dataverseType}">
+                                            <h:selectOneMenu id="dataverseCategory" styleClass="form-control" value="#{DataversePage.dataverse.dataverseType}" required="true">
                                                 <f:selectItem id="dvSelect" itemLabel="#{bundle['dataverse.type.selectTab.top']}" itemValue="" />
                                                 <f:selectItem id="dvDepartment" itemLabel="#{bundle['dataverse.type.selectTab.department']}" itemValue="DEPARTMENT" />
                                                 <f:selectItem id="dvJournals" itemLabel="#{bundle['dataverse.type.selectTab.journals']}" itemValue="JOURNALS" />
@@ -146,7 +146,7 @@
                                                 <ui:repeat value="#{DataversePage.dataverse.dataverseContacts}" var="contacts" varStatus="valCount">
                                                     <div class="row col-xs-12 form-group">
                                                         <div class="col-xs-9 form-col-container">
-                                                            <p:inputText id="contactEmail" styleClass="form-control" value="#{contacts.contactEmail}">
+                                                            <p:inputText id="contactEmail" styleClass="form-control" value="#{contacts.contactEmail}" required="true">
                                                                 <f:validateBean disabled="#{param['SKIP_VALIDATION']}"/>
                                                             </p:inputText>
                                                             <p:message for="contactEmail" display="text"/>

From 4c48cb6a8ab2cb9f2f1f10de1a9834b924cf3dd3 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Fri, 18 Oct 2019 14:40:10 -0400
Subject: [PATCH 09/35] Added Add Data btn to My Data pg, moved Edit Account
 btn to Account tab [ref #5615]

---
 src/main/webapp/dataverseuser.xhtml   | 68 +++++++++++++++------------
 src/main/webapp/mydata_fragment.xhtml | 35 ++++++++++----
 2 files changed, 63 insertions(+), 40 deletions(-)

diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml
index 1349216caaa..9af1aed40f5 100644
--- a/src/main/webapp/dataverseuser.xhtml
+++ b/src/main/webapp/dataverseuser.xhtml
@@ -39,36 +39,11 @@
                 <h:form id="dataverseUserForm">
 
                     <p:focus context="dataverseUserForm"/>
-                    <div class="clearfix" jsf:rendered="#{empty DataverseUserPage.editMode}">
-                        <div class="btn-group pull-right" jsf:rendered="#{DataverseUserPage.passwordEditable or DataverseUserPage.accountDetailsEditable}">
-                            <button type="button" id="editAccount" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                                <ui:fragment rendered="#{DataverseUserPage.accountDetailsEditable}">
-                                    <span class="glyphicon glyphicon-pencil"/> #{bundle['account.edit']}
-                                </ui:fragment>
-                                <ui:fragment rendered="#{! DataverseUserPage.accountDetailsEditable}">
-                                    #{bundle['account.info']}
-                                </ui:fragment>
-                                <span class="caret"></span>
-                            </button>
-                            <ul class="dropdown-menu pull-right text-left" role="menu">
-                                <ui:fragment rendered="#{DataverseUserPage.passwordEditable or DataverseUserPage.accountDetailsEditable}">
-                                    <li>
-                                        <p:commandLink id="editAccount" rendered="#{DataverseUserPage.accountDetailsEditable}"
-                                                       actionListener="#{DataverseUserPage.edit}" update="@form" oncomplete="javascript:bind_bsui_components();">
-                                            <h:outputText value="#{bundle['account.info']}" />
-                                        </p:commandLink>
-                                    </li>
-                                    <li>
-                                        <p:commandLink id="changePassword" rendered="#{DataverseUserPage.passwordEditable}" 
-                                                       actionListener="#{DataverseUserPage.changePassword}" update="@form" oncomplete="javascript:bind_bsui_components();">
-                                            <h:outputText value="#{bundle.passwd}" />
-                                        </p:commandLink>
-                                    </li>
-                                </ui:fragment>
-                            </ul>
-                        </div>
-                    </div>
-
+                    
+                    
+                    
+                    
+                    
                     <p:panel rendered="#{DataverseUserPage.editMode == 'FORGOT'}">
                         <h:outputText value="#{bundle['user.lostPasswdTip']}" />
                     </p:panel>
@@ -341,6 +316,39 @@
                             </div>
                         </p:tab>
                         <p:tab id="accountInfo" title="#{bundle['header.user.selectTab.accountInfo']}">
+                            
+                            
+                            <div class="button-block tab-header margin-bottom text-right" jsf:rendered="#{empty DataverseUserPage.editMode or DataverseUserPage.passwordEditable or DataverseUserPage.accountDetailsEditable}">
+                                <div class="btn-group">
+                                    <button type="button" id="editAccount" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                                        <ui:fragment rendered="#{DataverseUserPage.accountDetailsEditable}">
+                                            <span class="glyphicon glyphicon-pencil"/> #{bundle['account.edit']}
+                                        </ui:fragment>
+                                        <ui:fragment rendered="#{! DataverseUserPage.accountDetailsEditable}">
+                                            #{bundle['account.info']}
+                                        </ui:fragment>
+                                        <span class="caret"></span>
+                                    </button>
+                                    <ul class="dropdown-menu pull-right text-left" role="menu">
+                                        <ui:fragment rendered="#{DataverseUserPage.passwordEditable or DataverseUserPage.accountDetailsEditable}">
+                                            <li>
+                                                <p:commandLink id="editAccount" rendered="#{DataverseUserPage.accountDetailsEditable}"
+                                                               actionListener="#{DataverseUserPage.edit}" update="@form" oncomplete="javascript:bind_bsui_components();">
+                                                    <h:outputText value="#{bundle['account.info']}" />
+                                                </p:commandLink>
+                                            </li>
+                                            <li>
+                                                <p:commandLink id="changePassword" rendered="#{DataverseUserPage.passwordEditable}" 
+                                                               actionListener="#{DataverseUserPage.changePassword}" update="@form" oncomplete="javascript:bind_bsui_components();">
+                                                    <h:outputText value="#{bundle.passwd}" />
+                                                </p:commandLink>
+                                            </li>
+                                        </ui:fragment>
+                                    </ul>
+                                </div>
+                            </div>
+                            
+                            
                             <div class="form-horizontal" jsf:rendered="#{!empty DataverseUserPage.currentUser}">
                                 <div class="form-group" jsf:rendered="#{not DataverseUserPage.accountDetailsEditable}">
                                     <div class="col-sm-12">
diff --git a/src/main/webapp/mydata_fragment.xhtml b/src/main/webapp/mydata_fragment.xhtml
index 6ade2184137..2338e0d020a 100644
--- a/src/main/webapp/mydata_fragment.xhtml
+++ b/src/main/webapp/mydata_fragment.xhtml
@@ -16,20 +16,31 @@
         </div>
     </div>
     
-    <div class="row" id="my_data_filter_column2">
-        <div class="col-xs-7"  style="padding:10px 30px;">
+    <div class="row margin-bottom" id="my_data_filter_column2">
+        <div class="col-xs-7">
             <input type="text" size="40" class="ui-inputfield ui-inputtext ui-widget ui-state-default ui-corner-all search-input" name="mydata_search_term" id="mydata_search_term" placeholder="#{bundle['mydataFragment.search']}" />
-            
             &#160; <a id="btn_find_my_data" class="btn btn-default"><span class="glyphicon glyphicon-search"></span>#{bundle['find']}</a>
-            <!-- &#160; <a target="_self" href="/dataverse/root/search" >Advanced Search </a> -->
         </div>
-        <ui:fragment rendered="#{MyDataPage.isSuperuser()}">
-        <div class="col-xs-4 pull-right text-right" style="margin-right:30px;margin-bottom:0;padding:8px 6px;background:none;">
-            #{bundle['mydataFragment.resultsByUserName']}
-            <input type="text" name="userIdentifier" id="userIdentifier" value="#{MyDataPage.getAuthUserIdentifier()}" class="ui-inputfield ui-inputtext ui-widget ui-state-default ui-corner-all" />
-           
+        <div class="col-xs-5 text-right col-manage-action">
+            <div class="btn-group">
+                <a href="#" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown">
+                    <span class="glyphicon glyphicon-plus"></span>
+                    #{bundle['dataverse.results.btn.addData']} <b class="caret"></b>
+                </a>
+                <ul class="dropdown-menu pull-right text-left">
+                    <li>
+                        <h:outputLink value="/dataverse.xhtml?ownerId=#{dataverseServiceBean.findRootDataverse().id}">
+                            <h:outputText value="#{bundle['dataverse.results.btn.addData.newDataverse']}"/>
+                        </h:outputLink>
+                    </li>
+                    <li>
+                        <h:outputLink value="/dataset.xhtml?ownerId=#{dataverseServiceBean.findRootDataverse().id}">
+                            <h:outputText value="#{bundle['dataverse.results.btn.addData.newDataset']}"/>
+                        </h:outputLink>
+                    </li>
+                </ul>
+            </div>
         </div>
-        </ui:fragment>
     </div>
 <!-- start: panel --><div class="panel panel-default">
 <!-- start: panel body --><div class="panel-body clearfix">
@@ -94,6 +105,10 @@
         </div><!-- end: filter column -->
         <!-- start: workspace column -->
         <div class="col-xs-9">
+            <div class="text-right" style="" jsf:rendered="#{MyDataPage.isSuperuser()}">
+                #{bundle['mydataFragment.resultsByUserName']}
+                <input type="text" name="userIdentifier" id="userIdentifier" value="#{MyDataPage.getAuthUserIdentifier()}" class="ui-inputfield ui-inputtext ui-widget ui-state-default ui-corner-all"/>
+            </div>
             <div id="div-pagination"></div>
             <!--<div id="div-test-json" class="well">(pagination)</div>-->
             <div id="div-result-message"></div>

From 7054e313aa959604acb39053c0c0a813182a5a92 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Mon, 21 Oct 2019 10:46:09 -0400
Subject: [PATCH 10/35] Cleaned up layout of asterisk required msg on edit
 dataset pg, added it to edit dataverse pg [ref 5615]

---
 src/main/webapp/dataset.xhtml   | 4 +---
 src/main/webapp/dataverse.xhtml | 5 +++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 804727ce651..f8099007427 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -545,9 +545,7 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <div class="col-sm-12">
-                                <span class="glyphicon glyphicon-asterisk text-danger"/> <h:outputText value="#{bundle['dataset.asterisk.tip']}"/>
-                            </div>
+                            <span class="glyphicon glyphicon-asterisk text-danger"/> <h:outputText value="#{bundle['dataset.asterisk.tip']}"/>
                         </div>
                     </ui:fragment>
                     <ui:fragment rendered="#{DatasetPage.editMode == 'CREATE'}">
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index 52266e3e181..8f720ab6632 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -51,6 +51,11 @@
                     <!-- Edit Mode -->
                     <ui:fragment rendered="#{DataversePage.editMode == 'INFO' or DataversePage.editMode == 'CREATE'}">
                         <p:focus context="dataverseForm"/>
+                        <div class="row">
+                            <div class="col-xs-12 form-group">
+                                <span class="glyphicon glyphicon-asterisk text-danger"/> <h:outputText value="#{bundle['dataset.asterisk.tip']}"/>
+                            </div>
+                        </div>
                         <!-- Edit Info Panel -->
                         <div class="row">
                             <div class="col-md-6 form-group">

From c2944ae4a4b255dbbb1fe7afa7a048d2be3074ca Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Tue, 22 Oct 2019 12:19:30 -0400
Subject: [PATCH 11/35] Improved responsive layout of navbar, styling of
 language dropdown, and resposnive layout improvements to top metrics/button
 block of dataverse and dateset pgs [ref #5615]

---
 src/main/webapp/dataset.xhtml               | 487 ++++++++++----------
 src/main/webapp/dataverse.xhtml             | 279 +++++------
 src/main/webapp/resources/css/structure.css |  55 ++-
 3 files changed, 442 insertions(+), 379 deletions(-)

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index f8099007427..e554eef2a57 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -80,266 +80,269 @@
                     <!-- View editMode -->
                     <p:fragment id="topDatasetBlockFragment">
                     <div id="topDatasetBlock" class="row" jsf:rendered="#{empty DatasetPage.editMode}">
-                        <div id="actionButtonBlock" class="button-block clearfix" jsf:rendered="#{!widgetWrapper.widgetView}">
-                            <div class="btn-group pull-right" jsf:rendered="#{DatasetPage.sessionUserAuthenticated
-                                                                              and !DatasetPage.dataset.deaccessioned
-                                                                              and DatasetPage.showComputeButton()}">
-                                <!-- Compute Button Group -->
-                                <button type="button" id="computeBatch" class="btn btn-default btn-compute dropdown-toggle" data-toggle="dropdown">
-                                    <span class="glyphicon glyphicon-flash"/> #{bundle['dataset.compute.computeBtn']} <span class="caret"></span>
-                                </button>
-                                <ul class="dropdown-menu pull-left text-left" role="menu">
-                                    <li>
-                                        <!-- Compute dataset link -->
-                                        <h:commandLink action="#{DatasetPage.canComputeAllFiles(false)}">
-                                            <h:outputText value="#{bundle['dataset.compute.computeBatchSingle']}"/>
-                                        </h:commandLink>
-                                    </li>
-                                    <li jsf:rendered="#{!DatasetPage.isCartEmpty()}" class="divider"></li>
-                                    <li jsf:rendered="#{!DatasetPage.checkCartForItem(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}">
-                                        <!-- Add link -->
-                                        <p:commandLink action="#{DatasetPage.addItemtoCart(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}"
-                                            disabled="#{DatasetPage.locked}" value="#{bundle['dataset.compute.computeBatchAdd']}" update=":datasetForm,:messagePanel">
-                                            <h:outputText value="#{bundle['dataset.compute.computeBatchAdd']}"/>
-                                        </p:commandLink>
-                                    </li>
-                                    <ui:fragment rendered="#{!DatasetPage.isCartEmpty()}">
-                                        <li jsf:rendered="#{DatasetPage.checkCartForItem(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}">
-                                            <!-- Remove link -->
-                                            <p:commandLink value="#{bundle['dataset.compute.computeBatchRemove']}" action="#{DatasetPage.removeCartItem(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}" update=":datasetForm,:messagePanel">  
-                                                <h:outputText value="#{bundle['dataset.compute.computeBatchRemove']}"/>
-                                            </p:commandLink>
-                                        </li>
-                                        <li>
-                                            <!-- List link -->
-                                            <p:commandLink title="#{bundle['dataset.compute.computeBatchList']}"
-                                                           value="#{bundle['dataset.compute.computeBatchList']}"
-                                                           oncomplete="PF('computeBatchListPopup').show();bind_bsui_components();"
-                                                           update="computeBatchListPopup">
-                                                <h:outputText value="#{bundle['dataset.compute.computeBatchList']}"/>
-                                            </p:commandLink>
-                                        </li>
-                                        <li>
-                                            <!-- Clear link -->
-                                            <p:commandLink value="#{bundle['dataset.compute.computeBatchClear']}" action="#{DatasetPage.clearCart()}" update=":datasetForm,:messagePanel">  
-                                                <h:outputText value="#{bundle['dataset.compute.computeBatchClear']}"/>
-                                            </p:commandLink>
-                                        </li>
-                                        <li>
-                                            <!-- Compute batch link -->
-                                            <h:outputLink value="#{DatasetPage.cartComputeUrl}" target="_blank">
-                                                <h:outputText id="compute-batch-button" value="#{bundle['dataset.compute.computeBatchCompute']}" />
-                                            </h:outputLink>
-                                        </li>
-                                    </ui:fragment>
-                                </ul>
-                            </div>
-                            <div class="btn-group pull-right" jsf:rendered="#{!DatasetPage.dataset.deaccessioned}">
-                                <!-- Explore Button Group -->
-                                <ui:fragment rendered="#{DatasetPage.datasetExploreTools.size()==1}">
-                                    <button type="button" class="btn btn-default btn-explore" onclick="$(this).parent().find( 'li > a' ).trigger( 'click' );">
-                                        <span class="glyphicon glyphicon-equalizer"/> #{bundle.explore}
-                                    </button>
-                                </ui:fragment>
-                                <ui:fragment rendered="#{DatasetPage.datasetExploreTools.size()>1}">
-                                    <button type="button" class="btn btn-default btn-explore dropdown-toggle" data-toggle="dropdown">
-                                        <span class="glyphicon glyphicon-equalizer"/> #{bundle.explore} <span class="caret"></span>
-                                    </button>
-                                </ui:fragment>
-                                <ul class="dropdown-menu pull-left text-left" role="menu">
-                                    <!-- Explore tool links -->
-                                    <ui:repeat var="tool" value="#{DatasetPage.datasetExploreTools}">
-                                        <li>
-                                            <h:commandLink action="#{DatasetPage.explore(tool)}">
-                                                <h:outputText value="#{tool.displayName}"/>
-                                            </h:commandLink>
-                                        </li>
-                                    </ui:repeat>
-                                </ul>
-                            </div>
-                            <div class="btn-group pull-right" role="group">
-                                <!-- Edit/Publish Button Group -->
-                                <!-- Publish/Submit for Review/Return to Author Button Group -->
-                                <ui:fragment rendered="#{DatasetPage.workingVersion == DatasetPage.dataset.latestVersion
-                                                            and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)
-                                                            or (DatasetPage.dataset.latestVersion.versionState=='DRAFT'
-                                                            and DatasetPage.canUpdateDataset()
-                                                            and !permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset))}">
-                                    <!-- Publish Buttons -->
-                                    <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" onclick="PF('publishConfirm').show()"
-                                                   rendered="#{!DatasetPage.dataset.released
-                                                               and DatasetPage.dataset.latestVersion.versionState=='DRAFT' and DatasetPage.dataset.owner.released
-                                                               and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
-                                        <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
-                                    </p:commandLink>
-                                    <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" onclick="PF('releaseDraft').show()"
-                                                   rendered="#{DatasetPage.dataset.released and DatasetPage.dataset.latestVersion.versionState=='DRAFT' and DatasetPage.dataset.owner.released
-                                                               and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
-                                        <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
-                                    </p:commandLink>
-                                    <!-- 4.2.1:  replaced permissionServiceBean.on(DatasetPage.dataset.owner).has('PublishDataverse') with DatasetPage.canPublishDataverse() -->
-                                    <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" onclick="PF('mayNotRelease').show()"
-                                                   rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and !DatasetPage.dataset.owner.released
-                                                               and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)
-                                                               and !DatasetPage.canPublishDataverse()}">
-                                        <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
+                        <div id="actionButtonBlock" class="button-block row" jsf:rendered="#{!widgetWrapper.widgetView}">
+                            
+                            <div class="col-xs-12 text-right">
+                                <!-- Contact/Share Button Group -->
+                                <div class="btn-group" id="datasetButtonBar" role="group">
+                                    <p:commandLink class="text-button btn-contact bootstrap-button-tooltip" title="#{bundle['dataset.email.datasetContactBtn']}"
+                                                   update=":contactDialog" oncomplete="PF('contactForm').show()" actionListener="#{sendFeedbackDialog.initUserInput}">
+                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
+                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
+                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
+                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{DatasetPage.dataset}"/>
+                                        <span class="glyphicon glyphicon-envelope"/> #{bundle['contact.contact']}
                                     </p:commandLink>
-                                    <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" onclick="PF('publishParent').show()"
-                                                   rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and !DatasetPage.dataset.owner.released
-                                                               and DatasetPage.canPublishDataverse()
-                                                               and (DatasetPage.dataset.owner.owner == null or (DatasetPage.dataset.owner.owner != null and DatasetPage.dataset.owner.owner.released))
-                                                               and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
-                                        <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
+                                    <p:commandLink styleClass="text-button btn-share bootstrap-button-tooltip" rendered="#{!DatasetPage.workingVersion.deaccessioned}"
+                                                   title="#{bundle['dataset.share.datasetShare']}"
+                                                   oncomplete="PF('shareDialog').show();sharrre();">
+                                        <span class="glyphicon glyphicon-share"/> #{bundle['share']}
                                     </p:commandLink>
-                                    <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}"
-                                                   rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and !DatasetPage.dataset.owner.released
-                                                               and DatasetPage.canPublishDataverse()
-                                                               and (DatasetPage.dataset.owner.owner != null and !DatasetPage.dataset.owner.owner.released)
-                                                               and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}"
-                                                   onclick="PF('maynotPublishParent').show()">
-                                        <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
-                                    </p:commandLink>
-                                    <!-- END: Publish Buttons -->
-                                    <ui:fragment rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and DatasetPage.dataset.latestVersion.inReview
-                                                               and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
-                                        <!-- Return to Author Button -->
-                                        <button type="button" class="btn btn-default btn-access #{(DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview) ? 'disabled' : ''}" 
-                                                              onclick="PF('sendBackToContributor').show()">
-                                            <span class="glyphicon glyphicon-repeat"/> #{bundle['dataset.rejectBtn']}
-                                        </button>
-                                        <!-- END: Return to Author Button -->
-                                    </ui:fragment>
+                                </div>
+                                <!-- END: Contact/Share Button Group -->
+                                <div class="btn-group" role="group">
+                                    <!-- Edit/Publish Button Group -->
+                                    <!-- Publish/Submit for Review/Return to Author Button Group -->
                                     <ui:fragment rendered="#{DatasetPage.workingVersion == DatasetPage.dataset.latestVersion
-                                                            and !DatasetPage.datasetLockedInWorkflow
-                                                            and DatasetPage.dataset.latestVersion.versionState=='DRAFT'
-                                                            and DatasetPage.canUpdateDataset()
-                                                            and !permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
-                                        <!-- Submit for Review Button -->
-                                        <button type="button" class="btn btn-default btn-access #{DatasetPage.dataset.latestVersion.inReview or DatasetPage.dataset.locked ? 'disabled' : ''}" 
-                                                              onclick="PF('inreview').show()">
-                                            <span class="glyphicon glyphicon-globe"/> #{DatasetPage.dataset.latestVersion.inReview ? bundle['dataset.disabledSubmittedBtn'] : bundle['dataset.submitBtn']}
-                                        </button>
-                                        <!-- End: Submit for Review Button -->
+                                                                and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)
+                                                                or (DatasetPage.dataset.latestVersion.versionState=='DRAFT'
+                                                                and DatasetPage.canUpdateDataset()
+                                                                and !permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset))}">
+                                        <!-- Publish Buttons -->
+                                        <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" onclick="PF('publishConfirm').show()"
+                                                       rendered="#{!DatasetPage.dataset.released
+                                                                   and DatasetPage.dataset.latestVersion.versionState=='DRAFT' and DatasetPage.dataset.owner.released
+                                                                   and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
+                                            <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
+                                        </p:commandLink>
+                                        <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" onclick="PF('releaseDraft').show()"
+                                                       rendered="#{DatasetPage.dataset.released and DatasetPage.dataset.latestVersion.versionState=='DRAFT' and DatasetPage.dataset.owner.released
+                                                                   and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
+                                            <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
+                                        </p:commandLink>
+                                        <!-- 4.2.1:  replaced permissionServiceBean.on(DatasetPage.dataset.owner).has('PublishDataverse') with DatasetPage.canPublishDataverse() -->
+                                        <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" onclick="PF('mayNotRelease').show()"
+                                                       rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and !DatasetPage.dataset.owner.released
+                                                                   and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)
+                                                                   and !DatasetPage.canPublishDataverse()}">
+                                            <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
+                                        </p:commandLink>
+                                        <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" onclick="PF('publishParent').show()"
+                                                       rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and !DatasetPage.dataset.owner.released
+                                                                   and DatasetPage.canPublishDataverse()
+                                                                   and (DatasetPage.dataset.owner.owner == null or (DatasetPage.dataset.owner.owner != null and DatasetPage.dataset.owner.owner.released))
+                                                                   and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
+                                            <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
+                                        </p:commandLink>
+                                        <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}"
+                                                       rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and !DatasetPage.dataset.owner.released
+                                                                   and DatasetPage.canPublishDataverse()
+                                                                   and (DatasetPage.dataset.owner.owner != null and !DatasetPage.dataset.owner.owner.released)
+                                                                   and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}"
+                                                       onclick="PF('maynotPublishParent').show()">
+                                            <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
+                                        </p:commandLink>
+                                        <!-- END: Publish Buttons -->
+                                        <ui:fragment rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and DatasetPage.dataset.latestVersion.inReview
+                                                                   and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
+                                            <!-- Return to Author Button -->
+                                            <button type="button" class="btn btn-default btn-access #{(DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview) ? 'disabled' : ''}" 
+                                                                  onclick="PF('sendBackToContributor').show()">
+                                                <span class="glyphicon glyphicon-repeat"/> #{bundle['dataset.rejectBtn']}
+                                            </button>
+                                            <!-- END: Return to Author Button -->
+                                        </ui:fragment>
+                                        <ui:fragment rendered="#{DatasetPage.workingVersion == DatasetPage.dataset.latestVersion
+                                                                and !DatasetPage.datasetLockedInWorkflow
+                                                                and DatasetPage.dataset.latestVersion.versionState=='DRAFT'
+                                                                and DatasetPage.canUpdateDataset()
+                                                                and !permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
+                                            <!-- Submit for Review Button -->
+                                            <button type="button" class="btn btn-default btn-access #{DatasetPage.dataset.latestVersion.inReview or DatasetPage.dataset.locked ? 'disabled' : ''}" 
+                                                                  onclick="PF('inreview').show()">
+                                                <span class="glyphicon glyphicon-globe"/> #{DatasetPage.dataset.latestVersion.inReview ? bundle['dataset.disabledSubmittedBtn'] : bundle['dataset.submitBtn']}
+                                            </button>
+                                            <!-- End: Submit for Review Button -->
+                                        </ui:fragment>
                                     </ui:fragment>
-                                </ui:fragment>
-                                <!-- END: Publish/Submit for Review/Return to Author Button Group -->
-                                <p:commandLink rendered="#{dataverseSession.user.authenticated and !DatasetPage.workingVersion.deaccessioned and DatasetPage.dataset.released}"
-                                               styleClass="btn btn-default btn-access"   
-                                               action="#{DatasetPage.setShowLinkingPopup(true)}"
-                                               oncomplete="PF('linkDatasetForm').show();bind_bsui_components();"
-                                               update="@form">
-                                    <span class="glyphicon glyphicon-link"/> #{bundle['link']}
-                                </p:commandLink>
-                                <!-- Edit Button -->
-                                <ui:fragment rendered="#{DatasetPage.sessionUserAuthenticated
-                                                                                  and DatasetPage.canUpdateDataset()
-                                                                                  and !DatasetPage.dataset.deaccessioned}">
-                                    <button type="button" id="editDataSet" class="btn btn-default btn-access dropdown-toggle #{DatasetPage.lockedFromEdits ? 'disabled' : ''}" data-toggle="dropdown">
-                                        <span class="glyphicon glyphicon-pencil"/> #{bundle['dataset.editBtn']} <span class="caret"></span>
-                                    </button>
-                                    <ul class="dropdown-menu pull-right text-left" role="menu">
-                                        <li>                                           
-                                            <h:outputLink value="/editdatafiles.xhtml?datasetId=#{DatasetPage.dataset.id}&#38;mode=UPLOAD">
-                                                <h:outputText value="#{bundle['dataset.editBtn.itemLabel.upload']}"/>
-                                            </h:outputLink>
-                                        </li>
-                                        <li>
-                                            <p:commandLink id="editMetadata" actionListener="#{DatasetPage.edit('METADATA')}" update="@form,:datasetForm,:messagePanel" oncomplete="javascript:bind_bsui_components();">
-                                                <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
-                                                <h:outputText value="#{bundle['dataset.editBtn.itemLabel.metadata']}" />
-                                            </p:commandLink>
-                                        </li>
-                                        <li>
-                                            <p:commandLink id="editTerms" actionListener="#{DatasetPage.edit('LICENSE')}" update="@form,:datasetForm,:messagePanel" oncomplete="javascript:bind_bsui_components();">
-                                                <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
-                                                <h:outputText value="#{bundle['dataset.editBtn.itemLabel.terms']}" />
-                                            </p:commandLink>
-                                        </li>
-                                        <ui:fragment rendered="#{permissionsWrapper.canManagePermissions(DatasetPage.dataset)}">
-                                            <li class="#{settingsWrapper.publicInstall ? '' : 'dropdown-submenu pull-left'}">
-                                                <ui:fragment rendered="#{!settingsWrapper.publicInstall}">
-                                                    <a tabindex="-1" href="#">#{bundle['dataset.editBtn.itemLabel.permissions']}</a>
-                                                    <ul class="dropdown-menu">
-                                                        <li>
-                                                            <h:link id="manageDatasetPermissions" styleClass="ui-commandlink ui-widget" outcome="permissions-manage">
-                                                                <h:outputText value="#{bundle['dataset']}" />
-                                                                <f:param name="id" value="#{DatasetPage.dataset.id}" />
-                                                            </h:link>
-                                                        </li>
-                                                        <li>
-                                                            <h:link id="manageFilePermissions" styleClass="ui-commandlink ui-widget" outcome="permissions-manage-files">
-                                                                <h:outputText value="#{bundle['file']}" />
-                                                                <f:param name="id" value="#{DatasetPage.dataset.id}" />
-                                                            </h:link>
-                                                        </li>
-                                                    </ul>
-                                                </ui:fragment>                                            
-                                                <h:link id="managePermissions" rendered="#{settingsWrapper.publicInstall}"
-                                                        styleClass="ui-commandlink ui-widget" outcome="permissions-manage">
-                                                    <h:outputText value="#{bundle['dataset.editBtn.itemLabel.permissions']}" />
-                                                    <f:param name="id" value="#{DatasetPage.dataset.id}" />
-                                                </h:link>
+                                    <!-- END: Publish/Submit for Review/Return to Author Button Group -->
+                                    <p:commandLink rendered="#{dataverseSession.user.authenticated and !DatasetPage.workingVersion.deaccessioned and DatasetPage.dataset.released}"
+                                                   styleClass="btn btn-default btn-access"   
+                                                   action="#{DatasetPage.setShowLinkingPopup(true)}"
+                                                   oncomplete="PF('linkDatasetForm').show();bind_bsui_components();"
+                                                   update="@form">
+                                        <span class="glyphicon glyphicon-link"/> #{bundle['link']}
+                                    </p:commandLink>
+                                    <!-- Edit Button -->
+                                    <ui:fragment rendered="#{DatasetPage.sessionUserAuthenticated
+                                                                                      and DatasetPage.canUpdateDataset()
+                                                                                      and !DatasetPage.dataset.deaccessioned}">
+                                        <button type="button" id="editDataSet" class="btn btn-default btn-access dropdown-toggle #{DatasetPage.lockedFromEdits ? 'disabled' : ''}" data-toggle="dropdown">
+                                            <span class="glyphicon glyphicon-pencil"/> #{bundle['dataset.editBtn']} <span class="caret"></span>
+                                        </button>
+                                        <ul class="dropdown-menu pull-right text-left" role="menu">
+                                            <li>                                           
+                                                <h:outputLink value="/editdatafiles.xhtml?datasetId=#{DatasetPage.dataset.id}&#38;mode=UPLOAD">
+                                                    <h:outputText value="#{bundle['dataset.editBtn.itemLabel.upload']}"/>
+                                                </h:outputLink>
                                             </li>
                                             <li>
-                                                <p:commandLink id="privateUrl" oncomplete="PF('privateUrlConfirmation').show()" action="#{DatasetPage.initPrivateUrlPopUp()}" update="privateUrlPanel">
-                                                    <h:outputText value="#{bundle['dataset.editBtn.itemLabel.privateUrl']}" />
+                                                <p:commandLink id="editMetadata" actionListener="#{DatasetPage.edit('METADATA')}" update="@form,:datasetForm,:messagePanel" oncomplete="javascript:bind_bsui_components();">
+                                                    <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
+                                                    <h:outputText value="#{bundle['dataset.editBtn.itemLabel.metadata']}" />
                                                 </p:commandLink>
                                             </li>
-                                        </ui:fragment>
-                                        <li>
-                                            <h:outputLink value="/dataset-widgets.xhtml?datasetId=#{DatasetPage.dataset.id}">
-                                                <h:outputText value="#{bundle['dataset.editBtn.itemLabel.thumbnailsAndWidgets']}"/>
-                                            </h:outputLink>
-                                        </li>
-                                        <ui:fragment rendered="#{!DatasetPage.dataset.released and DatasetPage.dataset.latestVersion.versionState=='DRAFT' and permissionsWrapper.canIssueDeleteDatasetCommand(DatasetPage.dataset)}">
-                                            <li class="divider"></li>
                                             <li>
-                                                <p:commandLink id="deleteDataset" onclick="PF('deleteConfirmation').show()">
-                                                    <h:outputText value="#{bundle['dataset.editBtn.itemLabel.deleteDataset']}" />
+                                                <p:commandLink id="editTerms" actionListener="#{DatasetPage.edit('LICENSE')}" update="@form,:datasetForm,:messagePanel" oncomplete="javascript:bind_bsui_components();">
+                                                    <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
+                                                    <h:outputText value="#{bundle['dataset.editBtn.itemLabel.terms']}" />
                                                 </p:commandLink>
                                             </li>
-                                        </ui:fragment>
-                                        <ui:fragment rendered="#{DatasetPage.dataset.released and DatasetPage.dataset.latestVersion.versionState=='DRAFT' and permissionsWrapper.canIssueDeleteDatasetCommand(DatasetPage.dataset)}">
-                                            <li class="divider"></li>
+                                            <ui:fragment rendered="#{permissionsWrapper.canManagePermissions(DatasetPage.dataset)}">
+                                                <li class="#{settingsWrapper.publicInstall ? '' : 'dropdown-submenu pull-left'}">
+                                                    <ui:fragment rendered="#{!settingsWrapper.publicInstall}">
+                                                        <a tabindex="-1" href="#">#{bundle['dataset.editBtn.itemLabel.permissions']}</a>
+                                                        <ul class="dropdown-menu">
+                                                            <li>
+                                                                <h:link id="manageDatasetPermissions" styleClass="ui-commandlink ui-widget" outcome="permissions-manage">
+                                                                    <h:outputText value="#{bundle['dataset']}" />
+                                                                    <f:param name="id" value="#{DatasetPage.dataset.id}" />
+                                                                </h:link>
+                                                            </li>
+                                                            <li>
+                                                                <h:link id="manageFilePermissions" styleClass="ui-commandlink ui-widget" outcome="permissions-manage-files">
+                                                                    <h:outputText value="#{bundle['file']}" />
+                                                                    <f:param name="id" value="#{DatasetPage.dataset.id}" />
+                                                                </h:link>
+                                                            </li>
+                                                        </ul>
+                                                    </ui:fragment>                                            
+                                                    <h:link id="managePermissions" rendered="#{settingsWrapper.publicInstall}"
+                                                            styleClass="ui-commandlink ui-widget" outcome="permissions-manage">
+                                                        <h:outputText value="#{bundle['dataset.editBtn.itemLabel.permissions']}" />
+                                                        <f:param name="id" value="#{DatasetPage.dataset.id}" />
+                                                    </h:link>
+                                                </li>
+                                                <li>
+                                                    <p:commandLink id="privateUrl" oncomplete="PF('privateUrlConfirmation').show()" action="#{DatasetPage.initPrivateUrlPopUp()}" update="privateUrlPanel">
+                                                        <h:outputText value="#{bundle['dataset.editBtn.itemLabel.privateUrl']}" />
+                                                    </p:commandLink>
+                                                </li>
+                                            </ui:fragment>
                                             <li>
-                                                <p:commandLink id="deleteVersion" onclick="PF('deleteVersionConfirmation').show()">
-                                                    <h:outputText value="#{bundle['dataset.editBtn.itemLabel.deleteDraft']}" />
-                                                </p:commandLink>
+                                                <h:outputLink value="/dataset-widgets.xhtml?datasetId=#{DatasetPage.dataset.id}">
+                                                    <h:outputText value="#{bundle['dataset.editBtn.itemLabel.thumbnailsAndWidgets']}"/>
+                                                </h:outputLink>
                                             </li>
+                                            <ui:fragment rendered="#{!DatasetPage.dataset.released and DatasetPage.dataset.latestVersion.versionState=='DRAFT' and permissionsWrapper.canIssueDeleteDatasetCommand(DatasetPage.dataset)}">
+                                                <li class="divider"></li>
+                                                <li>
+                                                    <p:commandLink id="deleteDataset" onclick="PF('deleteConfirmation').show()">
+                                                        <h:outputText value="#{bundle['dataset.editBtn.itemLabel.deleteDataset']}" />
+                                                    </p:commandLink>
+                                                </li>
+                                            </ui:fragment>
+                                            <ui:fragment rendered="#{DatasetPage.dataset.released and DatasetPage.dataset.latestVersion.versionState=='DRAFT' and permissionsWrapper.canIssueDeleteDatasetCommand(DatasetPage.dataset)}">
+                                                <li class="divider"></li>
+                                                <li>
+                                                    <p:commandLink id="deleteVersion" onclick="PF('deleteVersionConfirmation').show()">
+                                                        <h:outputText value="#{bundle['dataset.editBtn.itemLabel.deleteDraft']}" />
+                                                    </p:commandLink>
+                                                </li>
+                                            </ui:fragment>
+                                            <ui:fragment rendered="#{DatasetPage.dataset.released and DatasetPage.existReleasedVersion and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
+                                                <li class="divider"></li>
+                                                <li>
+                                                    <p:commandLink id="deaccessionDatasetLink" 
+                                                                   action="#{DatasetPage.clickDeaccessionDataset}"
+                                                                   oncomplete="PF('deaccessionBlock').show();bind_bsui_components();"
+                                                                   update="deaccessionBlock">
+                                                        <h:outputText value="#{bundle['dataset.editBtn.itemLabel.deaccession']}" />
+                                                    </p:commandLink>
+                                                </li>
+                                            </ui:fragment>
+                                        </ul>
+                                    </ui:fragment>
+                                    <!-- END: Edit Button -->
+                                    <!-- END: Edit/Link/Publish Button Group -->
+                                    <div class="btn-group" jsf:rendered="#{!DatasetPage.dataset.deaccessioned}">
+                                        <!-- Explore Button Group -->
+                                        <ui:fragment rendered="#{DatasetPage.datasetExploreTools.size()==1}">
+                                            <button type="button" class="btn btn-default btn-explore" onclick="$(this).parent().find( 'li > a' ).trigger( 'click' );">
+                                                <span class="glyphicon glyphicon-equalizer"/> #{bundle.explore}
+                                            </button>
                                         </ui:fragment>
-                                        <ui:fragment rendered="#{DatasetPage.dataset.released and DatasetPage.existReleasedVersion and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
-                                            <li class="divider"></li>
+                                        <ui:fragment rendered="#{DatasetPage.datasetExploreTools.size()>1}">
+                                            <button type="button" class="btn btn-default btn-explore dropdown-toggle" data-toggle="dropdown">
+                                                <span class="glyphicon glyphicon-equalizer"/> #{bundle.explore} <span class="caret"></span>
+                                            </button>
+                                        </ui:fragment>
+                                        <ul class="dropdown-menu pull-left text-left" role="menu">
+                                            <!-- Explore tool links -->
+                                            <ui:repeat var="tool" value="#{DatasetPage.datasetExploreTools}">
+                                                <li>
+                                                    <h:commandLink action="#{DatasetPage.explore(tool)}">
+                                                        <h:outputText value="#{tool.displayName}"/>
+                                                    </h:commandLink>
+                                                </li>
+                                            </ui:repeat>
+                                        </ul>
+                                    </div>
+                                    <div class="btn-group" jsf:rendered="#{DatasetPage.sessionUserAuthenticated
+                                                                                  and !DatasetPage.dataset.deaccessioned
+                                                                                  and DatasetPage.showComputeButton()}">
+                                        <!-- Compute Button Group -->
+                                        <button type="button" id="computeBatch" class="btn btn-default btn-compute dropdown-toggle" data-toggle="dropdown">
+                                            <span class="glyphicon glyphicon-flash"/> #{bundle['dataset.compute.computeBtn']} <span class="caret"></span>
+                                        </button>
+                                        <ul class="dropdown-menu pull-left text-left" role="menu">
                                             <li>
-                                                <p:commandLink id="deaccessionDatasetLink" 
-                                                               action="#{DatasetPage.clickDeaccessionDataset}"
-                                                               oncomplete="PF('deaccessionBlock').show();bind_bsui_components();"
-                                                               update="deaccessionBlock">
-                                                    <h:outputText value="#{bundle['dataset.editBtn.itemLabel.deaccession']}" />
+                                                <!-- Compute dataset link -->
+                                                <h:commandLink action="#{DatasetPage.canComputeAllFiles(false)}">
+                                                    <h:outputText value="#{bundle['dataset.compute.computeBatchSingle']}"/>
+                                                </h:commandLink>
+                                            </li>
+                                            <li jsf:rendered="#{!DatasetPage.isCartEmpty()}" class="divider"></li>
+                                            <li jsf:rendered="#{!DatasetPage.checkCartForItem(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}">
+                                                <!-- Add link -->
+                                                <p:commandLink action="#{DatasetPage.addItemtoCart(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}"
+                                                    disabled="#{DatasetPage.locked}" value="#{bundle['dataset.compute.computeBatchAdd']}" update=":datasetForm,:messagePanel">
+                                                    <h:outputText value="#{bundle['dataset.compute.computeBatchAdd']}"/>
                                                 </p:commandLink>
                                             </li>
-                                        </ui:fragment>
-                                    </ul>
-                                </ui:fragment>
-                                <!-- END: Edit Button -->
-                                <!-- END: Edit/Link/Publish Button Group -->
-                            </div>
-                            <!-- Contact/Share Button Group -->
-                            <div class="btn-group pull-right" id="datasetButtonBar" role="group">
-                                <p:commandLink class="text-button btn-contact bootstrap-button-tooltip" title="#{bundle['dataset.email.datasetContactBtn']}"
-                                               update=":contactDialog" oncomplete="PF('contactForm').show()" actionListener="#{sendFeedbackDialog.initUserInput}">
-                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
-                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
-                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
-                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{DatasetPage.dataset}"/>
-                                    <span class="glyphicon glyphicon-envelope"/> #{bundle['contact.contact']}
-                                </p:commandLink>
-                                <p:commandLink styleClass="text-button btn-share bootstrap-button-tooltip" rendered="#{!DatasetPage.workingVersion.deaccessioned}"
-                                               title="#{bundle['dataset.share.datasetShare']}"
-                                               oncomplete="PF('shareDialog').show();sharrre();">
-                                    <span class="glyphicon glyphicon-share"/> #{bundle['share']}
-                                </p:commandLink>
+                                            <ui:fragment rendered="#{!DatasetPage.isCartEmpty()}">
+                                                <li jsf:rendered="#{DatasetPage.checkCartForItem(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}">
+                                                    <!-- Remove link -->
+                                                    <p:commandLink value="#{bundle['dataset.compute.computeBatchRemove']}" action="#{DatasetPage.removeCartItem(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}" update=":datasetForm,:messagePanel">  
+                                                        <h:outputText value="#{bundle['dataset.compute.computeBatchRemove']}"/>
+                                                    </p:commandLink>
+                                                </li>
+                                                <li>
+                                                    <!-- List link -->
+                                                    <p:commandLink title="#{bundle['dataset.compute.computeBatchList']}"
+                                                                   value="#{bundle['dataset.compute.computeBatchList']}"
+                                                                   oncomplete="PF('computeBatchListPopup').show();bind_bsui_components();"
+                                                                   update="computeBatchListPopup">
+                                                        <h:outputText value="#{bundle['dataset.compute.computeBatchList']}"/>
+                                                    </p:commandLink>
+                                                </li>
+                                                <li>
+                                                    <!-- Clear link -->
+                                                    <p:commandLink value="#{bundle['dataset.compute.computeBatchClear']}" action="#{DatasetPage.clearCart()}" update=":datasetForm,:messagePanel">  
+                                                        <h:outputText value="#{bundle['dataset.compute.computeBatchClear']}"/>
+                                                    </p:commandLink>
+                                                </li>
+                                                <li>
+                                                    <!-- Compute batch link -->
+                                                    <h:outputLink value="#{DatasetPage.cartComputeUrl}" target="_blank">
+                                                        <h:outputText id="compute-batch-button" value="#{bundle['dataset.compute.computeBatchCompute']}" />
+                                                    </h:outputLink>
+                                                </li>
+                                            </ui:fragment>
+                                        </ul>
+                                    </div>
+                                </div>
                             </div>
-                            <!-- END: Contact/Share Button Group -->
                         </div>
                         <div id="datasetVersionBlock" class="col-sm-12">
                             <div id="title-block" class="row margin-bottom-half" jsf:rendered="#{!empty DatasetPage.datasetVersionUI.title.value}">
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index 8f720ab6632..fe8eb6e861a 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -348,143 +348,12 @@
                     <!-- END Edit Mode -->
                     <!-- View Mode / Description Panel -->
                     <ui:fragment rendered="#{empty DataversePage.editMode}">
-                        <div id="actionButtonBlock" class="button-block clearfix" jsf:rendered="#{!widgetWrapper.widgetView}">
-                            <!-- Edit/Publish Button Group -->
-                            <div class="btn-group pull-right" jsf:rendered="#{dataverseSession.user.authenticated and
-                                                     (permissionsWrapper.canIssueUpdateDataverseCommand(DataversePage.dataverse)
-                                                     or permissionsWrapper.canIssuePublishDataverseCommand(DataversePage.dataverse))}">
-                                    <!-- Publish Button -->
-                                    <ui:fragment rendered="#{permissionsWrapper.canIssuePublishDataverseCommand(DataversePage.dataverse)}">
-                                        <button type="button" class="btn btn-default btn-access" onclick="PF('confirmation').show()"
-                                                jsf:rendered="#{!DataversePage.dataverse.released and (empty DataversePage.dataverse.owner or DataversePage.dataverse.owner.released)}">
-                                            <span class="glyphicon glyphicon-globe"/> #{bundle['dataverse.publish.btn']}
-                                        </button>
-                                        <button type="button" class="btn btn-default btn-access" onclick="PF('mayNotRelease').show()"
-                                                jsf:rendered="#{!DataversePage.dataverse.released and (!empty DataversePage.dataverse.owner and !DataversePage.dataverse.owner.released)}">
-                                            <span class="glyphicon glyphicon-globe"/> #{bundle['dataverse.publish.btn']}
-                                        </button>
-                                    </ui:fragment>
-                                    <!-- END: Publish Button -->
-                                    <div class="btn-group" jsf:rendered="#{dataverseSession.user.superuser and (SearchIncludeFragment.mode == 'search' or DataversePage.dataverse.owner != null)}">
-                                        <button type="button" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-                                            <span class="glyphicon glyphicon-link"/> #{bundle['link']} <span class="caret"></span>
-                                        </button>
-                                        <ul class="dropdown-menu pull-right text-left" role="menu">
-                                            <li class="#{DataversePage.dataverse.owner != null ? '' : 'disabled'}">
-                                                <p:commandLink action="#{DataversePage.setupLinkingPopup('link')}"
-                                                               oncomplete="PF('linkDataverseForm').show()"
-                                                               update=":linkDataverseForm"
-                                                               disabled="#{DataversePage.dataverse.owner == null}">
-                                                    #{bundle['dataverse.link']}
-                                                </p:commandLink>
-                                            </li>
-                                            <li class="#{SearchIncludeFragment.mode == 'search' ? '' : 'disabled'}">
-                                                <p:commandLink action="#{DataversePage.setupLinkingPopup('savedSearch')}"
-                                                               oncomplete="PF('linkDataverseForm').show()"
-                                                               update=":linkDataverseForm"
-                                                               disabled="#{SearchIncludeFragment.mode != 'search'}">
-                                                    #{bundle['dataverse.savedsearch.link']}
-                                                </p:commandLink>
-                                            </li>
-                                        </ul>
-                                    </div>
-                                    <!-- Edit Button -->
-                                    <div class="btn-group" jsf:rendered="#{permissionsWrapper.canIssueUpdateDataverseCommand(DataversePage.dataverse)}">
-                                        <button type="button" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown">
-                                            <span class="glyphicon glyphicon-pencil"/> #{bundle['dataverse.edit']} <span class="caret"></span>
-                                        </button>
-                                        <ul class="dropdown-menu pull-right text-left" role="menu">
-                                            <li>
-                                                <div id="dataverse-info-dropdown">
-                                                    <div class="dataverse-info-logo-icon">
-                                                        <span class="icon-dataverse text-brand"></span>
-                                                    </div>
-                                                    <div class="dataverse-info-general">
-                                                        <div><h:outputText value="#{DataversePage.dataverse.name}" styleClass="highlightBold"/> <h:outputText value=" (#{DataversePage.dataverse.affiliation})" styleClass="text-muted" rendered="#{!empty DataversePage.dataverse.affiliation}"/></div>
-                                                        <div class="text-muted">#{DataversePage.dataverse.alias}</div>
-                                                    </div>
-                                                </div>
-                                            </li>
-                                            <li class="divider" role="presentation"></li>
-                                            <li>
-                                                <p:commandLink id="editInfo" actionListener="#{DataversePage.edit('INFO')}" update="@form,:dataverseForm,:searchResults,:messagePanel" oncomplete="javascript:bind_bsui_components();">
-                                                    <h:outputText value="#{bundle['dataverse.option.generalInfo']}" />
-                                                </p:commandLink>
-                                            </li>
-                                            <li>
-                                                <h:link outcome="ThemeAndWidgets" id="themeWidgetsOpts">
-                                                    <f:param name="id" value="#{DataversePage.dataverse.id}" />
-                                                    <h:outputText value="#{bundle['dataverse.option.themeAndWidgets']}" />
-                                                </h:link>
-                                            </li>
-                                            <ui:fragment rendered="#{permissionsWrapper.canManagePermissions(DataversePage.dataverse)}">
-                                                <li>
-                                                    <h:link id="managePermissions" styleClass="ui-commandlink ui-widget" outcome="permissions-manage">
-                                                        <h:outputText value="#{bundle['dataverse.option.permissions']}" />
-                                                        <f:param name="id" value="#{DataversePage.dataverse.id}" />
-                                                    </h:link>
-                                                </li>
-                                            </ui:fragment>
-                                            <ui:fragment rendered="#{permissionsWrapper.canManagePermissions(DataversePage.dataverse)}">
-                                                <li>
-                                                    <h:link id="manageGroups" styleClass="ui-commandlink ui-widget" outcome="manage-groups">
-                                                        <h:outputText value="#{bundle['dataverse.option.dataverseGroups']}" />
-                                                        <f:param name="dataverseId" value="#{DataversePage.dataverse.id}" />
-                                                    </h:link>
-                                                </li>
-                                            </ui:fragment>
-                                            <li>
-                                                <h:link id="manageTemplates" styleClass="ui-commandlink ui-widget" outcome="manage-templates">
-                                                    <h:outputText value="#{bundle['dataverse.option.datasetTemplates']}" />
-                                                    <f:param name="dataverseId" value="#{DataversePage.dataverse.id}" />
-                                                </h:link>
-                                            </li>
-                                            <li jsf:rendered="#{!settingsWrapper.rsyncOnly}">
-                                                <h:link id="manageGuestbooks" styleClass="ui-commandlink ui-widget" outcome="manage-guestbooks">
-                                                    <h:outputText value="#{bundle['dataverse.option.datasetGuestbooks']}" />
-                                                    <f:param name="dataverseId" value="#{DataversePage.dataverse.id}" />
-                                                </h:link>
-                                            </li>
-                                            <li>
-                                                <p:commandLink id="browseOpts" actionListener="#{DataversePage.edit('FEATURED')}" oncomplete="PF('browseOptsForm').show()"
-                                                               update="dataverseForm:browseOptsForm">
-                                                    <h:outputText value="#{bundle['dataverse.option.featuredDataverse']}" />
-                                                </p:commandLink>
-                                            </li>
-                                            <ui:fragment rendered="#{DataversePage.isEmptyDataverse() and !(DataversePage.dataverse.owner == null)
-                                                                     and permissionsWrapper.canIssueDeleteDataverseCommand(DataversePage.dataverse)}">
-                                                <li class="divider"></li>
-                                                <li>
-                                                    <p:commandLink id="deleteDataset" onclick="PF('deleteConfirmation').show()">
-                                                        <h:outputText value="#{bundle['dataverse.option.deleteDataverse']}" />
-                                                    </p:commandLink>
-                                                </li>
-                                            </ui:fragment>
-                                        </ul>
-                                    </div>
-                                    <!-- END: Edit Button -->
-                            </div>
-                            <!-- END: Edit/Publish Button Group -->
-                            <!-- Email/Link/Share Button Group -->
-                            <div class="btn-group pull-right" role="group">
-                                <p:commandLink type="button" styleClass="text-button btn-contact bootstrap-button-tooltip" title="#{bundle['dataverse.contact']}"
-                                               update=":contactDialog" oncomplete="PF('contactForm').show()" actionListener="#{sendFeedbackDialog.initUserInput}">
-                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
-                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
-                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
-                                    <f:param name="DO_VALIDATION" value="false"/>
-                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{DataversePage.dataverse}"/>
-                                        <span class="glyphicon glyphicon-envelope"/> #{bundle['contact.contact']}
-                                </p:commandLink>
-                                <p:commandLink type="button" styleClass="text-button btn-share bootstrap-button-tooltip"
-                                   title="#{bundle['dataverse.share.dataverseShare']}"
-                                   oncomplete="PF('shareDialog').show();sharrre();">
-                                    <span class="glyphicon glyphicon-share"/> #{bundle['share']}
-                                </p:commandLink>
-                            </div>
-                            <!-- END: Email/Link/Share Button Group -->
+                        <div id="actionButtonBlock" class="button-block row" jsf:rendered="#{!widgetWrapper.widgetView}">
+                                
+                            
+                            
                             <!-- Metrics for Root Dataverse -->
-                            <div id="metrics-block" class="col-xs-3" jsf:rendered="#{DataversePage.isRootDataverse() and !settingsWrapper.rsyncOnly}">
+                            <div id="metrics-block" class="col-xs-4" jsf:rendered="#{DataversePage.isRootDataverse() and !settingsWrapper.rsyncOnly}">
                                 <div id="metrics-label" class="col-xs-4 small text-center">
                                     <h:outputLink value="#{systemConfig.metricsUrl}" target="_blank" title="#{bundle['metrics.title.tip']}" rendered="#{systemConfig.metricsUrl != null}">
                                         <span class="glyphicon glyphicon-stats"/> #{bundle['metrics.title']}
@@ -500,6 +369,144 @@
                                 </div>
                             </div>
                             <!-- END: Metrics for Root Dataverse-->
+                            <!-- Email/Link/Share Button Group -->
+                            <div class="#{DataversePage.isRootDataverse() ? 'col-xs-8' : 'col-xs-12'} text-right">
+                                <div class="btn-group" role="group">
+                                    <p:commandLink type="button" styleClass="text-button btn-contact bootstrap-button-tooltip" title="#{bundle['dataverse.contact']}"
+                                                   update=":contactDialog" oncomplete="PF('contactForm').show()" actionListener="#{sendFeedbackDialog.initUserInput}">
+                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
+                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
+                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
+                                        <f:param name="DO_VALIDATION" value="false"/>
+                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{DataversePage.dataverse}"/>
+                                            <span class="glyphicon glyphicon-envelope"/> #{bundle['contact.contact']}
+                                    </p:commandLink>
+                                    <p:commandLink type="button" styleClass="text-button btn-share bootstrap-button-tooltip"
+                                       title="#{bundle['dataverse.share.dataverseShare']}"
+                                       oncomplete="PF('shareDialog').show();sharrre();">
+                                        <span class="glyphicon glyphicon-share"/> #{bundle['share']}
+                                    </p:commandLink>
+                                </div>
+                                
+                                <!-- Edit/Publish Button Group -->
+                                <div class="btn-group" jsf:rendered="#{dataverseSession.user.authenticated and
+                                                         (permissionsWrapper.canIssueUpdateDataverseCommand(DataversePage.dataverse)
+                                                         or permissionsWrapper.canIssuePublishDataverseCommand(DataversePage.dataverse))}">
+                                        <!-- Publish Button -->
+                                        <ui:fragment rendered="#{permissionsWrapper.canIssuePublishDataverseCommand(DataversePage.dataverse)}">
+                                            <button type="button" class="btn btn-default btn-access" onclick="PF('confirmation').show()"
+                                                    jsf:rendered="#{!DataversePage.dataverse.released and (empty DataversePage.dataverse.owner or DataversePage.dataverse.owner.released)}">
+                                                <span class="glyphicon glyphicon-globe"/> #{bundle['dataverse.publish.btn']}
+                                            </button>
+                                            <button type="button" class="btn btn-default btn-access" onclick="PF('mayNotRelease').show()"
+                                                    jsf:rendered="#{!DataversePage.dataverse.released and (!empty DataversePage.dataverse.owner and !DataversePage.dataverse.owner.released)}">
+                                                <span class="glyphicon glyphicon-globe"/> #{bundle['dataverse.publish.btn']}
+                                            </button>
+                                        </ui:fragment>
+                                        <!-- END: Publish Button -->
+                                        <div class="btn-group" jsf:rendered="#{dataverseSession.user.superuser and (SearchIncludeFragment.mode == 'search' or DataversePage.dataverse.owner != null)}">
+                                            <button type="button" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+                                                <span class="glyphicon glyphicon-link"/> #{bundle['link']} <span class="caret"></span>
+                                            </button>
+                                            <ul class="dropdown-menu pull-right text-left" role="menu">
+                                                <li class="#{DataversePage.dataverse.owner != null ? '' : 'disabled'}">
+                                                    <p:commandLink action="#{DataversePage.setupLinkingPopup('link')}"
+                                                                   oncomplete="PF('linkDataverseForm').show()"
+                                                                   update=":linkDataverseForm"
+                                                                   disabled="#{DataversePage.dataverse.owner == null}">
+                                                        #{bundle['dataverse.link']}
+                                                    </p:commandLink>
+                                                </li>
+                                                <li class="#{SearchIncludeFragment.mode == 'search' ? '' : 'disabled'}">
+                                                    <p:commandLink action="#{DataversePage.setupLinkingPopup('savedSearch')}"
+                                                                   oncomplete="PF('linkDataverseForm').show()"
+                                                                   update=":linkDataverseForm"
+                                                                   disabled="#{SearchIncludeFragment.mode != 'search'}">
+                                                        #{bundle['dataverse.savedsearch.link']}
+                                                    </p:commandLink>
+                                                </li>
+                                            </ul>
+                                        </div>
+                                        <!-- Edit Button -->
+                                        <div class="btn-group" jsf:rendered="#{permissionsWrapper.canIssueUpdateDataverseCommand(DataversePage.dataverse)}">
+                                            <button type="button" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown">
+                                                <span class="glyphicon glyphicon-pencil"/> #{bundle['dataverse.edit']} <span class="caret"></span>
+                                            </button>
+                                            <ul class="dropdown-menu pull-right text-left" role="menu">
+                                                <li>
+                                                    <div id="dataverse-info-dropdown">
+                                                        <div class="dataverse-info-logo-icon">
+                                                            <span class="icon-dataverse text-brand"></span>
+                                                        </div>
+                                                        <div class="dataverse-info-general">
+                                                            <div><h:outputText value="#{DataversePage.dataverse.name}" styleClass="highlightBold"/> <h:outputText value=" (#{DataversePage.dataverse.affiliation})" styleClass="text-muted" rendered="#{!empty DataversePage.dataverse.affiliation}"/></div>
+                                                            <div class="text-muted">#{DataversePage.dataverse.alias}</div>
+                                                        </div>
+                                                    </div>
+                                                </li>
+                                                <li class="divider" role="presentation"></li>
+                                                <li>
+                                                    <p:commandLink id="editInfo" actionListener="#{DataversePage.edit('INFO')}" update="@form,:dataverseForm,:searchResults,:messagePanel" oncomplete="javascript:bind_bsui_components();">
+                                                        <h:outputText value="#{bundle['dataverse.option.generalInfo']}" />
+                                                    </p:commandLink>
+                                                </li>
+                                                <li>
+                                                    <h:link outcome="ThemeAndWidgets" id="themeWidgetsOpts">
+                                                        <f:param name="id" value="#{DataversePage.dataverse.id}" />
+                                                        <h:outputText value="#{bundle['dataverse.option.themeAndWidgets']}" />
+                                                    </h:link>
+                                                </li>
+                                                <ui:fragment rendered="#{permissionsWrapper.canManagePermissions(DataversePage.dataverse)}">
+                                                    <li>
+                                                        <h:link id="managePermissions" styleClass="ui-commandlink ui-widget" outcome="permissions-manage">
+                                                            <h:outputText value="#{bundle['dataverse.option.permissions']}" />
+                                                            <f:param name="id" value="#{DataversePage.dataverse.id}" />
+                                                        </h:link>
+                                                    </li>
+                                                </ui:fragment>
+                                                <ui:fragment rendered="#{permissionsWrapper.canManagePermissions(DataversePage.dataverse)}">
+                                                    <li>
+                                                        <h:link id="manageGroups" styleClass="ui-commandlink ui-widget" outcome="manage-groups">
+                                                            <h:outputText value="#{bundle['dataverse.option.dataverseGroups']}" />
+                                                            <f:param name="dataverseId" value="#{DataversePage.dataverse.id}" />
+                                                        </h:link>
+                                                    </li>
+                                                </ui:fragment>
+                                                <li>
+                                                    <h:link id="manageTemplates" styleClass="ui-commandlink ui-widget" outcome="manage-templates">
+                                                        <h:outputText value="#{bundle['dataverse.option.datasetTemplates']}" />
+                                                        <f:param name="dataverseId" value="#{DataversePage.dataverse.id}" />
+                                                    </h:link>
+                                                </li>
+                                                <li jsf:rendered="#{!settingsWrapper.rsyncOnly}">
+                                                    <h:link id="manageGuestbooks" styleClass="ui-commandlink ui-widget" outcome="manage-guestbooks">
+                                                        <h:outputText value="#{bundle['dataverse.option.datasetGuestbooks']}" />
+                                                        <f:param name="dataverseId" value="#{DataversePage.dataverse.id}" />
+                                                    </h:link>
+                                                </li>
+                                                <li>
+                                                    <p:commandLink id="browseOpts" actionListener="#{DataversePage.edit('FEATURED')}" oncomplete="PF('browseOptsForm').show()"
+                                                                   update="dataverseForm:browseOptsForm">
+                                                        <h:outputText value="#{bundle['dataverse.option.featuredDataverse']}" />
+                                                    </p:commandLink>
+                                                </li>
+                                                <ui:fragment rendered="#{DataversePage.isEmptyDataverse() and !(DataversePage.dataverse.owner == null)
+                                                                         and permissionsWrapper.canIssueDeleteDataverseCommand(DataversePage.dataverse)}">
+                                                    <li class="divider"></li>
+                                                    <li>
+                                                        <p:commandLink id="deleteDataset" onclick="PF('deleteConfirmation').show()">
+                                                            <h:outputText value="#{bundle['dataverse.option.deleteDataverse']}" />
+                                                        </p:commandLink>
+                                                    </li>
+                                                </ui:fragment>
+                                            </ul>
+                                        </div>
+                                        <!-- END: Edit Button -->
+                                </div>
+                                <!-- END: Edit/Publish Button Group -->
+                                
+                            </div>
+                            <!-- END: Email/Link/Share Button Group -->
                         </div>
                         <ui:fragment rendered="#{SearchIncludeFragment.filterQueries.size() == 0 and SearchIncludeFragment.mode != SearchIncludeFragment.searchModeString}">
                             <o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 629ce6be178..404c3585933 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -589,7 +589,7 @@ div[id$='roleDisplay'] span.label, div[id$='roleDetails'] span.label {display:in
 #metrics-block {margin-bottom:20px;}
 
 /* -- OLD LAYOUT -- */
-#metrics-block.col-xs-3 {border:1px solid #eee;padding:0;}
+#metrics-block {border:1px solid #eee;padding:0;}
 #metrics-label {color:#333;background:#eee;padding:8px 10px;}
 #metrics-label a {color:#333;display:block;}
 #metrics-label a:hover {text-decoration:none;}
@@ -934,6 +934,59 @@ div.ui-widget-overlay {background:#ccc; opacity:.6;}
         display:none;
     }
 }
+/* COLLAPSE-NAVBAR */
+@media (max-width: 992px) {
+    .navbar-header {
+        float: none;
+    }
+    .navbar-left,.navbar-right {
+        float: none !important;
+    }
+    .navbar-toggle {
+        display: block;
+        margin-right: 0px;
+    }
+    .navbar-collapse {
+        border-top: 1px solid transparent;
+        box-shadow: inset 0 1px 0 rgba(255,255,255,0.1);
+    }
+    .navbar-fixed-top {
+        top: 0;
+        border-width: 0 0 1px;
+    }
+    .navbar-collapse.collapse {
+        display: none !important;
+    }
+    .navbar-nav {
+        float: none!important;
+        margin-top: 7.5px;
+    }
+    .navbar-nav>li {
+        float: none;
+    }
+    .navbar-nav>li>a {
+        padding-top: 10px;
+        padding-bottom: 10px;
+    }
+    .collapse.in{
+        display: block !important;
+    }
+    .navbar-right .dropdown-menu {
+        left: 0;
+        right: auto;
+    }
+    /* LANGUAGE STYLES */
+    #navbarFixed .dropdown-menu.navbar-language a.language-menu-link {
+        color: #777;
+        line-height: 20px;
+        padding: 5px 15px 5px 25px;
+    }
+    #navbarFixed .dropdown-menu.navbar-language a.language-menu-link:hover,
+    #navbarFixed .dropdown-menu.navbar-language a.language-menu-link:focus {
+        color: #333;
+        background-color: transparent;
+    }
+}
 
 /* CITATION-FRAME */
 #citation-banner {width:100%; height:45px; position: absolute; z-index: 999999; border-radius: 0; border-width: 0 0 1px 0;}

From fe17457999593c67166f2a9720a66e7952e8a379 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Tue, 22 Oct 2019 15:54:15 -0400
Subject: [PATCH 12/35] More responsive layout improvements, plus deaccession
 reason layout fixes [ref #5615, #6162]

---
 src/main/webapp/dataset-citation.xhtml      |   2 +-
 src/main/webapp/dataset.xhtml               | 841 ++++++++++----------
 src/main/webapp/dataverse.xhtml             | 294 ++++---
 src/main/webapp/file.xhtml                  | 374 ++++-----
 src/main/webapp/resources/css/structure.css |   7 +-
 5 files changed, 766 insertions(+), 752 deletions(-)

diff --git a/src/main/webapp/dataset-citation.xhtml b/src/main/webapp/dataset-citation.xhtml
index 84dcf4d6849..7d3c582448a 100644
--- a/src/main/webapp/dataset-citation.xhtml
+++ b/src/main/webapp/dataset-citation.xhtml
@@ -7,7 +7,7 @@
      xmlns:o="http://omnifaces.org/ui"
      xmlns:jsf="http://xmlns.jcp.org/jsf">
     
-    <div class="#{widgetWrapper.widgetView ? 'col-sm-12' : 'col-sm-9'} citation-block">
+    <div class="#{(widgetWrapper.widgetView or DatasetPage.workingVersion.deaccessioned) ? 'col-sm-12' : 'col-sm-9'} citation-block">
         <div class="col-sm-12 #{DatasetPage.workingVersion.deaccessioned ? 'alert alert-danger bg-danger' : 'alert alert-info bg-citation'}">
             <div class="row ">
                 <div class="col-sm-12 citation">
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index e554eef2a57..76dad11f1d1 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -76,432 +76,444 @@
                     <f:viewAction action="#{EditDatafilesPage.initCreateMode(DatasetPage.editMode, DatasetPage.workingVersion, DatasetPage.newFiles, DatasetPage.selectedFiles)}"/>
                 </f:metadata>
                 <h:form id="datasetForm">
-                    <!-- Header / Button Panel -->
-                    <!-- View editMode -->
+                    <!-- View infoMode -->
+                    <!-- Top Button/Citation Blocks -->
                     <p:fragment id="topDatasetBlockFragment">
-                    <div id="topDatasetBlock" class="row" jsf:rendered="#{empty DatasetPage.editMode}">
-                        <div id="actionButtonBlock" class="button-block row" jsf:rendered="#{!widgetWrapper.widgetView}">
-                            
-                            <div class="col-xs-12 text-right">
-                                <!-- Contact/Share Button Group -->
-                                <div class="btn-group" id="datasetButtonBar" role="group">
-                                    <p:commandLink class="text-button btn-contact bootstrap-button-tooltip" title="#{bundle['dataset.email.datasetContactBtn']}"
-                                                   update=":contactDialog" oncomplete="PF('contactForm').show()" actionListener="#{sendFeedbackDialog.initUserInput}">
-                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
-                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
-                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
-                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{DatasetPage.dataset}"/>
-                                        <span class="glyphicon glyphicon-envelope"/> #{bundle['contact.contact']}
-                                    </p:commandLink>
-                                    <p:commandLink styleClass="text-button btn-share bootstrap-button-tooltip" rendered="#{!DatasetPage.workingVersion.deaccessioned}"
-                                                   title="#{bundle['dataset.share.datasetShare']}"
-                                                   oncomplete="PF('shareDialog').show();sharrre();">
-                                        <span class="glyphicon glyphicon-share"/> #{bundle['share']}
-                                    </p:commandLink>
-                                </div>
-                                <!-- END: Contact/Share Button Group -->
-                                <div class="btn-group" role="group">
-                                    <!-- Edit/Publish Button Group -->
-                                    <!-- Publish/Submit for Review/Return to Author Button Group -->
-                                    <ui:fragment rendered="#{DatasetPage.workingVersion == DatasetPage.dataset.latestVersion
-                                                                and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)
-                                                                or (DatasetPage.dataset.latestVersion.versionState=='DRAFT'
-                                                                and DatasetPage.canUpdateDataset()
-                                                                and !permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset))}">
-                                        <!-- Publish Buttons -->
-                                        <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" onclick="PF('publishConfirm').show()"
-                                                       rendered="#{!DatasetPage.dataset.released
-                                                                   and DatasetPage.dataset.latestVersion.versionState=='DRAFT' and DatasetPage.dataset.owner.released
-                                                                   and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
-                                            <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
-                                        </p:commandLink>
-                                        <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" onclick="PF('releaseDraft').show()"
-                                                       rendered="#{DatasetPage.dataset.released and DatasetPage.dataset.latestVersion.versionState=='DRAFT' and DatasetPage.dataset.owner.released
-                                                                   and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
-                                            <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
-                                        </p:commandLink>
-                                        <!-- 4.2.1:  replaced permissionServiceBean.on(DatasetPage.dataset.owner).has('PublishDataverse') with DatasetPage.canPublishDataverse() -->
-                                        <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" onclick="PF('mayNotRelease').show()"
-                                                       rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and !DatasetPage.dataset.owner.released
-                                                                   and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)
-                                                                   and !DatasetPage.canPublishDataverse()}">
-                                            <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
-                                        </p:commandLink>
-                                        <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" onclick="PF('publishParent').show()"
-                                                       rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and !DatasetPage.dataset.owner.released
-                                                                   and DatasetPage.canPublishDataverse()
-                                                                   and (DatasetPage.dataset.owner.owner == null or (DatasetPage.dataset.owner.owner != null and DatasetPage.dataset.owner.owner.released))
-                                                                   and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
-                                            <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
-                                        </p:commandLink>
-                                        <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}"
-                                                       rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and !DatasetPage.dataset.owner.released
-                                                                   and DatasetPage.canPublishDataverse()
-                                                                   and (DatasetPage.dataset.owner.owner != null and !DatasetPage.dataset.owner.owner.released)
-                                                                   and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}"
-                                                       onclick="PF('maynotPublishParent').show()">
-                                            <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
-                                        </p:commandLink>
-                                        <!-- END: Publish Buttons -->
-                                        <ui:fragment rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and DatasetPage.dataset.latestVersion.inReview
-                                                                   and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
-                                            <!-- Return to Author Button -->
-                                            <button type="button" class="btn btn-default btn-access #{(DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview) ? 'disabled' : ''}" 
-                                                                  onclick="PF('sendBackToContributor').show()">
-                                                <span class="glyphicon glyphicon-repeat"/> #{bundle['dataset.rejectBtn']}
-                                            </button>
-                                            <!-- END: Return to Author Button -->
-                                        </ui:fragment>
-                                        <ui:fragment rendered="#{DatasetPage.workingVersion == DatasetPage.dataset.latestVersion
-                                                                and !DatasetPage.datasetLockedInWorkflow
-                                                                and DatasetPage.dataset.latestVersion.versionState=='DRAFT'
-                                                                and DatasetPage.canUpdateDataset()
-                                                                and !permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
-                                            <!-- Submit for Review Button -->
-                                            <button type="button" class="btn btn-default btn-access #{DatasetPage.dataset.latestVersion.inReview or DatasetPage.dataset.locked ? 'disabled' : ''}" 
-                                                                  onclick="PF('inreview').show()">
-                                                <span class="glyphicon glyphicon-globe"/> #{DatasetPage.dataset.latestVersion.inReview ? bundle['dataset.disabledSubmittedBtn'] : bundle['dataset.submitBtn']}
-                                            </button>
-                                            <!-- End: Submit for Review Button -->
-                                        </ui:fragment>
-                                    </ui:fragment>
-                                    <!-- END: Publish/Submit for Review/Return to Author Button Group -->
-                                    <p:commandLink rendered="#{dataverseSession.user.authenticated and !DatasetPage.workingVersion.deaccessioned and DatasetPage.dataset.released}"
-                                                   styleClass="btn btn-default btn-access"   
-                                                   action="#{DatasetPage.setShowLinkingPopup(true)}"
-                                                   oncomplete="PF('linkDatasetForm').show();bind_bsui_components();"
-                                                   update="@form">
-                                        <span class="glyphicon glyphicon-link"/> #{bundle['link']}
-                                    </p:commandLink>
-                                    <!-- Edit Button -->
-                                    <ui:fragment rendered="#{DatasetPage.sessionUserAuthenticated
-                                                                                      and DatasetPage.canUpdateDataset()
-                                                                                      and !DatasetPage.dataset.deaccessioned}">
-                                        <button type="button" id="editDataSet" class="btn btn-default btn-access dropdown-toggle #{DatasetPage.lockedFromEdits ? 'disabled' : ''}" data-toggle="dropdown">
-                                            <span class="glyphicon glyphicon-pencil"/> #{bundle['dataset.editBtn']} <span class="caret"></span>
-                                        </button>
-                                        <ul class="dropdown-menu pull-right text-left" role="menu">
-                                            <li>                                           
-                                                <h:outputLink value="/editdatafiles.xhtml?datasetId=#{DatasetPage.dataset.id}&#38;mode=UPLOAD">
-                                                    <h:outputText value="#{bundle['dataset.editBtn.itemLabel.upload']}"/>
-                                                </h:outputLink>
-                                            </li>
-                                            <li>
-                                                <p:commandLink id="editMetadata" actionListener="#{DatasetPage.edit('METADATA')}" update="@form,:datasetForm,:messagePanel" oncomplete="javascript:bind_bsui_components();">
-                                                    <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
-                                                    <h:outputText value="#{bundle['dataset.editBtn.itemLabel.metadata']}" />
+                    <div class="row" rendered="#{empty DatasetPage.editMode}">
+                        <div class="col-xs-12">
+                            <div id="actionButtonBlock" class="col-xs-12 button-block" jsf:rendered="#{!widgetWrapper.widgetView}">
+                                <div class="row">
+                                    <!-- ActionButtonBlock -->
+                                    <div class="col-xs-12 text-right padding-none">
+                                        <!-- Contact/Share Button Group -->
+                                        <div class="btn-group" id="datasetButtonBar" role="group">
+                                            <p:commandLink class="text-button btn-contact bootstrap-button-tooltip" title="#{bundle['dataset.email.datasetContactBtn']}"
+                                                           update=":contactDialog" oncomplete="PF('contactForm').show()" actionListener="#{sendFeedbackDialog.initUserInput}">
+                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
+                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
+                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
+                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{DatasetPage.dataset}"/>
+                                                <span class="glyphicon glyphicon-envelope"/> #{bundle['contact.contact']}
+                                            </p:commandLink>
+                                            <p:commandLink styleClass="text-button btn-share bootstrap-button-tooltip" rendered="#{!DatasetPage.workingVersion.deaccessioned}"
+                                                           title="#{bundle['dataset.share.datasetShare']}"
+                                                           oncomplete="PF('shareDialog').show();sharrre();">
+                                                <span class="glyphicon glyphicon-share"/> #{bundle['share']}
+                                            </p:commandLink>
+                                        </div>
+                                        <!-- END: Contact/Share Button Group -->
+                                        <div class="btn-group" role="group">
+                                            <!-- Edit/Publish Button Group -->
+                                            <!-- Publish/Submit for Review/Return to Author Button Group -->
+                                            <ui:fragment rendered="#{DatasetPage.workingVersion == DatasetPage.dataset.latestVersion
+                                                                        and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)
+                                                                        or (DatasetPage.dataset.latestVersion.versionState=='DRAFT'
+                                                                        and DatasetPage.canUpdateDataset()
+                                                                        and !permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset))}">
+                                                <!-- Publish Buttons -->
+                                                <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" onclick="PF('publishConfirm').show()"
+                                                               rendered="#{!DatasetPage.dataset.released
+                                                                           and DatasetPage.dataset.latestVersion.versionState=='DRAFT' and DatasetPage.dataset.owner.released
+                                                                           and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
+                                                    <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
                                                 </p:commandLink>
-                                            </li>
-                                            <li>
-                                                <p:commandLink id="editTerms" actionListener="#{DatasetPage.edit('LICENSE')}" update="@form,:datasetForm,:messagePanel" oncomplete="javascript:bind_bsui_components();">
-                                                    <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
-                                                    <h:outputText value="#{bundle['dataset.editBtn.itemLabel.terms']}" />
+                                                <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" onclick="PF('releaseDraft').show()"
+                                                               rendered="#{DatasetPage.dataset.released and DatasetPage.dataset.latestVersion.versionState=='DRAFT' and DatasetPage.dataset.owner.released
+                                                                           and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
+                                                    <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
                                                 </p:commandLink>
-                                            </li>
-                                            <ui:fragment rendered="#{permissionsWrapper.canManagePermissions(DatasetPage.dataset)}">
-                                                <li class="#{settingsWrapper.publicInstall ? '' : 'dropdown-submenu pull-left'}">
-                                                    <ui:fragment rendered="#{!settingsWrapper.publicInstall}">
-                                                        <a tabindex="-1" href="#">#{bundle['dataset.editBtn.itemLabel.permissions']}</a>
-                                                        <ul class="dropdown-menu">
-                                                            <li>
-                                                                <h:link id="manageDatasetPermissions" styleClass="ui-commandlink ui-widget" outcome="permissions-manage">
-                                                                    <h:outputText value="#{bundle['dataset']}" />
-                                                                    <f:param name="id" value="#{DatasetPage.dataset.id}" />
-                                                                </h:link>
-                                                            </li>
-                                                            <li>
-                                                                <h:link id="manageFilePermissions" styleClass="ui-commandlink ui-widget" outcome="permissions-manage-files">
-                                                                    <h:outputText value="#{bundle['file']}" />
-                                                                    <f:param name="id" value="#{DatasetPage.dataset.id}" />
-                                                                </h:link>
-                                                            </li>
-                                                        </ul>
-                                                    </ui:fragment>                                            
-                                                    <h:link id="managePermissions" rendered="#{settingsWrapper.publicInstall}"
-                                                            styleClass="ui-commandlink ui-widget" outcome="permissions-manage">
-                                                        <h:outputText value="#{bundle['dataset.editBtn.itemLabel.permissions']}" />
-                                                        <f:param name="id" value="#{DatasetPage.dataset.id}" />
-                                                    </h:link>
-                                                </li>
-                                                <li>
-                                                    <p:commandLink id="privateUrl" oncomplete="PF('privateUrlConfirmation').show()" action="#{DatasetPage.initPrivateUrlPopUp()}" update="privateUrlPanel">
-                                                        <h:outputText value="#{bundle['dataset.editBtn.itemLabel.privateUrl']}" />
-                                                    </p:commandLink>
-                                                </li>
-                                            </ui:fragment>
-                                            <li>
-                                                <h:outputLink value="/dataset-widgets.xhtml?datasetId=#{DatasetPage.dataset.id}">
-                                                    <h:outputText value="#{bundle['dataset.editBtn.itemLabel.thumbnailsAndWidgets']}"/>
-                                                </h:outputLink>
-                                            </li>
-                                            <ui:fragment rendered="#{!DatasetPage.dataset.released and DatasetPage.dataset.latestVersion.versionState=='DRAFT' and permissionsWrapper.canIssueDeleteDatasetCommand(DatasetPage.dataset)}">
-                                                <li class="divider"></li>
-                                                <li>
-                                                    <p:commandLink id="deleteDataset" onclick="PF('deleteConfirmation').show()">
-                                                        <h:outputText value="#{bundle['dataset.editBtn.itemLabel.deleteDataset']}" />
-                                                    </p:commandLink>
-                                                </li>
-                                            </ui:fragment>
-                                            <ui:fragment rendered="#{DatasetPage.dataset.released and DatasetPage.dataset.latestVersion.versionState=='DRAFT' and permissionsWrapper.canIssueDeleteDatasetCommand(DatasetPage.dataset)}">
-                                                <li class="divider"></li>
-                                                <li>
-                                                    <p:commandLink id="deleteVersion" onclick="PF('deleteVersionConfirmation').show()">
-                                                        <h:outputText value="#{bundle['dataset.editBtn.itemLabel.deleteDraft']}" />
-                                                    </p:commandLink>
-                                                </li>
-                                            </ui:fragment>
-                                            <ui:fragment rendered="#{DatasetPage.dataset.released and DatasetPage.existReleasedVersion and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
-                                                <li class="divider"></li>
-                                                <li>
-                                                    <p:commandLink id="deaccessionDatasetLink" 
-                                                                   action="#{DatasetPage.clickDeaccessionDataset}"
-                                                                   oncomplete="PF('deaccessionBlock').show();bind_bsui_components();"
-                                                                   update="deaccessionBlock">
-                                                        <h:outputText value="#{bundle['dataset.editBtn.itemLabel.deaccession']}" />
-                                                    </p:commandLink>
-                                                </li>
-                                            </ui:fragment>
-                                        </ul>
-                                    </ui:fragment>
-                                    <!-- END: Edit Button -->
-                                    <!-- END: Edit/Link/Publish Button Group -->
-                                    <div class="btn-group" jsf:rendered="#{!DatasetPage.dataset.deaccessioned}">
-                                        <!-- Explore Button Group -->
-                                        <ui:fragment rendered="#{DatasetPage.datasetExploreTools.size()==1}">
-                                            <button type="button" class="btn btn-default btn-explore" onclick="$(this).parent().find( 'li > a' ).trigger( 'click' );">
-                                                <span class="glyphicon glyphicon-equalizer"/> #{bundle.explore}
-                                            </button>
-                                        </ui:fragment>
-                                        <ui:fragment rendered="#{DatasetPage.datasetExploreTools.size()>1}">
-                                            <button type="button" class="btn btn-default btn-explore dropdown-toggle" data-toggle="dropdown">
-                                                <span class="glyphicon glyphicon-equalizer"/> #{bundle.explore} <span class="caret"></span>
-                                            </button>
-                                        </ui:fragment>
-                                        <ul class="dropdown-menu pull-left text-left" role="menu">
-                                            <!-- Explore tool links -->
-                                            <ui:repeat var="tool" value="#{DatasetPage.datasetExploreTools}">
-                                                <li>
-                                                    <h:commandLink action="#{DatasetPage.explore(tool)}">
-                                                        <h:outputText value="#{tool.displayName}"/>
-                                                    </h:commandLink>
-                                                </li>
-                                            </ui:repeat>
-                                        </ul>
-                                    </div>
-                                    <div class="btn-group" jsf:rendered="#{DatasetPage.sessionUserAuthenticated
-                                                                                  and !DatasetPage.dataset.deaccessioned
-                                                                                  and DatasetPage.showComputeButton()}">
-                                        <!-- Compute Button Group -->
-                                        <button type="button" id="computeBatch" class="btn btn-default btn-compute dropdown-toggle" data-toggle="dropdown">
-                                            <span class="glyphicon glyphicon-flash"/> #{bundle['dataset.compute.computeBtn']} <span class="caret"></span>
-                                        </button>
-                                        <ul class="dropdown-menu pull-left text-left" role="menu">
-                                            <li>
-                                                <!-- Compute dataset link -->
-                                                <h:commandLink action="#{DatasetPage.canComputeAllFiles(false)}">
-                                                    <h:outputText value="#{bundle['dataset.compute.computeBatchSingle']}"/>
-                                                </h:commandLink>
-                                            </li>
-                                            <li jsf:rendered="#{!DatasetPage.isCartEmpty()}" class="divider"></li>
-                                            <li jsf:rendered="#{!DatasetPage.checkCartForItem(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}">
-                                                <!-- Add link -->
-                                                <p:commandLink action="#{DatasetPage.addItemtoCart(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}"
-                                                    disabled="#{DatasetPage.locked}" value="#{bundle['dataset.compute.computeBatchAdd']}" update=":datasetForm,:messagePanel">
-                                                    <h:outputText value="#{bundle['dataset.compute.computeBatchAdd']}"/>
+                                                <!-- 4.2.1:  replaced permissionServiceBean.on(DatasetPage.dataset.owner).has('PublishDataverse') with DatasetPage.canPublishDataverse() -->
+                                                <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" onclick="PF('mayNotRelease').show()"
+                                                               rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and !DatasetPage.dataset.owner.released
+                                                                           and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)
+                                                                           and !DatasetPage.canPublishDataverse()}">
+                                                    <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
                                                 </p:commandLink>
-                                            </li>
-                                            <ui:fragment rendered="#{!DatasetPage.isCartEmpty()}">
-                                                <li jsf:rendered="#{DatasetPage.checkCartForItem(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}">
-                                                    <!-- Remove link -->
-                                                    <p:commandLink value="#{bundle['dataset.compute.computeBatchRemove']}" action="#{DatasetPage.removeCartItem(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}" update=":datasetForm,:messagePanel">  
-                                                        <h:outputText value="#{bundle['dataset.compute.computeBatchRemove']}"/>
-                                                    </p:commandLink>
-                                                </li>
-                                                <li>
-                                                    <!-- List link -->
-                                                    <p:commandLink title="#{bundle['dataset.compute.computeBatchList']}"
-                                                                   value="#{bundle['dataset.compute.computeBatchList']}"
-                                                                   oncomplete="PF('computeBatchListPopup').show();bind_bsui_components();"
-                                                                   update="computeBatchListPopup">
-                                                        <h:outputText value="#{bundle['dataset.compute.computeBatchList']}"/>
-                                                    </p:commandLink>
-                                                </li>
-                                                <li>
-                                                    <!-- Clear link -->
-                                                    <p:commandLink value="#{bundle['dataset.compute.computeBatchClear']}" action="#{DatasetPage.clearCart()}" update=":datasetForm,:messagePanel">  
-                                                        <h:outputText value="#{bundle['dataset.compute.computeBatchClear']}"/>
-                                                    </p:commandLink>
-                                                </li>
-                                                <li>
-                                                    <!-- Compute batch link -->
-                                                    <h:outputLink value="#{DatasetPage.cartComputeUrl}" target="_blank">
-                                                        <h:outputText id="compute-batch-button" value="#{bundle['dataset.compute.computeBatchCompute']}" />
-                                                    </h:outputLink>
-                                                </li>
+                                                <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}" onclick="PF('publishParent').show()"
+                                                               rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and !DatasetPage.dataset.owner.released
+                                                                           and DatasetPage.canPublishDataverse()
+                                                                           and (DatasetPage.dataset.owner.owner == null or (DatasetPage.dataset.owner.owner != null and DatasetPage.dataset.owner.owner.released))
+                                                                           and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
+                                                    <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
+                                                </p:commandLink>
+                                                <p:commandLink styleClass="btn btn-default btn-access #{DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview ? 'disabled' : ''}"
+                                                               rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and !DatasetPage.dataset.owner.released
+                                                                           and DatasetPage.canPublishDataverse()
+                                                                           and (DatasetPage.dataset.owner.owner != null and !DatasetPage.dataset.owner.owner.released)
+                                                                           and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}"
+                                                               onclick="PF('maynotPublishParent').show()">
+                                                    <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
+                                                </p:commandLink>
+                                                <!-- END: Publish Buttons -->
+                                                <ui:fragment rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and DatasetPage.dataset.latestVersion.inReview
+                                                                           and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
+                                                    <!-- Return to Author Button -->
+                                                    <button type="button" class="btn btn-default btn-access #{(DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview) ? 'disabled' : ''}" 
+                                                                          onclick="PF('sendBackToContributor').show()">
+                                                        <span class="glyphicon glyphicon-repeat"/> #{bundle['dataset.rejectBtn']}
+                                                    </button>
+                                                    <!-- END: Return to Author Button -->
+                                                </ui:fragment>
+                                                <ui:fragment rendered="#{DatasetPage.workingVersion == DatasetPage.dataset.latestVersion
+                                                                        and !DatasetPage.datasetLockedInWorkflow
+                                                                        and DatasetPage.dataset.latestVersion.versionState=='DRAFT'
+                                                                        and DatasetPage.canUpdateDataset()
+                                                                        and !permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
+                                                    <!-- Submit for Review Button -->
+                                                    <button type="button" class="btn btn-default btn-access #{DatasetPage.dataset.latestVersion.inReview or DatasetPage.dataset.locked ? 'disabled' : ''}" 
+                                                                          onclick="PF('inreview').show()">
+                                                        <span class="glyphicon glyphicon-globe"/> #{DatasetPage.dataset.latestVersion.inReview ? bundle['dataset.disabledSubmittedBtn'] : bundle['dataset.submitBtn']}
+                                                    </button>
+                                                    <!-- End: Submit for Review Button -->
+                                                </ui:fragment>
                                             </ui:fragment>
-                                        </ul>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div id="datasetVersionBlock" class="col-sm-12">
-                            <div id="title-block" class="row margin-bottom-half" jsf:rendered="#{!empty DatasetPage.datasetVersionUI.title.value}">
-                                <div class="col-xs-1 vcenter title-preview-icon-block">
-                                    <img src="#{DatasetPage.thumbnailString}" jsf:rendered="#{!empty DatasetPage.thumbnailString}" alt="#{DatasetPage.datasetVersionUI.title.value}"/>
-                                    <span class="icon-dataset" jsf:rendered="#{empty DatasetPage.thumbnailString}"/>
-                                </div>
-                                <div class="col-xs-11 vcenter">
-                                    <span id="title">#{DatasetPage.datasetVersionUI.title.value}</span>
-                                    <div id="title-label-block" class="margin-top-half">
-                                        <h:outputText value="#{bundle['dataset.versionUI.draft']}" styleClass="label label-primary" rendered="#{DatasetPage.workingVersion.draft}"/>
-                                        <h:outputText value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{DatasetPage.workingVersion.inReview}"/>
-                                        <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{!DatasetPage.dataset.released}"/>
-                                        <h:outputText value="#{bundle['dataset.versionUI.deaccessioned']}" styleClass="label label-danger" rendered="#{DatasetPage.workingVersion.deaccessioned}"/>
-                                        <!-- DATASET VERSION NUMBER -->
-                                        <h:outputText styleClass="label label-default" rendered="#{DatasetPage.workingVersion.released and !(DatasetPage.workingVersion.draft or DatasetPage.workingVersion.inReview or DatasetPage.workingVersion.deaccessioned)}"
-                                                      value="#{bundle['file.DatasetVersion']} #{DatasetPage.workingVersion.versionNumber}.#{DatasetPage.workingVersion.minorVersionNumber}" /> 
-                                        <h:outputText styleClass="label label-default" rendered="#{!DatasetPage.workingVersion.released and !(DatasetPage.workingVersion.draft or DatasetPage.workingVersion.inReview or DatasetPage.workingVersion.deaccessioned)}"
-                                                      value="#{bundle['file.DatasetVersion']} #{DatasetPage.workingVersion.versionState}"/>
+                                            <!-- END: Publish/Submit for Review/Return to Author Button Group -->
+                                            <p:commandLink rendered="#{dataverseSession.user.authenticated and !DatasetPage.workingVersion.deaccessioned and DatasetPage.dataset.released}"
+                                                           styleClass="btn btn-default btn-access"   
+                                                           action="#{DatasetPage.setShowLinkingPopup(true)}"
+                                                           oncomplete="PF('linkDatasetForm').show();bind_bsui_components();"
+                                                           update="@form">
+                                                <span class="glyphicon glyphicon-link"/> #{bundle['link']}
+                                            </p:commandLink>
+                                            <!-- Edit Button -->
+                                            <ui:fragment rendered="#{DatasetPage.sessionUserAuthenticated
+                                                                                              and DatasetPage.canUpdateDataset()
+                                                                                              and !DatasetPage.dataset.deaccessioned}">
+                                                <button type="button" id="editDataSet" class="btn btn-default btn-access dropdown-toggle #{DatasetPage.lockedFromEdits ? 'disabled' : ''}" data-toggle="dropdown">
+                                                    <span class="glyphicon glyphicon-pencil"/> #{bundle['dataset.editBtn']} <span class="caret"></span>
+                                                </button>
+                                                <ul class="dropdown-menu pull-right text-left" role="menu">
+                                                    <li>                                           
+                                                        <h:outputLink value="/editdatafiles.xhtml?datasetId=#{DatasetPage.dataset.id}&#38;mode=UPLOAD">
+                                                            <h:outputText value="#{bundle['dataset.editBtn.itemLabel.upload']}"/>
+                                                        </h:outputLink>
+                                                    </li>
+                                                    <li>
+                                                        <p:commandLink id="editMetadata" actionListener="#{DatasetPage.edit('METADATA')}" update="@form,:datasetForm,:messagePanel" oncomplete="javascript:bind_bsui_components();">
+                                                            <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
+                                                            <h:outputText value="#{bundle['dataset.editBtn.itemLabel.metadata']}" />
+                                                        </p:commandLink>
+                                                    </li>
+                                                    <li>
+                                                        <p:commandLink id="editTerms" actionListener="#{DatasetPage.edit('LICENSE')}" update="@form,:datasetForm,:messagePanel" oncomplete="javascript:bind_bsui_components();">
+                                                            <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
+                                                            <h:outputText value="#{bundle['dataset.editBtn.itemLabel.terms']}" />
+                                                        </p:commandLink>
+                                                    </li>
+                                                    <ui:fragment rendered="#{permissionsWrapper.canManagePermissions(DatasetPage.dataset)}">
+                                                        <li class="#{settingsWrapper.publicInstall ? '' : 'dropdown-submenu pull-left'}">
+                                                            <ui:fragment rendered="#{!settingsWrapper.publicInstall}">
+                                                                <a tabindex="-1" href="#">#{bundle['dataset.editBtn.itemLabel.permissions']}</a>
+                                                                <ul class="dropdown-menu">
+                                                                    <li>
+                                                                        <h:link id="manageDatasetPermissions" styleClass="ui-commandlink ui-widget" outcome="permissions-manage">
+                                                                            <h:outputText value="#{bundle['dataset']}" />
+                                                                            <f:param name="id" value="#{DatasetPage.dataset.id}" />
+                                                                        </h:link>
+                                                                    </li>
+                                                                    <li>
+                                                                        <h:link id="manageFilePermissions" styleClass="ui-commandlink ui-widget" outcome="permissions-manage-files">
+                                                                            <h:outputText value="#{bundle['file']}" />
+                                                                            <f:param name="id" value="#{DatasetPage.dataset.id}" />
+                                                                        </h:link>
+                                                                    </li>
+                                                                </ul>
+                                                            </ui:fragment>                                            
+                                                            <h:link id="managePermissions" rendered="#{settingsWrapper.publicInstall}"
+                                                                    styleClass="ui-commandlink ui-widget" outcome="permissions-manage">
+                                                                <h:outputText value="#{bundle['dataset.editBtn.itemLabel.permissions']}" />
+                                                                <f:param name="id" value="#{DatasetPage.dataset.id}" />
+                                                            </h:link>
+                                                        </li>
+                                                        <li>
+                                                            <p:commandLink id="privateUrl" oncomplete="PF('privateUrlConfirmation').show()" action="#{DatasetPage.initPrivateUrlPopUp()}" update="privateUrlPanel">
+                                                                <h:outputText value="#{bundle['dataset.editBtn.itemLabel.privateUrl']}" />
+                                                            </p:commandLink>
+                                                        </li>
+                                                    </ui:fragment>
+                                                    <li>
+                                                        <h:outputLink value="/dataset-widgets.xhtml?datasetId=#{DatasetPage.dataset.id}">
+                                                            <h:outputText value="#{bundle['dataset.editBtn.itemLabel.thumbnailsAndWidgets']}"/>
+                                                        </h:outputLink>
+                                                    </li>
+                                                    <ui:fragment rendered="#{!DatasetPage.dataset.released and DatasetPage.dataset.latestVersion.versionState=='DRAFT' and permissionsWrapper.canIssueDeleteDatasetCommand(DatasetPage.dataset)}">
+                                                        <li class="divider"></li>
+                                                        <li>
+                                                            <p:commandLink id="deleteDataset" onclick="PF('deleteConfirmation').show()">
+                                                                <h:outputText value="#{bundle['dataset.editBtn.itemLabel.deleteDataset']}" />
+                                                            </p:commandLink>
+                                                        </li>
+                                                    </ui:fragment>
+                                                    <ui:fragment rendered="#{DatasetPage.dataset.released and DatasetPage.dataset.latestVersion.versionState=='DRAFT' and permissionsWrapper.canIssueDeleteDatasetCommand(DatasetPage.dataset)}">
+                                                        <li class="divider"></li>
+                                                        <li>
+                                                            <p:commandLink id="deleteVersion" onclick="PF('deleteVersionConfirmation').show()">
+                                                                <h:outputText value="#{bundle['dataset.editBtn.itemLabel.deleteDraft']}" />
+                                                            </p:commandLink>
+                                                        </li>
+                                                    </ui:fragment>
+                                                    <ui:fragment rendered="#{DatasetPage.dataset.released and DatasetPage.existReleasedVersion and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
+                                                        <li class="divider"></li>
+                                                        <li>
+                                                            <p:commandLink id="deaccessionDatasetLink" 
+                                                                           action="#{DatasetPage.clickDeaccessionDataset}"
+                                                                           oncomplete="PF('deaccessionBlock').show();bind_bsui_components();"
+                                                                           update="deaccessionBlock">
+                                                                <h:outputText value="#{bundle['dataset.editBtn.itemLabel.deaccession']}" />
+                                                            </p:commandLink>
+                                                        </li>
+                                                    </ui:fragment>
+                                                </ul>
+                                            </ui:fragment>
+                                            <!-- END: Edit Button -->
+                                            <!-- END: Edit/Link/Publish Button Group -->
+                                            <div class="btn-group" jsf:rendered="#{!DatasetPage.dataset.deaccessioned}">
+                                                <!-- Explore Button Group -->
+                                                <ui:fragment rendered="#{DatasetPage.datasetExploreTools.size()==1}">
+                                                    <button type="button" class="btn btn-default btn-explore" onclick="$(this).parent().find( 'li > a' ).trigger( 'click' );">
+                                                        <span class="glyphicon glyphicon-equalizer"/> #{bundle.explore}
+                                                    </button>
+                                                </ui:fragment>
+                                                <ui:fragment rendered="#{DatasetPage.datasetExploreTools.size()>1}">
+                                                    <button type="button" class="btn btn-default btn-explore dropdown-toggle" data-toggle="dropdown">
+                                                        <span class="glyphicon glyphicon-equalizer"/> #{bundle.explore} <span class="caret"></span>
+                                                    </button>
+                                                </ui:fragment>
+                                                <ul class="dropdown-menu pull-left text-left" role="menu">
+                                                    <!-- Explore tool links -->
+                                                    <ui:repeat var="tool" value="#{DatasetPage.datasetExploreTools}">
+                                                        <li>
+                                                            <h:commandLink action="#{DatasetPage.explore(tool)}">
+                                                                <h:outputText value="#{tool.displayName}"/>
+                                                            </h:commandLink>
+                                                        </li>
+                                                    </ui:repeat>
+                                                </ul>
+                                            </div>
+                                            <div class="btn-group" jsf:rendered="#{DatasetPage.sessionUserAuthenticated
+                                                                                          and !DatasetPage.dataset.deaccessioned
+                                                                                          and DatasetPage.showComputeButton()}">
+                                                <!-- Compute Button Group -->
+                                                <button type="button" id="computeBatch" class="btn btn-default btn-compute dropdown-toggle" data-toggle="dropdown">
+                                                    <span class="glyphicon glyphicon-flash"/> #{bundle['dataset.compute.computeBtn']} <span class="caret"></span>
+                                                </button>
+                                                <ul class="dropdown-menu pull-left text-left" role="menu">
+                                                    <li>
+                                                        <!-- Compute dataset link -->
+                                                        <h:commandLink action="#{DatasetPage.canComputeAllFiles(false)}">
+                                                            <h:outputText value="#{bundle['dataset.compute.computeBatchSingle']}"/>
+                                                        </h:commandLink>
+                                                    </li>
+                                                    <li jsf:rendered="#{!DatasetPage.isCartEmpty()}" class="divider"></li>
+                                                    <li jsf:rendered="#{!DatasetPage.checkCartForItem(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}">
+                                                        <!-- Add link -->
+                                                        <p:commandLink action="#{DatasetPage.addItemtoCart(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}"
+                                                            disabled="#{DatasetPage.locked}" value="#{bundle['dataset.compute.computeBatchAdd']}" update=":datasetForm,:messagePanel">
+                                                            <h:outputText value="#{bundle['dataset.compute.computeBatchAdd']}"/>
+                                                        </p:commandLink>
+                                                    </li>
+                                                    <ui:fragment rendered="#{!DatasetPage.isCartEmpty()}">
+                                                        <li jsf:rendered="#{DatasetPage.checkCartForItem(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}">
+                                                            <!-- Remove link -->
+                                                            <p:commandLink value="#{bundle['dataset.compute.computeBatchRemove']}" action="#{DatasetPage.removeCartItem(DatasetPage.dataset.getDisplayName(), DatasetPage.getPersistentId())}" update=":datasetForm,:messagePanel">  
+                                                                <h:outputText value="#{bundle['dataset.compute.computeBatchRemove']}"/>
+                                                            </p:commandLink>
+                                                        </li>
+                                                        <li>
+                                                            <!-- List link -->
+                                                            <p:commandLink title="#{bundle['dataset.compute.computeBatchList']}"
+                                                                           value="#{bundle['dataset.compute.computeBatchList']}"
+                                                                           oncomplete="PF('computeBatchListPopup').show();bind_bsui_components();"
+                                                                           update="computeBatchListPopup">
+                                                                <h:outputText value="#{bundle['dataset.compute.computeBatchList']}"/>
+                                                            </p:commandLink>
+                                                        </li>
+                                                        <li>
+                                                            <!-- Clear link -->
+                                                            <p:commandLink value="#{bundle['dataset.compute.computeBatchClear']}" action="#{DatasetPage.clearCart()}" update=":datasetForm,:messagePanel">  
+                                                                <h:outputText value="#{bundle['dataset.compute.computeBatchClear']}"/>
+                                                            </p:commandLink>
+                                                        </li>
+                                                        <li>
+                                                            <!-- Compute batch link -->
+                                                            <h:outputLink value="#{DatasetPage.cartComputeUrl}" target="_blank">
+                                                                <h:outputText id="compute-batch-button" value="#{bundle['dataset.compute.computeBatchCompute']}" />
+                                                            </h:outputLink>
+                                                        </li>
+                                                    </ui:fragment>
+                                                </ul>
+                                            </div>
+                                        </div>
                                     </div>
+                                    <!-- END: ActionButtonBlock -->
                                 </div>
                             </div>
-                            <div class="row">
-                                <!-- CITATION BLOCK -->
-                                <ui:fragment rendered="#{!empty DatasetPage.displayCitation}">
-                                    <ui:include src="dataset-citation.xhtml">
-                                        <ui:param name="datasetPage" value="true"/>
-                                    </ui:include>
-                                </ui:fragment>
-                                <!-- END: CITATION BLOCK -->
-                                <div id="deaccession-reason-block" class="bg-danger" jsf:rendered="#{DatasetPage.workingVersion.deaccessioned}">
-                                    <h5 class="margin-top-half">#{bundle['dataset.deaccession.reason']}</h5>
-                                    <p>#{DatasetPage.workingVersion.versionNote}</p>
-                                    <ui:fragment rendered="#{!empty DatasetPage.workingVersion.archiveNote}">
-                                        <p>#{bundle['dataset.beAccessedAt']} <a href="#{DatasetPage.workingVersion.archiveNote}" target="_blank">#{DatasetPage.workingVersion.archiveNote}</a></p>
-                                    </ui:fragment>
-                                </div>
-                                <!-- Metrics -->
-                                <div id="metrics-block" class="col-sm-3" jsf:rendered="#{!(settingsWrapper.rsyncDownload or DatasetPage.workingVersion.deaccessioned)}">
-                                    <div id="metrics-heading">
-                                        #{bundle['metrics.dataset.title']}
-                                        <span class="glyphicon glyphicon-question-sign tooltip-icon" data-toggle="tooltip" data-placement="auto top" 
-                                                data-original-title="#{settingsWrapper.makeDataCountDisplayEnabled ? bundle['metrics.dataset.tip.makedatacount'] : bundle['metrics.dataset.tip.default']}"></span>
-                                    </div>
-                                    <div id="metrics-body">
-                                        <!-- Classic downloads -->
-                                        <div class="metrics-count-block" jsf:rendered="#{!settingsWrapper.makeDataCountDisplayEnabled}">
-                                            <h:outputFormat value="{0} #{bundle['metrics.downloads']}">
-                                                <f:param value="#{guestbookResponseServiceBean.getCountGuestbookResponsesByDatasetId(DatasetPage.dataset.id)}"/>
-                                            </h:outputFormat>
-                                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                    data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.downloads.default.tip']}"></span>
-                                        </div>
-                                        <!-- Make Data Count views -->
-                                        <div class="metrics-count-block" jsf:rendered="#{settingsWrapper.makeDataCountDisplayEnabled}">
-                                            <h:outputFormat value="{0} #{bundle['metrics.views']}">
-                                                <f:param value="#{datasetMetricsServiceBean.getMetrics(DatasetPage.dataset).getViewsTotal()}"/>
-                                            </h:outputFormat>
-                                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                    data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.views.tip']}"></span>
+                            <div id="datasetVersionBlock" class="row">
+                                <div class="col-xs-12">
+                                    <div id="title-block" class="row margin-bottom-half" jsf:rendered="#{!empty DatasetPage.datasetVersionUI.title.value}">
+                                        <div class="col-xs-1 vcenter title-preview-icon-block">
+                                            <img src="#{DatasetPage.thumbnailString}" jsf:rendered="#{!empty DatasetPage.thumbnailString}" alt="#{DatasetPage.datasetVersionUI.title.value}"/>
+                                            <span class="icon-dataset" jsf:rendered="#{empty DatasetPage.thumbnailString}"/>
                                         </div>
-                                        <!-- Make Data Count downloads -->
-                                        <div class="metrics-count-block" jsf:rendered="#{settingsWrapper.makeDataCountDisplayEnabled}">
-                                            <h:outputFormat value="{0} #{bundle['metrics.downloads']}">
-                                                <f:param value="#{datasetMetricsServiceBean.getMetrics(DatasetPage.dataset).getDownloadsTotal()}"/>
-                                            </h:outputFormat>
-                                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                    data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.downloads.makedatacount.tip']}"></span>
+                                        <div class="col-xs-11 vcenter">
+                                            <span id="title">#{DatasetPage.datasetVersionUI.title.value}</span>
+                                            <div id="title-label-block" class="margin-top-half">
+                                                <h:outputText value="#{bundle['dataset.versionUI.draft']}" styleClass="label label-primary" rendered="#{DatasetPage.workingVersion.draft}"/>
+                                                <h:outputText value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{DatasetPage.workingVersion.inReview}"/>
+                                                <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{!DatasetPage.dataset.released}"/>
+                                                <h:outputText value="#{bundle['dataset.versionUI.deaccessioned']}" styleClass="label label-danger" rendered="#{DatasetPage.workingVersion.deaccessioned}"/>
+                                                <!-- DATASET VERSION NUMBER -->
+                                                <h:outputText styleClass="label label-default" rendered="#{DatasetPage.workingVersion.released and !(DatasetPage.workingVersion.draft or DatasetPage.workingVersion.inReview or DatasetPage.workingVersion.deaccessioned)}"
+                                                              value="#{bundle['file.DatasetVersion']} #{DatasetPage.workingVersion.versionNumber}.#{DatasetPage.workingVersion.minorVersionNumber}" /> 
+                                                <h:outputText styleClass="label label-default" rendered="#{!DatasetPage.workingVersion.released and !(DatasetPage.workingVersion.draft or DatasetPage.workingVersion.inReview or DatasetPage.workingVersion.deaccessioned)}"
+                                                              value="#{bundle['file.DatasetVersion']} #{DatasetPage.workingVersion.versionState}"/>
+                                            </div>
                                         </div>
-                                        <!-- Make Data Count citations (DOIs only, not Handles) -->
-                                        <div class="metrics-count-block" jsf:rendered="#{settingsWrapper.makeDataCountDisplayEnabled and settingsWrapper.doiInstallation}">
-                                            <p:commandLink oncomplete="PF('citationsDialog').show();">
-                                                <h:outputFormat value="{0} #{bundle['metrics.citations']}">
-                                                    <f:param value="#{fn:length(datasetExternalCitationsServiceBean.getDatasetExternalCitationsByDataset(DatasetPage.dataset))}"/>
-                                                </h:outputFormat>
-                                            </p:commandLink>
-                                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                    data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.citations.tip']}"></span>
+                                    </div>
+                                    <div class="row">
+                                        <!-- CITATION BLOCK -->
+                                        <ui:fragment rendered="#{!empty DatasetPage.displayCitation}">
+                                            <ui:include src="dataset-citation.xhtml">
+                                                <ui:param name="datasetPage" value="true"/>
+                                            </ui:include>
+                                        </ui:fragment>
+                                        <!-- END: CITATION BLOCK -->
+                                        <!-- Metrics -->
+                                        <div class="col-sm-3" jsf:rendered="#{!(settingsWrapper.rsyncDownload or DatasetPage.workingVersion.deaccessioned)}">
+                                            <div id="metrics-block">
+                                            <div id="metrics-heading">
+                                                #{bundle['metrics.dataset.title']}
+                                                <span class="glyphicon glyphicon-question-sign tooltip-icon" data-toggle="tooltip" data-placement="auto top" 
+                                                        data-original-title="#{settingsWrapper.makeDataCountDisplayEnabled ? bundle['metrics.dataset.tip.makedatacount'] : bundle['metrics.dataset.tip.default']}"></span>
+                                            </div>
+                                            <div id="metrics-body">
+                                                <!-- Classic downloads -->
+                                                <div class="metrics-count-block" jsf:rendered="#{!settingsWrapper.makeDataCountDisplayEnabled}">
+                                                    <h:outputFormat value="{0} #{bundle['metrics.downloads']}">
+                                                        <f:param value="#{guestbookResponseServiceBean.getCountGuestbookResponsesByDatasetId(DatasetPage.dataset.id)}"/>
+                                                    </h:outputFormat>
+                                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                            data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.downloads.default.tip']}"></span>
+                                                </div>
+                                                <!-- Make Data Count views -->
+                                                <div class="metrics-count-block" jsf:rendered="#{settingsWrapper.makeDataCountDisplayEnabled}">
+                                                    <h:outputFormat value="{0} #{bundle['metrics.views']}">
+                                                        <f:param value="#{datasetMetricsServiceBean.getMetrics(DatasetPage.dataset).getViewsTotal()}"/>
+                                                    </h:outputFormat>
+                                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                            data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.views.tip']}"></span>
+                                                </div>
+                                                <!-- Make Data Count downloads -->
+                                                <div class="metrics-count-block" jsf:rendered="#{settingsWrapper.makeDataCountDisplayEnabled}">
+                                                    <h:outputFormat value="{0} #{bundle['metrics.downloads']}">
+                                                        <f:param value="#{datasetMetricsServiceBean.getMetrics(DatasetPage.dataset).getDownloadsTotal()}"/>
+                                                    </h:outputFormat>
+                                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                            data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.downloads.makedatacount.tip']}"></span>
+                                                </div>
+                                                <!-- Make Data Count citations (DOIs only, not Handles) -->
+                                                <div class="metrics-count-block" jsf:rendered="#{settingsWrapper.makeDataCountDisplayEnabled and settingsWrapper.doiInstallation}">
+                                                    <p:commandLink oncomplete="PF('citationsDialog').show();">
+                                                        <h:outputFormat value="{0} #{bundle['metrics.citations']}">
+                                                            <f:param value="#{fn:length(datasetExternalCitationsServiceBean.getDatasetExternalCitationsByDataset(DatasetPage.dataset))}"/>
+                                                        </h:outputFormat>
+                                                    </p:commandLink>
+                                                    <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                            data-toggle="tooltip" data-placement="auto top" data-original-title="#{bundle['metrics.dataset.citations.tip']}"></span>
+                                                </div>
+                                            </div>
+                                            </div>
                                         </div>
+                                        <!-- END: Metrics -->
                                     </div>
-                                </div>
-                                <!-- END: Metrics -->
-                            </div>
-                            <!-- BEGIN: DATASET SUMMARY -->
-                            <div id="dataset-summary-metadata" class="row"
-                                 jsf:rendered="#{!widgetWrapper.widgetView and !DatasetPage.workingVersion.deaccessioned and 
-                                                 (!empty DatasetPage.datasetVersionUI.descriptionDisplay
-                                                 or !empty DatasetPage.datasetVersionUI.keywordDisplay
-                                                 or !empty DatasetPage.datasetVersionUI.subject.value
-                                                 or !empty DatasetPage.datasetVersionUI.relPublicationCitation
-                                                 or !empty DatasetPage.datasetVersionUI.notes.value) and !empty DatasetPage.datasetSummaryFields}">
-                                <div class="col-sm-12 metadata-container">
-                                    <table class="metadata">
-                                        <tbody>
-                                            <ui:repeat value="#{DatasetPage.datasetSummaryFields}" var="dsf">
-                                                <tr id="keywords" jsf:rendered="#{!empty DatasetPage.datasetVersionUI.keywordDisplay and dsf.datasetFieldType.id==DatasetPage.datasetVersionUI.keyword.datasetFieldType.id}">
-                                                    <th scope="row">
-                                                        #{bundle['dataset.keywordDisplay.title']}
-                                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{DatasetPage.datasetVersionUI.keyword.datasetFieldType.localeDescription}"></span>
-                                                    </th>
-                                                    <td>#{DatasetPage.datasetVersionUI.keywordDisplay}</td>
-                                                </tr>
-                                                <tr id="publication" jsf:rendered="#{!empty DatasetPage.datasetVersionUI.relPublicationCitation and dsf.datasetFieldType.name=='publication'}">
-                                                    <th scope="row">
-                                                        #{DatasetPage.datasetVersionUI.datasetRelPublications.get(0).title}
-                                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{DatasetPage.datasetVersionUI.datasetRelPublications.get(0).description}"></span>
-                                                    </th>
-                                                    <td>
-                                                        <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(DatasetPage.datasetVersionUI.relPublicationCitation)}" escape="false"/>
-                                                        <a href="#{DatasetPage.datasetVersionUI.relPublicationUrl}" title="#{DatasetPage.datasetVersionUI.relPublicationUrl}" target="_blank" rel="noopener">#{DatasetPage.datasetVersionUI.relPublicationId}</a>
-                                                    </td>
-                                                </tr>
-                                                <tr id="#{dsf.datasetFieldType.name}" jsf:rendered="#{dsf.datasetFieldType.name!='publication' and dsf.datasetFieldType.name!='keyword'}">
-                                                    <th scope="row">
-                                                        #{dsf.datasetFieldType.localeTitle}
-                                                        <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{dsf.datasetFieldType.localeDescription}"></span>
-                                                    </th>
-                                                    <td>
-                                                        <!-- Primitive datasetFields -->
-                                                        <ui:fragment rendered="#{dsf.datasetFieldType.primitive}">
-                                                            <h:outputText value="#{dsf.displayValue}" rendered="#{!dsf.datasetFieldType.allowMultiples}"
-                                                                          escape="#{dsf.datasetFieldType.isEscapeOutputText()}"/>
-                                                            <ui:repeat value="#{dsf.values}" var="value" varStatus="loop" rendered="#{dsf.datasetFieldType.allowMultiples}">
-                                                                <h:outputText value="#{loop.first?'':'; '}#{ value }"
-                                                                              escape="#{dsf.datasetFieldType.isEscapeOutputText()}"/>
-                                                            </ui:repeat>
-                                                        </ui:fragment>
-                                                        <!-- Compound datasetFields -->
-                                                        <ui:fragment rendered="#{dsf.datasetFieldType.compound}">
-                                                            <ui:fragment rendered="#{dsf.datasetFieldType.name == 'datasetContact'}">
-                                                                <p class="help-block">
-                                                                    <h:outputText value="#{bundle['dataset.contact.tip']}"/>
-                                                                </p>
-                                                            </ui:fragment>
-                                                            <ui:repeat value="#{dsf.datasetFieldCompoundValues}" var="compoundValue">
-                                                                <div>
-                                                                    <ui:repeat value="#{compoundValue.displayValueMap.entrySet().toArray()}" var="cvPart" varStatus="partStatus">
-                                                                        <h:outputText value="#{dsf.datasetFieldType.displayFormat} " rendered="${!partStatus.first}"/>
-                                                                        <h:outputText value="#{cvPart.value}"
-                                                                                      escape="#{cvPart.key.datasetFieldType.isEscapeOutputText()}"/>
+                                    <!-- DEACCESSION REASON -->
+                                    <div id="deaccession-reason-block" class="col-sm-12 bg-danger margin-bottom" jsf:rendered="#{DatasetPage.workingVersion.deaccessioned}">
+                                        <h5 class="margin-top-half">#{bundle['dataset.deaccession.reason']}</h5>
+                                        <p>#{DatasetPage.workingVersion.versionNote}</p>
+                                        <ui:fragment rendered="#{!empty DatasetPage.workingVersion.archiveNote}">
+                                            <p>#{bundle['dataset.beAccessedAt']} <a href="#{DatasetPage.workingVersion.archiveNote}" target="_blank">#{DatasetPage.workingVersion.archiveNote}</a></p>
+                                        </ui:fragment>
+                                    </div>
+                                    <!-- END: DEACCESSION REASON -->
+                                    <!-- BEGIN: DATASET SUMMARY -->
+                                    <div id="dataset-summary-metadata" class="row"
+                                         jsf:rendered="#{!widgetWrapper.widgetView and !DatasetPage.workingVersion.deaccessioned and 
+                                                         (!empty DatasetPage.datasetVersionUI.descriptionDisplay
+                                                         or !empty DatasetPage.datasetVersionUI.keywordDisplay
+                                                         or !empty DatasetPage.datasetVersionUI.subject.value
+                                                         or !empty DatasetPage.datasetVersionUI.relPublicationCitation
+                                                         or !empty DatasetPage.datasetVersionUI.notes.value) and !empty DatasetPage.datasetSummaryFields}">
+                                        <div class="col-sm-12 metadata-container">
+                                            <table class="metadata">
+                                                <tbody>
+                                                    <ui:repeat value="#{DatasetPage.datasetSummaryFields}" var="dsf">
+                                                        <tr id="keywords" jsf:rendered="#{!empty DatasetPage.datasetVersionUI.keywordDisplay and dsf.datasetFieldType.id==DatasetPage.datasetVersionUI.keyword.datasetFieldType.id}">
+                                                            <th scope="row">
+                                                                #{bundle['dataset.keywordDisplay.title']}
+                                                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{DatasetPage.datasetVersionUI.keyword.datasetFieldType.localeDescription}"></span>
+                                                            </th>
+                                                            <td>#{DatasetPage.datasetVersionUI.keywordDisplay}</td>
+                                                        </tr>
+                                                        <tr id="publication" jsf:rendered="#{!empty DatasetPage.datasetVersionUI.relPublicationCitation and dsf.datasetFieldType.name=='publication'}">
+                                                            <th scope="row">
+                                                                #{DatasetPage.datasetVersionUI.datasetRelPublications.get(0).title}
+                                                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{DatasetPage.datasetVersionUI.datasetRelPublications.get(0).description}"></span>
+                                                            </th>
+                                                            <td>
+                                                                <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(DatasetPage.datasetVersionUI.relPublicationCitation)}" escape="false"/>
+                                                                <a href="#{DatasetPage.datasetVersionUI.relPublicationUrl}" title="#{DatasetPage.datasetVersionUI.relPublicationUrl}" target="_blank" rel="noopener">#{DatasetPage.datasetVersionUI.relPublicationId}</a>
+                                                            </td>
+                                                        </tr>
+                                                        <tr id="#{dsf.datasetFieldType.name}" jsf:rendered="#{dsf.datasetFieldType.name!='publication' and dsf.datasetFieldType.name!='keyword'}">
+                                                            <th scope="row">
+                                                                #{dsf.datasetFieldType.localeTitle}
+                                                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
+                                                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{dsf.datasetFieldType.localeDescription}"></span>
+                                                            </th>
+                                                            <td>
+                                                                <!-- Primitive datasetFields -->
+                                                                <ui:fragment rendered="#{dsf.datasetFieldType.primitive}">
+                                                                    <h:outputText value="#{dsf.displayValue}" rendered="#{!dsf.datasetFieldType.allowMultiples}"
+                                                                                  escape="#{dsf.datasetFieldType.isEscapeOutputText()}"/>
+                                                                    <ui:repeat value="#{dsf.values}" var="value" varStatus="loop" rendered="#{dsf.datasetFieldType.allowMultiples}">
+                                                                        <h:outputText value="#{loop.first?'':'; '}#{ value }"
+                                                                                      escape="#{dsf.datasetFieldType.isEscapeOutputText()}"/>
                                                                     </ui:repeat>
-                                                                </div>
-                                                            </ui:repeat>
-                                                        </ui:fragment>
-                                                    </td>
-                                                </tr>
-                                            </ui:repeat>
-                                        </tbody>
-                                    </table>
+                                                                </ui:fragment>
+                                                                <!-- Compound datasetFields -->
+                                                                <ui:fragment rendered="#{dsf.datasetFieldType.compound}">
+                                                                    <ui:fragment rendered="#{dsf.datasetFieldType.name == 'datasetContact'}">
+                                                                        <p class="help-block">
+                                                                            <h:outputText value="#{bundle['dataset.contact.tip']}"/>
+                                                                        </p>
+                                                                    </ui:fragment>
+                                                                    <ui:repeat value="#{dsf.datasetFieldCompoundValues}" var="compoundValue">
+                                                                        <div>
+                                                                            <ui:repeat value="#{compoundValue.displayValueMap.entrySet().toArray()}" var="cvPart" varStatus="partStatus">
+                                                                                <h:outputText value="#{dsf.datasetFieldType.displayFormat} " rendered="${!partStatus.first}"/>
+                                                                                <h:outputText value="#{cvPart.value}"
+                                                                                              escape="#{cvPart.key.datasetFieldType.isEscapeOutputText()}"/>
+                                                                            </ui:repeat>
+                                                                        </div>
+                                                                    </ui:repeat>
+                                                                </ui:fragment>
+                                                            </td>
+                                                        </tr>
+                                                    </ui:repeat>
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                    </div>
+                                    <!-- END: DATASET SUMMARY -->
                                 </div>
                             </div>
-                            <!-- END: DATASET SUMMARY -->
                         </div>
                     </div>
                     </p:fragment>
-                    <!-- END View editMode -->
+                    <!-- END Top Button/Citation Blocks -->
+                    <!-- END View infoMode -->
                     <!-- Create/Edit editMode -->
                     <ui:fragment rendered="#{DatasetPage.editMode == 'METADATA' or DatasetPage.editMode == 'CREATE'}">
                         <p:focus context="datasetForm"/>
@@ -560,17 +572,16 @@
                             <ui:param name="globalId" value="#{DatasetPage.dataset.globalIdString}"/>
                         </ui:include>
                     </ui:fragment>
-                    <!-- END Create/Edit editMode -->
-                    <!-- Edit editMode -->
+                    <!-- Create/Save Dataset Button Panel TOP editMode -->
                     <div class="button-block form-top" jsf:rendered="#{DatasetPage.editMode == 'METADATA' or DatasetPage.editMode == 'LICENSE'}">
                         <p:commandButton id="saveTop" styleClass="btn btn-default" value="#{bundle.saveChanges}" onclick="checkNewlyRestricted();PF('blockDatasetForm').show();"/>
                         <p:commandButton id="cancelTop" styleClass="btn btn-link" value="#{bundle.cancel}" action="#{DatasetPage.cancel}" process="@this" update="@form" oncomplete="javascript:bind_bsui_components();">
                             <f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="#{DatasetPage.editMode == 'METADATA' ? 1 : DatasetPage.selectedTabIndex}"/>
                         </p:commandButton>
                     </div>
-                    <!-- END Header / Button Panel -->
+                    <!-- END Create/Save Dataset Button Panel TOP editMode -->
+                    <!-- END Create/Edit editMode -->
                     <!-- View/Tabs infoMode -->
-                    <!-- Tabs -->
                     <div id="contentTabs" jsf:rendered="#{DatasetPage.editMode != 'INFO'}">
                         <p:fragment id="pageRefreshFragment"> <!-- rendered="_{empty DatasetPage.editMode}" -->
                             <h:inputHidden value="#{DatasetPage.lockedForAnyReason}" id="datasetLockedForAnyReasonVariable" />
@@ -699,7 +710,7 @@
                     <div class="alert alert-info margin-top" jsf:rendered="#{DatasetPage.editMode == 'CREATE'}">
                         #{bundle['file.metadataTip']}
                     </div>
-                    <!-- Create/Save Dataset Button Panel -->
+                    <!-- Create/Save Dataset Button Panel BTM editMode -->
                     <div class="button-block" jsf:rendered="#{!empty DatasetPage.editMode}">
                         <p:commandButton id="save" styleClass="btn btn-default" value="#{DatasetPage.editMode == 'CREATE' ? bundle['file.addBtn'] : bundle.saveChanges}" onclick="checkNewlyRestricted();PF('blockDatasetForm').show();"/>
                         <p:commandButton id="cancel" styleClass="btn btn-link" value="#{bundle.cancel}" action="#{DatasetPage.cancel}" process="@this" update="@form" rendered="#{DatasetPage.editMode != 'CREATE'}" oncomplete="javascript:bind_bsui_components();">
@@ -712,9 +723,9 @@
                                          oncomplete="javascript:bind_bsui_components();$(document).scrollTop(0);"
                                          action="#{DatasetPage.save}"/>
                     </div>
-                    <!-- END: Create/Save Dataset Button Panel -->
+                    <!-- END: Create/Save Dataset Button Panel BTM editMode -->
                     <p:blockUI block="datasetForm" widgetVar="blockDatasetForm"/>
-                    <!-- Popups -->
+                    <!-- POPUPS -->
                     <p:dialog id="shareDialog" header="#{bundle['dataset.share.datasetShare']}" widgetVar="shareDialog" modal="true" rendered="#{!DatasetPage.workingVersion.deaccessioned}">
                         <p class="help-block">#{bundle['dataset.share.datasetShare.tip']}</p>
                         <div id="sharrre-widget" data-url="#{DatasetPage.dataverseSiteUrl}/dataset.xhtml?persistentId=#{dataset.globalId}" data-text="#{bundle['dataset.share.datasetShare.shareText']}"></div>
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index fe8eb6e861a..65db37b170d 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -348,174 +348,172 @@
                     <!-- END Edit Mode -->
                     <!-- View Mode / Description Panel -->
                     <ui:fragment rendered="#{empty DataversePage.editMode}">
-                        <div id="actionButtonBlock" class="button-block row" jsf:rendered="#{!widgetWrapper.widgetView}">
-                                
-                            
-                            
-                            <!-- Metrics for Root Dataverse -->
-                            <div id="metrics-block" class="col-xs-4" jsf:rendered="#{DataversePage.isRootDataverse() and !settingsWrapper.rsyncOnly}">
-                                <div id="metrics-label" class="col-xs-4 small text-center">
-                                    <h:outputLink value="#{systemConfig.metricsUrl}" target="_blank" title="#{bundle['metrics.title.tip']}" rendered="#{systemConfig.metricsUrl != null}">
-                                        <span class="glyphicon glyphicon-stats"/> #{bundle['metrics.title']}
-                                    </h:outputLink>
-                                    <ui:fragment rendered="#{systemConfig.metricsUrl == null}">
-                                        <span class="glyphicon glyphicon-stats"/> #{bundle['metrics.title']}
-                                    </ui:fragment>
-                                </div>
-                                <div id="metrics-content" class="col-xs-8 small text-center">
-                                    <h:outputFormat styleClass="metrics-downloads" value="{0} #{bundle['metrics.downloads']}">
-                                        <f:param value="#{guestbookResponseServiceBean.getCountOfAllGuestbookResponses()}"/>
-                                    </h:outputFormat>
-                                </div>
-                            </div>
-                            <!-- END: Metrics for Root Dataverse-->
-                            <!-- Email/Link/Share Button Group -->
-                            <div class="#{DataversePage.isRootDataverse() ? 'col-xs-8' : 'col-xs-12'} text-right">
-                                <div class="btn-group" role="group">
-                                    <p:commandLink type="button" styleClass="text-button btn-contact bootstrap-button-tooltip" title="#{bundle['dataverse.contact']}"
-                                                   update=":contactDialog" oncomplete="PF('contactForm').show()" actionListener="#{sendFeedbackDialog.initUserInput}">
-                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
-                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
-                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
-                                        <f:param name="DO_VALIDATION" value="false"/>
-                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{DataversePage.dataverse}"/>
-                                            <span class="glyphicon glyphicon-envelope"/> #{bundle['contact.contact']}
-                                    </p:commandLink>
-                                    <p:commandLink type="button" styleClass="text-button btn-share bootstrap-button-tooltip"
-                                       title="#{bundle['dataverse.share.dataverseShare']}"
-                                       oncomplete="PF('shareDialog').show();sharrre();">
-                                        <span class="glyphicon glyphicon-share"/> #{bundle['share']}
-                                    </p:commandLink>
-                                </div>
-                                
-                                <!-- Edit/Publish Button Group -->
-                                <div class="btn-group" jsf:rendered="#{dataverseSession.user.authenticated and
-                                                         (permissionsWrapper.canIssueUpdateDataverseCommand(DataversePage.dataverse)
-                                                         or permissionsWrapper.canIssuePublishDataverseCommand(DataversePage.dataverse))}">
-                                        <!-- Publish Button -->
-                                        <ui:fragment rendered="#{permissionsWrapper.canIssuePublishDataverseCommand(DataversePage.dataverse)}">
-                                            <button type="button" class="btn btn-default btn-access" onclick="PF('confirmation').show()"
-                                                    jsf:rendered="#{!DataversePage.dataverse.released and (empty DataversePage.dataverse.owner or DataversePage.dataverse.owner.released)}">
-                                                <span class="glyphicon glyphicon-globe"/> #{bundle['dataverse.publish.btn']}
-                                            </button>
-                                            <button type="button" class="btn btn-default btn-access" onclick="PF('mayNotRelease').show()"
-                                                    jsf:rendered="#{!DataversePage.dataverse.released and (!empty DataversePage.dataverse.owner and !DataversePage.dataverse.owner.released)}">
-                                                <span class="glyphicon glyphicon-globe"/> #{bundle['dataverse.publish.btn']}
-                                            </button>
+                        <div id="actionButtonBlock" class="col-xs-12 button-block" jsf:rendered="#{!widgetWrapper.widgetView}">
+                            <div class="row">
+                                <!-- Metrics for Root Dataverse -->
+                                <div id="metrics-block" class="col-xs-4" jsf:rendered="#{DataversePage.isRootDataverse() and !settingsWrapper.rsyncOnly}">
+                                    <div id="metrics-label" class="col-xs-4 small text-center">
+                                        <h:outputLink value="#{systemConfig.metricsUrl}" target="_blank" title="#{bundle['metrics.title.tip']}" rendered="#{systemConfig.metricsUrl != null}">
+                                            <span class="glyphicon glyphicon-stats"/> #{bundle['metrics.title']}
+                                        </h:outputLink>
+                                        <ui:fragment rendered="#{systemConfig.metricsUrl == null}">
+                                            <span class="glyphicon glyphicon-stats"/> #{bundle['metrics.title']}
                                         </ui:fragment>
-                                        <!-- END: Publish Button -->
-                                        <div class="btn-group" jsf:rendered="#{dataverseSession.user.superuser and (SearchIncludeFragment.mode == 'search' or DataversePage.dataverse.owner != null)}">
-                                            <button type="button" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-                                                <span class="glyphicon glyphicon-link"/> #{bundle['link']} <span class="caret"></span>
-                                            </button>
-                                            <ul class="dropdown-menu pull-right text-left" role="menu">
-                                                <li class="#{DataversePage.dataverse.owner != null ? '' : 'disabled'}">
-                                                    <p:commandLink action="#{DataversePage.setupLinkingPopup('link')}"
-                                                                   oncomplete="PF('linkDataverseForm').show()"
-                                                                   update=":linkDataverseForm"
-                                                                   disabled="#{DataversePage.dataverse.owner == null}">
-                                                        #{bundle['dataverse.link']}
-                                                    </p:commandLink>
-                                                </li>
-                                                <li class="#{SearchIncludeFragment.mode == 'search' ? '' : 'disabled'}">
-                                                    <p:commandLink action="#{DataversePage.setupLinkingPopup('savedSearch')}"
-                                                                   oncomplete="PF('linkDataverseForm').show()"
-                                                                   update=":linkDataverseForm"
-                                                                   disabled="#{SearchIncludeFragment.mode != 'search'}">
-                                                        #{bundle['dataverse.savedsearch.link']}
-                                                    </p:commandLink>
-                                                </li>
-                                            </ul>
-                                        </div>
-                                        <!-- Edit Button -->
-                                        <div class="btn-group" jsf:rendered="#{permissionsWrapper.canIssueUpdateDataverseCommand(DataversePage.dataverse)}">
-                                            <button type="button" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown">
-                                                <span class="glyphicon glyphicon-pencil"/> #{bundle['dataverse.edit']} <span class="caret"></span>
-                                            </button>
-                                            <ul class="dropdown-menu pull-right text-left" role="menu">
-                                                <li>
-                                                    <div id="dataverse-info-dropdown">
-                                                        <div class="dataverse-info-logo-icon">
-                                                            <span class="icon-dataverse text-brand"></span>
-                                                        </div>
-                                                        <div class="dataverse-info-general">
-                                                            <div><h:outputText value="#{DataversePage.dataverse.name}" styleClass="highlightBold"/> <h:outputText value=" (#{DataversePage.dataverse.affiliation})" styleClass="text-muted" rendered="#{!empty DataversePage.dataverse.affiliation}"/></div>
-                                                            <div class="text-muted">#{DataversePage.dataverse.alias}</div>
+                                    </div>
+                                    <div id="metrics-content" class="col-xs-8 small text-center">
+                                        <h:outputFormat styleClass="metrics-downloads" value="{0} #{bundle['metrics.downloads']}">
+                                            <f:param value="#{guestbookResponseServiceBean.getCountOfAllGuestbookResponses()}"/>
+                                        </h:outputFormat>
+                                    </div>
+                                </div>
+                                <!-- END: Metrics for Root Dataverse-->
+                                <!-- ActionButtonBlock -->
+                                <div class="#{DataversePage.isRootDataverse() ? 'col-xs-8' : 'col-xs-12'} text-right padding-none">
+                                    <!-- Email/Link/Share Button Group -->
+                                    <div class="btn-group" role="group">
+                                        <p:commandLink type="button" styleClass="text-button btn-contact bootstrap-button-tooltip" title="#{bundle['dataverse.contact']}"
+                                                       update=":contactDialog" oncomplete="PF('contactForm').show()" actionListener="#{sendFeedbackDialog.initUserInput}">
+                                            <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
+                                            <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
+                                            <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
+                                            <f:param name="DO_VALIDATION" value="false"/>
+                                            <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{DataversePage.dataverse}"/>
+                                                <span class="glyphicon glyphicon-envelope"/> #{bundle['contact.contact']}
+                                        </p:commandLink>
+                                        <p:commandLink type="button" styleClass="text-button btn-share bootstrap-button-tooltip"
+                                           title="#{bundle['dataverse.share.dataverseShare']}"
+                                           oncomplete="PF('shareDialog').show();sharrre();">
+                                            <span class="glyphicon glyphicon-share"/> #{bundle['share']}
+                                        </p:commandLink>
+                                    </div>
+                                    <!-- END: Email/Link/Share Button Group -->
+                                    <!-- Edit/Publish Button Group -->
+                                    <div class="btn-group" jsf:rendered="#{dataverseSession.user.authenticated and
+                                                             (permissionsWrapper.canIssueUpdateDataverseCommand(DataversePage.dataverse)
+                                                             or permissionsWrapper.canIssuePublishDataverseCommand(DataversePage.dataverse))}">
+                                            <!-- Publish Button -->
+                                            <ui:fragment rendered="#{permissionsWrapper.canIssuePublishDataverseCommand(DataversePage.dataverse)}">
+                                                <button type="button" class="btn btn-default btn-access" onclick="PF('confirmation').show()"
+                                                        jsf:rendered="#{!DataversePage.dataverse.released and (empty DataversePage.dataverse.owner or DataversePage.dataverse.owner.released)}">
+                                                    <span class="glyphicon glyphicon-globe"/> #{bundle['dataverse.publish.btn']}
+                                                </button>
+                                                <button type="button" class="btn btn-default btn-access" onclick="PF('mayNotRelease').show()"
+                                                        jsf:rendered="#{!DataversePage.dataverse.released and (!empty DataversePage.dataverse.owner and !DataversePage.dataverse.owner.released)}">
+                                                    <span class="glyphicon glyphicon-globe"/> #{bundle['dataverse.publish.btn']}
+                                                </button>
+                                            </ui:fragment>
+                                            <!-- END: Publish Button -->
+                                            <div class="btn-group" jsf:rendered="#{dataverseSession.user.superuser and (SearchIncludeFragment.mode == 'search' or DataversePage.dataverse.owner != null)}">
+                                                <button type="button" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+                                                    <span class="glyphicon glyphicon-link"/> #{bundle['link']} <span class="caret"></span>
+                                                </button>
+                                                <ul class="dropdown-menu pull-right text-left" role="menu">
+                                                    <li class="#{DataversePage.dataverse.owner != null ? '' : 'disabled'}">
+                                                        <p:commandLink action="#{DataversePage.setupLinkingPopup('link')}"
+                                                                       oncomplete="PF('linkDataverseForm').show()"
+                                                                       update=":linkDataverseForm"
+                                                                       disabled="#{DataversePage.dataverse.owner == null}">
+                                                            #{bundle['dataverse.link']}
+                                                        </p:commandLink>
+                                                    </li>
+                                                    <li class="#{SearchIncludeFragment.mode == 'search' ? '' : 'disabled'}">
+                                                        <p:commandLink action="#{DataversePage.setupLinkingPopup('savedSearch')}"
+                                                                       oncomplete="PF('linkDataverseForm').show()"
+                                                                       update=":linkDataverseForm"
+                                                                       disabled="#{SearchIncludeFragment.mode != 'search'}">
+                                                            #{bundle['dataverse.savedsearch.link']}
+                                                        </p:commandLink>
+                                                    </li>
+                                                </ul>
+                                            </div>
+                                            <!-- Edit Button -->
+                                            <div class="btn-group" jsf:rendered="#{permissionsWrapper.canIssueUpdateDataverseCommand(DataversePage.dataverse)}">
+                                                <button type="button" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown">
+                                                    <span class="glyphicon glyphicon-pencil"/> #{bundle['dataverse.edit']} <span class="caret"></span>
+                                                </button>
+                                                <ul class="dropdown-menu pull-right text-left" role="menu">
+                                                    <li>
+                                                        <div id="dataverse-info-dropdown">
+                                                            <div class="dataverse-info-logo-icon">
+                                                                <span class="icon-dataverse text-brand"></span>
+                                                            </div>
+                                                            <div class="dataverse-info-general">
+                                                                <div><h:outputText value="#{DataversePage.dataverse.name}" styleClass="highlightBold"/> <h:outputText value=" (#{DataversePage.dataverse.affiliation})" styleClass="text-muted" rendered="#{!empty DataversePage.dataverse.affiliation}"/></div>
+                                                                <div class="text-muted">#{DataversePage.dataverse.alias}</div>
+                                                            </div>
                                                         </div>
-                                                    </div>
-                                                </li>
-                                                <li class="divider" role="presentation"></li>
-                                                <li>
-                                                    <p:commandLink id="editInfo" actionListener="#{DataversePage.edit('INFO')}" update="@form,:dataverseForm,:searchResults,:messagePanel" oncomplete="javascript:bind_bsui_components();">
-                                                        <h:outputText value="#{bundle['dataverse.option.generalInfo']}" />
-                                                    </p:commandLink>
-                                                </li>
-                                                <li>
-                                                    <h:link outcome="ThemeAndWidgets" id="themeWidgetsOpts">
-                                                        <f:param name="id" value="#{DataversePage.dataverse.id}" />
-                                                        <h:outputText value="#{bundle['dataverse.option.themeAndWidgets']}" />
-                                                    </h:link>
-                                                </li>
-                                                <ui:fragment rendered="#{permissionsWrapper.canManagePermissions(DataversePage.dataverse)}">
+                                                    </li>
+                                                    <li class="divider" role="presentation"></li>
+                                                    <li>
+                                                        <p:commandLink id="editInfo" actionListener="#{DataversePage.edit('INFO')}" update="@form,:dataverseForm,:searchResults,:messagePanel" oncomplete="javascript:bind_bsui_components();">
+                                                            <h:outputText value="#{bundle['dataverse.option.generalInfo']}" />
+                                                        </p:commandLink>
+                                                    </li>
                                                     <li>
-                                                        <h:link id="managePermissions" styleClass="ui-commandlink ui-widget" outcome="permissions-manage">
-                                                            <h:outputText value="#{bundle['dataverse.option.permissions']}" />
+                                                        <h:link outcome="ThemeAndWidgets" id="themeWidgetsOpts">
                                                             <f:param name="id" value="#{DataversePage.dataverse.id}" />
+                                                            <h:outputText value="#{bundle['dataverse.option.themeAndWidgets']}" />
                                                         </h:link>
                                                     </li>
-                                                </ui:fragment>
-                                                <ui:fragment rendered="#{permissionsWrapper.canManagePermissions(DataversePage.dataverse)}">
+                                                    <ui:fragment rendered="#{permissionsWrapper.canManagePermissions(DataversePage.dataverse)}">
+                                                        <li>
+                                                            <h:link id="managePermissions" styleClass="ui-commandlink ui-widget" outcome="permissions-manage">
+                                                                <h:outputText value="#{bundle['dataverse.option.permissions']}" />
+                                                                <f:param name="id" value="#{DataversePage.dataverse.id}" />
+                                                            </h:link>
+                                                        </li>
+                                                    </ui:fragment>
+                                                    <ui:fragment rendered="#{permissionsWrapper.canManagePermissions(DataversePage.dataverse)}">
+                                                        <li>
+                                                            <h:link id="manageGroups" styleClass="ui-commandlink ui-widget" outcome="manage-groups">
+                                                                <h:outputText value="#{bundle['dataverse.option.dataverseGroups']}" />
+                                                                <f:param name="dataverseId" value="#{DataversePage.dataverse.id}" />
+                                                            </h:link>
+                                                        </li>
+                                                    </ui:fragment>
                                                     <li>
-                                                        <h:link id="manageGroups" styleClass="ui-commandlink ui-widget" outcome="manage-groups">
-                                                            <h:outputText value="#{bundle['dataverse.option.dataverseGroups']}" />
+                                                        <h:link id="manageTemplates" styleClass="ui-commandlink ui-widget" outcome="manage-templates">
+                                                            <h:outputText value="#{bundle['dataverse.option.datasetTemplates']}" />
+                                                            <f:param name="dataverseId" value="#{DataversePage.dataverse.id}" />
+                                                        </h:link>
+                                                    </li>
+                                                    <li jsf:rendered="#{!settingsWrapper.rsyncOnly}">
+                                                        <h:link id="manageGuestbooks" styleClass="ui-commandlink ui-widget" outcome="manage-guestbooks">
+                                                            <h:outputText value="#{bundle['dataverse.option.datasetGuestbooks']}" />
                                                             <f:param name="dataverseId" value="#{DataversePage.dataverse.id}" />
                                                         </h:link>
                                                     </li>
-                                                </ui:fragment>
-                                                <li>
-                                                    <h:link id="manageTemplates" styleClass="ui-commandlink ui-widget" outcome="manage-templates">
-                                                        <h:outputText value="#{bundle['dataverse.option.datasetTemplates']}" />
-                                                        <f:param name="dataverseId" value="#{DataversePage.dataverse.id}" />
-                                                    </h:link>
-                                                </li>
-                                                <li jsf:rendered="#{!settingsWrapper.rsyncOnly}">
-                                                    <h:link id="manageGuestbooks" styleClass="ui-commandlink ui-widget" outcome="manage-guestbooks">
-                                                        <h:outputText value="#{bundle['dataverse.option.datasetGuestbooks']}" />
-                                                        <f:param name="dataverseId" value="#{DataversePage.dataverse.id}" />
-                                                    </h:link>
-                                                </li>
-                                                <li>
-                                                    <p:commandLink id="browseOpts" actionListener="#{DataversePage.edit('FEATURED')}" oncomplete="PF('browseOptsForm').show()"
-                                                                   update="dataverseForm:browseOptsForm">
-                                                        <h:outputText value="#{bundle['dataverse.option.featuredDataverse']}" />
-                                                    </p:commandLink>
-                                                </li>
-                                                <ui:fragment rendered="#{DataversePage.isEmptyDataverse() and !(DataversePage.dataverse.owner == null)
-                                                                         and permissionsWrapper.canIssueDeleteDataverseCommand(DataversePage.dataverse)}">
-                                                    <li class="divider"></li>
                                                     <li>
-                                                        <p:commandLink id="deleteDataset" onclick="PF('deleteConfirmation').show()">
-                                                            <h:outputText value="#{bundle['dataverse.option.deleteDataverse']}" />
+                                                        <p:commandLink id="browseOpts" actionListener="#{DataversePage.edit('FEATURED')}" oncomplete="PF('browseOptsForm').show()"
+                                                                       update="dataverseForm:browseOptsForm">
+                                                            <h:outputText value="#{bundle['dataverse.option.featuredDataverse']}" />
                                                         </p:commandLink>
                                                     </li>
-                                                </ui:fragment>
-                                            </ul>
-                                        </div>
-                                        <!-- END: Edit Button -->
+                                                    <ui:fragment rendered="#{DataversePage.isEmptyDataverse() and !(DataversePage.dataverse.owner == null)
+                                                                             and permissionsWrapper.canIssueDeleteDataverseCommand(DataversePage.dataverse)}">
+                                                        <li class="divider"></li>
+                                                        <li>
+                                                            <p:commandLink id="deleteDataset" onclick="PF('deleteConfirmation').show()">
+                                                                <h:outputText value="#{bundle['dataverse.option.deleteDataverse']}" />
+                                                            </p:commandLink>
+                                                        </li>
+                                                    </ui:fragment>
+                                                </ul>
+                                            </div>
+                                            <!-- END: Edit Button -->
+                                    </div>
+                                    <!-- END: Edit/Publish Button Group -->
                                 </div>
-                                <!-- END: Edit/Publish Button Group -->
-                                
                             </div>
-                            <!-- END: Email/Link/Share Button Group -->
+                            <!-- END: ActionButtonBlock -->
                         </div>
                         <ui:fragment rendered="#{SearchIncludeFragment.filterQueries.size() == 0 and SearchIncludeFragment.mode != SearchIncludeFragment.searchModeString}">
                             <o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
-                            <ui:fragment rendered="#{!empty DataversePage.dataverse.description and !widgetWrapper.widgetView}">
-                                <div id="dataverseDesc" style="margin-bottom:1em;">
+                            <div class="row margin-bottom" jsf:rendered="#{!empty DataversePage.dataverse.description and !widgetWrapper.widgetView}">
+                                <div id="dataverseDesc" class="col-xs-12">
                                     <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(DataversePage.dataverse.description)}" escape="false"/>
                                 </div>
-                                <div class="clearfix"/>
-                            </ui:fragment>
+                            </div>
                             <!-- Featured Dataverses Carousel -->
                             <div id="carouselBlocksWrapper" jsf:rendered="#{!empty DataversePage.carouselFeaturedDataverses}">
                                 <div id="featuredDataversesBlock">
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index 219c4e8f5ac..cec6b146d73 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -21,7 +21,6 @@
             <ui:define name="meta_header">
             <meta name="description" content="#{FilePage.fileMetadata.description}"/>
             </ui:define>
-            <ui:remove><!-- We might want dc_meta_header/og_header/jsonld_header at the file level some day.--></ui:remove>
             <ui:define name="body">
                 <f:metadata>
                     <f:viewParam name="fileId" value="#{FilePage.fileId}"/>
@@ -32,186 +31,179 @@
                     <f:viewAction action="#{dataverseHeaderFragment.initBreadcrumbsForFileMetadata(FilePage.fileMetadata)}"/>
                 </f:metadata>
                 <h:form id="fileForm">
-                    <div id="topDatasetBlock" class="row">
-                        <div id="actionButtonBlock" class="col-xs-12">
-                            <div class="button-block pull-right">
-                                <!-- Email/Share Button Group -->
-                                <div class="btn-group" id="datasetButtonBar" role="group" jsf:rendered="#{!widgetWrapper.widgetView}">
-                                    <p:commandLink class="text-button btn-contact bootstrap-button-tooltip" title="#{bundle['dataset.email.datasetContactBtn']}"
-                                                   update=":contactDialog" oncomplete="PF('contactForm').show()" actionListener="#{sendFeedbackDialog.initUserInput}">
-                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
-                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
-                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
-                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{FilePage.fileMetadata.dataFile}"/>
-                                        <span class="glyphicon glyphicon-envelope"/> #{bundle['contact.contact']}
-                                    </p:commandLink>
-                                    <p:commandLink styleClass="text-button btn-share bootstrap-button-tooltip" rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}"
-                                                   title="#{bundle['dataset.share.datasetShare']}"
-                                                   oncomplete="PF('shareDialog').show();sharrre();">
-                                        <span class="glyphicon glyphicon-share"/> #{bundle['share']}
-                                    </p:commandLink>
-                                </div>
-                                <p:dialog id="shareDialog" header="#{bundle['dataset.share.datasetShare']}" widgetVar="shareDialog" modal="true"  rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
-                                    <p class="help-block">#{bundle['dataset.share.datasetShare.tip']}</p>
-
-                                    <div id="sharrre-widget" data-url="#{systemConfig.dataverseSiteUrl}/dataset.xhtml?persistentId=#{FilePage.fileMetadata.datasetVersion.dataset.globalIdString}" data-text="#{bundle['dataset.share.datasetShare.shareText']}"></div>
-
-                                    <div class="button-block">
-                                        <button class="btn btn-default" onclick="PF('shareDialog').hide()" type="button">
-                                            #{bundle.close}
-                                        </button>
-                                    </div>
-                                </p:dialog>
-                                <!-- END: Email/Share Button Group -->
-                                
-                                <div class="button-container btn-group" jsf:rendered="#{!widgetWrapper.widgetView}">
-                                    <!-- Map Data/Set Up Button Block -->
-                                    <ui:fragment rendered="#{dataverseSession.user.authenticated and FilePage.canUpdateDataset() 
-                                                             and (FilePage.getConfigureTools().size() > 0
-                                                             or worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(FilePage.fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(FilePage.fileMetadata))}">		
-                                        <ui:include src="file-configure-dropdown-fragment.xhtml">
-                                            <ui:param name="configureTools" value="#{FilePage.getConfigureTools()}"/>
-                                            <ui:param name="fileId" value="#{FilePage.fileMetadata.dataFile.id}"/>
-                                            <ui:param name="fileMetadata" value="#{FilePage.fileMetadata}"/>		
-                                            <ui:param name="canUpdateDataset" value="#{FilePage.canUpdateDataset()}"/>		
-                                        </ui:include>		
-                                    </ui:fragment>
-                                    <!-- END: Map Data/Set Up Button Block -->
-                                    
-                                    <!-- Edit Button Group -->
-                                    <div class="btn-group" jsf:rendered="#{dataverseSession.user.authenticated
-                                                             and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset) 
-                                                             and (dataFileServiceBean.hasReplacement(FilePage.fileMetadata.dataFile) or dataFileServiceBean.hasBeenDeleted(FilePage.fileMetadata.dataFile))}">
-                                        <p:commandLink styleClass="btn btn-default btn-access" onclick="PF('fileAlreadyReplacedPrevious').show()">
-                                            <span class="glyphicon glyphicon-pencil"/> #{bundle['dataset.editBtn']}
-                                        </p:commandLink>
-                                    </div>
-                                    <div class="btn-group" jsf:rendered="#{dataverseSession.user.authenticated
-                                                             and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset)
-                                                             and !FilePage.lockedFromEdits
-                                                             and !(dataFileServiceBean.hasReplacement(FilePage.fileMetadata.dataFile) or dataFileServiceBean.hasBeenDeleted(FilePage.fileMetadata.dataFile))}">
-                                        <button type="button" id="editFile" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown">
-                                            <span class="glyphicon glyphicon-pencil"/> #{bundle['dataset.editBtn']} <span class="caret"></span>
-                                        </button>
-                                        <ul class="dropdown-menu pull-right text-left" role="menu">
-                                            <ui:fragment rendered="#{systemConfig.provCollectionEnabled}">
-                                            <!--  Should be FilePage.isLockedFromEdits() ? -->
-                                                <li class="#{DatasetPage.lockedFromEdits  ? 'disabled' : ''}">
-                                                    <p:commandLink id="fileProvenanceButton"
-                                                               update="editProvenancePopup"
-                                                               oncomplete="PF('editProvenancePopup').show();bind_bsui_components();">
-                                                               <f:actionListener binding="#{provPopupFragmentBean.updatePopupState(fileMetadata, true)}" /> <!--clearProvenanceUpdates() -->
-                                                                #{bundle['file.provenance']} 
-                                                    </p:commandLink>
-                                                </li> 
+                    <!-- Top Button/Citation Blocks -->
+                    <div class="row">
+                        <div class="col-xs-12">
+                            <div id="actionButtonBlock" class="col-xs-12 button-block">
+                                <div class="row">
+                                    <!-- ActionButtonBlock -->
+                                    <div class="col-xs-12 text-right padding-none">
+                                        <!-- Contact/Share Button Group -->
+                                        <div class="btn-group" id="datasetButtonBar" role="group" jsf:rendered="#{!widgetWrapper.widgetView}">
+                                            <p:commandLink class="text-button btn-contact bootstrap-button-tooltip" title="#{bundle['dataset.email.datasetContactBtn']}"
+                                                           update=":contactDialog" oncomplete="PF('contactForm').show()" actionListener="#{sendFeedbackDialog.initUserInput}">
+                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
+                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
+                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
+                                                <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{FilePage.fileMetadata.dataFile}"/>
+                                                <span class="glyphicon glyphicon-envelope"/> #{bundle['contact.contact']}
+                                            </p:commandLink>
+                                            <p:commandLink styleClass="text-button btn-share bootstrap-button-tooltip" rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}"
+                                                           title="#{bundle['dataset.share.datasetShare']}"
+                                                           oncomplete="PF('shareDialog').show();sharrre();">
+                                                <span class="glyphicon glyphicon-share"/> #{bundle['share']}
+                                            </p:commandLink>
+                                        </div>
+                                        <!-- END: Contact/Share Button Group -->
+                                        <!-- Map/Edit Button Block -->
+                                        <div class="button-container btn-group" jsf:rendered="#{!widgetWrapper.widgetView}">
+                                            <!-- Map Data/Set Up Button Block -->
+                                            <ui:fragment rendered="#{dataverseSession.user.authenticated and FilePage.canUpdateDataset() 
+                                                                     and (FilePage.getConfigureTools().size() > 0
+                                                                     or worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(FilePage.fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(FilePage.fileMetadata))}">		
+                                                <ui:include src="file-configure-dropdown-fragment.xhtml">
+                                                    <ui:param name="configureTools" value="#{FilePage.getConfigureTools()}"/>
+                                                    <ui:param name="fileId" value="#{FilePage.fileMetadata.dataFile.id}"/>
+                                                    <ui:param name="fileMetadata" value="#{FilePage.fileMetadata}"/>		
+                                                    <ui:param name="canUpdateDataset" value="#{FilePage.canUpdateDataset()}"/>		
+                                                </ui:include>		
                                             </ui:fragment>
-                                            <li>
-                                                <h:outputLink value="/editdatafiles.xhtml?selectedFileIds=#{FilePage.fileMetadata.dataFile.id}&#38;datasetId=#{FilePage.fileMetadata.datasetVersion.dataset.id}&#38;mode=SINGLE&#38;version=#{FilePage.version}">
-                                                    <h:outputText id="editFile-Multi-Link" value="#{bundle['file.dataFilesTab.metadata.header']}"/>
-                                                </h:outputLink>
-                                            </li>
-                                            <ui:fragment rendered="#{!settingsWrapper.publicInstall}">
-                                                <ui:fragment rendered="#{!FilePage.fileMetadata.dataFile.filePackage and !FilePage.fileMetadata.restricted}">
+                                            <!-- END: Map Data/Set Up Button Block -->
+                                            <!-- Edit Button Group -->
+                                            <div class="btn-group" jsf:rendered="#{dataverseSession.user.authenticated
+                                                                     and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset) 
+                                                                     and (dataFileServiceBean.hasReplacement(FilePage.fileMetadata.dataFile) or dataFileServiceBean.hasBeenDeleted(FilePage.fileMetadata.dataFile))}">
+                                                <p:commandLink styleClass="btn btn-default btn-access" onclick="PF('fileAlreadyReplacedPrevious').show()">
+                                                    <span class="glyphicon glyphicon-pencil"/> #{bundle['dataset.editBtn']}
+                                                </p:commandLink>
+                                            </div>
+                                            <div class="btn-group" jsf:rendered="#{dataverseSession.user.authenticated
+                                                                     and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset)
+                                                                     and !FilePage.lockedFromEdits
+                                                                     and !(dataFileServiceBean.hasReplacement(FilePage.fileMetadata.dataFile) or dataFileServiceBean.hasBeenDeleted(FilePage.fileMetadata.dataFile))}">
+                                                <button type="button" id="editFile" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown">
+                                                    <span class="glyphicon glyphicon-pencil"/> #{bundle['dataset.editBtn']} <span class="caret"></span>
+                                                </button>
+                                                <ul class="dropdown-menu pull-right text-left" role="menu">
+                                                    <ui:fragment rendered="#{systemConfig.provCollectionEnabled}">
+                                                    <!--  Should be FilePage.isLockedFromEdits() ? -->
+                                                        <li class="#{DatasetPage.lockedFromEdits  ? 'disabled' : ''}">
+                                                            <p:commandLink id="fileProvenanceButton"
+                                                                       update="editProvenancePopup"
+                                                                       oncomplete="PF('editProvenancePopup').show();bind_bsui_components();">
+                                                                       <f:actionListener binding="#{provPopupFragmentBean.updatePopupState(fileMetadata, true)}" /> <!--clearProvenanceUpdates() -->
+                                                                        #{bundle['file.provenance']} 
+                                                            </p:commandLink>
+                                                        </li> 
+                                                    </ui:fragment>
                                                     <li>
-                                                        <p:commandLink onclick="PF('accessPopup').show()">
-                                                            <h:outputText value="#{bundle['file.restrict']}"/>
-                                                        </p:commandLink>
+                                                        <h:outputLink value="/editdatafiles.xhtml?selectedFileIds=#{FilePage.fileMetadata.dataFile.id}&#38;datasetId=#{FilePage.fileMetadata.datasetVersion.dataset.id}&#38;mode=SINGLE&#38;version=#{FilePage.version}">
+                                                            <h:outputText id="editFile-Multi-Link" value="#{bundle['file.dataFilesTab.metadata.header']}"/>
+                                                        </h:outputLink>
                                                     </li>
-                                                </ui:fragment>
-                                                <ui:fragment rendered="#{!FilePage.fileMetadata.dataFile.filePackage and FilePage.fileMetadata.restricted}">
-                                                    <li>
-                                                        <p:commandLink update="@form" actionListener="#{FilePage.restrictFile(false)}">
-                                                            <h:outputText value="#{bundle['file.unrestrict']}"/>
+                                                    <ui:fragment rendered="#{!settingsWrapper.publicInstall}">
+                                                        <ui:fragment rendered="#{!FilePage.fileMetadata.dataFile.filePackage and !FilePage.fileMetadata.restricted}">
+                                                            <li>
+                                                                <p:commandLink onclick="PF('accessPopup').show()">
+                                                                    <h:outputText value="#{bundle['file.restrict']}"/>
+                                                                </p:commandLink>
+                                                            </li>
+                                                        </ui:fragment>
+                                                        <ui:fragment rendered="#{!FilePage.fileMetadata.dataFile.filePackage and FilePage.fileMetadata.restricted}">
+                                                            <li>
+                                                                <p:commandLink update="@form" actionListener="#{FilePage.restrictFile(false)}">
+                                                                    <h:outputText value="#{bundle['file.unrestrict']}"/>
+                                                                </p:commandLink>
+                                                            </li>
+                                                        </ui:fragment>     
+                                                    </ui:fragment>
+                                                    <ui:fragment rendered="#{FilePage.fileMetadata.dataFile.released and FilePage.draftReplacementFile == false and !FilePage.fileMetadata.dataFile.filePackage}">                                        
+                                                    <li><!-- start: replace file link -->
+                                                        <h:outputLink value="/editdatafiles.xhtml?mode=SINGLE_REPLACE&#38;datasetId=#{FilePage.fileMetadata.datasetVersion.dataset.id}&#38;fid=#{FilePage.fileMetadata.dataFile.id}&#38;version=#{FilePage.version}">
+                                                             <h:outputText value="#{bundle['file.replace']}"/>
+                                                        </h:outputLink>
+                                                    <!-- end replace file link --></li>
+                                                    </ui:fragment>
+                                                    <ui:fragment rendered="#{ !FilePage.fileMetadata.dataFile.filePackage and ((FilePage.fileMetadata.dataFile.released and FilePage.draftReplacementFile == true) or (!FilePage.fileMetadata.dataFile.released and FilePage.fileMetadata.datasetVersion.dataset.released)) }">                                        
+                                                    <li><!-- start: already replaced replace file link -->
+                                                        <p:commandLink title="#{bundle['file.delete']}" onclick="PF('fileAlreadyReplacedDraft').show();">
+                                                            <h:outputText value="#{bundle['file.replace']}"/>
                                                         </p:commandLink>
+                                                    <!-- end replace file link --></li>
+                                                    </ui:fragment>  
+                                                    <ui:fragment rendered="#{!FilePage.fileMetadata.dataFile.released or !FilePage.fileMetadata.dataFile.filePackage}"> 
+                                                        <li>
+                                                            <p:commandLink title="#{bundle['file.delete']}" onclick="PF('deleteFileConfirmation').show();">
+                                                                <h:outputText value= "#{bundle['file.delete']}"/>
+                                                            </p:commandLink>
+                                                        </li>
+                                                    </ui:fragment>
+                                                    <ui:fragment rendered="#{!widgetWrapper.widgetView and (worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(FilePage.fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(FilePage.fileMetadata))}">
+                                                    <li>
                                                     </li>
-                                                </ui:fragment>     
-                                            </ui:fragment>
-                                            <ui:fragment rendered="#{FilePage.fileMetadata.dataFile.released and FilePage.draftReplacementFile == false and !FilePage.fileMetadata.dataFile.filePackage}">                                        
-                                            <li><!-- start: replace file link -->
-                                                <h:outputLink value="/editdatafiles.xhtml?mode=SINGLE_REPLACE&#38;datasetId=#{FilePage.fileMetadata.datasetVersion.dataset.id}&#38;fid=#{FilePage.fileMetadata.dataFile.id}&#38;version=#{FilePage.version}">
-                                                     <h:outputText value="#{bundle['file.replace']}"/>
-                                                </h:outputLink>
-                                            <!-- end replace file link --></li>
-                                            </ui:fragment>
-                                            <ui:fragment rendered="#{ !FilePage.fileMetadata.dataFile.filePackage and ((FilePage.fileMetadata.dataFile.released and FilePage.draftReplacementFile == true) or (!FilePage.fileMetadata.dataFile.released and FilePage.fileMetadata.datasetVersion.dataset.released)) }">                                        
-                                            <li><!-- start: already replaced replace file link -->
-                                                <p:commandLink title="#{bundle['file.delete']}" onclick="PF('fileAlreadyReplacedDraft').show();">
-                                                    <h:outputText value="#{bundle['file.replace']}"/>
-                                                </p:commandLink>
-                                            <!-- end replace file link --></li>
-                                            </ui:fragment>  
-                                            <ui:fragment rendered="#{!FilePage.fileMetadata.dataFile.released or !FilePage.fileMetadata.dataFile.filePackage}"> 
-                                                <li>
-                                                    <p:commandLink title="#{bundle['file.delete']}" onclick="PF('deleteFileConfirmation').show();">
-                                                        <h:outputText value= "#{bundle['file.delete']}"/>
-                                                    </p:commandLink>
-                                                </li>
-                                            </ui:fragment>
-                                            <ui:fragment rendered="#{!widgetWrapper.widgetView and (worldMapPermissionHelper.canUserSeeMapDataButtonFromPage(FilePage.fileMetadata) or worldMapPermissionHelper.canSeeMapButtonReminderToPublishFromPage(FilePage.fileMetadata))}">
-                                            <li>
-                                            </li>
-                                            </ui:fragment>
-                                        </ul>
+                                                    </ui:fragment>
+                                                </ul>
+                                            </div>
+                                            <!-- END: Edit Button Group -->
+                                        </div>
+                                        <!-- END: Map/Edit Button Block -->
+                                        <!-- Explore/Download/Request Button Block -->
+                                        <div class="button-container btn-group" jsf:rendered="#{(!FilePage.fileMetadata.datasetVersion.deaccessioned or 
+                                                                                                    (FilePage.fileMetadata.datasetVersion.deaccessioned and FilePage.canUpdateDataset())) 
+                                                                                                     and (!FilePage.fileMetadata.dataFile.filePackage or
+                                                                                                           FilePage.fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload)}">
+                                            <ui:include src="file-download-button-fragment.xhtml">
+                                                <ui:param name="fileMetadata" value="#{FilePage.fileMetadata}"/>
+                                                <ui:param name="canUpdateDataset" value="#{FilePage.canUpdateDataset()}"/>
+                                                <ui:param name="downloadPopupRequired" value="#{FilePage.downloadPopupRequired}"/>
+                                                <ui:param name="requestAccessPopupRequired" value="#{FilePage.requestAccessPopupRequired}"/>
+                                                <ui:param name="guestbookResponse" value="#{FilePage.guestbookResponse}"/>
+                                                <ui:param name="guestbookResponseService" value="#{FilePage.guestbookResponseService}"/>
+                                                <ui:param name="fileDownloadService" value="#{FilePage.fileDownloadService}"/>
+                                                <ui:param name="isFilePg" value="true"/>
+                                                <ui:param name="lockedFromDownload" value="#{FilePage.lockedFromDownload}"/>
+                                                <ui:param name="exploreTools" value="#{FilePage.exploreTools}"/>
+                                            </ui:include>
+                                        </div>
+                                        <!-- END: Explore/Download/Request Button Block -->
                                     </div>
-                                    <!-- END: Edit Button Group -->
-                                </div>
-                                
-                                <!-- Explore/Download/Request Button Block -->
-                                <div class="button-container btn-group" jsf:rendered="#{(!FilePage.fileMetadata.datasetVersion.deaccessioned or 
-                                                                                            (FilePage.fileMetadata.datasetVersion.deaccessioned and FilePage.canUpdateDataset())) 
-                                                                                             and (!FilePage.fileMetadata.dataFile.filePackage or
-                                                                                                   FilePage.fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload)}">
-                                    <ui:include src="file-download-button-fragment.xhtml">
-                                        <ui:param name="fileMetadata" value="#{FilePage.fileMetadata}"/>
-                                        <ui:param name="canUpdateDataset" value="#{FilePage.canUpdateDataset()}"/>
-                                        <ui:param name="downloadPopupRequired" value="#{FilePage.downloadPopupRequired}"/>
-                                        <ui:param name="requestAccessPopupRequired" value="#{FilePage.requestAccessPopupRequired}"/>
-                                        <ui:param name="guestbookResponse" value="#{FilePage.guestbookResponse}"/>
-                                        <ui:param name="guestbookResponseService" value="#{FilePage.guestbookResponseService}"/>
-                                        <ui:param name="fileDownloadService" value="#{FilePage.fileDownloadService}"/>
-                                        <ui:param name="isFilePg" value="true"/>
-                                        <ui:param name="lockedFromDownload" value="#{FilePage.lockedFromDownload}"/>
-                                        <ui:param name="exploreTools" value="#{FilePage.exploreTools}"/>
-                                    </ui:include>
+                                    <!-- END: ActionButtonBlock -->
                                 </div>
-                                <!-- END: Explore/Download/Request Button Block -->
                             </div>
-                        </div>
-                    </div>
-                    <!-- END topDatasetBlock -->
-                    <div id="fileImageTitle" class="row">
-                        <div class="col-xs-12">
-                            <div class="row">
-                                <div id="file-title-block" class="col-xs-12 margin-bottom-half">
-                                    <!-- Restricted File Icon -->
-                                    <span class="glyphicon glyphicon-lock text-danger" jsf:rendered="#{FilePage.fileMetadata.restricted and !(fileDownloadHelper.canDownloadFile(FilePage.fileMetadata))}" />
-                                    <span class="icon-unlock text-success" jsf:rendered="#{FilePage.fileMetadata.restricted  and fileDownloadHelper.canDownloadFile(FilePage.fileMetadata) }" />
+                            <div id="fileVersionBlock" class="row">
+                                <div id="fileImageTitle" class="col-xs-12">
+                                    <div id="file-title-block" class="row margin-bottom-half">
+                                        <div class="col-xs-12">
+                                            <!-- Restricted File Icon -->
+                                            <span class="glyphicon glyphicon-lock text-danger" jsf:rendered="#{FilePage.fileMetadata.restricted and !(fileDownloadHelper.canDownloadFile(FilePage.fileMetadata))}" />
+                                            <span class="icon-unlock text-success" jsf:rendered="#{FilePage.fileMetadata.restricted  and fileDownloadHelper.canDownloadFile(FilePage.fileMetadata) }" />
+
+                                            <!-- Title/Label -->
+                                            <h:outputText value="#{FilePage.fileMetadata.label}" styleClass="file-title-label"/>
 
-                                    <!-- Title/Label -->
-                                    <h:outputText value="#{FilePage.fileMetadata.label}" styleClass="file-title-label"/>
-                                    
-                                    <div id="title-label-block" class="margin-top-half">
-                                        <h:outputText value="#{bundle['dataset.versionUI.draft']}" styleClass="label label-primary" rendered="#{FilePage.fileMetadata.datasetVersion.draft}"/>
-                                        <h:outputText value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{FilePage.fileMetadata.datasetVersion.inReview}"/>
-                                        <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{!FilePage.fileMetadata.datasetVersion.dataset.released}"/>   
-                                        <h:outputText value="#{bundle['dataset.versionUI.deaccessioned']}" styleClass="label label-danger" rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}"/>
-                                        <!-- DATASET VERSION NUMBER -->
-                                        <h:outputText styleClass="label label-default" rendered="#{FilePage.fileMetadata.datasetVersion.released and !(FilePage.fileMetadata.datasetVersion.draft or FilePage.fileMetadata.datasetVersion.inReview)}"
-                                                      value="#{bundle['file.DatasetVersion']} #{FilePage.fileMetadata.datasetVersion.versionNumber}.#{FilePage.fileMetadata.datasetVersion.minorVersionNumber}" /> 
-                                        <h:outputText styleClass="label label-default" rendered="#{!FilePage.fileMetadata.datasetVersion.released and !(FilePage.fileMetadata.datasetVersion.draft or FilePage.fileMetadata.datasetVersion.inReview)}"
-                                                      value="#{bundle['file.DatasetVersion']} #{FilePage.fileMetadata.datasetVersion.versionState}"/>
+                                            <div id="title-label-block" class="margin-top-half">
+                                                <h:outputText value="#{bundle['dataset.versionUI.draft']}" styleClass="label label-primary" rendered="#{FilePage.fileMetadata.datasetVersion.draft}"/>
+                                                <h:outputText value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{FilePage.fileMetadata.datasetVersion.inReview}"/>
+                                                <h:outputText value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{!FilePage.fileMetadata.datasetVersion.dataset.released}"/>   
+                                                <h:outputText value="#{bundle['dataset.versionUI.deaccessioned']}" styleClass="label label-danger" rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}"/>
+                                                <!-- DATASET VERSION NUMBER -->
+                                                <h:outputText styleClass="label label-default" rendered="#{FilePage.fileMetadata.datasetVersion.released and !(FilePage.fileMetadata.datasetVersion.draft or FilePage.fileMetadata.datasetVersion.inReview)}"
+                                                              value="#{bundle['file.DatasetVersion']} #{FilePage.fileMetadata.datasetVersion.versionNumber}.#{FilePage.fileMetadata.datasetVersion.minorVersionNumber}" /> 
+                                                <h:outputText styleClass="label label-default" rendered="#{!FilePage.fileMetadata.datasetVersion.released and !(FilePage.fileMetadata.datasetVersion.draft or FilePage.fileMetadata.datasetVersion.inReview)}"
+                                                              value="#{bundle['file.DatasetVersion']} #{FilePage.fileMetadata.datasetVersion.versionState}"/>
+                                            </div>
+                                        </div>
                                     </div>
-                                </div>
-                                
-                                <div class="col-xs-12">
                                     <div class="row">
-                                        <div class="col-sm-9">
+                                        <!-- CITATION BLOCK -->
+                                        <div class="#{FilePage.fileMetadata.datasetVersion.deaccessioned ? 'col-sm-12' : 'col-sm-9'}">
                                             <div class="row">
+                                                <!-- FILE CITATION -->
                                                 <div class="col-sm-12">
                                                     <h:outputFormat styleClass="h5" value="#{bundle['file.citation.datafile']}" escape="false" />
                                                 </div>
                                                 <div class="col-sm-12 citation-block">
-                                                     <div class="col-sm-12 #{FilePage.fileMetadata.datasetVersion.deaccessioned ? 'alert alert-danger bg-danger' : 'alert alert-info bg-citation bg-citation-file'}">
+                                                    <div class="col-sm-12 #{FilePage.fileMetadata.datasetVersion.deaccessioned ? 'alert alert-danger bg-danger' : 'alert alert-info bg-citation bg-citation-file'}">
                                                         <div class="row">
                                                             <div class="col-sm-12 citation">
                                                                 <span id="citation-select-2" onclick="if (event.target) { selectText(event.target); } else{ selectText(this); }">
@@ -246,13 +238,14 @@
                                                                     </ul>
                                                                 </div>
                                                             </div>
-                                                            <div class="col-sm-6 text-right small text-muted citation-standards vcenter" jsf:rendered="#{!DatasetPage.workingVersion.deaccessioned}">
+                                                            <div class="col-sm-6 text-right small text-muted citation-standards vcenter" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
                                                                 <h:outputText value="#{bundle['dataset.cite.standards.tip']}" escape="false"/>
                                                             </div>
                                                         </div>
                                                     </div>
                                                 </div>
-
+                                                <!-- END FILE CITATION -->
+                                                <!-- DATASET CITATION -->
                                                 <div class="col-sm-12">
                                                     <p class="help-block">
                                                         <h:outputFormat value="#{bundle['file.citation.notice']}" escape="false">
@@ -299,26 +292,17 @@
                                                                     </ul>
                                                                 </div>
                                                             </div>
-                                                            <div class="col-sm-6 text-right small text-muted citation-standards vcenter" jsf:rendered="#{!DatasetPage.workingVersion.deaccessioned}">
+                                                            <div class="col-sm-6 text-right small text-muted citation-standards vcenter" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
                                                                 <h:outputText value="#{bundle['dataset.cite.standards.tip']}" escape="false"/>
                                                             </div>
                                                         </div>
                                                     </div>
                                                 </div>
-
-                                                <div id="deaccession-reason-block" class="col-xs-12" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}">
-                                                    <div class="col-xs-12 bg-danger">
-                                                        <h5 class="margin-top-half">#{bundle['dataset.deaccession.reason']}</h5>
-                                                        <p>#{FilePage.fileMetadata.datasetVersion.versionNote}</p>
-                                                        <ui:fragment rendered="#{!empty FilePage.fileMetadata.datasetVersion.archiveNote}">
-                                                            <p>#{bundle['dataset.beAccessedAt']} <a href="#{FilePage.fileMetadata.datasetVersion.archiveNote}" target="_blank">#{FilePage.fileMetadata.datasetVersion.archiveNote}</a></p>
-                                                        </ui:fragment>
-                                                    </div>
-                                                </div>
                                             </div>
                                         </div>
+                                        <!-- END DATASET CITATION -->
+                                        <!-- Metrics -->
                                         <div class="col-sm-3">
-                                            <!-- Metrics -->
                                             <div id="metrics-block" jsf:rendered="#{!(widgetWrapper.widgetView or FilePage.fileMetadata.dataFile.filePackage or FilePage.fileMetadata.datasetVersion.deaccessioned)}">
                                                 <div id="metrics-heading">
                                                     #{bundle['metrics.file.title']}
@@ -344,14 +328,27 @@
                                                     </div>
                                                 </div>
                                             </div>
-                                            <!-- END: Metrics -->
                                         </div>
+                                        <!-- END: Metrics -->
                                     </div>
+                                    <!-- DEACCESSION REASON -->
+                                    <div class="row" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.deaccessioned}">
+                                        <div id="deaccession-reason-block" class="col-xs-12">
+                                            <div class="col-xs-12 bg-danger">
+                                                <h5 class="margin-top-half">#{bundle['dataset.deaccession.reason']}</h5>
+                                                <p>#{FilePage.fileMetadata.datasetVersion.versionNote}</p>
+                                                <ui:fragment rendered="#{!empty FilePage.fileMetadata.datasetVersion.archiveNote}">
+                                                    <p>#{bundle['dataset.beAccessedAt']} <a href="#{FilePage.fileMetadata.datasetVersion.archiveNote}" target="_blank">#{FilePage.fileMetadata.datasetVersion.archiveNote}</a></p>
+                                                </ui:fragment>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <!-- END DEACCESSION REASON -->
                                 </div>
                             </div>
                         </div>
                     </div>
-
+                    <!-- END Top Button/Citation Blocks -->
                     <div id="contentTabs">
                         <!-- Metadata -->
                         <p:tabView id="tabView" widgetVar="content" activeIndex="#{FilePage.selectedTabIndex}">
@@ -557,7 +554,16 @@
                             </p:tab>
                         </p:tabView>
                     </div>
-
+                    <!-- POPUPS -->
+                    <p:dialog id="shareDialog" header="#{bundle['dataset.share.datasetShare']}" widgetVar="shareDialog" modal="true"  rendered="#{!FilePage.fileMetadata.datasetVersion.deaccessioned}">
+                        <p class="help-block">#{bundle['dataset.share.datasetShare.tip']}</p>
+                        <div id="sharrre-widget" data-url="#{systemConfig.dataverseSiteUrl}/dataset.xhtml?persistentId=#{FilePage.fileMetadata.datasetVersion.dataset.globalIdString}" data-text="#{bundle['dataset.share.datasetShare.shareText']}"></div>
+                        <div class="button-block">
+                            <button class="btn btn-default" onclick="PF('shareDialog').hide()" type="button">
+                                #{bundle.close}
+                            </button>
+                        </div>
+                    </p:dialog>
                     <p:dialog id="deleteFileConfirm" styleClass="smallPopUp" header="#{bundle['file.deleteFileDialog.header']}" widgetVar="deleteFileConfirmation" modal="true">
                         <p class="text-warning"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.deleteFileDialog.immediate']}</p>
                         <ui:fragment rendered="#{FilePage.fileMetadata.dataFile.owner.released}">
@@ -605,11 +611,9 @@
                             <ui:param name="canUpdateDataset" value="#{FilePage.canUpdateDataset()}"/>
                         </ui:include>
                     </p:dialog>
-                    
                     <ui:include rendered="#{systemConfig.provCollectionEnabled}" src="provenance-popups-fragment.xhtml">
-                            <ui:param name="saveInPopup" value="true"/>
+                        <ui:param name="saveInPopup" value="true"/>
                     </ui:include>
-                    
                     <!-- Request Access Sign Up/Log In Button -->
                     <p:dialog id="accessGuest" header="#{bundle['file.requestAccess']}" widgetVar="accessSignUpLogIn_popup" modal="true">
                         <p class="help-block">
diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 404c3585933..21737d14d3d 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -375,7 +375,7 @@ div.ui-state-focus span.ui-chkbox-icon {outline: -webkit-focus-ring-color auto 5
 .form-group > .button-block, 
 .panel-body > .button-block, 
 td.col-file-action > .button-block, .col-manage-action > .button-block,
-div.ui-datatable-header > .button-block, .button-block.tab-header, #topDatasetBlock > #actionButtonBlock > .button-block, .inline-buttons > .button-block {margin-top:0;}
+div.ui-datatable-header > .button-block, .button-block.tab-header, #actionButtonBlock > .button-block, .inline-buttons > .button-block {margin-top:0;}
 th.col-file-action.text-right {text-align: right;}
 form.btn-form {display:inline-block;}
 .button-block button, .button-block a.btn, .button-block input.btn, .button-block div.btn-group, .button-block span.btn.ui-state-disabled, .button-block .button-container {margin-right:1em;}
@@ -589,7 +589,7 @@ div[id$='roleDisplay'] span.label, div[id$='roleDetails'] span.label {display:in
 #metrics-block {margin-bottom:20px;}
 
 /* -- OLD LAYOUT -- */
-#metrics-block {border:1px solid #eee;padding:0;}
+#metrics-block {border:1px solid #eee;}
 #metrics-label {color:#333;background:#eee;padding:8px 10px;}
 #metrics-label a {color:#333;display:block;}
 #metrics-label a:hover {text-decoration:none;}
@@ -619,6 +619,7 @@ div[id$='roleDisplay'] span.label, div[id$='roleDetails'] span.label {display:in
 .citation-block {/*-- margin-bottom:.5em; padding-right:0; --*/}
 .bg-citation {background:#ECF6FB;}
 .bg-citation-file {background:#f5f5f5; border: 1px solid #DDD;}
+.alert-danger.bg-danger {background:#F2DEDE;}
 div.alert-info.bg-citation, div.alert-danger.bg-danger {padding-top:4px; padding-bottom:4px; border-radius:0; color:#333;}
 .citation-block > div.alert-info.bg-citation, .citation-block > div.alert-danger.bg-danger {padding-top:0; padding-bottom:0;}
 .citation-select {/*-- display:inline-block; --*/}
@@ -635,7 +636,7 @@ div.panel-body.read-terms{max-height:220px; overflow-y:scroll; width:100%; backg
 span[id$='editDataSet'] .ui-button-text {white-space: nowrap;}
 #replicationDataButton {margin-top:5px;}
 
-#deaccession-reason-block {padding:4px; margin-bottom:.5em;}
+#deaccession-reason-block {}
 
 div.form-group .glyphicon.glyphicon-asterisk {font-size:.5em; vertical-align:text-top;}
 #datasetForm .form-group, #templateForm .form-group {overflow: hidden;}

From c41b8bb337c3407542ba5a7d48a95e11ba16ae29 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Tue, 22 Oct 2019 16:46:45 -0400
Subject: [PATCH 13/35] Fixed padding issue with Metrics block on dataverse pg
 [ref #5615]

---
 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 21737d14d3d..0bab029b3ee 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -589,7 +589,7 @@ div[id$='roleDisplay'] span.label, div[id$='roleDetails'] span.label {display:in
 #metrics-block {margin-bottom:20px;}
 
 /* -- OLD LAYOUT -- */
-#metrics-block {border:1px solid #eee;}
+#metrics-block {border:1px solid #eee; padding:0;}
 #metrics-label {color:#333;background:#eee;padding:8px 10px;}
 #metrics-label a {color:#333;display:block;}
 #metrics-label a:hover {text-decoration:none;}

From 305caf0639c659140d741f1548d318a4a92aafe9 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Wed, 23 Oct 2019 12:24:46 -0400
Subject: [PATCH 14/35] Fixed broken render logic on edit dataset pg from
 recent responsiveness changes [ref #5615]

---
 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 76dad11f1d1..95da42f1e39 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -79,7 +79,7 @@
                     <!-- View infoMode -->
                     <!-- Top Button/Citation Blocks -->
                     <p:fragment id="topDatasetBlockFragment">
-                    <div class="row" rendered="#{empty DatasetPage.editMode}">
+                    <div class="row" jsf:rendered="#{empty DatasetPage.editMode}">
                         <div class="col-xs-12">
                             <div id="actionButtonBlock" class="col-xs-12 button-block" jsf:rendered="#{!widgetWrapper.widgetView}">
                                 <div class="row">

From e08a3c6f51858ac77172964fdf6f9fca112d8d13 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Wed, 23 Oct 2019 17:07:28 -0400
Subject: [PATCH 15/35] Added name to dataverse label on create/edit dataverse
 form, added documention of Add Data workflows for new navbar and My Data
 link/button to user guides, fixed misc formatting issues in guides [ref
 #5615]

---
 .../source/admin/make-data-count.rst          |  2 +-
 doc/sphinx-guides/source/user/account.rst     |  6 +-
 .../source/user/dataset-management.rst        | 10 ++-
 .../source/user/dataverse-management.rst      | 65 +++++++++----------
 src/main/java/propertyFiles/Bundle.properties |  3 +-
 src/main/webapp/dataverse.xhtml               |  4 +-
 6 files changed, 42 insertions(+), 48 deletions(-)

diff --git a/doc/sphinx-guides/source/admin/make-data-count.rst b/doc/sphinx-guides/source/admin/make-data-count.rst
index deb0679b32d..9506e939af6 100644
--- a/doc/sphinx-guides/source/admin/make-data-count.rst
+++ b/doc/sphinx-guides/source/admin/make-data-count.rst
@@ -66,7 +66,7 @@ To make Dataverse log dataset usage (views and downloads) for Make Data Count, y
 After you have your first day of logs, you can process them the next day.
 
 Enable or Disable Display of Make Data Count Metrics
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 By default, when MDC logging is enabled (when ``:MDCLogPath`` is set), Dataverse will display MDC metrics instead of it's internal (legacy) metrics. You can avoid this (e.g. to collect MDC metrics for some period of time before starting to display them) by setting ``:DisplayMDCMetrics`` to false.
 
diff --git a/doc/sphinx-guides/source/user/account.rst b/doc/sphinx-guides/source/user/account.rst
index f9180a530c3..8c2305f30c1 100755
--- a/doc/sphinx-guides/source/user/account.rst
+++ b/doc/sphinx-guides/source/user/account.rst
@@ -142,11 +142,11 @@ You can also convert your Dataverse account to use authentication provided by Gi
 My Data
 -------
 
-The My Data section of your account page displays a listing of all the dataverses, datasets, and files you have either created, uploaded or that you have a role assigned on. If you see unexpected dataverses or datasets in your My Data page, it might be because someone has assigned your account a role on those dataverses or datasets. For example, some institutions automatically assign the "File Downloader" role on their datasets to all accounts using their institutional login.
+The My Data section of your account page displays a listing of all the dataverses, datasets, and files you have either created, uploaded or that you have a role assigned on. You are able to filter through all the dataverses, datasets, and files listed on your My Data page using the filter box. You may also use the facets on the left side to only view a specific Publication Status or Role.
 
+.. note:: If you see unexpected dataverses or datasets in your My Data page, it might be because someone has assigned your account a role on those dataverses or datasets. For example, some institutions automatically assign the "File Downloader" role on their datasets to all accounts using their institutional login.
 
-You are able to filter through all the dataverses, datasets, and files listed on your My Data page using the filter box. You may also use the facets on the left side to only view a specific Publication Status or Role.
-
+You can use the Add Data button to create a new dataverse or dataset. By default, the new dataverse or dataset will be created in the root dataverse, but from the create form you can use the Host Dataverse dropdown menu to choose a different dataverse, for which you have the proper access privileges. However, you will not be able to change this selection after you create your dataverse or dataset.
 
 Notifications
 -------------
diff --git a/doc/sphinx-guides/source/user/dataset-management.rst b/doc/sphinx-guides/source/user/dataset-management.rst
index 3cdc9aec954..1ec57da8727 100755
--- a/doc/sphinx-guides/source/user/dataset-management.rst
+++ b/doc/sphinx-guides/source/user/dataset-management.rst
@@ -41,8 +41,8 @@ Each of these metadata exports contains the metadata of the most recently publis
 Adding a New Dataset
 ====================
 
-#. Navigate to the dataverse in which you want to add a dataset. 
-#. Click on the "Add Data" button and select "New Dataset" in the dropdown menu.
+#. Navigate to the dataverse in which you want to add a dataset.
+#. Click on the "Add Data" button and select "New Dataset" in the dropdown menu. **Note:** If you are on the root dataverse, your My Data page or click the "Add Data" link in the navbar, the dataset you create will be hosted in the root dataverse. You can change this by selecting another dataverse you have proper permissions to create datasets in, from the Host Dataverse dropdown in the create dataset form. This option to choose will not be available after you create the dataset.
 #. To quickly get started, enter at minimum all the required fields with an asterisk (e.g., the Dataset Title, Author, 
    Description, Contact Email and Subject) to get a Data Citation with a DOI.
 #. Scroll down to the "Files" section and click on "Select Files to Add" to add all the relevant files to your Dataset. 
@@ -51,7 +51,7 @@ Adding a New Dataset
    description and tags (via the "Edit Tag" button) for each file. Additionally, an MD5 checksum will be added for each file. If you upload a tabular file a :ref:`Universal Numerical Fingerprint (UNF) <unf>` will be added to this file.
 #. Click the "Save Dataset" button when you are done. Your unpublished dataset is now created. 
 
-Note: You can add additional metadata once you have completed the initial dataset creation by going to Edit Dataset > Metadata. 
+Note: You can add additional metadata once you have completed the initial dataset creation by going to clicking the Edit button and selecting Metadata from the dropdown menu.
 
 Supported HTML Fields
 ---------------------
@@ -205,8 +205,6 @@ These folder names are subject to strict validation rules. Only the following ch
 
 .. note:: If you upload multiple .zip files to one dataset, any subdirectories that are identical across multiple .zips will be merged together when the user downloads the full dataset.
 
-
-
 Other File Types
 ----------------
 
@@ -272,6 +270,7 @@ Dataset terms can be viewed and edited from the Terms tab of the dataset page, o
 
 CC0 Public Domain Dedication
 ----------------------------
+
 By default, all new datasets created through Dataverse's web UI are given a `Creative Commons CC0 Public Domain Dedication <https://creativecommons.org/publicdomain/zero/1.0/>`_.
 
 The `Creative Commons <https://creativecommons.org>`_ organization defines a number of `licenses <https://creativecommons.org/licenses/>`_ that allow copyright holders to release their intellectual property more openly, with fewer legal restrictions than standard copyright enforces. Each Creative Commons license typically specifies simple terms for how the IP must be used, reused, shared, and attributed. In addition to these licenses, Creative Commons also provides public domain tools that make it easy to dedicate IP to the public domain. 
@@ -536,4 +535,3 @@ If you deaccession the most recently published version of the dataset but not al
    
 .. _Make Data Count: https://makedatacount.org
 .. _Crossref: https://crossref.org
-
diff --git a/doc/sphinx-guides/source/user/dataverse-management.rst b/doc/sphinx-guides/source/user/dataverse-management.rst
index 046917673ef..eaa116550aa 100755
--- a/doc/sphinx-guides/source/user/dataverse-management.rst
+++ b/doc/sphinx-guides/source/user/dataverse-management.rst
@@ -5,40 +5,40 @@ A dataverse is a container for datasets (research data, code, documentation, and
 
 |image1|
 
-Once a user creates a dataverse they, by default, become the
-administrator of that dataverse. The dataverse administrator has access
-to manage the settings described in this guide.
+Once a user creates a dataverse they, by default, become the administrator of that dataverse. The dataverse administrator has access to manage the settings described in this guide.
 
 .. contents:: |toctitle|
   :local:
 
-Create a Dataverse (Within the "Root" Dataverse)
-===================================================
+Create a New Dataverse
+=======================
 
-Creating a dataverse is easy but first you must be a registered user (see :doc:`/user/account`).
+Creating a dataverse is easy but first you must be a registered user (see :doc:`/user/account`). Once you are logged in, click on the "Add Data" button, or "Add Data" navbar link and in the dropdown menu select "New Dataverse".
 
-#. Once you are logged in click on the "Add Data" button and in the dropdown menu select "New Dataverse".
-#. Once on the "New Dataverse" page fill in the following fields:
-    * **Name**: Enter the name of your dataverse.
+#. **Fill in the following fields on the "New Dataverse" page** (required fields in the form are denoted by a red asterisk, next to the label):
+    * **Dataverse Name**: Enter the name of your dataverse.
+    * **Affiliation**: Add any affiliation that can be associated with this particular dataverse (e.g., project name, institute name, department name, journal name, etc). This is automatically filled out if you have added an affiliation for your user account.
     * **Identifier**: This is an abbreviation, usually lower-case, that becomes part of the URL for the new dataverse. Special characters (~,\`, !, @, #, $, %, ^, &, and \*) and spaces are not allowed. **Note**: if you change this field in the future, the URL for your Dataverse will change (http//.../'identifier'), which will break older links to the page.
+    * **Host Dataverse**: Select a dataverse you would like to create the new dataverse in, by default the root dataverse is selected if you click the Add Data button from the root dataverse, your My Data pg, the Add Data link in the navbar, or the Add a dataset button on the custom homepage (if configured), but you can select any dataverse for which you the proper permissions to create dataverses.
+    * **Category**: Select a category that best describes the type of dataverse this will be. For example, if this is a dataverse for an individual researcher's datasets, select *Researcher*. If this is a dataverse for an institution, select *Organization or Institution*.
     * **Email**: This is the email address that will be used as the contact for this particular dataverse. You can have more than one contact email address for your dataverse.
-    * **Affiliation**: Add any Affiliation that can be associated with this particular dataverse (e.g., project name, institute name, department name, journal name, etc). This is automatically filled out if you have added an affiliation for your user account.
     * **Description**: Provide a description of this dataverse. This will display on the landing page of your dataverse and in the search result list. The description field supports certain HTML tags, if you'd like to format your text (<a>, <b>, <blockquote>, <br>, <code>, <del>, <dd>, <dl>, <dt>, <em>, <hr>, <h1>-<h3>, <i>, <img>, <kbd>, <li>, <ol>, <p>, <pre>, <s>, <sup>, <sub>, <strong>, <strike>, <ul>).
-    * **Category**: Select a category that best describes the type of dataverse this will be. For example, if this is a dataverse for an individual researcher's datasets, select *Researcher*. If this is a dataverse for an institution, select *Organization or Institution*.
-    * **Choose the sets of Metadata Fields for datasets in this dataverse**: By default the metadata elements will be from the host dataverse that this new dataverse is created in. Dataverse offers metadata standards for multiple domains. To learn more about the metadata standards in Dataverse please check out the :doc:`/user/appendix`.
-    * **Select facets for this dataverse**:  Choose which metadata fields will be used as facets on your dataverse. These facets will allow users browsing or searching your dataverse to filter its contents according to the fields you’ve selected. For example, if you select “Subject” as a facet, users will be able to filter your dataverse’s contents by subject area. By default, the facets that will appear on your dataverse landing page will be from the host dataverse that this new dataverse was created in, but you can add or remove facets from this default.
-#. Selected metadata elements are also used to pick which metadata fields you would like to use for creating templates for your datasets. Metadata fields can be hidden, or selected as required or optional. Once you have selected all the fields you would like to use, you can create your template(s) after you finish creating your dataverse.
-#. Click "Create Dataverse" button and you're done! 
-
-\*Required fields are denoted by a red asterisk.
-
-Edit Dataverse 
-=================
-
-To edit your dataverse, navigate to your dataverse's landing page and select the "Edit Dataverse" button, 
-where you will be presented with the following editing options: 
-
-- :ref:`General Information <general-information>`: edit name, identifier, category, contact email, affiliation, description, Metadata Elements, and facets for your dataverse
+#. **Choose the sets of Metadata Fields for datasets in this dataverse**:
+    * By default the metadata elements will be from the host dataverse that this new dataverse is created in.
+    * Dataverse offers metadata standards for multiple domains. To learn more about the metadata standards in Dataverse please check out the :doc:`/user/appendix`.
+    * Metadata fields can be hidden, or selected as required or optional.
+    * Selected metadata elements are also used to pick which metadata fields you would like to use for creating :ref:`Dataset Templates <dataset-templates>`: after you finish creating your dataverse.
+#. **Choose which metadata fields will be used as browse/search facets on your dataverse**:
+    * These facets will allow users browsing or searching your dataverse to filter its contents according to the fields you have selected. For example, if you select “Subject” as a facet, users will be able to filter your dataverse’s contents by subject area.
+    * By default, the facets that will appear on your dataverse landing page will be from the host dataverse that this new dataverse was created in, but you can add or remove facets from this default.
+#. **Click the "Create Dataverse" button** and you're done!
+
+Edit Dataverse
+================
+
+To edit your dataverse, navigate to your dataverse's landing page and select the "Edit Dataverse" button, where you will be presented with the following editing options: 
+
+- :ref:`General Information <general-information>`: edit name, affiliation, identifier, category, contact email, description, metadata fields, and browse/search facets for your dataverse
 - :ref:`Theme <theme>`: upload a logo for your dataverse, add a link to your department or personal website, add a custom footer image, and select colors for your dataverse in order to brand it
 - :ref:`Widgets <dataverse-widgets>`: get code to add to your website to have your dataverse display on it
 - :ref:`Permissions <dataverse-permissions>`: give Dataverse users permissions to your dataverse, i.e.-can edit datasets, and see which users already have which permissions for your dataverse
@@ -89,7 +89,6 @@ Dataverse Listing Widget
 
 The Dataverse Listing Widget provides a listing of all your dataverses and datasets for users to browse, sort, filter and search. When someone clicks on a dataverse or dataset in the widget, it displays the content in the widget on your website. They can download data files directly from the datasets within the widget. If a file is restricted, they will be directed to your dataverse to log in, instead of logging in through the widget on your website.
 
-
 Adding Widgets to an OpenScholar Website
 ******************************************
 #. Log in to your OpenScholar website
@@ -125,6 +124,7 @@ Please note that even on a newly created dataverse, you may see user and groups
 
 Setting Access Configurations
 *******************************
+
 Under the Permissions tab, you can click the "Edit Access" button to open a box where you can add to your dataverse and what permissions are granted to those who add to your dataverse.
 
 |image4|
@@ -137,6 +137,7 @@ Both of these settings can be changed at any time.
 
 Assigning Roles to Users and Groups
 *************************************
+
 Under the Users/Groups tab, you can add, edit, or remove the roles granted to users and groups on your dataverse. A role is a set of permissions granted to a user or group when they're using your dataverse. For example, giving your research assistant the "Contributor" role would give her the following self-explanatory permissions on your dataverse and all datasets within your dataverse: "ViewUnpublishedDataset", "DownloadFile", "EditDataset", and "DeleteDatasetDraft". She would, however, lack the "PublishDataset" permission, and thus would be unable to publish datasets on your dataverse. If you wanted to give her that permission, you would give her a role with that permission, like the Curator role. Users and groups can hold multiple roles at the same time if needed. Roles can be removed at any time. All roles and their associated permissions are listed under the "Roles" tab of the same page.
 
 |image5|
@@ -151,6 +152,7 @@ Note: If you need to assign a role to ALL Dataverse user accounts, you can assig
 
 Dataset Templates
 -------------------
+
 Templates are useful when you have several datasets that have the same information in multiple metadata fields that you would prefer not to have to keep manually typing in, or if you want to use a custom set of Terms of Use and Access for multiple datasets in a dataverse. In Dataverse 4.0, templates are created at the dataverse level, can be deleted (so it does not show for future datasets), set to default (not required), or can be copied so you do not have to start over when creating a new template with similar metadata from another template. When a template is deleted, it does not impact the datasets that have used the template already.
 
 How do you create a template? 
@@ -169,6 +171,7 @@ How do you create a template?
 
 Dataset Guestbooks
 -----------------------------
+
 Guestbooks allow you to collect data about who is downloading the files from your datasets. You can decide to collect account information (username, given name & last name, affiliation, etc.) as well as create custom questions (e.g., What do you plan to use this data for?). You are also able to download the data collected from the enabled guestbooks as Excel files to store and use outside of Dataverse.
 
 How do you create a guestbook?
@@ -179,16 +182,12 @@ How do you create a guestbook?
 #. Name the guestbook, determine the account information that you would like to be required (all account information fields show when someone downloads a file), and then add Custom Questions (can be required or not required). 
 #. Hit the Create Dataset Guestbook button once you have finished.
 
-What can you do with a guestbook?
-After creating a guestbook, you will notice there are several options for a guestbook and appear in the list of guestbooks. 
+What can you do with a guestbook? After creating a guestbook, you will notice there are several options for a guestbook and appear in the list of guestbooks. 
 
 - If you want to use a guestbook you have created, you will first need to click the button in the Action column that says Enable. Once a guestbook has been enabled, you can go to the License + Terms for a dataset and select a guestbook for it.
-
 - There are also options to view, copy, edit, or delete a guestbook.
-
 - Once someone has downloaded a file in a dataset where a guestbook has been assigned, an option to download collected data will appear. 
 
-
 .. _featured-dataverses:
 
 Featured Dataverses
@@ -228,7 +227,6 @@ Once your dataverse is ready to go public, go to your dataverse page, click on t
 hand side of the page. A pop-up will appear to confirm that you are ready to actually Publish, since once a dataverse
 is made public, it can no longer be unpublished.
 
-
 .. |image1| image:: ./img/Dataverse-Diagram.png
 .. |image2| image:: ./img/dvperms1.png
    :class: img-responsive
@@ -240,6 +238,3 @@ is made public, it can no longer be unpublished.
    :class: img-responsive
 .. |image6| image:: ./img/dv5.png
    :class: img-responsive
-
-
-
diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index 5014d2b3b26..bc3d5929396 100755
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -676,7 +676,8 @@ notification.email.apiTokenGenerated=Hello {0} {1},\n\nAPI Token has been genera
 notification.email.apiTokenGenerated.subject=API Token was generated
 
 # dataverse.xhtml
-dataverse.title=The project, department, university, professor, or journal this dataverse will contain data for.
+dataverse.name=Dataverse Name
+dataverse.name.title=The project, department, university, professor, or journal this dataverse will contain data for.
 dataverse.enterName=Enter name...
 dataverse.host.title=The dataverse which contains this data.
 dataverse.identifier.title=Short name used for the URL of this dataverse.
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index 0291df216a7..f5a33a20f53 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -60,9 +60,9 @@
                         <div class="row">
                             <div class="col-md-6 form-group">
                                 <h:outputLabel for="name" styleClass="control-label">
-                                    #{bundle.dataverse} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
+                                    #{bundle['dataverse.name']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
-                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.title']}"></span>
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.name.title']}"></span>
                                 </h:outputLabel>
                                 <div class="form-col-container">
                                     <p:inputText id="name" styleClass="form-control" value="#{DataversePage.dataverse.name}" required="true"/>

From c71be8196c5fe12bc8bd5cc582334e60e2c7780c Mon Sep 17 00:00:00 2001
From: Leonid Andreev <leonid@hmdc.harvard.edu>
Date: Tue, 29 Oct 2019 19:00:02 -0400
Subject: [PATCH 16/35] added code for dataverse/dataset page updates when a
 new host (owner) dataverse is selected (#5615)

---
 .../edu/harvard/iq/dataverse/DatasetPage.java    |  9 +++++++++
 .../edu/harvard/iq/dataverse/DataversePage.java  |  9 +++++++++
 src/main/webapp/dataset.xhtml                    | 11 ++++++++++-
 src/main/webapp/dataverse.xhtml                  | 16 +++++++++++++---
 4 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
index 704a499d469..ebb58684a8a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -1750,6 +1750,15 @@ public String initCitation() {
         return init(false);
     }     
     
+    public void updateOwnerDataverse() {
+        logger.info("New host dataverse id: "+ownerId);
+        // discard the dataset already created:
+        dataset = new Dataset();
+        // initiate from scratch: (isolate the creation of a new dataset in its own method?)
+        init(true);
+        logger.info("Created a new new dataset.");
+    }
+    
     private String init(boolean initFull) {
   
         //System.out.println("_YE_OLDE_QUERY_COUNTER_");  // for debug purposes
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataversePage.java b/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
index 7f8a12c8753..5afcbeda2ba 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
@@ -267,6 +267,15 @@ public void setOwnerId(Long ownerId) {
         this.ownerId = ownerId;
     }
 
+    public void updateOwnerDataverse() {
+        logger.info("New host dataverse id: "+ownerId);
+        // discard the dataverse already created:
+        dataverse = new Dataverse();
+        // initialize a new new dataverse:
+        init();
+        logger.info("Created a new new dataverse.");
+    }
+    
     public String init() {
         //System.out.println("_YE_OLDE_QUERY_COUNTER_");  // for debug purposes
 
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 95da42f1e39..fd35ecf647a 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -528,10 +528,16 @@
                                     <p jsf:id="select_HostDataverse_Static" class="form-control-static">#{DatasetPage.dataset.owner.name}</p>
                                     <h:inputHidden value="#{DatasetPage.ownerId}" id="select_HostDataverseStatic"/>
                                 </ui:fragment>
-                                <p:selectOneMenu id="select_HostDataverse" rendered="#{DatasetPage.editMode == 'CREATE'}"
+                                <p:selectOneMenu id="select_HostDataverse" onchange="updateOwnerDataverse()" rendered="#{DatasetPage.editMode == 'CREATE'}"
                                                  value="#{DatasetPage.ownerId}" filter="true" filterMatchMode="startsWith" effect="none">
                                     <f:selectItems value="#{dataverseServiceBean.findAll()}" var="dv" itemLabel="#{dv.name}" itemValue="#{dv.id}"/>
                                 </p:selectOneMenu>
+                                <!-- an invisible button to refresh the page with the new owner dataverse: -->
+                                <p:commandButton id="updateOwnerDataverse"
+                                    style="display:none"
+                                    update="@form"
+                                    action="#{DatasetPage.updateOwnerDataverse()}">
+                                </p:commandButton>
                             </div>
                         </div>
                         <div class="form-group" jsf:rendered="#{!empty DatasetPage.dataverseTemplates and DatasetPage.editMode == 'CREATE'}">
@@ -1660,6 +1666,9 @@
                     function updateHiddenReason(textArea) {
                         $('input[id$="hiddenReasonInput"]').val(textArea.value);
                     }
+                    function updateOwnerDataverse() {
+                        $('button[id$="updateOwnerDataverse"]').trigger('click');
+                    } 
                     //]]>
                 </script>
             </ui:define>
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index f5a33a20f53..c30e77a7152 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -106,11 +106,18 @@
                                         <p id="hostDataverseStatic" class="form-control-static">#{DataversePage.dataverse.getOwner().name}</p>
                                         <h:inputHidden value="#{DataversePage.ownerId}" id="hostDataverseStatic"/>
                                     </ui:fragment>
-                                    <p:selectOneMenu id="hostDataverse" rendered="#{DataversePage.editMode == 'CREATE'}"
+                                    <p:selectOneMenu id="hostDataverse" onchange="updateOwnerDataverse()" rendered="#{DataversePage.editMode == 'CREATE'}"
                                                      value="#{DataversePage.ownerId}" filter="true" filterMatchMode="startsWith" effect="none">
-                                        <f:selectItems value="#{dataverseServiceBean.findAll()}" var="dv" itemLabel="#{dv.name}" itemValue="#{dv.id}"
-                                                       itemDisabled="#{dv eq DataversePage.dataverse or dv.owners.contains(DataversePage.dataverse)}"/>
+                                        <f:selectItems value="#{dataverseServiceBean.findAll()}" var="dv" itemLabel="#{dv.name}" itemValue="#{dv.id}"/>
+                                                       <!-- itemDisabled="#{dv eq DataversePage.dataverse or dv.owners.contains(DataversePage.dataverse)}"/ -->
                                     </p:selectOneMenu>
+                                    <!-- an invisible button to refresh the page with the new owner dataverse: -->
+                                    <p:commandButton id="updateOwnerDataverse"
+                                        style="display:none"
+                                        process="@this :dataverseForm:hostDataverse"
+                                        update="@form"
+                                        action="#{DataversePage.updateOwnerDataverse()}">
+                                    </p:commandButton>
                                 </div>
                             </div>
                         </div>
@@ -801,6 +808,9 @@
                     function uncheck() {
                         $('input:checkbox[id$="metadataRoot"]').prop('checked', false);
                     }
+                    function updateOwnerDataverse() {
+                        $('button[id$="updateOwnerDataverse"]').trigger('click');
+                    }
                     //]]>                                     
                 </script>
             </ui:define>

From bec5ddf9ed7e4800612e08cb7d60f3fac4429947 Mon Sep 17 00:00:00 2001
From: Leonid Andreev <leonid@hmdc.harvard.edu>
Date: Wed, 30 Oct 2019 18:34:53 -0400
Subject: [PATCH 17/35] fixed the breadcrumb display (#5615)

---
 src/main/java/edu/harvard/iq/dataverse/DatasetPage.java   | 4 ++++
 src/main/java/edu/harvard/iq/dataverse/DataversePage.java | 2 ++
 src/main/webapp/dataset.xhtml                             | 8 +++++---
 src/main/webapp/dataverse.xhtml                           | 3 ++-
 src/main/webapp/dataverse_header.xhtml                    | 2 ++
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
index ebb58684a8a..ccf5b02f2db 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -237,6 +237,7 @@ public enum DisplayMode {
     ProvPopupFragmentBean provPopupFragmentBean;
     @Inject
     MakeDataCountLoggingServiceBean mdcLogService;
+    @Inject DataverseHeaderFragment dataverseHeaderFragment;
 
     private Dataset dataset = new Dataset();
     private EditMode editMode;
@@ -1757,6 +1758,9 @@ public void updateOwnerDataverse() {
         // initiate from scratch: (isolate the creation of a new dataset in its own method?)
         init(true);
         logger.info("Created a new new dataset.");
+        // rebuild the bred crumbs display:
+        //dataverseHeaderFragment.setBreadcrumbs(new ArrayList<>());
+        dataverseHeaderFragment.initBreadcrumbs(dataset);
     }
     
     private String init(boolean initFull) {
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataversePage.java b/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
index 5afcbeda2ba..6959fc1c2b2 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
@@ -108,6 +108,7 @@ public enum LinkMode {
     @EJB
     DataverseLinkingServiceBean linkingService;
     @Inject PermissionsWrapper permissionsWrapper;
+    @Inject DataverseHeaderFragment dataverseHeaderFragment; 
 
     private Dataverse dataverse = new Dataverse();
     private EditMode editMode;
@@ -274,6 +275,7 @@ public void updateOwnerDataverse() {
         // initialize a new new dataverse:
         init();
         logger.info("Created a new new dataverse.");
+        dataverseHeaderFragment.initBreadcrumbs(dataverse);
     }
     
     public String init() {
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index fd35ecf647a..90bf00d2c1f 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -518,7 +518,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' ? 'select_HostDataverse' : 'select_HostDataverse_Static'}" class="col-md-3 control-label">
+                            <label jsf:for="#{DatasetPage.editMode == 'CREATE' ? 'hostDataverse' : '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>
@@ -528,16 +528,18 @@
                                     <p jsf:id="select_HostDataverse_Static" class="form-control-static">#{DatasetPage.dataset.owner.name}</p>
                                     <h:inputHidden value="#{DatasetPage.ownerId}" id="select_HostDataverseStatic"/>
                                 </ui:fragment>
-                                <p:selectOneMenu id="select_HostDataverse" onchange="updateOwnerDataverse()" rendered="#{DatasetPage.editMode == 'CREATE'}"
+                                <p:selectOneMenu id="hostDataverse" onchange="updateOwnerDataverse()" rendered="#{DatasetPage.editMode == 'CREATE'}"
                                                  value="#{DatasetPage.ownerId}" filter="true" filterMatchMode="startsWith" effect="none">
                                     <f:selectItems value="#{dataverseServiceBean.findAll()}" var="dv" itemLabel="#{dv.name}" itemValue="#{dv.id}"/>
                                 </p:selectOneMenu>
                                 <!-- an invisible button to refresh the page with the new owner dataverse: -->
                                 <p:commandButton id="updateOwnerDataverse"
                                     style="display:none"
-                                    update="@form"
+                                    process="@this :datasetForm:hostDataverse"
+                                    update="@form,:breadCrumbPanel"
                                     action="#{DatasetPage.updateOwnerDataverse()}">
                                 </p:commandButton>
+                                <!-- :#{p:resolveClientId('breadCrumbPanel', view)},@form" -->
                             </div>
                         </div>
                         <div class="form-group" jsf:rendered="#{!empty DatasetPage.dataverseTemplates and DatasetPage.editMode == 'CREATE'}">
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index c30e77a7152..86ffebdb3bc 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -115,9 +115,10 @@
                                     <p:commandButton id="updateOwnerDataverse"
                                         style="display:none"
                                         process="@this :dataverseForm:hostDataverse"
-                                        update="@form"
+                                        update="@form,:breadCrumbPanel"
                                         action="#{DataversePage.updateOwnerDataverse()}">
                                     </p:commandButton>
+                                    <!-- update="@widgetVar(breadcrumbNavBlock), @form" -->
                                 </div>
                             </div>
                         </div>
diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
index 3b6e6bc0518..97ba2ba56f9 100644
--- a/src/main/webapp/dataverse_header.xhtml
+++ b/src/main/webapp/dataverse_header.xhtml
@@ -232,6 +232,7 @@
                 </div>
             </div>
         </div>
+	<p:fragment id="breadCrumbPanel" rendered="#{dataverseHeaderFragment.breadcrumbs.size() > 1}">
         <div id="breadcrumbNavBlock" class="container" jsf:rendered="#{dataverseHeaderFragment.breadcrumbs.size() > 1}">
             <ui:repeat value="#{dataverseHeaderFragment.breadcrumbs}" var="breadcrumb" varStatus="status">
                 <h:outputText value=" > " styleClass="breadcrumbCarrot" rendered="#{!status.first}"/>
@@ -267,6 +268,7 @@
                 </div>
             </ui:repeat>
         </div>
+	</p:fragment>
         <ui:remove>
             <!-- Removing this temporarily until we can fix the performance issues with it;
                  replaced with generic bookmarks; will have to see how to best make this work

From 51a886f7af717d2ba171db3a58ab44960e2b5ad9 Mon Sep 17 00:00:00 2001
From: Leonid Andreev <leonid@hmdc.harvard.edu>
Date: Wed, 30 Oct 2019 18:37:34 -0400
Subject: [PATCH 18/35] fixed the breadcrumb display (#5615)

---
 src/main/java/edu/harvard/iq/dataverse/DatasetPage.java | 1 -
 src/main/webapp/dataset.xhtml                           | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
index ccf5b02f2db..b47b832cdd4 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -1759,7 +1759,6 @@ public void updateOwnerDataverse() {
         init(true);
         logger.info("Created a new new dataset.");
         // rebuild the bred crumbs display:
-        //dataverseHeaderFragment.setBreadcrumbs(new ArrayList<>());
         dataverseHeaderFragment.initBreadcrumbs(dataset);
     }
     
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 90bf00d2c1f..8361eeb170d 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -539,7 +539,6 @@
                                     update="@form,:breadCrumbPanel"
                                     action="#{DatasetPage.updateOwnerDataverse()}">
                                 </p:commandButton>
-                                <!-- :#{p:resolveClientId('breadCrumbPanel', view)},@form" -->
                             </div>
                         </div>
                         <div class="form-group" jsf:rendered="#{!empty DatasetPage.dataverseTemplates and DatasetPage.editMode == 'CREATE'}">

From 39b3789ff4c4693ae3b0d6932ee90a685843a07a Mon Sep 17 00:00:00 2001
From: Leonid Andreev <leonid@hmdc.harvard.edu>
Date: Thu, 31 Oct 2019 20:31:21 -0400
Subject: [PATCH 19/35] faster/less memory hoggish dataverse menu list via a
 native query (#5615)

---
 .../java/edu/harvard/iq/dataverse/DataverseServiceBean.java  | 5 +++++
 src/main/webapp/dataset.xhtml                                | 2 +-
 src/main/webapp/dataverse.xhtml                              | 4 +---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
index 8dc85cb2d28..10af1ba3a3e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
@@ -789,4 +789,9 @@ public String addRoleAssignmentsToChildren(Dataverse owner, ArrayList<String> ro
         logger.info(result);
         return (result);
     }
+    
+    public List<Object[]> getDataverseMenuList() {
+            return em.createNativeQuery("SELECT d.id, d.name FROM Dataverse d order by d.name").getResultList();
+    }
+    
 }
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 8361eeb170d..d15d5b7d270 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -530,7 +530,7 @@
                                 </ui:fragment>
                                 <p:selectOneMenu id="hostDataverse" onchange="updateOwnerDataverse()" rendered="#{DatasetPage.editMode == 'CREATE'}"
                                                  value="#{DatasetPage.ownerId}" filter="true" filterMatchMode="startsWith" effect="none">
-                                    <f:selectItems value="#{dataverseServiceBean.findAll()}" var="dv" itemLabel="#{dv.name}" itemValue="#{dv.id}"/>
+                                    <f:selectItems value="#{dataverseServiceBean.getDataverseMenuList()}" var="dv" itemLabel="#{dv[1]}" itemValue="#{dv[0]}"/>
                                 </p:selectOneMenu>
                                 <!-- an invisible button to refresh the page with the new owner dataverse: -->
                                 <p:commandButton id="updateOwnerDataverse"
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index 86ffebdb3bc..ab988ca7d39 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -108,8 +108,7 @@
                                     </ui:fragment>
                                     <p:selectOneMenu id="hostDataverse" onchange="updateOwnerDataverse()" rendered="#{DataversePage.editMode == 'CREATE'}"
                                                      value="#{DataversePage.ownerId}" filter="true" filterMatchMode="startsWith" effect="none">
-                                        <f:selectItems value="#{dataverseServiceBean.findAll()}" var="dv" itemLabel="#{dv.name}" itemValue="#{dv.id}"/>
-                                                       <!-- itemDisabled="#{dv eq DataversePage.dataverse or dv.owners.contains(DataversePage.dataverse)}"/ -->
+                                        <f:selectItems value="#{dataverseServiceBean.getDataverseMenuList()}" var="dv" itemLabel="#{dv[1]}" itemValue="#{dv[0]}"/>
                                     </p:selectOneMenu>
                                     <!-- an invisible button to refresh the page with the new owner dataverse: -->
                                     <p:commandButton id="updateOwnerDataverse"
@@ -118,7 +117,6 @@
                                         update="@form,:breadCrumbPanel"
                                         action="#{DataversePage.updateOwnerDataverse()}">
                                     </p:commandButton>
-                                    <!-- update="@widgetVar(breadcrumbNavBlock), @form" -->
                                 </div>
                             </div>
                         </div>

From dfa4b4d1affb12cf938531458fc42e2648b39d8b Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Fri, 1 Nov 2019 14:25:31 -0400
Subject: [PATCH 20/35] Moved host dataverse select component on dataverse
 form, added bundle info msg [ref #5615]

---
 src/main/java/propertyFiles/Bundle.properties |  2 +
 src/main/webapp/dataset.xhtml                 | 27 +++++----
 src/main/webapp/dataverse.xhtml               | 57 +++++++++++--------
 3 files changed, 50 insertions(+), 36 deletions(-)

diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index bc3d5929396..0a10fbd1c8d 100755
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -680,6 +680,7 @@ dataverse.name=Dataverse Name
 dataverse.name.title=The project, department, university, professor, or journal this dataverse will contain data for.
 dataverse.enterName=Enter name...
 dataverse.host.title=The dataverse which contains this data.
+dataverse.host.tip=Changing the host dataverse will clear any fields you may have entered data into.
 dataverse.identifier.title=Short name used for the URL of this dataverse.
 dataverse.affiliation.title=The organization with which this dataverse is affiliated.
 dataverse.category=Category
@@ -1383,6 +1384,7 @@ dataset.versionDifferences.changed=Changed
 dataset.versionDifferences.from=From
 dataset.versionDifferences.to=To
 file.viewDiffDialog.restricted=Restricted
+dataset.host.tip=Changing the host dataverse will clear any fields you may have entered data into.
 dataset.template.tip=Changing the template will clear any fields you may have entered data into.
 dataset.noTemplate.label=None
 dataset.noSelectedFiles.header=Select File(s)
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index d15d5b7d270..a897cc266b8 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -528,17 +528,22 @@
                                     <p jsf:id="select_HostDataverse_Static" class="form-control-static">#{DatasetPage.dataset.owner.name}</p>
                                     <h:inputHidden value="#{DatasetPage.ownerId}" id="select_HostDataverseStatic"/>
                                 </ui:fragment>
-                                <p:selectOneMenu id="hostDataverse" onchange="updateOwnerDataverse()" rendered="#{DatasetPage.editMode == 'CREATE'}"
-                                                 value="#{DatasetPage.ownerId}" filter="true" filterMatchMode="startsWith" effect="none">
-                                    <f:selectItems value="#{dataverseServiceBean.getDataverseMenuList()}" var="dv" itemLabel="#{dv[1]}" itemValue="#{dv[0]}"/>
-                                </p:selectOneMenu>
-                                <!-- an invisible button to refresh the page with the new owner dataverse: -->
-                                <p:commandButton id="updateOwnerDataverse"
-                                    style="display:none"
-                                    process="@this :datasetForm:hostDataverse"
-                                    update="@form,:breadCrumbPanel"
-                                    action="#{DatasetPage.updateOwnerDataverse()}">
-                                </p:commandButton>
+                                <ui:fragment rendered="#{DatasetPage.editMode == 'CREATE'}">
+                                    <p class="help-block">
+                                        #{bundle['dataset.host.tip']}
+                                    </p>
+                                    <p:selectOneMenu id="hostDataverse" onchange="updateOwnerDataverse()"
+                                                     value="#{DatasetPage.ownerId}" filter="true" filterMatchMode="startsWith" effect="none">
+                                        <f:selectItems value="#{dataverseServiceBean.getDataverseMenuList()}" var="dv" itemLabel="#{dv[1]}" itemValue="#{dv[0]}"/>
+                                    </p:selectOneMenu>
+                                    <!-- an invisible button to refresh the page with the new owner dataverse: -->
+                                    <p:commandButton id="updateOwnerDataverse"
+                                        style="display:none"
+                                        process="@this :datasetForm:hostDataverse"
+                                        update="@form,:breadCrumbPanel"
+                                        action="#{DatasetPage.updateOwnerDataverse()}">
+                                    </p:commandButton>
+                                </ui:fragment>
                             </div>
                         </div>
                         <div class="form-group" jsf:rendered="#{!empty DatasetPage.dataverseTemplates and DatasetPage.editMode == 'CREATE'}">
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index ab988ca7d39..43fa253d754 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -52,11 +52,42 @@
                     <ui:fragment rendered="#{DataversePage.editMode == 'INFO' or DataversePage.editMode == 'CREATE'}">
                         <p:focus context="dataverseForm"/>
                         <div class="row">
-                            <div class="col-xs-12 form-group">
+                            <div class="col-xs-6 form-group">
                                 <span class="glyphicon glyphicon-asterisk text-danger"/> <h:outputText value="#{bundle['dataset.asterisk.tip']}"/>
                             </div>
                         </div>
                         <!-- Edit Info Panel -->
+                        <div class="row" jsf:rendered="#{DataversePage.ownerId != null}">
+                            <div class="col-md-6 form-group">
+                                <h:outputLabel for="#{DataversePage.editMode == 'CREATE' ? 'hostDataverse' : 'hostDataverseStatic'}" styleClass="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>
+                                </h:outputLabel>
+                                <div class="form-col-container">
+                                    <ui:fragment rendered="#{DataversePage.editMode == 'INFO'}">
+                                        <p id="hostDataverseStatic" class="form-control-static">#{DataversePage.dataverse.getOwner().name}</p>
+                                        <h:inputHidden value="#{DataversePage.ownerId}" id="hostDataverseStatic"/>
+                                    </ui:fragment>
+                                    <ui:fragment rendered="#{DataversePage.editMode == 'CREATE'}">
+                                        <p class="help-block">
+                                            #{bundle['dataverse.host.tip']}
+                                        </p>
+                                        <p:selectOneMenu id="hostDataverse" onchange="updateOwnerDataverse()"
+                                                         value="#{DataversePage.ownerId}" filter="true" filterMatchMode="startsWith" effect="none">
+                                            <f:selectItems value="#{dataverseServiceBean.getDataverseMenuList()}" var="dv" itemLabel="#{dv[1]}" itemValue="#{dv[0]}"/>
+                                        </p:selectOneMenu>
+                                        <!-- an invisible button to refresh the page with the new owner dataverse: -->
+                                        <p:commandButton id="updateOwnerDataverse"
+                                            style="display:none"
+                                            process="@this :dataverseForm:hostDataverse"
+                                            update="@form,:breadCrumbPanel"
+                                            action="#{DataversePage.updateOwnerDataverse()}">
+                                        </p:commandButton>
+                                    </ui:fragment>
+                                </div>
+                            </div>
+                        </div>
                         <div class="row">
                             <div class="col-md-6 form-group">
                                 <h:outputLabel for="name" styleClass="control-label">
@@ -95,30 +126,6 @@
                                     <p:message for="identifier" display="text"/>
                                 </div>
                             </div>
-                            <div class="col-md-6 form-group" jsf:rendered="#{DataversePage.ownerId != null}">
-                                <h:outputLabel for="#{DataversePage.editMode == 'CREATE' ? 'hostDataverse' : 'hostDataverseStatic'}" styleClass="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>
-                                </h:outputLabel>
-                                <div class="form-col-container">
-                                    <ui:fragment rendered="#{DataversePage.editMode == 'INFO'}">
-                                        <p id="hostDataverseStatic" class="form-control-static">#{DataversePage.dataverse.getOwner().name}</p>
-                                        <h:inputHidden value="#{DataversePage.ownerId}" id="hostDataverseStatic"/>
-                                    </ui:fragment>
-                                    <p:selectOneMenu id="hostDataverse" onchange="updateOwnerDataverse()" rendered="#{DataversePage.editMode == 'CREATE'}"
-                                                     value="#{DataversePage.ownerId}" filter="true" filterMatchMode="startsWith" effect="none">
-                                        <f:selectItems value="#{dataverseServiceBean.getDataverseMenuList()}" var="dv" itemLabel="#{dv[1]}" itemValue="#{dv[0]}"/>
-                                    </p:selectOneMenu>
-                                    <!-- an invisible button to refresh the page with the new owner dataverse: -->
-                                    <p:commandButton id="updateOwnerDataverse"
-                                        style="display:none"
-                                        process="@this :dataverseForm:hostDataverse"
-                                        update="@form,:breadCrumbPanel"
-                                        action="#{DataversePage.updateOwnerDataverse()}">
-                                    </p:commandButton>
-                                </div>
-                            </div>
                         </div>
                         <div class="row">
                             <div class="col-md-6 form-group">

From 864efa1d033c1c7ed99a30d6ae9a66cec13d2b23 Mon Sep 17 00:00:00 2001
From: Leonid Andreev <leonid@hmdc.harvard.edu>
Date: Tue, 5 Nov 2019 18:58:04 -0500
Subject: [PATCH 21/35] experimental framework for pre-selecting the dataverses
 where the user is allowed to add datasets... this is not fully acceptable
 either, unfortunately (#5615)

---
 .../edu/harvard/iq/dataverse/DatasetPage.java | 44 +++++++++++++++++++
 src/main/webapp/dataset.xhtml                 |  2 +-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
index b47b832cdd4..7c0d2c19dcf 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -88,6 +88,7 @@
 import javax.faces.model.SelectItem;
 import java.util.logging.Level;
 import edu.harvard.iq.dataverse.datasetutility.WorldMapPermissionHelper;
+import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
 import edu.harvard.iq.dataverse.engine.command.impl.AbstractSubmitToArchiveCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.CreateNewDatasetCommand;
@@ -129,6 +130,7 @@
 import edu.harvard.iq.dataverse.search.SearchUtil;
 import edu.harvard.iq.dataverse.search.SolrClientService;
 import java.util.Comparator;
+import java.util.EnumSet;
 import java.util.TimeZone;
 import javax.servlet.http.HttpServletRequest;
 import org.apache.solr.client.solrj.SolrClient;
@@ -3010,6 +3012,48 @@ public List<Dataverse> completeLinkingDataverse(String query) {
             return null;
         }
     }
+    
+    public List<Object[]> getHostDataverseMenuList() {
+        // An unauthenticated user should not have gotten this far, but just in case:
+        if (!this.isSessionUserAuthenticated()){
+            return null; 
+        }
+        // Admin user can modify any dataverse - so we just return them all: 
+        if (this.session.getUser().isSuperuser()) {
+            return dataverseService.getDataverseMenuList();
+        }
+        
+        // For everybody else, we'll have to do something more elaborate:
+        
+        Dataverse rootDv = dataverseService.findRootDataverse();
+        List<Object[]> ret = new ArrayList<>();
+        
+        // Check if we can add datasets in root: 
+        DataverseRequest req = dvRequestService.getDataverseRequest();
+        if (permissionService.requestOn(req, rootDv).has(Permission.AddDataset)) {
+            logger.info("Yes, can add datasets to root");
+            Object[] dvEntry = new Object[2];
+            dvEntry[0] = rootDv.getId();
+            dvEntry[1] = rootDv.getName();
+            ret.add(dvEntry);
+        }
+        
+        List<DvObject> authorizedDataverses = permissionService.whichChildrenHasPermissionsFor(dvRequestService.getDataverseRequest(), dataverseService.findRootDataverse(), EnumSet.of(Permission.PublishDataset));
+        // (Why does Permission.AddDaset NOT work though??)
+        
+        for (DvObject dvObject : authorizedDataverses) {
+            if (dvObject instanceof Dataverse) {
+                Dataverse dataverse = (Dataverse)dvObject;
+                Object[] dvEntry = new Object[2];
+                dvEntry[0] = dataverse.getId();
+                dvEntry[1] = dataverse.getName();
+                ret.add(dvEntry);
+            }
+        }
+        
+        return ret; 
+        
+    }
 
     List<FileMetadata> previouslyRestrictedFiles = null;
     
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index a897cc266b8..cfd29151f29 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -534,7 +534,7 @@
                                     </p>
                                     <p:selectOneMenu id="hostDataverse" onchange="updateOwnerDataverse()"
                                                      value="#{DatasetPage.ownerId}" filter="true" filterMatchMode="startsWith" effect="none">
-                                        <f:selectItems value="#{dataverseServiceBean.getDataverseMenuList()}" var="dv" itemLabel="#{dv[1]}" itemValue="#{dv[0]}"/>
+                                        <f:selectItems value="#{DatasetPage.getHostDataverseMenuList()}" var="dv" itemLabel="#{dv[1]}" itemValue="#{dv[0]}"/>
                                     </p:selectOneMenu>
                                     <!-- an invisible button to refresh the page with the new owner dataverse: -->
                                     <p:commandButton id="updateOwnerDataverse"

From 03e8f5f3381ef1023c2e43a3388c606e51eed1bb Mon Sep 17 00:00:00 2001
From: Leonid Andreev <leonid@hmdc.harvard.edu>
Date: Wed, 6 Nov 2019 16:44:12 -0500
Subject: [PATCH 22/35] switched to using the type-to-select method for
 choosing the host dataverse (#5615)

---
 .../edu/harvard/iq/dataverse/DatasetPage.java | 40 ++++++++++----
 .../edu/harvard/iq/dataverse/Dataverse.java   |  3 +-
 .../iq/dataverse/DataverseServiceBean.java    | 41 +++++++++++++++
 src/main/webapp/dataset.xhtml                 | 52 ++++++++++++++-----
 4 files changed, 113 insertions(+), 23 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
index 7c0d2c19dcf..50af3e6b256 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -1462,7 +1462,7 @@ public Long getOwnerId() {
     public void setOwnerId(Long ownerId) {
         this.ownerId = ownerId;
     }
-
+    
     public Long getVersionId() {
         return versionId;
     }
@@ -1754,14 +1754,17 @@ public String initCitation() {
     }     
     
     public void updateOwnerDataverse() {
-        logger.info("New host dataverse id: "+ownerId);
-        // discard the dataset already created:
-        dataset = new Dataset();
-        // initiate from scratch: (isolate the creation of a new dataset in its own method?)
-        init(true);
-        logger.info("Created a new new dataset.");
-        // rebuild the bred crumbs display:
-        dataverseHeaderFragment.initBreadcrumbs(dataset);
+        if (dataset.getOwner() != null && dataset.getOwner().getId() != null) {
+            ownerId = dataset.getOwner().getId();
+            logger.info("New host dataverse id: "+ownerId);
+            // discard the dataset already created:
+            dataset = new Dataset();
+            // initiate from scratch: (isolate the creation of a new dataset in its own method?)
+            init(true);
+            logger.info("Created a new new dataset.");
+            // rebuild the bred crumbs display:
+            dataverseHeaderFragment.initBreadcrumbs(dataset);
+        }
     }
     
     private String init(boolean initFull) {
@@ -1937,7 +1940,7 @@ private String init(boolean initFull) {
             } else if (!permissionService.on(dataset.getOwner()).has(Permission.AddDataset)) {
                 return permissionsWrapper.notAuthorized(); 
             }
-            
+                        
             dataverseTemplates.addAll(dataverseService.find(ownerId).getTemplates());
             if (!dataverseService.find(ownerId).isTemplateRoot()) {
                 dataverseTemplates.addAll(dataverseService.find(ownerId).getParentTemplates());
@@ -2979,6 +2982,15 @@ public void setSelectedDataverseMenu(UIInput selectedDataverseMenu) {
         this.selectedLinkingDataverseMenu = selectedDataverseMenu;
     }
     
+    UIInput selectedHostDataverseMenu;
+    
+    public UIInput getSelectedHostDataverseMenu() {
+        return selectedHostDataverseMenu;
+    }
+
+    public void setSelectedHostDataverseMenu(UIInput selectedHostDataverseMenu) {
+        this.selectedHostDataverseMenu = selectedHostDataverseMenu;
+    }
     
     private Boolean saveLink(Dataverse dataverse){
         boolean retVal = true;
@@ -3013,6 +3025,14 @@ public List<Dataverse> completeLinkingDataverse(String query) {
         }
     }
     
+    public List<Dataverse> completeHostDataverseMenuList(String query) {
+        if (session.getUser().isAuthenticated()) {
+            return dataverseService.filterDataversesForHosting(query, dvRequestService.getDataverseRequest());
+        } else {
+            return null;
+        }
+    }
+    
     public List<Object[]> getHostDataverseMenuList() {
         // An unauthenticated user should not have gotten this far, but just in case:
         if (!this.isSessionUserAuthenticated()){
diff --git a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
index 024281b0b96..ca8ef27fd38 100644
--- a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
+++ b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
@@ -47,7 +47,8 @@
     @NamedQuery(name = "Dataverse.findByOwnerId", query="select object(o) from Dataverse as o where o.owner.id =:ownerId order by o.name"),
     @NamedQuery(name = "Dataverse.filterByAlias", query="SELECT dv FROM Dataverse dv WHERE LOWER(dv.alias) LIKE :alias order by dv.alias"),
     @NamedQuery(name = "Dataverse.filterByAliasNameAffiliation", query="SELECT dv FROM Dataverse dv WHERE (LOWER(dv.alias) LIKE :alias) OR (LOWER(dv.name) LIKE :name) OR (LOWER(dv.affiliation) LIKE :affiliation) order by dv.alias"),
-    @NamedQuery(name = "Dataverse.filterByName", query="SELECT dv FROM Dataverse dv WHERE LOWER(dv.name) LIKE :name  order by dv.alias")
+    @NamedQuery(name = "Dataverse.filterByName", query="SELECT dv FROM Dataverse dv WHERE LOWER(dv.name) LIKE :name  order by dv.alias"),
+    @NamedQuery(name = "Dataverse.filterByNamePattern", query="SELECT dv FROM Dataverse dv WHERE (LOWER(dv.name) LIKE :pattern1) OR (LOWER(dv.name) LIKE :pattern2) order by dv.alias")
 })
 @Entity
 @Table(indexes = {@Index(columnList="defaultcontributorrole_id")
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
index 10af1ba3a3e..9b9663b103a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
@@ -498,6 +498,47 @@ public List<Dataverse> filterDataversesForLinking(String query, DataverseRequest
         return dataverseList;
     }
     
+    public List<Dataverse> filterDataversesForHosting(String pattern, DataverseRequest req) {
+
+        List<Dataverse> dataverseList = new ArrayList<>();
+
+        pattern = pattern.toLowerCase();
+        String nameQuery;
+        
+        String pattern1 = pattern + "%";
+        String pattern2 = "% " + pattern + "%";
+
+        // Adjust the queries for very short, 1 and 2-character patterns:
+        if (pattern.length() < 3) {
+            pattern1 = pattern;
+            pattern2 = pattern + " %";
+        } 
+        
+        // Find the dataverses matching the search parameters: 
+        List<Dataverse> results = em.createNamedQuery("Dataverse.filterByNamePattern", Dataverse.class)
+                .setParameter("pattern1", pattern1)
+                .setParameter("pattern2", pattern2)
+                .getResultList();
+
+        logger.info("search query found " + results.size() + " results");
+        
+        // Filter the results and drop the dataverses where the user is not allowed to 
+        // add datasets:
+        
+        if (req.getAuthenticatedUser().isSuperuser()) {
+            logger.info("will skip permission check...");
+        }
+        for (Dataverse res : results) {
+            if (req.getAuthenticatedUser().isSuperuser() || this.permissionService.requestOn(req, res).has(Permission.AddDataset)) {
+                dataverseList.add(res);
+            }
+        }
+        
+        logger.info("returning " + dataverseList.size() + " final results");
+
+        return dataverseList;
+    }
+    
     /**
      * Used to identify and properly display Harvested objects on the dataverse page.
      * 
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index cfd29151f29..8ed989fa9c6 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -518,11 +518,12 @@
                     <ui:fragment rendered="#{DatasetPage.editMode == 'METADATA' or DatasetPage.editMode == 'CREATE'}">
                         <p:focus context="datasetForm"/>
                         <div class="form-group">
-                            <label jsf:for="#{DatasetPage.editMode == 'CREATE' ? 'hostDataverse' : 'select_HostDataverse_Static'}" class="col-md-3 control-label">
+                            <label jsf:for="#{DatasetPage.editMode == 'CREATE' ? 'selectHostDataverse' : '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>
                             </label>
+                            
                             <div class="col-md-7">
                                 <ui:fragment rendered="#{DatasetPage.editMode == 'METADATA'}">
                                     <p jsf:id="select_HostDataverse_Static" class="form-control-static">#{DatasetPage.dataset.owner.name}</p>
@@ -532,18 +533,45 @@
                                     <p class="help-block">
                                         #{bundle['dataset.host.tip']}
                                     </p>
-                                    <p:selectOneMenu id="hostDataverse" onchange="updateOwnerDataverse()"
-                                                     value="#{DatasetPage.ownerId}" filter="true" filterMatchMode="startsWith" effect="none">
-                                        <f:selectItems value="#{DatasetPage.getHostDataverseMenuList()}" var="dv" itemLabel="#{dv[1]}" itemValue="#{dv[0]}"/>
-                                    </p:selectOneMenu>
-                                    <!-- an invisible button to refresh the page with the new owner dataverse: -->
-                                    <p:commandButton id="updateOwnerDataverse"
-                                        style="display:none"
-                                        process="@this :datasetForm:hostDataverse"
-                                        update="@form,:breadCrumbPanel"
-                                        action="#{DatasetPage.updateOwnerDataverse()}">
-                                    </p:commandButton>
+
+                                    <div class="form-group">
+
+                                        <p:focus for="selectHostDataverse"/>
+                                        <div class="col-xs-8">
+                                            <p:fragment id="hostDataverseContent">
+                                                <p:autoComplete id="selectHostDataverse" style="width:100%;"
+                                                                binding="#{DatasetPage.selectedHostDataverseMenu}"
+                                                                placeholder="#{bundle['dataverse.link.yourDataverses.inputPlaceholder']}"
+                                                                scrollHeight="180" forceSelection="true" 
+                                                                minQueryLength="1" queryDelay="1000"
+                                                                value="#{DatasetPage.dataset.owner}" 
+                                                                multiple="false"
+                                                                completeMethod="#{DatasetPage.completeHostDataverseMenuList}"
+                                                                required="#{param['DO_DS_LINK_VALIDATION']}" requiredMessage="#{bundle['dataverse.link.select']}"
+                                                                styleClass="DropdownPopup" panelStyleClass="DropdownPopupPanel"
+                                                                var="hostDataverse" itemLabel="#{hostDataverse.displayName}" itemValue="#{hostDataverse}" converter="dataverseConverter"
+                                                                >
+                                                    <p:column>
+                                                        <h:outputText value="#{hostDataverse.displayName}"/> 
+                                                    </p:column>
+                                                    <p:column>
+                                                        <h:outputText value="#{hostDataverse.alias}"/> 
+                                                    </p:column>
+                                                    <p:ajax process="@this" event="itemSelect"  oncomplete="updateOwnerDataverse()"  />
+                                                    <p:ajax process="@this" event="itemUnselect" oncomplete="updateOwnerDataverse()" />
+                                                </p:autoComplete>
+                                                <p:message for="selectHostDataverse"/>
+                                                <p:commandButton id="updateOwnerDataverse"
+                                                                 style="display:none"
+                                                                 process="@this :datasetForm:hostDataverseContent"
+                                                                 update="@form,:breadCrumbPanel"
+                                                                 action="#{DatasetPage.updateOwnerDataverse()}">
+                                                </p:commandButton>
+                                            </p:fragment>
+                                        </div>
+                                    </div>
                                 </ui:fragment>
+
                             </div>
                         </div>
                         <div class="form-group" jsf:rendered="#{!empty DatasetPage.dataverseTemplates and DatasetPage.editMode == 'CREATE'}">

From d452c46edd469d42a7f55312ba4f24d68ae67c55 Mon Sep 17 00:00:00 2001
From: Leonid Andreev <leonid@hmdc.harvard.edu>
Date: Wed, 6 Nov 2019 17:01:30 -0500
Subject: [PATCH 23/35] same, for the dataverse page as well (#5615)

---
 .../edu/harvard/iq/dataverse/DatasetPage.java | 42 -------------
 .../harvard/iq/dataverse/DataversePage.java   | 35 ++++++++---
 .../iq/dataverse/DataverseServiceBean.java    |  4 --
 src/main/webapp/dataverse.xhtml               | 61 ++++++++++++-------
 4 files changed, 66 insertions(+), 76 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
index 50af3e6b256..293a299a166 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -3032,48 +3032,6 @@ public List<Dataverse> completeHostDataverseMenuList(String query) {
             return null;
         }
     }
-    
-    public List<Object[]> getHostDataverseMenuList() {
-        // An unauthenticated user should not have gotten this far, but just in case:
-        if (!this.isSessionUserAuthenticated()){
-            return null; 
-        }
-        // Admin user can modify any dataverse - so we just return them all: 
-        if (this.session.getUser().isSuperuser()) {
-            return dataverseService.getDataverseMenuList();
-        }
-        
-        // For everybody else, we'll have to do something more elaborate:
-        
-        Dataverse rootDv = dataverseService.findRootDataverse();
-        List<Object[]> ret = new ArrayList<>();
-        
-        // Check if we can add datasets in root: 
-        DataverseRequest req = dvRequestService.getDataverseRequest();
-        if (permissionService.requestOn(req, rootDv).has(Permission.AddDataset)) {
-            logger.info("Yes, can add datasets to root");
-            Object[] dvEntry = new Object[2];
-            dvEntry[0] = rootDv.getId();
-            dvEntry[1] = rootDv.getName();
-            ret.add(dvEntry);
-        }
-        
-        List<DvObject> authorizedDataverses = permissionService.whichChildrenHasPermissionsFor(dvRequestService.getDataverseRequest(), dataverseService.findRootDataverse(), EnumSet.of(Permission.PublishDataset));
-        // (Why does Permission.AddDaset NOT work though??)
-        
-        for (DvObject dvObject : authorizedDataverses) {
-            if (dvObject instanceof Dataverse) {
-                Dataverse dataverse = (Dataverse)dvObject;
-                Object[] dvEntry = new Object[2];
-                dvEntry[0] = dataverse.getId();
-                dvEntry[1] = dataverse.getName();
-                ret.add(dvEntry);
-            }
-        }
-        
-        return ret; 
-        
-    }
 
     List<FileMetadata> previouslyRestrictedFiles = null;
     
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataversePage.java b/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
index 6959fc1c2b2..6a330974912 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
@@ -122,6 +122,16 @@ public enum LinkMode {
     private List<SelectItem> linkingDVSelectItems;
     private Dataverse linkingDataverse;
     private List<ControlledVocabularyValue> selectedSubjects;
+    
+    UIInput selectedHostDataverseMenu;
+    
+    public UIInput getSelectedHostDataverseMenu() {
+        return selectedHostDataverseMenu;
+    }
+
+    public void setSelectedHostDataverseMenu(UIInput selectedHostDataverseMenu) {
+        this.selectedHostDataverseMenu = selectedHostDataverseMenu;
+    }
 
     public List<ControlledVocabularyValue> getSelectedSubjects() {
         return selectedSubjects;
@@ -269,13 +279,16 @@ public void setOwnerId(Long ownerId) {
     }
 
     public void updateOwnerDataverse() {
-        logger.info("New host dataverse id: "+ownerId);
-        // discard the dataverse already created:
-        dataverse = new Dataverse();
-        // initialize a new new dataverse:
-        init();
-        logger.info("Created a new new dataverse.");
-        dataverseHeaderFragment.initBreadcrumbs(dataverse);
+        if (dataverse.getOwner() != null && dataverse.getOwner().getId() != null) {
+            ownerId = dataverse.getOwner().getId();
+            logger.info("New host dataverse id: " + ownerId);
+            // discard the dataverse already created:
+            dataverse = new Dataverse();
+            // initialize a new new dataverse:
+            init();
+            logger.info("Created a new new dataverse.");
+            dataverseHeaderFragment.initBreadcrumbs(dataverse);
+        }
     }
     
     public String init() {
@@ -1170,4 +1183,12 @@ public String getSearchFieldSubtree() {
     public void setSearchFieldSubtree(String searchFieldSubtree) {
         this.searchFieldSubtree = searchFieldSubtree;
     }
+    
+    public List<Dataverse> completeHostDataverseMenuList(String query) {
+        if (session.getUser().isAuthenticated()) {
+            return dataverseService.filterDataversesForHosting(query, dvRequestService.getDataverseRequest());
+        } else {
+            return null;
+        }
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
index 9b9663b103a..cef4f264c56 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
@@ -831,8 +831,4 @@ public String addRoleAssignmentsToChildren(Dataverse owner, ArrayList<String> ro
         return (result);
     }
     
-    public List<Object[]> getDataverseMenuList() {
-            return em.createNativeQuery("SELECT d.id, d.name FROM Dataverse d order by d.name").getResultList();
-    }
-    
 }
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index 43fa253d754..6c7ffd783f5 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -59,33 +59,48 @@
                         <!-- Edit Info Panel -->
                         <div class="row" jsf:rendered="#{DataversePage.ownerId != null}">
                             <div class="col-md-6 form-group">
-                                <h:outputLabel for="#{DataversePage.editMode == 'CREATE' ? 'hostDataverse' : 'hostDataverseStatic'}" styleClass="control-label">
+                                <h:outputLabel for="#{DataversePage.editMode == 'CREATE' ? 'selectHostDataverse' : 'hostDataverseStatic'}" styleClass="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>
                                 </h:outputLabel>
-                                <div class="form-col-container">
-                                    <ui:fragment rendered="#{DataversePage.editMode == 'INFO'}">
-                                        <p id="hostDataverseStatic" class="form-control-static">#{DataversePage.dataverse.getOwner().name}</p>
-                                        <h:inputHidden value="#{DataversePage.ownerId}" id="hostDataverseStatic"/>
-                                    </ui:fragment>
-                                    <ui:fragment rendered="#{DataversePage.editMode == 'CREATE'}">
-                                        <p class="help-block">
-                                            #{bundle['dataverse.host.tip']}
-                                        </p>
-                                        <p:selectOneMenu id="hostDataverse" onchange="updateOwnerDataverse()"
-                                                         value="#{DataversePage.ownerId}" filter="true" filterMatchMode="startsWith" effect="none">
-                                            <f:selectItems value="#{dataverseServiceBean.getDataverseMenuList()}" var="dv" itemLabel="#{dv[1]}" itemValue="#{dv[0]}"/>
-                                        </p:selectOneMenu>
-                                        <!-- an invisible button to refresh the page with the new owner dataverse: -->
-                                        <p:commandButton id="updateOwnerDataverse"
-                                            style="display:none"
-                                            process="@this :dataverseForm:hostDataverse"
-                                            update="@form,:breadCrumbPanel"
-                                            action="#{DataversePage.updateOwnerDataverse()}">
-                                        </p:commandButton>
-                                    </ui:fragment>
-                                </div>
+                                
+                                <div class="form-group">
+
+                                        <p:focus for="selectHostDataverse"/>
+                                        <div class="col-xs-8">
+                                            <p:fragment id="hostDataverseContent">
+                                                <p:autoComplete id="selectHostDataverse" style="width:100%;"
+                                                                binding="#{DataversePage.selectedHostDataverseMenu}"
+                                                                placeholder="#{bundle['dataverse.link.yourDataverses.inputPlaceholder']}"
+                                                                scrollHeight="180" forceSelection="true" 
+                                                                minQueryLength="1" queryDelay="1000"
+                                                                value="#{DataversePage.dataverse.owner}" 
+                                                                multiple="false"
+                                                                completeMethod="#{DataversePage.completeHostDataverseMenuList}"
+                                                                required="#{param['DO_DS_LINK_VALIDATION']}" requiredMessage="#{bundle['dataverse.link.select']}"
+                                                                styleClass="DropdownPopup" panelStyleClass="DropdownPopupPanel"
+                                                                var="hostDataverse" itemLabel="#{hostDataverse.displayName}" itemValue="#{hostDataverse}" converter="dataverseConverter"
+                                                                >
+                                                    <p:column>
+                                                        <h:outputText value="#{hostDataverse.displayName}"/> 
+                                                    </p:column>
+                                                    <p:column>
+                                                        <h:outputText value="#{hostDataverse.alias}"/> 
+                                                    </p:column>
+                                                    <p:ajax process="@this" event="itemSelect"  oncomplete="updateOwnerDataverse()"  />
+                                                    <p:ajax process="@this" event="itemUnselect" oncomplete="updateOwnerDataverse()" />
+                                                </p:autoComplete>
+                                                <p:message for="selectHostDataverse"/>
+                                                <p:commandButton id="updateOwnerDataverse"
+                                                                 style="display:none"
+                                                                 process="@this :dataverseForm:selectHostDataverse"
+                                                                 update="@form,:breadCrumbPanel"
+                                                                 action="#{DataversePage.updateOwnerDataverse()}">
+                                                </p:commandButton>
+                                            </p:fragment>
+                                        </div>
+                                    </div>
                             </div>
                         </div>
                         <div class="row">

From 640fca10835b3a425295984e350a6c63d2325259 Mon Sep 17 00:00:00 2001
From: Leonid Andreev <leonid@hmdc.harvard.edu>
Date: Wed, 6 Nov 2019 17:08:46 -0500
Subject: [PATCH 24/35] removed some verbose debugging messages. (#5615)

---
 .../java/edu/harvard/iq/dataverse/DataverseServiceBean.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
index cef4f264c56..4b376b7a7da 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
@@ -520,13 +520,13 @@ public List<Dataverse> filterDataversesForHosting(String pattern, DataverseReque
                 .setParameter("pattern2", pattern2)
                 .getResultList();
 
-        logger.info("search query found " + results.size() + " results");
+        logger.fine("search query found " + results.size() + " results");
         
         // Filter the results and drop the dataverses where the user is not allowed to 
         // add datasets:
         
         if (req.getAuthenticatedUser().isSuperuser()) {
-            logger.info("will skip permission check...");
+            logger.fine("will skip permission check...");
         }
         for (Dataverse res : results) {
             if (req.getAuthenticatedUser().isSuperuser() || this.permissionService.requestOn(req, res).has(Permission.AddDataset)) {
@@ -534,7 +534,7 @@ public List<Dataverse> filterDataversesForHosting(String pattern, DataverseReque
             }
         }
         
-        logger.info("returning " + dataverseList.size() + " final results");
+        logger.fine("returning " + dataverseList.size() + " final results");
 
         return dataverseList;
     }

From 12c8971b16d93beb4a0a2ffe499e82454d63364e Mon Sep 17 00:00:00 2001
From: Leonid Andreev <leonid@hmdc.harvard.edu>
Date: Thu, 7 Nov 2019 10:59:57 -0500
Subject: [PATCH 25/35] a small pattern matching refinement (#5615)

---
 .../java/edu/harvard/iq/dataverse/DataverseServiceBean.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
index 4b376b7a7da..48ea8a1126a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
@@ -513,6 +513,9 @@ public List<Dataverse> filterDataversesForHosting(String pattern, DataverseReque
             pattern1 = pattern;
             pattern2 = pattern + " %";
         } 
+        if (pattern.length() == 2) {
+            pattern2 = pattern + "%";
+        }
         
         // Find the dataverses matching the search parameters: 
         List<Dataverse> results = em.createNamedQuery("Dataverse.filterByNamePattern", Dataverse.class)

From 794b5252e8e7c5ce6906a62059d7993096e0e20b Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Thu, 7 Nov 2019 12:14:54 -0500
Subject: [PATCH 26/35] Cleaned up markup and CSS for autoComplete component on
 edit dataverse, dataset forms plus other instances [ref #5615]

---
 src/main/webapp/dataset.xhtml                 | 68 ++++++++-----------
 src/main/webapp/dataverse.xhtml               | 68 +++++++++----------
 .../webapp/explicitGroup-new-dialog.xhtml     |  2 +-
 src/main/webapp/resources/css/structure.css   |  8 ++-
 4 files changed, 68 insertions(+), 78 deletions(-)

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 8ed989fa9c6..3b3d674592a 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -523,7 +523,6 @@
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.host.title']}"></span>
                             </label>
-                            
                             <div class="col-md-7">
                                 <ui:fragment rendered="#{DatasetPage.editMode == 'METADATA'}">
                                     <p jsf:id="select_HostDataverse_Static" class="form-control-static">#{DatasetPage.dataset.owner.name}</p>
@@ -533,45 +532,38 @@
                                     <p class="help-block">
                                         #{bundle['dataset.host.tip']}
                                     </p>
-
                                     <div class="form-group">
-
-                                        <p:focus for="selectHostDataverse"/>
-                                        <div class="col-xs-8">
-                                            <p:fragment id="hostDataverseContent">
-                                                <p:autoComplete id="selectHostDataverse" style="width:100%;"
-                                                                binding="#{DatasetPage.selectedHostDataverseMenu}"
-                                                                placeholder="#{bundle['dataverse.link.yourDataverses.inputPlaceholder']}"
-                                                                scrollHeight="180" forceSelection="true" 
-                                                                minQueryLength="1" queryDelay="1000"
-                                                                value="#{DatasetPage.dataset.owner}" 
-                                                                multiple="false"
-                                                                completeMethod="#{DatasetPage.completeHostDataverseMenuList}"
-                                                                required="#{param['DO_DS_LINK_VALIDATION']}" requiredMessage="#{bundle['dataverse.link.select']}"
-                                                                styleClass="DropdownPopup" panelStyleClass="DropdownPopupPanel"
-                                                                var="hostDataverse" itemLabel="#{hostDataverse.displayName}" itemValue="#{hostDataverse}" converter="dataverseConverter"
-                                                                >
-                                                    <p:column>
-                                                        <h:outputText value="#{hostDataverse.displayName}"/> 
-                                                    </p:column>
-                                                    <p:column>
-                                                        <h:outputText value="#{hostDataverse.alias}"/> 
-                                                    </p:column>
-                                                    <p:ajax process="@this" event="itemSelect"  oncomplete="updateOwnerDataverse()"  />
-                                                    <p:ajax process="@this" event="itemUnselect" oncomplete="updateOwnerDataverse()" />
-                                                </p:autoComplete>
-                                                <p:message for="selectHostDataverse"/>
-                                                <p:commandButton id="updateOwnerDataverse"
-                                                                 style="display:none"
-                                                                 process="@this :datasetForm:hostDataverseContent"
-                                                                 update="@form,:breadCrumbPanel"
-                                                                 action="#{DatasetPage.updateOwnerDataverse()}">
-                                                </p:commandButton>
-                                            </p:fragment>
-                                        </div>
+                                        <p:fragment id="hostDataverseContent">
+                                            <p:autoComplete id="selectHostDataverse"
+                                                            binding="#{DatasetPage.selectedHostDataverseMenu}"
+                                                            placeholder="#{bundle['dataverse.link.yourDataverses.inputPlaceholder']}"
+                                                            scrollHeight="180" forceSelection="true" 
+                                                            minQueryLength="1" queryDelay="1000"
+                                                            value="#{DatasetPage.dataset.owner}" 
+                                                            multiple="false"
+                                                            completeMethod="#{DatasetPage.completeHostDataverseMenuList}"
+                                                            required="#{param['DO_DS_LINK_VALIDATION']}" requiredMessage="#{bundle['dataverse.link.select']}"
+                                                            styleClass="DropdownPopup" panelStyleClass="DropdownPopupPanel"
+                                                            var="hostDataverse" itemLabel="#{hostDataverse.displayName}" itemValue="#{hostDataverse}" converter="dataverseConverter">
+                                                <p:column>
+                                                    <h:outputText value="#{hostDataverse.displayName}"/> 
+                                                </p:column>
+                                                <p:column>
+                                                    <h:outputText value="#{hostDataverse.alias}"/> 
+                                                </p:column>
+                                                <p:ajax process="@this" event="itemSelect" oncomplete="updateOwnerDataverse()"/>
+                                                <p:ajax process="@this" event="itemUnselect" oncomplete="updateOwnerDataverse()"/>
+                                            </p:autoComplete>
+                                            <p:message for="selectHostDataverse"/>
+                                            <p:commandButton id="updateOwnerDataverse"
+                                                             style="display:none"
+                                                             process="@this :datasetForm:hostDataverseContent"
+                                                             update="@form,:breadCrumbPanel"
+                                                             action="#{DatasetPage.updateOwnerDataverse()}">
+                                            </p:commandButton>
+                                        </p:fragment>
                                     </div>
                                 </ui:fragment>
-
                             </div>
                         </div>
                         <div class="form-group" jsf:rendered="#{!empty DatasetPage.dataverseTemplates and DatasetPage.editMode == 'CREATE'}">
@@ -1363,7 +1355,7 @@
                                 </label>
                                 <div class="col-xs-8">
                                     <p:fragment id="linkNameContent">
-                                        <p:autoComplete id="dataverseLinkName" style="width:75%;"
+                                        <p:autoComplete id="dataverseLinkName"
                                                         binding="#{DatasetPage.selectedDataverseMenu}"
                                                         placeholder="#{bundle['dataverse.link.yourDataverses.inputPlaceholder']}"
                                                         emptyMessage="#{bundle['dataverse.link.dataset.none']}"
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index 6c7ffd783f5..07ee54bbdea 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -64,43 +64,37 @@
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.host.title']}"></span>
                                 </h:outputLabel>
-                                
-                                <div class="form-group">
-
-                                        <p:focus for="selectHostDataverse"/>
-                                        <div class="col-xs-8">
-                                            <p:fragment id="hostDataverseContent">
-                                                <p:autoComplete id="selectHostDataverse" style="width:100%;"
-                                                                binding="#{DataversePage.selectedHostDataverseMenu}"
-                                                                placeholder="#{bundle['dataverse.link.yourDataverses.inputPlaceholder']}"
-                                                                scrollHeight="180" forceSelection="true" 
-                                                                minQueryLength="1" queryDelay="1000"
-                                                                value="#{DataversePage.dataverse.owner}" 
-                                                                multiple="false"
-                                                                completeMethod="#{DataversePage.completeHostDataverseMenuList}"
-                                                                required="#{param['DO_DS_LINK_VALIDATION']}" requiredMessage="#{bundle['dataverse.link.select']}"
-                                                                styleClass="DropdownPopup" panelStyleClass="DropdownPopupPanel"
-                                                                var="hostDataverse" itemLabel="#{hostDataverse.displayName}" itemValue="#{hostDataverse}" converter="dataverseConverter"
-                                                                >
-                                                    <p:column>
-                                                        <h:outputText value="#{hostDataverse.displayName}"/> 
-                                                    </p:column>
-                                                    <p:column>
-                                                        <h:outputText value="#{hostDataverse.alias}"/> 
-                                                    </p:column>
-                                                    <p:ajax process="@this" event="itemSelect"  oncomplete="updateOwnerDataverse()"  />
-                                                    <p:ajax process="@this" event="itemUnselect" oncomplete="updateOwnerDataverse()" />
-                                                </p:autoComplete>
-                                                <p:message for="selectHostDataverse"/>
-                                                <p:commandButton id="updateOwnerDataverse"
-                                                                 style="display:none"
-                                                                 process="@this :dataverseForm:selectHostDataverse"
-                                                                 update="@form,:breadCrumbPanel"
-                                                                 action="#{DataversePage.updateOwnerDataverse()}">
-                                                </p:commandButton>
-                                            </p:fragment>
-                                        </div>
-                                    </div>
+                                <div class="form-col-container">
+                                    <p:fragment id="hostDataverseContent">
+                                        <p:autoComplete id="selectHostDataverse"
+                                                        binding="#{DataversePage.selectedHostDataverseMenu}"
+                                                        placeholder="#{bundle['dataverse.link.yourDataverses.inputPlaceholder']}"
+                                                        scrollHeight="180" forceSelection="true" 
+                                                        minQueryLength="1" queryDelay="1000"
+                                                        value="#{DataversePage.dataverse.owner}" 
+                                                        multiple="false"
+                                                        completeMethod="#{DataversePage.completeHostDataverseMenuList}"
+                                                        required="#{param['DO_DS_LINK_VALIDATION']}" requiredMessage="#{bundle['dataverse.link.select']}"
+                                                        styleClass="DropdownPopup" panelStyleClass="DropdownPopupPanel"
+                                                        var="hostDataverse" itemLabel="#{hostDataverse.displayName}" itemValue="#{hostDataverse}" converter="dataverseConverter">
+                                            <p:column>
+                                                <h:outputText value="#{hostDataverse.displayName}"/> 
+                                            </p:column>
+                                            <p:column>
+                                                <h:outputText value="#{hostDataverse.alias}"/> 
+                                            </p:column>
+                                            <p:ajax process="@this" event="itemSelect" oncomplete="updateOwnerDataverse()"/>
+                                            <p:ajax process="@this" event="itemUnselect" oncomplete="updateOwnerDataverse()"/>
+                                        </p:autoComplete>
+                                        <p:message for="selectHostDataverse"/>
+                                        <p:commandButton id="updateOwnerDataverse"
+                                                         style="display:none"
+                                                         process="@this :dataverseForm:selectHostDataverse"
+                                                         update="@form,:breadCrumbPanel"
+                                                         action="#{DataversePage.updateOwnerDataverse()}">
+                                        </p:commandButton>
+                                    </p:fragment>
+                                </div>
                             </div>
                         </div>
                         <div class="row">
diff --git a/src/main/webapp/explicitGroup-new-dialog.xhtml b/src/main/webapp/explicitGroup-new-dialog.xhtml
index 1a55d96c1a5..83d4f3b8d5d 100644
--- a/src/main/webapp/explicitGroup-new-dialog.xhtml
+++ b/src/main/webapp/explicitGroup-new-dialog.xhtml
@@ -59,7 +59,7 @@
                     <label for="roleAssigneeName" class="col-sm-3 control-label">
                         #{bundle['dataverse.permissions.explicitGroupEditDialog.roleAssigneeNames']}
                     </label>
-                    <div class="col-sm-9">
+                    <div class="col-sm-6">
                         <p:autoComplete id="roleAssigneeName" placeholder="#{bundle['dataverse.permissions.usersOrGroups.assignDialog.userOrGroup.enterName']}"
                                         multiple="true" scrollHeight="180" forceSelection="true" 
                                         minQueryLength="2" queryDelay="1000"                                      
diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 0bab029b3ee..ec3b5b42f20 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -918,9 +918,13 @@ div.ui-widget-overlay {background:#ccc; opacity:.6;}
     margin-left: 0px;
 } */
 .ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled {background: #e0e0e0; border-color: #ccc; opacity: 0.65;}
-.ui-autocomplete-input-token input, .ui-autocomplete-input-token {width:100%;}
+/* .ui-autocomplete-input-token input, .ui-autocomplete-input-token {width:100%;} */
 .ui-autocomplete-panel {z-index:100002 !important;}
-.ui-autocomplete input.ui-autocomplete-input {width:calc(100% - 34px);}
+div.ui-autocomplete {width:100%;}
+div.ui-autocomplete > ul, div.ui-autocomplete > ul > li > input {width:100%;} /* FIX WIDTH FOR AUTOCOMPLETE WITHOUT P:FRAGMENT */
+span.ui-autocomplete {width:100%;} /* FIX WIDTH FOR AUTOCOMPLETE IN P:FRAGMENT */
+span.ui-autocomplete input.ui-autocomplete-input {width:100%;}
+.ui-autocomplete input {padding:6px 12px; margin:0;}
 
 /* Overwrite Bootstrap */
 @media print {

From 059125eaf4b83ae5bc7894591990209dde2cbc70 Mon Sep 17 00:00:00 2001
From: Leonid Andreev <leonid@hmdc.harvard.edu>
Date: Thu, 7 Nov 2019 13:12:32 -0500
Subject: [PATCH 27/35] put the static host dataverse display back on the
 dataverse page, in the "edit existing dataverse" mode. (#5615)

---
 src/main/webapp/dataverse.xhtml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index 07ee54bbdea..578639646c7 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -66,7 +66,12 @@
                                 </h:outputLabel>
                                 <div class="form-col-container">
                                     <p:fragment id="hostDataverseContent">
+                                        <ui:fragment rendered="#{DataversePage.editMode == 'INFO'}">
+                                            <p id="hostDataverseStatic" class="form-control-static">#{DataversePage.dataverse.getOwner().name}</p>
+                                            <h:inputHidden value="#{DataversePage.ownerId}" id="hostDataverseStatic"/>
+                                        </ui:fragment>
                                         <p:autoComplete id="selectHostDataverse"
+                                                        rendered="#{DataversePage.editMode == 'CREATE'}"
                                                         binding="#{DataversePage.selectedHostDataverseMenu}"
                                                         placeholder="#{bundle['dataverse.link.yourDataverses.inputPlaceholder']}"
                                                         scrollHeight="180" forceSelection="true" 

From 9e962e94f07ecac4106d052e6edbc879372d8499 Mon Sep 17 00:00:00 2001
From: Leonid Andreev <leonid@hmdc.harvard.edu>
Date: Thu, 7 Nov 2019 13:20:33 -0500
Subject: [PATCH 28/35] added "no matches" message to the autocomplete on the
 dataverse page. (#5615)

---
 src/main/java/propertyFiles/Bundle.properties | 1 +
 src/main/webapp/dataverse.xhtml               | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index f7558cc6854..38e03b719e6 100755
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -681,6 +681,7 @@ dataverse.name.title=The project, department, university, professor, or journal
 dataverse.enterName=Enter name...
 dataverse.host.title=The dataverse which contains this data.
 dataverse.host.tip=Changing the host dataverse will clear any fields you may have entered data into.
+dataverse.host.autocomplete.nomatches=No matches
 dataverse.identifier.title=Short name used for the URL of this dataverse.
 dataverse.affiliation.title=The organization with which this dataverse is affiliated.
 dataverse.category=Category
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index 578639646c7..50812eb619b 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -74,6 +74,7 @@
                                                         rendered="#{DataversePage.editMode == 'CREATE'}"
                                                         binding="#{DataversePage.selectedHostDataverseMenu}"
                                                         placeholder="#{bundle['dataverse.link.yourDataverses.inputPlaceholder']}"
+                                                        emptyMessage="#{bundle['dataverse.host.autocomplete.nomatches']}"
                                                         scrollHeight="180" forceSelection="true" 
                                                         minQueryLength="1" queryDelay="1000"
                                                         value="#{DataversePage.dataverse.owner}" 

From 36bf30d0a7353e604ac280e8daa84fce21f6767f Mon Sep 17 00:00:00 2001
From: Leonid Andreev <leonid@hmdc.harvard.edu>
Date: Thu, 7 Nov 2019 13:23:25 -0500
Subject: [PATCH 29/35] added "no matches" message to the autocomplete on the
 dataset page. (#5615)

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

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 3b3d674592a..d9914561dec 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -537,6 +537,7 @@
                                             <p:autoComplete id="selectHostDataverse"
                                                             binding="#{DatasetPage.selectedHostDataverseMenu}"
                                                             placeholder="#{bundle['dataverse.link.yourDataverses.inputPlaceholder']}"
+                                                            emptyMessage="#{bundle['dataverse.host.autocomplete.nomatches']}"
                                                             scrollHeight="180" forceSelection="true" 
                                                             minQueryLength="1" queryDelay="1000"
                                                             value="#{DatasetPage.dataset.owner}" 

From 09f5a71a8d3a48ad9bb731888b52d8fb9bb26d55 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Thu, 7 Nov 2019 13:38:02 -0500
Subject: [PATCH 30/35] Moved list item for Host Dataverse...

to top of list since it is at the top of the form now [ref #5615]
---
 doc/sphinx-guides/source/user/dataverse-management.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sphinx-guides/source/user/dataverse-management.rst b/doc/sphinx-guides/source/user/dataverse-management.rst
index eaa116550aa..2a8c5dba31f 100755
--- a/doc/sphinx-guides/source/user/dataverse-management.rst
+++ b/doc/sphinx-guides/source/user/dataverse-management.rst
@@ -16,10 +16,10 @@ Create a New Dataverse
 Creating a dataverse is easy but first you must be a registered user (see :doc:`/user/account`). Once you are logged in, click on the "Add Data" button, or "Add Data" navbar link and in the dropdown menu select "New Dataverse".
 
 #. **Fill in the following fields on the "New Dataverse" page** (required fields in the form are denoted by a red asterisk, next to the label):
+    * **Host Dataverse**: Select a dataverse you would like to create the new dataverse in, by default the root dataverse is selected if you click the Add Data button from the root dataverse, your My Data pg, the Add Data link in the navbar, or the Add a dataset button on the custom homepage (if configured), but you can select any dataverse for which you the proper permissions to create dataverses.
     * **Dataverse Name**: Enter the name of your dataverse.
     * **Affiliation**: Add any affiliation that can be associated with this particular dataverse (e.g., project name, institute name, department name, journal name, etc). This is automatically filled out if you have added an affiliation for your user account.
     * **Identifier**: This is an abbreviation, usually lower-case, that becomes part of the URL for the new dataverse. Special characters (~,\`, !, @, #, $, %, ^, &, and \*) and spaces are not allowed. **Note**: if you change this field in the future, the URL for your Dataverse will change (http//.../'identifier'), which will break older links to the page.
-    * **Host Dataverse**: Select a dataverse you would like to create the new dataverse in, by default the root dataverse is selected if you click the Add Data button from the root dataverse, your My Data pg, the Add Data link in the navbar, or the Add a dataset button on the custom homepage (if configured), but you can select any dataverse for which you the proper permissions to create dataverses.
     * **Category**: Select a category that best describes the type of dataverse this will be. For example, if this is a dataverse for an individual researcher's datasets, select *Researcher*. If this is a dataverse for an institution, select *Organization or Institution*.
     * **Email**: This is the email address that will be used as the contact for this particular dataverse. You can have more than one contact email address for your dataverse.
     * **Description**: Provide a description of this dataverse. This will display on the landing page of your dataverse and in the search result list. The description field supports certain HTML tags, if you'd like to format your text (<a>, <b>, <blockquote>, <br>, <code>, <del>, <dd>, <dl>, <dt>, <em>, <hr>, <h1>-<h3>, <i>, <img>, <kbd>, <li>, <ol>, <p>, <pre>, <s>, <sup>, <sub>, <strong>, <strike>, <ul>).

From 561d2996cedb220eaa0889d0ef17108e90ffe453 Mon Sep 17 00:00:00 2001
From: Leonid Andreev <leonid@hmdc.harvard.edu>
Date: Thu, 7 Nov 2019 14:11:30 -0500
Subject: [PATCH 31/35] simplified the selection logic when performed by a
 superuser (#5615)

---
 .../iq/dataverse/DataverseServiceBean.java    | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
index 48ea8a1126a..2969de396fe 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
@@ -500,10 +500,7 @@ public List<Dataverse> filterDataversesForLinking(String query, DataverseRequest
     
     public List<Dataverse> filterDataversesForHosting(String pattern, DataverseRequest req) {
 
-        List<Dataverse> dataverseList = new ArrayList<>();
-
         pattern = pattern.toLowerCase();
-        String nameQuery;
         
         String pattern1 = pattern + "%";
         String pattern2 = "% " + pattern + "%";
@@ -518,28 +515,32 @@ public List<Dataverse> filterDataversesForHosting(String pattern, DataverseReque
         }
         
         // Find the dataverses matching the search parameters: 
-        List<Dataverse> results = em.createNamedQuery("Dataverse.filterByNamePattern", Dataverse.class)
+        List<Dataverse> searchResults = em.createNamedQuery("Dataverse.filterByNamePattern", Dataverse.class)
                 .setParameter("pattern1", pattern1)
                 .setParameter("pattern2", pattern2)
                 .getResultList();
 
-        logger.fine("search query found " + results.size() + " results");
+        logger.fine("search query found " + searchResults.size() + " results");
         
         // Filter the results and drop the dataverses where the user is not allowed to 
         // add datasets:
         
         if (req.getAuthenticatedUser().isSuperuser()) {
             logger.fine("will skip permission check...");
+            return searchResults;
         }
-        for (Dataverse res : results) {
-            if (req.getAuthenticatedUser().isSuperuser() || this.permissionService.requestOn(req, res).has(Permission.AddDataset)) {
-                dataverseList.add(res);
+        
+        List<Dataverse> finalResults = new ArrayList<>();
+        
+        for (Dataverse res : searchResults) {
+            if (this.permissionService.requestOn(req, res).has(Permission.AddDataset)) {
+                finalResults.add(res);
             }
         }
         
-        logger.fine("returning " + dataverseList.size() + " final results");
+        logger.fine("returning " + finalResults.size() + " final results");
 
-        return dataverseList;
+        return finalResults;
     }
     
     /**

From e6c989e816d77a19f89e318dc83767c606206bb9 Mon Sep 17 00:00:00 2001
From: Leonid Andreev <leonid@hmdc.harvard.edu>
Date: Fri, 8 Nov 2019 14:39:00 -0500
Subject: [PATCH 32/35] reorganized the search query code/added some final
 optimization fine-tuning (#5615)

---
 .../edu/harvard/iq/dataverse/Dataverse.java   |  3 +-
 .../iq/dataverse/DataverseServiceBean.java    | 73 +++++++++++++------
 2 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
index ca8ef27fd38..024281b0b96 100644
--- a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
+++ b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
@@ -47,8 +47,7 @@
     @NamedQuery(name = "Dataverse.findByOwnerId", query="select object(o) from Dataverse as o where o.owner.id =:ownerId order by o.name"),
     @NamedQuery(name = "Dataverse.filterByAlias", query="SELECT dv FROM Dataverse dv WHERE LOWER(dv.alias) LIKE :alias order by dv.alias"),
     @NamedQuery(name = "Dataverse.filterByAliasNameAffiliation", query="SELECT dv FROM Dataverse dv WHERE (LOWER(dv.alias) LIKE :alias) OR (LOWER(dv.name) LIKE :name) OR (LOWER(dv.affiliation) LIKE :affiliation) order by dv.alias"),
-    @NamedQuery(name = "Dataverse.filterByName", query="SELECT dv FROM Dataverse dv WHERE LOWER(dv.name) LIKE :name  order by dv.alias"),
-    @NamedQuery(name = "Dataverse.filterByNamePattern", query="SELECT dv FROM Dataverse dv WHERE (LOWER(dv.name) LIKE :pattern1) OR (LOWER(dv.name) LIKE :pattern2) order by dv.alias")
+    @NamedQuery(name = "Dataverse.filterByName", query="SELECT dv FROM Dataverse dv WHERE LOWER(dv.name) LIKE :name  order by dv.alias")
 })
 @Entity
 @Table(indexes = {@Index(columnList="defaultcontributorrole_id")
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
index 2969de396fe..c92748e553d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
@@ -474,9 +474,7 @@ public List<Dataverse> filterDataversesForLinking(String query, DataverseRequest
 
         List<Dataverse> dataverseList = new ArrayList<>();
 
-        List<Dataverse> results = em.createNamedQuery("Dataverse.filterByName", Dataverse.class)
-                .setParameter("name", "%" + query.toLowerCase() + "%")
-                .getResultList();
+        List<Dataverse> results = filterDataversesByNamePattern(query);
 
         List<Object> alreadyLinkeddv_ids = em.createNativeQuery("SELECT linkingdataverse_id   FROM datasetlinkingdataverse WHERE dataset_id = " + dataset.getId()).getResultList();
         List<Dataverse> remove = new ArrayList<>();
@@ -500,26 +498,10 @@ public List<Dataverse> filterDataversesForLinking(String query, DataverseRequest
     
     public List<Dataverse> filterDataversesForHosting(String pattern, DataverseRequest req) {
 
-        pattern = pattern.toLowerCase();
+        // Find the dataverses matching the search parameters: 
         
-        String pattern1 = pattern + "%";
-        String pattern2 = "% " + pattern + "%";
-
-        // Adjust the queries for very short, 1 and 2-character patterns:
-        if (pattern.length() < 3) {
-            pattern1 = pattern;
-            pattern2 = pattern + " %";
-        } 
-        if (pattern.length() == 2) {
-            pattern2 = pattern + "%";
-        }
+        List<Dataverse> searchResults = filterDataversesByNamePattern(pattern);
         
-        // Find the dataverses matching the search parameters: 
-        List<Dataverse> searchResults = em.createNamedQuery("Dataverse.filterByNamePattern", Dataverse.class)
-                .setParameter("pattern1", pattern1)
-                .setParameter("pattern2", pattern2)
-                .getResultList();
-
         logger.fine("search query found " + searchResults.size() + " results");
         
         // Filter the results and drop the dataverses where the user is not allowed to 
@@ -543,6 +525,55 @@ public List<Dataverse> filterDataversesForHosting(String pattern, DataverseReque
         return finalResults;
     }
     
+    
+    /* 
+        This method takes a search parameter and expands it into a list of 
+        Dataverses with matching names. 
+        The search is performed on the name with the trailing word "dataverse"
+        stripped (if present). This way the search on "data" (or on "da" pr 
+        "dat") does NOT return almost every dataverse in the database - since
+        most of them have names that end in "... Dataverse". 
+        The query isn't pretty, but it works, and it's still EJB QL (and NOT a 
+        native query). 
+    */
+    public List<Dataverse> filterDataversesByNamePattern(String pattern) {
+
+        pattern = pattern.toLowerCase();
+        
+        String pattern1 = pattern + "%";
+        String pattern2 = "% " + pattern + "%";
+
+        // Adjust the queries for very short, 1 and 2-character patterns:
+        if (pattern.length() == 1) {
+            pattern1 = pattern;
+            pattern2 = pattern + " %";
+        } 
+        /*if (pattern.length() == 2) {
+            pattern2 = pattern + "%";
+        }*/
+        
+        
+        String qstr = "select dv from Dataverse dv "
+                + "where (LOWER(dv.name) LIKE '%dataverse' and ((SUBSTRING(LOWER(dv.name),0,(LENGTH(dv.name)-9)) LIKE '" + pattern1 + "') "
+                + "     or (SUBSTRING(LOWER(dv.name),0,(LENGTH(dv.name)-9)) LIKE '" + pattern2 + "'))) "
+                + "or (LOWER(dv.name) NOT LIKE '%dataverse' and ((LOWER(dv.name) LIKE '" + pattern1 + "') "
+                + "     or (LOWER(dv.name) LIKE '" + pattern2 + "'))) "
+                + "order by dv.alias";
+                
+        List<Dataverse> testResults = null;
+        
+        try {
+            testResults = em.createQuery(qstr, Dataverse.class)
+                    //.setParameter("pattern1", "pattern1")
+                    //.setParameter("pattern2", "pattern2")
+                    .getResultList();
+        } catch (Exception ex) {
+            testResults = null;
+        }
+        
+        return testResults;
+    }
+    
     /**
      * Used to identify and properly display Harvested objects on the dataverse page.
      * 

From 6360f4ed18b3857d433565d8ff31455273301cb5 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Fri, 8 Nov 2019 15:37:12 -0500
Subject: [PATCH 33/35] Changed id on hidden input to avoid duplicate id errors
 on create dv [ref #5615]

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

diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index 50812eb619b..d3a23698385 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -68,7 +68,7 @@
                                     <p:fragment id="hostDataverseContent">
                                         <ui:fragment rendered="#{DataversePage.editMode == 'INFO'}">
                                             <p id="hostDataverseStatic" class="form-control-static">#{DataversePage.dataverse.getOwner().name}</p>
-                                            <h:inputHidden value="#{DataversePage.ownerId}" id="hostDataverseStatic"/>
+                                            <h:inputHidden value="#{DataversePage.ownerId}" id="hostDataverseStatic_hidden"/>
                                         </ui:fragment>
                                         <p:autoComplete id="selectHostDataverse"
                                                         rendered="#{DataversePage.editMode == 'CREATE'}"

From 84e08579b008d8df0639fbf80713da387e66bb7d Mon Sep 17 00:00:00 2001
From: Leonid Andreev <leonid@hmdc.harvard.edu>
Date: Tue, 12 Nov 2019 12:41:03 -0500
Subject: [PATCH 34/35] fixes the "duplicate id" issue with the autocomplete
 component, and wrong owner dataverse on create. (#5615)

---
 .../harvard/iq/dataverse/DataversePage.java   | 15 +----
 src/main/webapp/dataverse.xhtml               | 67 +++++++++----------
 2 files changed, 35 insertions(+), 47 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DataversePage.java b/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
index 6a330974912..eca97e52402 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
@@ -122,16 +122,6 @@ public enum LinkMode {
     private List<SelectItem> linkingDVSelectItems;
     private Dataverse linkingDataverse;
     private List<ControlledVocabularyValue> selectedSubjects;
-    
-    UIInput selectedHostDataverseMenu;
-    
-    public UIInput getSelectedHostDataverseMenu() {
-        return selectedHostDataverseMenu;
-    }
-
-    public void setSelectedHostDataverseMenu(UIInput selectedHostDataverseMenu) {
-        this.selectedHostDataverseMenu = selectedHostDataverseMenu;
-    }
 
     public List<ControlledVocabularyValue> getSelectedSubjects() {
         return selectedSubjects;
@@ -286,7 +276,6 @@ public void updateOwnerDataverse() {
             dataverse = new Dataverse();
             // initialize a new new dataverse:
             init();
-            logger.info("Created a new new dataverse.");
             dataverseHeaderFragment.initBreadcrumbs(dataverse);
         }
     }
@@ -635,7 +624,9 @@ public String save() {
         Boolean create;
         if (dataverse.getId() == null) {
             if (session.getUser().isAuthenticated()) {
-                dataverse.setOwner(ownerId != null ? dataverseService.find(ownerId) : null);
+                if (dataverse.getOwner() == null || dataverse.getOwner().getId() == null) {
+                    dataverse.setOwner(ownerId != null ? dataverseService.find(ownerId) : null);
+                }
                 create = Boolean.TRUE;
                 cmd = new CreateDataverseCommand(dataverse, dvRequestService.getDataverseRequest(), facets.getTarget(), listDFTIL);
             } else {
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index d3a23698385..b9df65bfc69 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -65,41 +65,38 @@
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['dataverse.host.title']}"></span>
                                 </h:outputLabel>
                                 <div class="form-col-container">
-                                    <p:fragment id="hostDataverseContent">
-                                        <ui:fragment rendered="#{DataversePage.editMode == 'INFO'}">
-                                            <p id="hostDataverseStatic" class="form-control-static">#{DataversePage.dataverse.getOwner().name}</p>
-                                            <h:inputHidden value="#{DataversePage.ownerId}" id="hostDataverseStatic_hidden"/>
-                                        </ui:fragment>
-                                        <p:autoComplete id="selectHostDataverse"
-                                                        rendered="#{DataversePage.editMode == 'CREATE'}"
-                                                        binding="#{DataversePage.selectedHostDataverseMenu}"
-                                                        placeholder="#{bundle['dataverse.link.yourDataverses.inputPlaceholder']}"
-                                                        emptyMessage="#{bundle['dataverse.host.autocomplete.nomatches']}"
-                                                        scrollHeight="180" forceSelection="true" 
-                                                        minQueryLength="1" queryDelay="1000"
-                                                        value="#{DataversePage.dataverse.owner}" 
-                                                        multiple="false"
-                                                        completeMethod="#{DataversePage.completeHostDataverseMenuList}"
-                                                        required="#{param['DO_DS_LINK_VALIDATION']}" requiredMessage="#{bundle['dataverse.link.select']}"
-                                                        styleClass="DropdownPopup" panelStyleClass="DropdownPopupPanel"
-                                                        var="hostDataverse" itemLabel="#{hostDataverse.displayName}" itemValue="#{hostDataverse}" converter="dataverseConverter">
-                                            <p:column>
-                                                <h:outputText value="#{hostDataverse.displayName}"/> 
-                                            </p:column>
-                                            <p:column>
-                                                <h:outputText value="#{hostDataverse.alias}"/> 
-                                            </p:column>
-                                            <p:ajax process="@this" event="itemSelect" oncomplete="updateOwnerDataverse()"/>
-                                            <p:ajax process="@this" event="itemUnselect" oncomplete="updateOwnerDataverse()"/>
-                                        </p:autoComplete>
-                                        <p:message for="selectHostDataverse"/>
-                                        <p:commandButton id="updateOwnerDataverse"
-                                                         style="display:none"
-                                                         process="@this :dataverseForm:selectHostDataverse"
-                                                         update="@form,:breadCrumbPanel"
-                                                         action="#{DataversePage.updateOwnerDataverse()}">
-                                        </p:commandButton>
-                                    </p:fragment>
+                                    <ui:fragment rendered="#{DataversePage.editMode == 'INFO'}">
+                                        <p id="hostDataverseStatic" class="form-control-static">#{DataversePage.dataverse.getOwner().name}</p>
+                                        <h:inputHidden value="#{DataversePage.ownerId}" id="hostDataverseStatic_hidden"/>
+                                    </ui:fragment>
+                                    <p:autoComplete id="selectHostDataverse"
+                                                    rendered="#{DataversePage.editMode == 'CREATE'}"
+                                                    placeholder="#{bundle['dataverse.link.yourDataverses.inputPlaceholder']}"
+                                                    emptyMessage="#{bundle['dataverse.host.autocomplete.nomatches']}"
+                                                    scrollHeight="180" forceSelection="true" 
+                                                    minQueryLength="1" queryDelay="1000"
+                                                    value="#{DataversePage.dataverse.owner}" 
+                                                    multiple="false"
+                                                    completeMethod="#{DataversePage.completeHostDataverseMenuList}"
+                                                    required="#{param['DO_DS_LINK_VALIDATION']}" requiredMessage="#{bundle['dataverse.link.select']}"
+                                                    styleClass="DropdownPopup" panelStyleClass="DropdownPopupPanel"
+                                                    var="hostDataverse" itemLabel="#{hostDataverse.displayName}" itemValue="#{hostDataverse}" converter="dataverseConverter">
+                                        <p:column>
+                                            <h:outputText value="#{hostDataverse.displayName}"/> 
+                                        </p:column>
+                                        <p:column>
+                                            <h:outputText value="#{hostDataverse.alias}"/> 
+                                        </p:column>
+                                        <p:ajax process="@this" event="itemSelect" oncomplete="updateOwnerDataverse()"/>
+                                        <p:ajax process="@this" event="itemUnselect" oncomplete="updateOwnerDataverse()"/>
+                                    </p:autoComplete>
+                                    <p:message for="selectHostDataverse"/>
+                                    <p:commandButton id="updateOwnerDataverse"
+                                                     style="display:none"
+                                                     process="@this :dataverseForm:selectHostDataverse"
+                                                     update="@form,:breadCrumbPanel"
+                                                     action="#{DataversePage.updateOwnerDataverse()}">
+                                    </p:commandButton>
                                 </div>
                             </div>
                         </div>

From 81020ab8999b521072a874778bb350e8c189f06e Mon Sep 17 00:00:00 2001
From: Leonid Andreev <leonid@hmdc.harvard.edu>
Date: Tue, 12 Nov 2019 13:06:56 -0500
Subject: [PATCH 35/35] removed the binding attribute from the host dataverse
 autoComplete. (#5615)

---
 .../edu/harvard/iq/dataverse/DatasetPage.java | 25 +++++++------------
 src/main/webapp/dataset.xhtml                 |  1 -
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
index 293a299a166..22b38878b4a 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -1761,7 +1761,6 @@ public void updateOwnerDataverse() {
             dataset = new Dataset();
             // initiate from scratch: (isolate the creation of a new dataset in its own method?)
             init(true);
-            logger.info("Created a new new dataset.");
             // rebuild the bred crumbs display:
             dataverseHeaderFragment.initBreadcrumbs(dataset);
         }
@@ -2982,16 +2981,6 @@ public void setSelectedDataverseMenu(UIInput selectedDataverseMenu) {
         this.selectedLinkingDataverseMenu = selectedDataverseMenu;
     }
     
-    UIInput selectedHostDataverseMenu;
-    
-    public UIInput getSelectedHostDataverseMenu() {
-        return selectedHostDataverseMenu;
-    }
-
-    public void setSelectedHostDataverseMenu(UIInput selectedHostDataverseMenu) {
-        this.selectedHostDataverseMenu = selectedHostDataverseMenu;
-    }
-    
     private Boolean saveLink(Dataverse dataverse){
         boolean retVal = true;
         if (readOnly) {
@@ -3306,12 +3295,16 @@ public void validateForwardURL(FacesContext context, UIComponent toValidate, Obj
 
     }
      
-     public String save() {
-         //Before dataset saved, write cached prov freeform to version
-        if(systemConfig.isProvCollectionEnabled()) {
+    public String save() {
+        //Before dataset saved, write cached prov freeform to version
+        if (systemConfig.isProvCollectionEnabled()) {
             provPopupFragmentBean.saveStageProvFreeformToLatestVersion();
         }
-        
+
+        // Before validating, ensure that the dataset has an owner:
+        if (dataset.getOwner() == null || dataset.getOwner().getId() == null) {
+            dataset.setOwner(ownerId != null ? dataverseService.find(ownerId) : null);
+        }
         // Validate
         Set<ConstraintViolation> constraintViolations = workingVersion.validate();
         if (!constraintViolations.isEmpty()) {
@@ -3324,7 +3317,7 @@ public String save() {
         Map<Long, String> deleteStorageLocations = null;
         
         try { 
-            if (editMode == EditMode.CREATE) {                
+            if (editMode == EditMode.CREATE) {
                 if ( selectedTemplate != null ) {
                     if ( isSessionUserAuthenticated() ) {
                         cmd = new CreateNewDatasetCommand(dataset, dvRequestService.getDataverseRequest(), false, selectedTemplate); 
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index d9914561dec..70d7a71dc4e 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -535,7 +535,6 @@
                                     <div class="form-group">
                                         <p:fragment id="hostDataverseContent">
                                             <p:autoComplete id="selectHostDataverse"
-                                                            binding="#{DatasetPage.selectedHostDataverseMenu}"
                                                             placeholder="#{bundle['dataverse.link.yourDataverses.inputPlaceholder']}"
                                                             emptyMessage="#{bundle['dataverse.host.autocomplete.nomatches']}"
                                                             scrollHeight="180" forceSelection="true"