Revert "only show header for non-root dataverses IQSS#4197 "

This reverts commit 8eccacd.
uit-no-old · Nov 15, 2017 · 1f938e9 · 1f938e9
1 parent 8eccacd
commit 1f938e9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git 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
@@ -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'};"