SAK-23795 Cut site titles in preferences in the same way as in tabs.

git-svn-id: https://source.sakaiproject.org/svn/user/trunk@311753 66ffb92e-73f9-0310-93c1-f5514f145a0a
aagrandaz · Aug 8, 2014 · 50fea4b · 50fea4b
1 parent 23d228a
commit 50fea4b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/user/user-tool-prefs/tool/src/java/org/sakaiproject/user/tool/UserPrefsTool.java b/user/user-tool-prefs/tool/src/java/org/sakaiproject/user/tool/UserPrefsTool.java
@@ -64,7 +64,7 @@
 import org.sakaiproject.user.api.UserNotificationPreferencesRegistration;
 import org.sakaiproject.user.api.UserNotificationPreferencesRegistrationService;
 import org.sakaiproject.util.ResourceLoader;
-
+import org.sakaiproject.util.FormattedText;
 
 /**
  * UserPrefsTool is the Sakai end-user tool to view and edit one's preferences.
@@ -1193,10 +1193,10 @@ public String processActionEdit()
 			SelectItem excludeItem = null;
 
 			if ("1".equals(sitetablabel)) {
-			    excludeItem = new SelectItem(element.getId(), element.getTitle());
+			    excludeItem = new SelectItem(element.getId(), FormattedText.makeShortenedText(element.getTitle(),null,null,null),element.getTitle());
 			}
 			else {
-			    excludeItem = new SelectItem(element.getId(), shortdesc);
+			    excludeItem = new SelectItem(element.getId(), FormattedText.makeShortenedText(shortdesc,null,null,null), shortdesc);
 			}
 			prefExcludeItems.add(excludeItem);
 		}
@@ -1213,10 +1213,10 @@ public String processActionEdit()
 
 			SelectItem orderItem = null;
 			if ("1".equals(sitetablabel)) {
-			    orderItem = new SelectItem(element.getId(), element.getTitle());
+			    orderItem = new SelectItem(element.getId(), FormattedText.makeShortenedText(element.getTitle(),null,null,null), element.getTitle());
 			}
 			else {
-			    orderItem = new SelectItem(element.getId(), shortdesc);
+			    orderItem = new SelectItem(element.getId(), FormattedText.makeShortenedText(shortdesc,null,null,null), shortdesc);
 			}
 
 			prefOrderItems.add(orderItem);

diff --git a/user/user-tool-prefs/tool/src/webapp/prefs/tab.jsp b/user/user-tool-prefs/tool/src/webapp/prefs/tab.jsp
@@ -141,7 +141,7 @@ if ( inIframe() ) {
                  <f:verbatim>">
                       <div class="demoSelector-layoutReorderer layoutReorderer-module-dragbar">
 		</f:verbatim>
-                <t:outputText value="#{item.label}" styleClass="siteLabel"></t:outputText>
+                <t:outputText value="#{item.label}" styleClass="siteLabel" title="#{item.description}"></t:outputText>
                 <f:verbatim>
                     <div class="checkBoxContainer">
                     <input type="checkbox" class="selectSiteCheck" title="
@@ -172,7 +172,7 @@ if ( inIframe() ) {
                  <f:verbatim>">
                       <div class="demoSelector-layoutReorderer layoutReorderer-module-dragbar">
 		</f:verbatim>
-                <t:outputText value="#{item.label}" styleClass="siteLabel"></t:outputText>
+                <t:outputText value="#{item.label}" styleClass="siteLabel" title="#{item.description}"></t:outputText>
                 <f:verbatim>
                     <div class="checkBoxContainer">
                     <input type="checkbox" class="selectSiteCheck" title="
@@ -201,7 +201,7 @@ if ( inIframe() ) {
                  <f:verbatim>">
                       <div class="demoSelector-layoutReorderer layoutReorderer-module-dragbar">
 		</f:verbatim>
-                <t:outputText value="#{item.label}" styleClass="siteLabel"></t:outputText>
+                <t:outputText value="#{item.label}" styleClass="siteLabel" title="#{item.description}"></t:outputText>
                 <f:verbatim>
                     <div class="checkBoxContainer">
                     <input type="checkbox" class="selectSiteCheck" title="