From 7795e7008640d4b7c491ed613e4b944349ae3fe3 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Mon, 13 Nov 2017 15:22:08 -0500
Subject: [PATCH 01/13] change header background from gray to white #4197

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

diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
index 8ec2ced172f..cf8c4ad6610 100644
--- a/src/main/webapp/dataverse_header.xhtml
+++ b/src/main/webapp/dataverse_header.xhtml
@@ -154,11 +154,13 @@
             </div>
         </nav>
         <!-- Header Panel -->
+        <!-- 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 : 'F5F5F5'};"
+                style="background:##{!empty dataverse.dataverseTheme.backgroundColor ? dataverse.dataverseTheme.backgroundColor : 'FFFFFF'};"
                 jsf:rendered="#{showDataverseHeader and !widgetWrapper.widgetView}">
              <o:importFunctions type="org.apache.commons.lang.StringEscapeUtils"/>
-            <div class="dataverseHeaderLogo" style="text-align:#{!empty dataverse.dataverseTheme.logoAlignment ? dataverse.dataverseTheme.logoAlignment : 'center'};background:##{!empty dataverse.dataverseTheme.logoBackgroundColor ? dataverse.dataverseTheme.logoBackgroundColor : 'F5F5F5'};"
+            <!-- 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'};"
                  jsf:rendered="#{!empty dataverse.dataverseTheme.logo and dataverse.dataverseTheme.logoFormat == 'RECTANGLE'}">
                 <img src="/logos/#{dataverse.logoOwnerId}/#{dataverse.dataverseTheme.logo}" alt="#{dataverse.name}"/>
             </div>

From 8eccacd27ff01b68530ce3fd1f0c0a1f139393ac Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Mon, 13 Nov 2017 15:52:37 -0500
Subject: [PATCH 02/13] only show header for non-root dataverses #4197

---
 src/main/java/edu/harvard/iq/dataverse/Dataverse.java | 7 +++++++
 src/main/webapp/dataverse_header.xhtml                | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
index df656bb61b1..5ae0e34297c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
+++ b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
@@ -745,4 +745,11 @@ 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 cf8c4ad6610..4086a5f41ba 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}">
+                jsf:rendered="#{showDataverseHeader and !widgetWrapper.widgetView and !dataverse.rootDataverse}">
              <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'};"

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 03/13] 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'};"

From b9c3c56b96b20492c0b3ed81bf7746ca3ff7fcc4 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Wed, 15 Nov 2017 08:53:36 -0500
Subject: [PATCH 04/13] stub out UI for disabling root dataverse theme #4197

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

diff --git a/src/main/webapp/themeAndWidgetsFragment.xhtml b/src/main/webapp/themeAndWidgetsFragment.xhtml
index 7feb2b7fa89..0a1b0176eef 100644
--- a/src/main/webapp/themeAndWidgetsFragment.xhtml
+++ b/src/main/webapp/themeAndWidgetsFragment.xhtml
@@ -31,6 +31,24 @@
                                 </div>
                             </div>
                         </div>
+                        <div class="form-group" jsf:rendered="#{themeWidgetFragment.editDv.owner == null}">
+                            <label class="col-sm-3 control-label">
+                                <span data-toggle="tooltip" data-placement="auto right"  class="tooltiplabel text-info" data-original-title="Only for the root dataverse, you can disable the theme.">
+                                    Disable Theme
+                                </span>
+                            </label>
+                            <div class="col-sm-9">
+                                <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> The theme for the root dataverse can be disabled to allow for easier site-wide branding if you choose to set up custom navbar and header as described under <a href="http://guides.dataverse.org/en/latest/installation/config.html#branding-your-installation">Branding Your Installation</a> in the Installation Guide.</p>
+                                <div class="checkbox">
+                                    <label class="metadata-blocks-default" for="disableRootTheme">
+                                        <h:selectBooleanCheckbox id="disableRootTheme" tabindex="7" styleClass="metadata-blocks-default"                                                                  value="#{themeWidgetFragment.inheritCustomization}" >
+                                        </h:selectBooleanCheckbox>
+                                        <h:outputFormat value="Disable Root Theme">
+                                        </h:outputFormat>
+                                    </label>
+                                </div>
+                            </div>
+                        </div>
                         <div class="form-group" jsf:rendered="#{themeWidgetFragment.editDv.themeRoot}">
                             <label class="col-sm-3 control-label" for="logoFormat">
                                 <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataverse.theme.logo.image.title']}">

From 7cd2fea02f1fb746f6af85034b8bbc328f4bbb1f Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Wed, 15 Nov 2017 12:01:57 -0500
Subject: [PATCH 05/13] Revert "stub out UI for disabling root dataverse theme
 #4197 "

This reverts commit b9c3c56b96b20492c0b3ed81bf7746ca3ff7fcc4.

We're going to use a database setting instead.
---
 src/main/webapp/themeAndWidgetsFragment.xhtml | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/main/webapp/themeAndWidgetsFragment.xhtml b/src/main/webapp/themeAndWidgetsFragment.xhtml
index 0a1b0176eef..7feb2b7fa89 100644
--- a/src/main/webapp/themeAndWidgetsFragment.xhtml
+++ b/src/main/webapp/themeAndWidgetsFragment.xhtml
@@ -31,24 +31,6 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="form-group" jsf:rendered="#{themeWidgetFragment.editDv.owner == null}">
-                            <label class="col-sm-3 control-label">
-                                <span data-toggle="tooltip" data-placement="auto right"  class="tooltiplabel text-info" data-original-title="Only for the root dataverse, you can disable the theme.">
-                                    Disable Theme
-                                </span>
-                            </label>
-                            <div class="col-sm-9">
-                                <p class="help-block"><span class="glyphicon glyphicon-info-sign"/> The theme for the root dataverse can be disabled to allow for easier site-wide branding if you choose to set up custom navbar and header as described under <a href="http://guides.dataverse.org/en/latest/installation/config.html#branding-your-installation">Branding Your Installation</a> in the Installation Guide.</p>
-                                <div class="checkbox">
-                                    <label class="metadata-blocks-default" for="disableRootTheme">
-                                        <h:selectBooleanCheckbox id="disableRootTheme" tabindex="7" styleClass="metadata-blocks-default"                                                                  value="#{themeWidgetFragment.inheritCustomization}" >
-                                        </h:selectBooleanCheckbox>
-                                        <h:outputFormat value="Disable Root Theme">
-                                        </h:outputFormat>
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
                         <div class="form-group" jsf:rendered="#{themeWidgetFragment.editDv.themeRoot}">
                             <label class="col-sm-3 control-label" for="logoFormat">
                                 <span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataverse.theme.logo.image.title']}">

From 28f705cbf52822a9778b73fb887f9ffe81faf6c7 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Wed, 15 Nov 2017 12:58:11 -0500
Subject: [PATCH 06/13] implement :DisableRootDataverseTheme db setting #4197

---
 doc/sphinx-guides/source/installation/config.rst     |  9 +++++++++
 src/main/java/Bundle.properties                      |  1 +
 .../iq/dataverse/DataverseHeaderFragment.java        | 12 ++++++++++++
 .../edu/harvard/iq/dataverse/SettingsWrapper.java    |  4 ++++
 .../iq/dataverse/settings/SettingsServiceBean.java   |  6 ++++++
 src/main/webapp/dataverse_header.xhtml               |  2 +-
 src/main/webapp/themeAndWidgetsFragment.xhtml        |  8 +++++++-
 7 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst
index 90db8d55afb..c79f76f7953 100644
--- a/doc/sphinx-guides/source/installation/config.rst
+++ b/doc/sphinx-guides/source/installation/config.rst
@@ -385,6 +385,10 @@ Once you have the location of your custom header HTML file, run this curl comman
 
 ``curl -X PUT -d '/var/www/dataverse/branding/custom-header.html' http://localhost:8080/api/admin/settings/:HeaderCustomizationFile``
 
+If you have enabled a custom header or navbar logo, you may want to disable the theme of the/logo/banner of the "root" dataverse by setting ``:DisableRootDataverseTheme`` to ``true`` like this:
+
+``curl -X PUT -d 'true' http://localhost:8080/api/admin/settings/:DisableRootDataverseTheme``
+
 Custom Footer
 +++++++++++++
 
@@ -679,6 +683,11 @@ See :ref:`Branding Your Installation` above.
 
 See :ref:`Branding Your Installation` above.
 
+:DisableRootDataverseTheme
+++++++++++++++++++++++++
+
+See :ref:`Branding Your Installation` above.
+
 :FooterCustomizationFile
 ++++++++++++++++++++++++
 
diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties
index a4e3fa63c58..c621bfc0674 100755
--- a/src/main/java/Bundle.properties
+++ b/src/main/java/Bundle.properties
@@ -792,6 +792,7 @@ dataverse.theme.website.title=URL for your personal website, institution, or any
 dataverse.theme.website.tip=The website will be linked behind the tagline. To have a website listed, you must also provide a tagline. 
 dataverse.theme.website.watermark=Your personal site, http://...
 dataverse.theme.website.invalidMsg=Invalid URL.
+dataverse.theme.disabled=The theme for the root dataverse has been administratively disabled with the :DisableRootDataverseTheme database setting.
 dataverse.widgets.title=Widgets
 dataverse.widgets.notPublished.why.header=Why Use Widgets?
 dataverse.widgets.notPublished.why.reason1=Increases the web visibility of your data by allowing you to embed your dataverse and datasets into your personal or project website.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java b/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java
index d3607a27093..dfe6e5e70c9 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java
@@ -249,6 +249,18 @@ public boolean isSignupAllowed() {
         return signupAllowed;
     }
 
+    public boolean isRootDataverseThemeDisabled(Dataverse dataverse) {
+        if (dataverse == null) {
+            return false;
+        }
+        if (dataverse.getOwner() == null) {
+            // We're operating on the root dataverse.
+            return settingsWrapper.isRootDataverseThemeDisabled();
+        } else {
+            return false;
+        }
+    }
+
     public String getSignupUrl(String loginRedirect) {
         String nonNullDefaultIfKeyNotFound = "";
         String signUpUrl = settingsWrapper.getValueForKey(SettingsServiceBean.Key.SignUpUrl, nonNullDefaultIfKeyNotFound);
diff --git a/src/main/java/edu/harvard/iq/dataverse/SettingsWrapper.java b/src/main/java/edu/harvard/iq/dataverse/SettingsWrapper.java
index 75ae1e00b96..0dfa2d67885 100644
--- a/src/main/java/edu/harvard/iq/dataverse/SettingsWrapper.java
+++ b/src/main/java/edu/harvard/iq/dataverse/SettingsWrapper.java
@@ -155,5 +155,9 @@ public String getSupportTeamName() {
         return BrandingUtil.getSupportTeamName(systemAddress, dataverseService.findRootDataverse().getName());
     }
 
+    public boolean isRootDataverseThemeDisabled() {
+        return isTrueForKey(Key.DisableRootDataverseTheme, false);
+    }
+
 }
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java
index 94024bf5949..f163bcaea0f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java
@@ -309,6 +309,12 @@ Whether Harvesting (OAI) service is enabled
         // Option to override multiple guides with a single url
         NavbarGuidesUrl,
         
+        /**
+         * The theme for the root dataverse can get in the way when you try make
+         * use of HeaderCustomizationFile and LogoCustomizationFile so this is a
+         * way to disable it.
+         */
+        DisableRootDataverseTheme,
         // Limit on how many guestbook entries to display on the guestbook-responses page:
         GuestbookResponsesPageDisplayLimit,
 
diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
index cf8c4ad6610..9a86e8f1e88 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}">
+                jsf:rendered="#{showDataverseHeader and !widgetWrapper.widgetView and !dataverseHeaderFragment.isRootDataverseThemeDisabled(dataverse)}">
              <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'};"
diff --git a/src/main/webapp/themeAndWidgetsFragment.xhtml b/src/main/webapp/themeAndWidgetsFragment.xhtml
index 7feb2b7fa89..9bfa1e9f2e5 100644
--- a/src/main/webapp/themeAndWidgetsFragment.xhtml
+++ b/src/main/webapp/themeAndWidgetsFragment.xhtml
@@ -6,7 +6,7 @@
     xmlns:o="http://omnifaces.org/ui">
     <!-- Theme and Widgets Edit Tabs -->
         <p:tabView  rendered="#{themeWidgetFragment.editDv!=null}" id="themeWidgetsTabView" widgetVar="content">
-            <p:tab id="themeTab" title="#{bundle['dataverse.theme.title']}">
+            <p:tab id="themeTab" title="#{bundle['dataverse.theme.title']}" rendered="#{not settingsWrapper.rootDataverseThemeDisabled or themeWidgetFragment.editDv.owner != null}">
                 <p:fragment autoUpdate="true">
                     <!-- Dataverse Theme Panel -->
                     <div class="row form-horizontal">
@@ -184,6 +184,12 @@
                     <p:commandButton class="btn btn-default" action="#{themeWidgetFragment.cancel()}" immediate="true" id="themeCancel" value="#{bundle.cancel}"/>
                 </div>
             </p:tab>
+            <p:tab id="themeTabDisabled" title="#{bundle['dataverse.theme.title']}" rendered="#{themeWidgetFragment.editDv.owner == null and settingsWrapper.rootDataverseThemeDisabled}">
+                <div>#{bundle['dataverse.theme.disabled']}</div>
+                <div class="button-block">
+                    <p:commandButton class="btn btn-default" action="#{themeWidgetFragment.cancel()}" immediate="true" id="themeTabDisabledDone" value="#{bundle.done}"/>
+                </div>
+            </p:tab>
             <p:tab id="widgetsTab" title="#{bundle['dataverse.widgets.title']}">
                 <div id="no-widgets-message" class="panel panel-default" jsf:rendered="#{!themeWidgetFragment.editDv.released}">
                     <div class="panel-body">

From 80219c513f3fe3699ed9e3cfe0207eb76e60289e Mon Sep 17 00:00:00 2001
From: Derek Murphy <dlmurphy@g.harvard.edu>
Date: Thu, 16 Nov 2017 11:43:59 -0500
Subject: [PATCH 07/13] Syntax + typo fix

Small edit, fixed a typo and a syntax error in (ironically) a header in
the docs
---
 doc/sphinx-guides/source/installation/config.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst
index c79f76f7953..ee19e67f8f6 100644
--- a/doc/sphinx-guides/source/installation/config.rst
+++ b/doc/sphinx-guides/source/installation/config.rst
@@ -385,7 +385,7 @@ Once you have the location of your custom header HTML file, run this curl comman
 
 ``curl -X PUT -d '/var/www/dataverse/branding/custom-header.html' http://localhost:8080/api/admin/settings/:HeaderCustomizationFile``
 
-If you have enabled a custom header or navbar logo, you may want to disable the theme of the/logo/banner of the "root" dataverse by setting ``:DisableRootDataverseTheme`` to ``true`` like this:
+If you have enabled a custom header or navbar logo, you may want to disable the theme of the logo/banner of the "root" dataverse by setting ``:DisableRootDataverseTheme`` to ``true`` like this:
 
 ``curl -X PUT -d 'true' http://localhost:8080/api/admin/settings/:DisableRootDataverseTheme``
 
@@ -684,7 +684,7 @@ See :ref:`Branding Your Installation` above.
 See :ref:`Branding Your Installation` above.
 
 :DisableRootDataverseTheme
-++++++++++++++++++++++++
+++++++++++++++++++++++++++
 
 See :ref:`Branding Your Installation` above.
 

From d277669672ab92a2678e651335e2b4f22b01186c Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Thu, 16 Nov 2017 16:21:29 -0500
Subject: [PATCH 08/13] Added tip to Installation Guide > Configuration >
 Custom Header related to disable root theme. [ref #4197]

---
 doc/sphinx-guides/source/installation/config.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst
index ee19e67f8f6..eee5a5d6bdb 100644
--- a/doc/sphinx-guides/source/installation/config.rst
+++ b/doc/sphinx-guides/source/installation/config.rst
@@ -385,10 +385,12 @@ Once you have the location of your custom header HTML file, run this curl comman
 
 ``curl -X PUT -d '/var/www/dataverse/branding/custom-header.html' http://localhost:8080/api/admin/settings/:HeaderCustomizationFile``
 
-If you have enabled a custom header or navbar logo, you may want to disable the theme of the logo/banner of the "root" dataverse by setting ``:DisableRootDataverseTheme`` to ``true`` like this:
+If you have enabled a custom header or navbar logo, you may want to disable the theme of the root dataverse. You can do so by setting ``:DisableRootDataverseTheme`` to ``true`` like this:
 
 ``curl -X PUT -d 'true' http://localhost:8080/api/admin/settings/:DisableRootDataverseTheme``
 
+Please note, if your installation is already up and running on production, before disabling your root dataverse theme, consider that child dataverses have the ability to inherit themes. You should manually revert the root dataverse theme to default values before disabling, or continue to allow the root dataverse theme to be inherited.
+
 Custom Footer
 +++++++++++++
 

From d61218902c0b47ddd37ea6d4a2c8bc0920d0e599 Mon Sep 17 00:00:00 2001
From: Derek Murphy <dlmurphy@g.harvard.edu>
Date: Fri, 17 Nov 2017 13:01:55 -0500
Subject: [PATCH 09/13] Docs: extremely nitpicky word change [#4197]

Changed a couple words in the config page.
---
 doc/sphinx-guides/source/installation/config.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst
index eee5a5d6bdb..41173dcc7c3 100644
--- a/doc/sphinx-guides/source/installation/config.rst
+++ b/doc/sphinx-guides/source/installation/config.rst
@@ -385,11 +385,11 @@ Once you have the location of your custom header HTML file, run this curl comman
 
 ``curl -X PUT -d '/var/www/dataverse/branding/custom-header.html' http://localhost:8080/api/admin/settings/:HeaderCustomizationFile``
 
-If you have enabled a custom header or navbar logo, you may want to disable the theme of the root dataverse. You can do so by setting ``:DisableRootDataverseTheme`` to ``true`` like this:
+If you have enabled a custom header or navbar logo, you might prefer to disable the theme of the root dataverse. You can do so by setting ``:DisableRootDataverseTheme`` to ``true`` like this:
 
 ``curl -X PUT -d 'true' http://localhost:8080/api/admin/settings/:DisableRootDataverseTheme``
 
-Please note, if your installation is already up and running on production, before disabling your root dataverse theme, consider that child dataverses have the ability to inherit themes. You should manually revert the root dataverse theme to default values before disabling, or continue to allow the root dataverse theme to be inherited.
+Please note: If your installation is already up and running on production, before disabling your root dataverse theme, consider that child dataverses have the ability to inherit themes. You should manually revert the root dataverse theme to default values before disabling, or continue to allow the root dataverse theme to be inherited.
 
 Custom Footer
 +++++++++++++

From 624922ff42dbc80a1479835ae691a6e8bcac9333 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Tue, 28 Nov 2017 11:09:26 -0500
Subject: [PATCH 10/13] when adding row to dataversetheme, use white instead of
 gray #4197

---
 .../java/edu/harvard/iq/dataverse/ThemeWidgetFragment.java    | 4 ++--
 src/main/webapp/dataverse_header.xhtml                        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/ThemeWidgetFragment.java b/src/main/java/edu/harvard/iq/dataverse/ThemeWidgetFragment.java
index 17b59eb27fd..d9cecd71343 100644
--- a/src/main/java/edu/harvard/iq/dataverse/ThemeWidgetFragment.java
+++ b/src/main/java/edu/harvard/iq/dataverse/ThemeWidgetFragment.java
@@ -44,8 +44,8 @@
 @ViewScoped
 @Named
 public class ThemeWidgetFragment implements java.io.Serializable {
-    static final String DEFAULT_LOGO_BACKGROUND_COLOR = "F5F5F5";
-    static final String DEFAULT_BACKGROUND_COLOR = "F5F5F5";
+    static final String DEFAULT_LOGO_BACKGROUND_COLOR = "FFFFFF";
+    static final String DEFAULT_BACKGROUND_COLOR = "FFFFFF";
     static final String DEFAULT_LINK_COLOR = "428BCA";
     static final String DEFAULT_TEXT_COLOR = "888888";
     private static final Logger logger = Logger.getLogger(ThemeWidgetFragment.class.getCanonicalName());   
diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
index 9a86e8f1e88..1582d7acbf6 100644
--- a/src/main/webapp/dataverse_header.xhtml
+++ b/src/main/webapp/dataverse_header.xhtml
@@ -154,12 +154,12 @@
             </div>
         </nav>
         <!-- Header Panel -->
-        <!-- FIXME: Rather than hard-coding "FFFFFF", get it from the backend. -->
+        <!-- FIXME: Rather than hard-coding "FFFFFF", get it from the backend (ThemeWidgetFragment.DEFAULT_BACKGROUND_COLOR). -->
         <div id="dataverseHeader" class="container bg-muted"
                 style="background:##{!empty dataverse.dataverseTheme.backgroundColor ? dataverse.dataverseTheme.backgroundColor : 'FFFFFF'};"
                 jsf:rendered="#{showDataverseHeader and !widgetWrapper.widgetView and !dataverseHeaderFragment.isRootDataverseThemeDisabled(dataverse)}">
              <o:importFunctions type="org.apache.commons.lang.StringEscapeUtils"/>
-            <!-- FIXME: Rather than hard-coding "FFFFFF", get it from the backend. -->
+            <!-- FIXME: Rather than hard-coding "FFFFFF", get it from the backend (ThemeWidgetFragment.DEFAULT_LOGO_BACKGROUND_COLOR). -->
             <div class="dataverseHeaderLogo" style="text-align:#{!empty dataverse.dataverseTheme.logoAlignment ? dataverse.dataverseTheme.logoAlignment : 'center'};background:##{!empty dataverse.dataverseTheme.logoBackgroundColor ? dataverse.dataverseTheme.logoBackgroundColor : 'FFFFFF'};"
                  jsf:rendered="#{!empty dataverse.dataverseTheme.logo and dataverse.dataverseTheme.logoFormat == 'RECTANGLE'}">
                 <img src="/logos/#{dataverse.logoOwnerId}/#{dataverse.dataverseTheme.logo}" alt="#{dataverse.name}"/>

From f68b81d6d177bd2e4720ff973e47e0216e8e21d3 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Tue, 28 Nov 2017 12:15:40 -0500
Subject: [PATCH 11/13] Removed commented out theme logic found in QA. [ref
 #4197]

---
 src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java b/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
index 97f3925b5ec..b75f8ae4f19 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
@@ -97,10 +97,6 @@ public class Dataverses extends AbstractApiBean {
     @Deprecated
     private static final Logger LOGGER = Logger.getLogger(Dataverses.class.getName());
     private static final Logger logger = Logger.getLogger(Dataverses.class.getCanonicalName());
-//    static final String DEFAULT_LOGO_BACKGROUND_COLOR = "F5F5F5";
-//    static final String DEFAULT_BACKGROUND_COLOR = "F5F5F5";
-//    static final String DEFAULT_LINK_COLOR = "428BCA";
-//    static final String DEFAULT_TEXT_COLOR = "888888";
 
     @EJB
     ExplicitGroupServiceBean explicitGroupSvc;

From c312a85b8d2f96b7e0e77c384afdfd77007b5739 Mon Sep 17 00:00:00 2001
From: Derek Murphy <dlmurphy@g.harvard.edu>
Date: Tue, 28 Nov 2017 13:05:39 -0500
Subject: [PATCH 12/13] Doc rewrites [#4197]

Rewrote some text on the config page for clarity, changed terminology
usage in dataverse management page to make it more consistent
---
 doc/sphinx-guides/source/installation/config.rst       | 3 ++-
 doc/sphinx-guides/source/user/dataverse-management.rst | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst
index 41173dcc7c3..6c3335bc414 100644
--- a/doc/sphinx-guides/source/installation/config.rst
+++ b/doc/sphinx-guides/source/installation/config.rst
@@ -389,7 +389,8 @@ If you have enabled a custom header or navbar logo, you might prefer to disable
 
 ``curl -X PUT -d 'true' http://localhost:8080/api/admin/settings/:DisableRootDataverseTheme``
 
-Please note: If your installation is already up and running on production, before disabling your root dataverse theme, consider that child dataverses have the ability to inherit themes. You should manually revert the root dataverse theme to default values before disabling, or continue to allow the root dataverse theme to be inherited.
+Please note: Disabling the display of the root dataverse theme also disables your ability to edit it. Remember that dataverse owners can set their dataverses to "inherit theme" from the root. Those dataverses will continue to inherit the root dataverse theme (even though it no longer displays on the root). If you would like to edit the root dataverse theme in the future, you will have to re-enable it first.
+
 
 Custom Footer
 +++++++++++++
diff --git a/doc/sphinx-guides/source/user/dataverse-management.rst b/doc/sphinx-guides/source/user/dataverse-management.rst
index be12c3b32aa..233a2fa0b0c 100755
--- a/doc/sphinx-guides/source/user/dataverse-management.rst
+++ b/doc/sphinx-guides/source/user/dataverse-management.rst
@@ -61,7 +61,7 @@ Tip: The metadata fields you select as required will appear on the Create Datase
 Theme 
 ====================================================
 
-The Theme feature provides you with a way to customize the look of your dataverse. You can decide either to use the customization from the dataverse above yours or upload your own image file. Supported image types are JPEG, TIFF, or PNG and should be no larger than 500 KB. The maximum display size for an image file in a dataverse's theme is 940 pixels wide by 120 pixels high. Additionally, you can select the colors for the header of your dataverse and the text that appears in your dataverse. You can also add a link to your personal website, the website for your organization or institution, your department, journal, etc.
+The Theme feature provides you with a way to customize the look of your dataverse. You can decide either to use the theme from the dataverse containing your dataverse (even up to the root dataverse, AKA the homepage), or upload your own image file. Supported image types are JPEG, TIFF, or PNG and should be no larger than 500 KB. The maximum display size for an image file in a dataverse's theme is 940 pixels wide by 120 pixels high. Additionally, you can select the colors for the header of your dataverse and the text that appears in your dataverse. You can also add a link to your personal website, the website for your organization or institution, your department, journal, etc.
 
 .. _dataverse-widgets:
 

From 8e6354a0fee38892f3b851b81e12afae48ac743f Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Tue, 28 Nov 2017 13:23:15 -0500
Subject: [PATCH 13/13] Changed references from "customization" to "theme" in
 Theme + Widgets pg. [ref #4197]

---
 src/main/java/Bundle.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties
index 3cacbcfd49e..6fd1aefb884 100755
--- a/src/main/java/Bundle.properties
+++ b/src/main/java/Bundle.properties
@@ -749,9 +749,9 @@ dataverse.results.cards.foundInMetadata=Found in Metadata Fields:
 dataverse.results.cards.files.tabularData=Tabular Data
 dataverse.results.solrIsDown=Please note: Due to an internal error, browsing and searching is not available.
 dataverse.theme.title=Theme
-dataverse.theme.inheritCustomization.title=Check this to use the existing theme.
-dataverse.theme.inheritCustomization.label=Inherit Customization
-dataverse.theme.inheritCustomization.checkbox=Inherit customization from {0}
+dataverse.theme.inheritCustomization.title=For this dataverse, use the same theme as the root dataverse.
+dataverse.theme.inheritCustomization.label=Inherit Theme
+dataverse.theme.inheritCustomization.checkbox=Inherit theme from {0}
 dataverse.theme.logo=Logo
 dataverse.theme.logo.tip=Supported image types are JPG, TIF, or PNG and should be no larger than 500 KB. The maximum display size for an image file in a dataverse's theme is 940 pixels wide by 120 pixels high.
 dataverse.theme.logo.format=Logo Format