diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index e5327f67057..c0fce1b844a 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -268,9 +268,9 @@ This is the email address that "system" emails are sent from such as password re :FooterCopyright ++++++++++++++++ -By default the footer says "Copyright © [YYYY], The President & Fellows of Harvard College" but the text after the year can be customized. +By default the footer says "Copyright © [YYYY]" but you can add text after the year, as in the example below. -``curl -X PUT -d "The President & Fellows of Harvard College" http://localhost:8080/api/admin/settings/:FooterCopyright`` +``curl -X PUT -d ", The President & Fellows of Harvard College" http://localhost:8080/api/admin/settings/:FooterCopyright`` :DoiProvider ++++++++++++ diff --git a/scripts/api/setup-optional-harvard.sh b/scripts/api/setup-optional-harvard.sh index 52caa31c1e0..3433e823014 100755 --- a/scripts/api/setup-optional-harvard.sh +++ b/scripts/api/setup-optional-harvard.sh @@ -22,6 +22,7 @@ curl -s -X PUT -d true "$SERVER/admin/settings/:GeoconnectCreateEditMaps" curl -s -X PUT -d true "$SERVER/admin/settings/:GeoconnectViewMaps" echo "- Setting system email" curl -X PUT -d "Dataverse Support " http://localhost:8080/api/admin/settings/:SystemEmail +curl -X PUT -d ", The President & Fellows of Harvard College" http://localhost:8080/api/admin/settings/:FooterCopyright echo "- Setting up the Harvard Shibboleth institutional group" curl -s -X POST -H 'Content-type:application/json' --upload-file data/shibGroupHarvard.json "$SERVER/admin/groups/shib?key=$adminKey" echo diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties index 8876ebc752c..ca19a51533e 100755 --- a/src/main/java/Bundle.properties +++ b/src/main/java/Bundle.properties @@ -92,7 +92,7 @@ footer.dataverseOnGitHub=Dataverse On GitHub footer.dataverseProjectOn=Dataverse Project on footer.Twitter=Twitter footer.dataScienceIQSS=Developed at the Institute for Quantitative Social Science -footer.copyright=Copyright © {0}, +footer.copyright=Copyright © {0} footer.widget.datastored=Data is stored at {0}. footer.widget.login=Log in to footer.privacyPolicy=Privacy Policy diff --git a/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java b/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java index 38abcbc5671..1912642ea9b 100644 --- a/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java +++ b/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java @@ -531,9 +531,7 @@ public boolean isTimerServer() { return false; } - public String getFooterCopyright() { - String copyrightYear = BundleUtil.getStringFromBundle("footer.copyright", Arrays.asList(Year.now().getValue() + "")); - String extraText = settingsService.getValueForKey(SettingsServiceBean.Key.FooterCopyright, "The President & Fellows of Harvard College"); - return copyrightYear + extraText; + public String getFooterCopyrightAndYear() { + return BundleUtil.getStringFromBundle("footer.copyright", Arrays.asList(Year.now().getValue() + "")); } } diff --git a/src/main/webapp/dataverse_footer.xhtml b/src/main/webapp/dataverse_footer.xhtml index 9ab7d10329d..285c4408f19 100644 --- a/src/main/webapp/dataverse_footer.xhtml +++ b/src/main/webapp/dataverse_footer.xhtml @@ -17,7 +17,7 @@  |  #{bundle['footer.dataverseProjectOn']}  |  #{bundle['footer.codeAvailable']}

-  |  #{bundle['footer.privacyPolicy']} +  |  #{bundle['footer.privacyPolicy']}