From f0f652bd2ac9ef728074f666d41fd229c9508cb9 Mon Sep 17 00:00:00 2001 From: Nick Riabovol Date: Thu, 19 Dec 2019 10:42:02 +0200 Subject: [PATCH 01/14] Added local configuration --- webapp/src/main/webapp/WEB-INF/conf/configuration.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webapp/src/main/webapp/WEB-INF/conf/configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/configuration.xml index 0682dd2c..ff30239d 100644 --- a/webapp/src/main/webapp/WEB-INF/conf/configuration.xml +++ b/webapp/src/main/webapp/WEB-INF/conf/configuration.xml @@ -37,13 +37,13 @@ org.exoplatform.outlook.jcr.ContentLink org.exoplatform.outlook.jcr.ContentLink - + From 6ea016d3228b5af72b9ec5a579c0f02bcd534257 Mon Sep 17 00:00:00 2001 From: Nick Riabovol Date: Fri, 20 Dec 2019 11:13:19 +0200 Subject: [PATCH 02/14] Fixed Outlook Save Attachments js error (missed var) and added vertical alignment for icons of the field in Destination folder block (.currentFolder) --- webapp/src/main/webapp/js/outlook.js | 2 +- webapp/src/main/webapp/skin/outlook.css | 41 +++++++++++++++---------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/webapp/src/main/webapp/js/outlook.js b/webapp/src/main/webapp/js/outlook.js index a82f70b0..f09aec59 100644 --- a/webapp/src/main/webapp/js/outlook.js +++ b/webapp/src/main/webapp/js/outlook.js @@ -834,7 +834,7 @@ require(["SHARED/jquery", "SHARED/outlookFabricUI", "SHARED/outlookJqueryUI", "S var item = Office.context.mailbox.item; if (item.attachments.length > 0) { - for (i = 0; i < item.attachments.length; i++) { + for (var i = 0; i < item.attachments.length; i++) { var att = item.attachments[i]; var $li = $("
  • " + att.name + "" // diff --git a/webapp/src/main/webapp/skin/outlook.css b/webapp/src/main/webapp/skin/outlook.css index d2111e6d..0a023ba4 100644 --- a/webapp/src/main/webapp/skin/outlook.css +++ b/webapp/src/main/webapp/skin/outlook.css @@ -3,7 +3,7 @@ body { padding: 0; } -.logoIcon* { +.logoIcon * { display: inline-block; } @@ -36,7 +36,7 @@ body { } /* It is a workaround to do not show dropdown in right-upper corner in task pane of Outlook for Windows/Web */ -@media ( min-width : 280px) { +@media ( min-width: 280px) { #outlook-pane .ms-Dropdown-items { top: auto; right: auto; @@ -44,13 +44,14 @@ body { left: auto; max-width: 100%; } + #outlook-pane .ms-Dropdown.ms-Dropdown--open .ms-Dropdown-items, #outlook-pane .ms-Dropdown.is-open .ms-Dropdown-items { position: absolute; } } /* Error banner (common) */ -.error-message>.ms-MessageBanner { +.error-message > .ms-MessageBanner { min-width: 290px; background-color: #fde7e9; color: #a80000; @@ -230,7 +231,7 @@ span[disabled] { display: block !important; } -#path-info>.ms-ListItem { +#path-info > .ms-ListItem { padding-left: 0px; padding-right: 0px; } @@ -364,17 +365,17 @@ div.form-buttons { background: -webkit-linear-gradient(top, rgba(255, 255, 255, 0) 25px, white); } -.messageEditor, .messageEditorContainer>.messageText, .statusText, .topicText { +.messageEditor, .messageEditorContainer > .messageText, .statusText, .topicText { height: 200px; overflow: hidden; padding: 0px; } -.messageEditor, .messageEditorContainer>.messageText { +.messageEditor, .messageEditorContainer > .messageText { max-height: 250px; } -.messageSubject, .messageEditorContainer>input[name='messageSubject'] { +.messageSubject, .messageEditorContainer > input[name='messageSubject'] { margin-bottom: -1px !important; } @@ -477,7 +478,7 @@ textarea[name='activityTitle'], textarea[name='comment'] { /*padding: 5px;*/ text-overflow: ellipsis; font-family: "wf_segoe-ui_semilight", "Segoe UI Semilight", "Segoe WP Semilight", "Segoe UI", "Segoe WP", Tahoma, Arial, - sans-serif; + sans-serif; } .activity { @@ -591,7 +592,7 @@ textarea[name='activityTitle'], textarea[name='comment'] { height: max-content; } -@media ( min-width : 480px) { +@media ( min-width: 480px) { #outlook-userInfo .ms-PersonaCard { /*max-width: 90%;*/ /*width: 80%;*/ @@ -599,9 +600,9 @@ textarea[name='activityTitle'], textarea[name='comment'] { } } -@media ( max-width : 480px) { +@media ( max-width: 480px) { #outlook-userInfo .ms-Persona-imageArea, #outlook-userInfo .ms-Persona-image, #outlook-userInfo .ms-Persona-imageArea, - #outlook-userInfo .ms-Persona-image { + #outlook-userInfo .ms-Persona-image { /*min-height: 48px;*/ /*min-width: 48px;*/ /*width: 100%;*/ @@ -738,15 +739,17 @@ textarea[name='activityTitle'], textarea[name='comment'] { .add-btn span { position: absolute; - top: 50%; margin-top: -4px; - left: 50%; margin-left: -1px; + top: 50%; + margin-top: -4px; + left: 50%; + margin-left: -1px; width: 3px; height: 14px; background-color: #0078d7; transition: 0.5s; } -.add-btn span::before{ +.add-btn span::before { background-color: #0078d7; width: 3px; position: absolute; @@ -776,9 +779,11 @@ textarea[name='activityTitle'], textarea[name='comment'] { .ms-CommandBarSearch input { padding: 0 0 0 40px; } + .ms-Sialog-Compose { display: flex; } + .ms-Persona-compase { display: contents; } @@ -823,10 +828,14 @@ textarea[name='activityTitle'], textarea[name='comment'] { } .connections { - position: relative; - transition: 2s; + position: relative; + transition: 2s; } .compose-Persona { margin: 10px 15px 10px 0; } + +.currentFolder .pathControls .ms-ListItem-action .ms-Icon { + vertical-align: middle; +} \ No newline at end of file From 5c2a6164a8a10392c42558e1a4e06f83a429aaf4 Mon Sep 17 00:00:00 2001 From: Nick Riabovol Date: Mon, 23 Dec 2019 16:23:54 +0200 Subject: [PATCH 03/14] Cleared local configuration --- webapp/src/main/webapp/WEB-INF/conf/configuration.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webapp/src/main/webapp/WEB-INF/conf/configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/configuration.xml index ff30239d..0682dd2c 100644 --- a/webapp/src/main/webapp/WEB-INF/conf/configuration.xml +++ b/webapp/src/main/webapp/WEB-INF/conf/configuration.xml @@ -37,13 +37,13 @@ org.exoplatform.outlook.jcr.ContentLink org.exoplatform.outlook.jcr.ContentLink - + From b67be486fc0ac5d57677c37e89b05827e126a4cd Mon Sep 17 00:00:00 2001 From: Nick Riabovol Date: Mon, 23 Dec 2019 16:29:35 +0200 Subject: [PATCH 04/14] Avoided style reformatting (outlook.css) --- webapp/src/main/webapp/skin/outlook.css | 37 +++++++++++-------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/webapp/src/main/webapp/skin/outlook.css b/webapp/src/main/webapp/skin/outlook.css index 0a023ba4..2dcdeb8b 100644 --- a/webapp/src/main/webapp/skin/outlook.css +++ b/webapp/src/main/webapp/skin/outlook.css @@ -3,7 +3,7 @@ body { padding: 0; } -.logoIcon * { +.logoIcon* { display: inline-block; } @@ -36,7 +36,7 @@ body { } /* It is a workaround to do not show dropdown in right-upper corner in task pane of Outlook for Windows/Web */ -@media ( min-width: 280px) { +@media ( min-width : 280px) { #outlook-pane .ms-Dropdown-items { top: auto; right: auto; @@ -44,14 +44,13 @@ body { left: auto; max-width: 100%; } - #outlook-pane .ms-Dropdown.ms-Dropdown--open .ms-Dropdown-items, #outlook-pane .ms-Dropdown.is-open .ms-Dropdown-items { position: absolute; } } /* Error banner (common) */ -.error-message > .ms-MessageBanner { +.error-message>.ms-MessageBanner { min-width: 290px; background-color: #fde7e9; color: #a80000; @@ -231,7 +230,7 @@ span[disabled] { display: block !important; } -#path-info > .ms-ListItem { +#path-info>.ms-ListItem { padding-left: 0px; padding-right: 0px; } @@ -365,17 +364,17 @@ div.form-buttons { background: -webkit-linear-gradient(top, rgba(255, 255, 255, 0) 25px, white); } -.messageEditor, .messageEditorContainer > .messageText, .statusText, .topicText { +.messageEditor, .messageEditorContainer>.messageText, .statusText, .topicText { height: 200px; overflow: hidden; padding: 0px; } -.messageEditor, .messageEditorContainer > .messageText { +.messageEditor, .messageEditorContainer>.messageText { max-height: 250px; } -.messageSubject, .messageEditorContainer > input[name='messageSubject'] { +.messageSubject, .messageEditorContainer>input[name='messageSubject'] { margin-bottom: -1px !important; } @@ -478,7 +477,7 @@ textarea[name='activityTitle'], textarea[name='comment'] { /*padding: 5px;*/ text-overflow: ellipsis; font-family: "wf_segoe-ui_semilight", "Segoe UI Semilight", "Segoe WP Semilight", "Segoe UI", "Segoe WP", Tahoma, Arial, - sans-serif; + sans-serif; } .activity { @@ -592,7 +591,7 @@ textarea[name='activityTitle'], textarea[name='comment'] { height: max-content; } -@media ( min-width: 480px) { +@media ( min-width : 480px) { #outlook-userInfo .ms-PersonaCard { /*max-width: 90%;*/ /*width: 80%;*/ @@ -600,9 +599,9 @@ textarea[name='activityTitle'], textarea[name='comment'] { } } -@media ( max-width: 480px) { +@media ( max-width : 480px) { #outlook-userInfo .ms-Persona-imageArea, #outlook-userInfo .ms-Persona-image, #outlook-userInfo .ms-Persona-imageArea, - #outlook-userInfo .ms-Persona-image { + #outlook-userInfo .ms-Persona-image { /*min-height: 48px;*/ /*min-width: 48px;*/ /*width: 100%;*/ @@ -739,17 +738,15 @@ textarea[name='activityTitle'], textarea[name='comment'] { .add-btn span { position: absolute; - top: 50%; - margin-top: -4px; - left: 50%; - margin-left: -1px; + top: 50%; margin-top: -4px; + left: 50%; margin-left: -1px; width: 3px; height: 14px; background-color: #0078d7; transition: 0.5s; } -.add-btn span::before { +.add-btn span::before{ background-color: #0078d7; width: 3px; position: absolute; @@ -779,11 +776,9 @@ textarea[name='activityTitle'], textarea[name='comment'] { .ms-CommandBarSearch input { padding: 0 0 0 40px; } - .ms-Sialog-Compose { display: flex; } - .ms-Persona-compase { display: contents; } @@ -828,8 +823,8 @@ textarea[name='activityTitle'], textarea[name='comment'] { } .connections { - position: relative; - transition: 2s; + position: relative; + transition: 2s; } .compose-Persona { From 407f732bd1ab2d0447be18f7b6a50b54d6f7c537 Mon Sep 17 00:00:00 2001 From: Nick Riabovol Date: Mon, 23 Dec 2019 17:07:33 +0200 Subject: [PATCH 05/14] Fixed Saved Attachment localization (added 'in') --- webapp/src/main/resources/locale/outlook/Outlook.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/resources/locale/outlook/Outlook.xml b/webapp/src/main/resources/locale/outlook/Outlook.xml index 39c75e96..9121ec29 100644 --- a/webapp/src/main/resources/locale/outlook/Outlook.xml +++ b/webapp/src/main/resources/locale/outlook/Outlook.xml @@ -58,7 +58,7 @@ Create a new folder Open in new window Saving your files... - Your files were successfully saved + Your files were successfully saved in Click a file in the list below to open it inside the intranet Adding new folder Provide a name for this new folder and then click "Add". From 0b60b72f0a63285a0f16223a599b604d02bc94cf Mon Sep 17 00:00:00 2001 From: Nick Riabovol Date: Fri, 27 Dec 2019 01:49:51 +0200 Subject: [PATCH 06/14] Fixed templates result status block alignment --- .../exoplatform/outlook/portlet/templates/addAttachment.gtmpl | 2 +- .../outlook/portlet/templates/convertToForum.gtmpl | 4 ++-- .../outlook/portlet/templates/convertToStatus.gtmpl | 4 ++-- .../exoplatform/outlook/portlet/templates/convertToWiki.gtmpl | 4 ++-- .../exoplatform/outlook/portlet/templates/postStatus.gtmpl | 4 ++-- .../org/exoplatform/outlook/portlet/templates/search.gtmpl | 4 ++-- .../outlook/portlet/templates/startDiscussion.gtmpl | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/webapp/src/main/java/org/exoplatform/outlook/portlet/templates/addAttachment.gtmpl b/webapp/src/main/java/org/exoplatform/outlook/portlet/templates/addAttachment.gtmpl index 5f79382f..c8223ca6 100644 --- a/webapp/src/main/java/org/exoplatform/outlook/portlet/templates/addAttachment.gtmpl +++ b/webapp/src/main/java/org/exoplatform/outlook/portlet/templates/addAttachment.gtmpl @@ -108,7 +108,7 @@
  • +
    <% if (userDet.isPhoneNumberPresent()) { %> &{Outlook.phone} <% userDet.getPhones().each { phName, phNumber -> %> @@ -136,6 +136,7 @@ <% } else { %> &{Outlook.noInfo} <% } %> +
  • diff --git a/webapp/src/main/webapp/images/outlook-user-img.png b/webapp/src/main/webapp/images/outlook-user-img.png deleted file mode 100644 index 0bd481410d40af5bc832178b1a6cd5cd13f253aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1467 zcmaJ>dpOez7+$k!7Me>tNE($}Q<0-wlAq=>6`LeSxeUuSt6{li`VFC2?rK>h_gm31 z$0@n2s74d*L{1l{MvEPd(sW$Tob$)|?>x`L4Kyhzi~n z=PBpFH6Wn!e&+i-ik#NPc)B=3nxE;4M!1Ug!8=X;kW*OeTxWWHOn) zO~rhXK^}shlz0Rnm=@K0Hx!x|3j_ksI?WvC#gdWkddxs3wPWC8o0xWQF*zkAh21pz zh|LMHSe%>d<#fi-=?9DILhuBevc9LiKFh-qZQkDAqZMXRh~A2k>91O%kXV~Ck%-KV zgr5VX@w!BFdkst0;Mx5HzlriTX(H1f{QlSohKJZ*b@4{gw)TZwZ)!4I(7(dLVA0jZ zY|<+Ux6IO$fTG$tZ{ta&=1KWDHxw29p-0(C@rWQj9ll_cQOIF16#Dd)5=rzRSEa=G z_&`*?rH+a`$;8+NET`NA5ZlW3Wg~n80;WET^4`ok!ASIp&mt4_<(cD(YCw@&Ikq07vNbm(KuwkNwFgwY0&tU<|z$ppen3Z;=&`Ix{g@$Q0$b9z(BRZ|RSQFPJhi zIeh-%TtBvZ4R38LHa7O*1fS7=t@A0yz?d~imCXfmTTf`?U}KGs7QTHOYfv@-Q_CXs zwyP`AOc;fjj**Y_gbNqQYuC4)tw3OJ{OYCz9cCS{PpzujK{L$YV6OQ8*`#P(!k@vb z1AxOW{ZF)e=<1DEH)&?!-n@CERY0WCXrq_*w1N=s#FN>$C6`YB(CN9%4bYBLxp~(( z!U(fnyIR8&q7cw(|AMyhGcTLFmf-VYy`d`M<*XlSSMuGel5dX*BZR$|CrOP+=)_qq z@$H(rFDon2l2-m6E?lMChDxJlz|&QohoY?7+uLj6y5dq30C8;M`Sa~wrhcbR>FVkA zy+60|Zs+HrGB*2DD41ZqcB z`)jCDz{=b9C%dPuyVe7>l}(+hg}iA=#72;yai@TiTeIcp2^4o>H$QV0@yXt~>S8m7 z^-Zm^$FV%1QH<<;)i+t@u$qcLfpUX!C9v=94RLVoC*;se84D$LKg0Apf_TlTgY1^N zA@#x|hGTaQh3PTElpL@1dvAdXxAHb$F2>llmtz@;r4u<$hldsytxv`wG!>O8SYI%r zO-C*Ur(1l%J0`8iFa6TdL5dH4uKuM-km_8Xpx|frxO01$LxV6VEtt5$*Uyh!5M6$4 zXFZ&3p=~ABwV^Bv!2$NLK+}fu@db!XhmOanHtH!;Eh7N;(^(3!^(t+ghK8NoDP5b} z>Ov4pUnexQp>zwuv}jNOHSX2^5cUF04$v;W5bJMX3Uj(ew3;-qF&aSvSvWAK!?ntj zbmJBgLEWFD`10k;D>0TxK(*$%!xTODU(>_G<3H23=bw}_F0pt<92i_yRAH9xySIZ# QmOoqw-pL);>=+3C4PvjV8UO$Q diff --git a/webapp/src/main/webapp/skin/outlook.css b/webapp/src/main/webapp/skin/outlook.css index fc48b941..08845bd5 100644 --- a/webapp/src/main/webapp/skin/outlook.css +++ b/webapp/src/main/webapp/skin/outlook.css @@ -1,7 +1,3 @@ -html { - overflow: hidden; -} - body { margin: 0; padding: 0; @@ -23,12 +19,6 @@ body { min-height: 450px; position: relative; height: 100vh; - overflow: scroll; - -ms-overflow-style: none; -} - -#outlook-pane::-webkit-scrollbar { - display: none; } #outlook-pane input { @@ -493,7 +483,6 @@ textarea[name='activityTitle'], textarea[name='comment'] { text-align: left; position: relative; padding: 0px; - border-bottom: 1px solid #c8c8c8; } .activity:hover { @@ -642,7 +631,7 @@ textarea[name='activityTitle'], textarea[name='comment'] { } #outlook-userInfo .activities-list { - margin-bottom: 40px; + /*margin-bottom: 40px;*/ } .ms-Persona-initials.ms-Persona-initials--darkBlue { @@ -845,4 +834,19 @@ textarea[name='activityTitle'], textarea[name='comment'] { #UIPortalApplication #UIPLFFooterwlcmScreen #WLCFooter .footerWLC { bottom: 35px; +} + +#outlook-userInfo .ms-OrgChart-listItem { + border-bottom: none; +} + +.default-user-icon { + color: #c8c8c8; + margin-left: -7px; + background-color: white; + font-size: 60px; +} + +.ms-Persona-primaryText { + width: unset; } \ No newline at end of file From 342e4260f7746ae5cdb73824394dc9fb93eb875b Mon Sep 17 00:00:00 2001 From: Nick Riabovol Date: Tue, 28 Jan 2020 18:55:24 +0200 Subject: [PATCH 14/14] Added getRelationshipsByStatus limit: 50 --- .../src/main/java/org/exoplatform/outlook/portlet/Outlook.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/java/org/exoplatform/outlook/portlet/Outlook.java b/webapp/src/main/java/org/exoplatform/outlook/portlet/Outlook.java index c218fd6e..ac4a2ec0 100644 --- a/webapp/src/main/java/org/exoplatform/outlook/portlet/Outlook.java +++ b/webapp/src/main/java/org/exoplatform/outlook/portlet/Outlook.java @@ -1932,7 +1932,7 @@ private RealtimeListAccess getActivity(String name) throws Ex @Deprecated private List getRelationships(String name) throws Exception { Identity userIdentity = identityManager.getOrCreateIdentity(OrganizationIdentityProvider.NAME, name, true); - List relationships = relationshipManager.getRelationshipsByStatus(userIdentity, CONFIRMED, 0, 0); + List relationships = relationshipManager.getRelationshipsByStatus(userIdentity, CONFIRMED, 0, 50); return relationships; }