From 740496bca66c84798c005b28e87e7e4f2cad8cd7 Mon Sep 17 00:00:00 2001 From: Emna Zouaghi Date: Wed, 18 Apr 2018 10:22:56 +0100 Subject: [PATCH 1/5] fix/PLF-7973 : address of a site in .bzh is not accepted --- .../org/exoplatform/social/user/form/UIEditUserProfileForm.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/portlet/src/main/java/org/exoplatform/social/user/form/UIEditUserProfileForm.java b/webapp/portlet/src/main/java/org/exoplatform/social/user/form/UIEditUserProfileForm.java index 550638783c..44f6a9040e 100644 --- a/webapp/portlet/src/main/java/org/exoplatform/social/user/form/UIEditUserProfileForm.java +++ b/webapp/portlet/src/main/java/org/exoplatform/social/user/form/UIEditUserProfileForm.java @@ -85,7 +85,7 @@ public class UIEditUserProfileForm extends UIForm { "(((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\." + // IPAddress "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))|" + // IPAddress "(?:(?:[-\\p{L}\\p{Digit}\\+\\$\\-\\*\\=]+\\.)+" + - "(?:com|org|net|edu|gov|mil|biz|info|mobi|name|aero|jobs|museum|travel|asia|cat|coop|int|pro|tel|xxx|[a-z]{2}))))|" + //Domain + "(?:com|org|net|edu|gov|mil|biz|bzh|info|mobi|name|aero|jobs|museum|travel|asia|cat|coop|int|pro|tel|xxx|[a-z]{2}))))|" + //Domain "(?:(?:(?:ht)tp(?:s?)\\:\\/\\/)(?:\\w+:\\w+@)?(?:[-\\p{L}\\p{Digit}\\+\\$\\-\\*\\=]+))" + // Protocol with hostname ")" + "(?::[\\d]{1,5})?" + // port From 7c660be1b22d5957af07ac6c27ae31cb1407c2fe Mon Sep 17 00:00:00 2001 From: Emna Zouaghi Date: Wed, 18 Apr 2018 12:35:03 +0100 Subject: [PATCH 2/5] fix/PLF-7973 : address of a site in .bzh is not accepted --- .../org/exoplatform/social/user/form/UIEditUserProfileForm.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/portlet/src/main/java/org/exoplatform/social/user/form/UIEditUserProfileForm.java b/webapp/portlet/src/main/java/org/exoplatform/social/user/form/UIEditUserProfileForm.java index 44f6a9040e..cf20490ea1 100644 --- a/webapp/portlet/src/main/java/org/exoplatform/social/user/form/UIEditUserProfileForm.java +++ b/webapp/portlet/src/main/java/org/exoplatform/social/user/form/UIEditUserProfileForm.java @@ -85,7 +85,7 @@ public class UIEditUserProfileForm extends UIForm { "(((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\." + // IPAddress "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))|" + // IPAddress "(?:(?:[-\\p{L}\\p{Digit}\\+\\$\\-\\*\\=]+\\.)+" + - "(?:com|org|net|edu|gov|mil|biz|bzh|info|mobi|name|aero|jobs|museum|travel|asia|cat|coop|int|pro|tel|xxx|[a-z]{2}))))|" + //Domain + "(?:[a-z]{2,}))))|" + //Domain "(?:(?:(?:ht)tp(?:s?)\\:\\/\\/)(?:\\w+:\\w+@)?(?:[-\\p{L}\\p{Digit}\\+\\$\\-\\*\\=]+))" + // Protocol with hostname ")" + "(?::[\\d]{1,5})?" + // port From 9f44a24070bcb3af062af08a2458ff954ed9b125 Mon Sep 17 00:00:00 2001 From: Emna Zouaghi Date: Wed, 18 Apr 2018 17:23:07 +0100 Subject: [PATCH 3/5] fix/PLF-7521 : [Regression][Default-Skin] Space description is not ellipsis with three points when its too long --- .../webapp/javascript/eXo/social/SocialUtil.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/webapp/resources/src/main/webapp/javascript/eXo/social/SocialUtil.js b/webapp/resources/src/main/webapp/javascript/eXo/social/SocialUtil.js index 08661adbe8..cb901fe875 100644 --- a/webapp/resources/src/main/webapp/javascript/eXo/social/SocialUtil.js +++ b/webapp/resources/src/main/webapp/javascript/eXo/social/SocialUtil.js @@ -388,14 +388,16 @@ } }, multipleLineEllipsis : function(selector) { - $(selector).each(function(i,elem) { - var elemChild = elem.querySelector('p'); - if(!elemChild) return; - var elemHeight = elem.clientHeight; - while (elemChild.offsetHeight > elemHeight) { - elemChild.textContent = elemChild.textContent.replace(/\W*\s(\S)*$/, '...'); - } - }); + $(elem).each(function(i){ + $(this).wrapInner(""); + var p=$(this).find(".mlto"); + var divh = $(this).height(); + while($(p).outerHeight()>divh) { + $(p).text(function (index, text) { + return text.replace(/\W*\s(\S)*$/, '...'); + }); + } + }) } }; From b92d48c018b4e37d253e0bc6ca5cee07674a452d Mon Sep 17 00:00:00 2001 From: Emna Zouaghi Date: Wed, 18 Apr 2018 17:50:44 +0100 Subject: [PATCH 4/5] fix/PLF-7521 : [Regression][Default-Skin] Space description is not ellipsis with three points when its too long --- .../webapp/groovy/social/webui/space/UIManageAllSpaces.gtmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension/war/src/main/webapp/groovy/social/webui/space/UIManageAllSpaces.gtmpl b/extension/war/src/main/webapp/groovy/social/webui/space/UIManageAllSpaces.gtmpl index d6caf9f0c2..4d5dd53afb 100644 --- a/extension/war/src/main/webapp/groovy/social/webui/space/UIManageAllSpaces.gtmpl +++ b/extension/war/src/main/webapp/groovy/social/webui/space/UIManageAllSpaces.gtmpl @@ -162,7 +162,7 @@ import org.exoplatform.social.core.service.LinkProvider;
$fieldLabelMembers <%= SpaceUtils.countMembers(space) %>
-

+

<% if (space.description != null && !space.description.isEmpty()) { print(space.description); } else { From 90c991dc9fc52bc121ddf5b633b065512f6e69eb Mon Sep 17 00:00:00 2001 From: Emna Zouaghi Date: Mon, 30 Apr 2018 12:36:27 +0100 Subject: [PATCH 5/5] fix/PLF-7521 : [Regression][Default-Skin] Space description is not ellipsis with three points when its too long --- .../webui/space/UIManageAllSpaces.gtmpl | 2 +- .../javascript/eXo/social/SocialUtil.js | 22 +++++++++---------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/extension/war/src/main/webapp/groovy/social/webui/space/UIManageAllSpaces.gtmpl b/extension/war/src/main/webapp/groovy/social/webui/space/UIManageAllSpaces.gtmpl index 4d5dd53afb..d6caf9f0c2 100644 --- a/extension/war/src/main/webapp/groovy/social/webui/space/UIManageAllSpaces.gtmpl +++ b/extension/war/src/main/webapp/groovy/social/webui/space/UIManageAllSpaces.gtmpl @@ -162,7 +162,7 @@ import org.exoplatform.social.core.service.LinkProvider;

$fieldLabelMembers <%= SpaceUtils.countMembers(space) %>
-

+

<% if (space.description != null && !space.description.isEmpty()) { print(space.description); } else { diff --git a/webapp/resources/src/main/webapp/javascript/eXo/social/SocialUtil.js b/webapp/resources/src/main/webapp/javascript/eXo/social/SocialUtil.js index cb901fe875..09dee816c5 100644 --- a/webapp/resources/src/main/webapp/javascript/eXo/social/SocialUtil.js +++ b/webapp/resources/src/main/webapp/javascript/eXo/social/SocialUtil.js @@ -387,18 +387,16 @@ }); } }, - multipleLineEllipsis : function(selector) { - $(elem).each(function(i){ - $(this).wrapInner(""); - var p=$(this).find(".mlto"); - var divh = $(this).height(); - while($(p).outerHeight()>divh) { - $(p).text(function (index, text) { - return text.replace(/\W*\s(\S)*$/, '...'); - }); - } - }) - } + multipleLineEllipsis : function(selector) { + $(selector).each(function(i,elem) { + var elemChild = elem.querySelector('p'); + if(!elemChild) return; + var elemHeight = elem.clientHeight; + while (elemChild.offsetHeight > elemHeight) { + elemChild.textContent = elemChild.textContent.replace(/\W*\s(\S)*$/, '...'); + } + }); + } }; PopupConfirmation = {