From 1f938e9155c570c4f274fcd3603e74f369297ce0 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Wed, 15 Nov 2017 08:18:25 -0500
Subject: [PATCH] Revert "only show header for non-root dataverses #4197 "

This reverts commit 8eccacd27ff01b68530ce3fd1f0c0a1f139393ac.
---
 src/main/java/edu/harvard/iq/dataverse/Dataverse.java | 7 -------
 src/main/webapp/dataverse_header.xhtml                | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
index 5ae0e34297c..df656bb61b1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
+++ b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
@@ -745,11 +745,4 @@ public boolean isAncestorOf( DvObject other ) {
         return false;
     }
 
-    public boolean isRootDataverse() {
-        if (getOwner() == null) {
-            return true;
-        } else {
-            return false;
-        }
-    }
 }
diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
index 4086a5f41ba..cf8c4ad6610 100644
--- a/src/main/webapp/dataverse_header.xhtml
+++ b/src/main/webapp/dataverse_header.xhtml
@@ -157,7 +157,7 @@
         <!-- FIXME: Rather than hard-coding "FFFFFF", get it from the backend. -->
         <div id="dataverseHeader" class="container bg-muted"
                 style="background:##{!empty dataverse.dataverseTheme.backgroundColor ? dataverse.dataverseTheme.backgroundColor : 'FFFFFF'};"
-                jsf:rendered="#{showDataverseHeader and !widgetWrapper.widgetView and !dataverse.rootDataverse}">
+                jsf:rendered="#{showDataverseHeader and !widgetWrapper.widgetView}">
              <o:importFunctions type="org.apache.commons.lang.StringEscapeUtils"/>
             <!-- FIXME: Rather than hard-coding "FFFFFF", get it from the backend. -->
             <div class="dataverseHeaderLogo" style="text-align:#{!empty dataverse.dataverseTheme.logoAlignment ? dataverse.dataverseTheme.logoAlignment : 'center'};background:##{!empty dataverse.dataverseTheme.logoBackgroundColor ? dataverse.dataverseTheme.logoBackgroundColor : 'FFFFFF'};"