change default to be "Copyright © [YYYY]" #3379

Also use `settingsWrapper.get` for better performance.
IQSS · Sep 29, 2016 · d78a834 · d78a834
1 parent 86195c7
commit d78a834
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git 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 &#38; Fellows of Harvard College" http://localhost:8080/api/admin/settings/:FooterCopyright``
+``curl -X PUT -d ", The President &#38; 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
@@ -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 <support@dataverse.org>" http://localhost:8080/api/admin/settings/:SystemEmail
+curl -X PUT -d ", The President &#38; 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
@@ -92,7 +92,7 @@ footer.dataverseOnGitHub=Dataverse On GitHub
 footer.dataverseProjectOn=Dataverse Project on
 footer.Twitter=Twitter
 footer.dataScienceIQSS=Developed at the <a href="http://www.iq.harvard.edu/" title="Institute for Quantitative Social Science" target="_blank">Institute for Quantitative Social Science</a>
-footer.copyright=Copyright &#169; {0}, 
+footer.copyright=Copyright &#169; {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
@@ -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 &#38; 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
@@ -17,7 +17,7 @@
                         <h:outputText value="#{bundle['footer.dataScienceIQSS']}" escape="false"/> &#160;|&#160; #{bundle['footer.dataverseProjectOn']} <a href="https://twitter.com/dataverseorg" target="_blank" title="#{bundle['footer.dataverseProjectOn']} #{bundle['footer.Twitter']}"><span class="socicon socicon-twitter" title="#{bundle['footer.dataverseProjectOn']} #{bundle['footer.Twitter']}"/></a> &#160;|&#160; #{bundle['footer.codeAvailable']} <a href="https://github.com/IQSS/dataverse" target="_blank" title="#{bundle['footer.dataverseOnGitHub']}"><span class="socicon socicon-github" title="#{bundle['footer.dataverseOnGitHub']}"/></a>
                     </p>
                     <p>
-                        <h:outputText value="#{systemConfig.footerCopyright}" escape="false"/> <ui:fragment rendered="#{!empty settingsWrapper.get(':ApplicationPrivacyPolicyUrl')}">&#160;|&#160; <h:outputLink value="#{settingsWrapper.get(':ApplicationPrivacyPolicyUrl')}" target="_blank">#{bundle['footer.privacyPolicy']}</h:outputLink></ui:fragment>
+                        <h:outputText value="#{systemConfig.footerCopyrightAndYear}#{settingsWrapper.get(':FooterCopyright')}" escape="false"/> <ui:fragment rendered="#{!empty settingsWrapper.get(':ApplicationPrivacyPolicyUrl')}">&#160;|&#160; <h:outputLink value="#{settingsWrapper.get(':ApplicationPrivacyPolicyUrl')}" target="_blank">#{bundle['footer.privacyPolicy']}</h:outputLink></ui:fragment>
                     </p>
                 </div>
                 <div class="col-xs-7 small" jsf:rendered="#{widgetView}">