diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index ab37d7ad1d8..3b69f72ca24 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -265,6 +265,13 @@ This is the email address that "system" emails are sent from such as password re ``curl -X PUT -d "Support " http://localhost:8080/api/admin/settings/:SystemEmail`` +:FooterCopyright +++++++++++++++++ + +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`` + :DoiProvider ++++++++++++ .. _: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 2ca4fd5de66..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 © 2016, The President & Fellows of Harvard College +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/settings/SettingsServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java index c4aedb81a71..9235ab19dab 100644 --- a/src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java @@ -33,6 +33,7 @@ public class SettingsServiceBean { * So there. */ public enum Key { + FooterCopyright, MinutesUntilConfirmEmailTokenExpires, /** * Override Solr highlighting "fragsize" 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 5246be6acd2..1912642ea9b 100644 --- a/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java +++ b/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java @@ -7,6 +7,8 @@ import java.io.InputStream; import java.net.InetAddress; import java.net.UnknownHostException; +import java.time.Year; +import java.util.Arrays; import java.util.MissingResourceException; import java.util.Properties; import java.util.ResourceBundle; @@ -528,4 +530,8 @@ public boolean isTimerServer() { } return false; } + + 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 97141f69b69..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']}