remove " Dataverse", suggest in watermark on create #3611

Places changed: - header - breadcrumbs - search cards - in-app notifications - widgets footer - MyData cards Note that reindexing is required because the citation is in Solr.
IQSS · Jun 2, 2017 · 6375f9e · 6375f9e
1 parent 914e4ea
commit 6375f9e
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 18 deletions.
diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties
@@ -1,4 +1,5 @@
 dataverse=Dataverse
+suggestedDataverseNameEnding=Dataverse
 newDataverse=New Dataverse
 hostDataverse=Host Dataverse
 dataverses=Dataverses
@@ -154,7 +155,7 @@ wasReturnedByReviewer=, was returned by the curator of
 toReview=Don't forget to publish it or send it back to the contributor!
 worldMap.added=dataset had a WorldMap layer data added to it.
 # Bundle file editors, please note that "notification.welcome" is used in a unit test.
-notification.welcome=Welcome to {0} Dataverse! Get started by adding or finding data. Have questions? Check out the {1}. Want to test out Dataverse features? Use our {2}. Also, check for your welcome email to verify your address.
+notification.welcome=Welcome to {0}! Get started by adding or finding data. Have questions? Check out the {1}. Want to test out Dataverse features? Use our {2}. Also, check for your welcome email to verify your address.
 notification.demoSite=Demo Site
 notification.requestFileAccess=File access requested for dataset: {0}.
 notification.grantFileAccess=Access granted for files in dataset: {0}.

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
@@ -809,7 +809,7 @@ public String getRootDataverseNameforCitation(){
         }
         String rootDataverseName = root.getName();
         if (!StringUtil.isEmpty(rootDataverseName)) {
-            return rootDataverseName + " Dataverse";
+            return rootDataverseName;
         } else {
             return "";
         }

diff --git a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
@@ -721,7 +721,7 @@ public String getDepositTermsOfUse() {
 
     @Override
     public String getDisplayName() {
-        return getName() + " Dataverse";
+        return getName();
     }
 
     @Override

diff --git a/src/main/java/edu/harvard/iq/dataverse/DataversePage.java b/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
@@ -4,6 +4,7 @@
 import edu.harvard.iq.dataverse.authorization.Permission;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.dataverse.DataverseUtil;
 import edu.harvard.iq.dataverse.engine.command.Command;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
@@ -1013,4 +1014,7 @@ public void validateAlias(FacesContext context, UIComponent toValidate, Object v
         }
     }
 
+    public String getSuggestedDataverseNameOnCreate() {
+        return DataverseUtil.getSuggestedDataverseNameOnCreate(session.getUser());
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataverse/DataverseUtil.java b/src/main/java/edu/harvard/iq/dataverse/dataverse/DataverseUtil.java
@@ -0,0 +1,16 @@
+package edu.harvard.iq.dataverse.dataverse;
+
+import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.util.BundleUtil;
+
+public class DataverseUtil {
+
+    public static String getSuggestedDataverseNameOnCreate(User user) {
+        if (user == null) {
+            return null;
+        }
+        // getDisplayInfo() is never null.
+        return user.getDisplayInfo().getTitle() + " " + BundleUtil.getStringFromBundle("suggestedDataverseNameEnding");
+    }
+
+}
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
@@ -12,7 +12,7 @@
 
     <h:body>
         <ui:composition template="/dataverse_template.xhtml">
-            <ui:param name="pageTitle" value="#{empty DataversePage.dataverse.name ? bundle.new : DataversePage.dataverse.name} #{bundle.dataverse}"/>
+            <ui:param name="pageTitle" value="#{empty DataversePage.dataverse.name ? bundle.new : DataversePage.dataverse.name}"/>
             <ui:param name="dataverse" value="#{DataversePage.dataverse}"/>
             <ui:define name="body">
                 <f:metadata>
@@ -57,11 +57,8 @@
                                     </span>
                                 </label>
                                 <div class="col-sm-9 form-col-container">
-                                    <div class="input-group">
-                                        <p:inputText id="name" tabindex="1" styleClass="form-control" value="#{DataversePage.dataverse.name}"/>
-                                        <div class="input-group-addon">#{bundle.dataverse}</div>
-                                    </div>
-                                    <p:watermark for="name" value="#{bundle['dataverse.enterName']}"/>
+                                    <p:inputText id="name" tabindex="1" styleClass="form-control" value="#{DataversePage.dataverse.name}"/>
+                                    <p:watermark for="name" value="#{DataversePage.suggestedDataverseNameOnCreate}"/>
                                 </div>
                             </div>
                             <div class="col-xs-6 form-group form-col-container">
@@ -399,7 +396,7 @@
                                                         <i class="icon-dataverse text-brand"></i>
                                                     </div>
                                                     <div class="dataverse-info-general">
-                                                        <div><h:outputText value="#{DataversePage.dataverse.name} #{bundle.dataverse}" styleClass="highlightBold"/> <h:outputText value=" (#{DataversePage.dataverse.affiliation})" styleClass="text-muted" rendered="#{!empty DataversePage.dataverse.affiliation}"/></div>
+                                                        <div><h:outputText value="#{DataversePage.dataverse.name}" styleClass="highlightBold"/> <h:outputText value=" (#{DataversePage.dataverse.affiliation})" styleClass="text-muted" rendered="#{!empty DataversePage.dataverse.affiliation}"/></div>
                                                         <div class="text-muted">#{DataversePage.dataverse.alias}</div>
                                                     </div>
                                                 </div>

diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
@@ -186,7 +186,7 @@
                     <img src="/logos/#{dataverse.logoOwnerId}/#{dataverse.dataverseTheme.logo}" alt="#{dataverse.name} #{bundle.dataverse}"/>
                 </div>
                 <div class="dataverseHeaderCell dataverseHeaderName" jsf:rendered="#{!empty dataverse.name}">
-                    <a href="/dataverse/#{dataverse.alias}" class="dataverseHeaderDataverseName" style="color:##{!empty dataverse.dataverseTheme.linkColor ? dataverse.dataverseTheme.linkColor : '428bca'};">#{dataverse.name} #{bundle.dataverse}</a>
+                    <a href="/dataverse/#{dataverse.alias}" class="dataverseHeaderDataverseName" style="color:##{!empty dataverse.dataverseTheme.linkColor ? dataverse.dataverseTheme.linkColor : '428bca'};">#{dataverse.name}</a>
                     <h:outputText style="color:##{!empty dataverse.dataverseTheme.textColor ? dataverse.dataverseTheme.textColor : '888888'};" value=" (#{dataverse.affiliation})" rendered="#{!empty dataverse.affiliation}"/>
                     <h:outputText value="#{bundle.unpublished}" styleClass="label label-warning label-unpublished" rendered="#{!dataverse.released}"/>
                 </div>

diff --git a/src/main/webapp/mydata_templates/cards_minimum.html b/src/main/webapp/mydata_templates/cards_minimum.html
@@ -16,7 +16,7 @@
         <div class="card-title-icon-block" style="font-size: 110%;"> 
  {% if card_info.type == "dataverse" %}
             <span class="icon-dataverse text-brand pull-right" title="Dataverse"></span>
-            <a href="/dataverse/{{ card_info.identifier }}"><span style="padding:4px 0;">{{ card_info.name }} Dataverse</span></a>
+            <a href="/dataverse/{{ card_info.identifier }}"><span style="padding:4px 0;">{{ card_info.name }}</span></a>
            {# <span class="text-muted">(<em>Affiliation</em>)</span>#}
  {% elif card_info.type == "dataset" %}
             <span class="icon-dataset text-info pull-right" title="Dataset"></span>
@@ -46,7 +46,7 @@
         <span class="text-muted">{{ card_info.date_to_display_on_card }} 
             {% if card_info.parentId %}
                 {% if card_info.parentId != card_info.identifier %}
-                  -  <a href="/dataverse.xhtml?id={{ card_info.parentId }}">{{ card_info.parentName }} Dataverse</a>
+                  -  <a href="/dataverse.xhtml?id={{ card_info.parentId }}">{{ card_info.parentName }}</a>
                 {% endif %}
             {% endif %}
         </span>
@@ -60,7 +60,7 @@
                 <a href="/dataset.xhtml?persistentId={{ card_info.global_id }}"><span class="icon-dataset text-info"></span></a>
             </div>
             <span class="text-muted">{{ card_info.date_to_display_on_card }}
-                - <a href="/dataverse.xhtml?id={{ card_info.parentId }}">{{ card_info.parentName }} Dataverse</a>
+                - <a href="/dataverse.xhtml?id={{ card_info.parentId }}">{{ card_info.parentName }}</a>
             </span>
             <span class="resultDatasetCitationBlock{%if card_info.is_deaccesioned %} bg-danger{% else %} bg-citation {% endif %}">
                 {%if card_info.citationHtml %}{{ card_info.citationHtml|safe }}{% else %}{{ card_info.citation|safe }}{% endif %}</span>

diff --git a/src/main/webapp/search-include-fragment.xhtml b/src/main/webapp/search-include-fragment.xhtml
@@ -445,8 +445,8 @@
                             <span class="icon-dataverse text-brand pull-right" title="#{bundle.dataverse}"/>
                             <c:set var="dvUrl" value="#{dataversePage}?alias=#{result.dataverseAlias}"/>
                             <h:outputLink value="#{!SearchIncludeFragment.rootDv and !result.isInTree ? dvUrl : widgetWrapper.wrapURL(dvUrl)}" target="#{!SearchIncludeFragment.rootDv and !result.isInTree and widgetWrapper.widgetView ? '_blank' : ''}">
-                                <h:outputText value="#{result.name} #{bundle.dataverse}" style="padding:4px 0;" rendered="#{result.nameHighlightSnippet == null}"/>
-                                <h:outputText value="#{result.nameHighlightSnippet} #{bundle.dataverse}" style="padding:4px 0;" rendered="#{result.nameHighlightSnippet != null}" escape="false"/>
+                                <h:outputText value="#{result.name}" style="padding:4px 0;" rendered="#{result.nameHighlightSnippet == null}"/>
+                                <h:outputText value="#{result.nameHighlightSnippet}" style="padding:4px 0;" rendered="#{result.nameHighlightSnippet != null}" escape="false"/>
                                 <h:outputText value=" (#{result.entityId})" style="padding:4px 0;" rendered="#{SearchIncludeFragment.debug == true}"/>
                             </h:outputLink>
                             <h:outputText value="(#{result.dataverseAffiliation})" styleClass="text-muted" style="margin-left: .5em;" rendered="#{!empty result.dataverseAffiliation and result.dataverseAffiliationHighlightSnippet == null}"/>
@@ -526,7 +526,7 @@
 
                         <c:set var="dvParentAlias" value="#{dataversePage}?alias=#{result.dataverseAlias}"/>
                         <h:outputLink value="#{!SearchIncludeFragment.rootDv and !result.isInTree ? dvParentAlias : widgetWrapper.wrapURL(dvParentAlias)}" target="#{(!SearchIncludeFragment.rootDv and !result.isInTree and widgetWrapper.widgetView) or result.harvested ? '_blank' : ''}" rendered="#{result.parent.id != SearchIncludeFragment.dataverse.id}">
-                            <h:outputText value="#{result.parent.get('name')} #{bundle.dataverse}"/>
+                            <h:outputText value="#{result.parent.get('name')}"/>
                         </h:outputLink>
 
                         <div class="resultDatasetCitationBlock #{result.deaccessionedState ? 'alert alert-danger bg-danger' : 'alert alert-info bg-citation'}">

diff --git a/src/test/java/edu/harvard/iq/dataverse/dataverse/DataverseUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/dataverse/DataverseUtilTest.java
@@ -0,0 +1,16 @@
+package edu.harvard.iq.dataverse.dataverse;
+
+import edu.harvard.iq.dataverse.mocks.MocksFactory;
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
+public class DataverseUtilTest {
+
+    @Test
+    public void testGetSuggestedDataverseNameOnCreate() {
+        System.out.println("getSuggestedDataverseNameOnCreate");
+        assertEquals(null, DataverseUtil.getSuggestedDataverseNameOnCreate(null));
+        assertEquals("Homer Simpson Dataverse", DataverseUtil.getSuggestedDataverseNameOnCreate(MocksFactory.makeAuthenticatedUser("Homer", "Simpson")));
+    }
+
+}
diff --git a/src/test/java/edu/harvard/iq/dataverse/util/BundleUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/util/BundleUtilTest.java
@@ -63,7 +63,7 @@ public void testGetStringFromBundleWithArguments() {
                 + "converted to use your institutional log in. After converting, you will only need to use your institutional log in.",
                 BundleUtil.getStringFromBundle("shib.welcomeExistingUserMessage",
                         Arrays.asList(BundleUtil.getStringFromBundle("shib.welcomeExistingUserMessageDefaultInstitution"))));
-        assertEquals("Welcome to Root Dataverse! Get started by adding or finding data. "
+        assertEquals("Welcome to Root! Get started by adding or finding data. "
                 + "Have questions? Check out the <a href=\"http://guides.dataverse.org/en/4.3/user/index.html\">User Guide</a>."
                 + " Want to test out Dataverse features? Use our <a href=\"https://demo.dataverse.org\">Demo Site</a>."
                 + " Also, check for your welcome email to verify your address.",