Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/save attachment #19

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Fix/save attachment #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f0f652b
Added local configuration
NickEngineer Dec 19, 2019
6ea016d
Fixed Outlook Save Attachments js error (missed var) and added vertic…
NickEngineer Dec 20, 2019
5c2a616
Cleared local configuration
NickEngineer Dec 23, 2019
b67be48
Avoided style reformatting (outlook.css)
NickEngineer Dec 23, 2019
407f732
Fixed Saved Attachment localization (added 'in')
NickEngineer Dec 23, 2019
0b60b72
Fixed templates result status block alignment
NickEngineer Dec 26, 2019
6746cc3
Corrected brandBar position (defined the bottom position by setting t…
NickEngineer Dec 27, 2019
602b655
Commented the link for Office.context.mailbox.item.addFileAttachmentA…
NickEngineer Dec 31, 2019
27fee3c
Added margin for .messageEditorIframe body (corrected intervals for t…
NickEngineer Dec 31, 2019
9b21033
Corrected outlook-brand-bar position (set fixed position in order to …
NickEngineer Jan 2, 2020
dfc9b63
Added default images for users in the People menu
NickEngineer Jan 3, 2020
18811b2
Corrected latest activities displaying (the date and title displaying)
NickEngineer Jan 3, 2020
ce4a7ec
Corrected eXo Platform -> People (user default icons changed, forgott…
NickEngineer Jan 3, 2020
342e426
Added getRelationshipsByStatus limit: 50
NickEngineer Jan 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion webapp/src/main/java/org/exoplatform/outlook/portlet/Outlook.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1932,7 +1932,7 @@ private RealtimeListAccess<ExoSocialActivity> getActivity(String name) throws Ex
@Deprecated
private List<Relationship> getRelationships(String name) throws Exception {
Identity userIdentity = identityManager.getOrCreateIdentity(OrganizationIdentityProvider.NAME, name, true);
List<Relationship> relationships = relationshipManager.getRelationshipsByStatus(userIdentity, CONFIRMED, 0, 0);
List<Relationship> relationships = relationshipManager.getRelationshipsByStatus(userIdentity, CONFIRMED, 0, 50);
return relationships;
}

Expand Down
2 changes: 1 addition & 1 deletion webapp/src/main/java/org/exoplatform/outlook/portlet/templates/addAttachment.gtmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@

<div id="attaching" class="ms-Grid-row centered" style="display: none;">
<div class="ms-Grid-col ms-u-sm1 ms-u-md2 ms-u-lg2"></div>
<div class="ms-Grid-col ms-u-sm8 text-centered">
<div class="ms-Grid-col ms-u-sm10 text-centered">
<div>&{Outlook.addingAttachment}</div>
<div class="ms-Spinner" style="display: inline-block;"></div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions webapp/src/main/java/org/exoplatform/outlook/portlet/templates/convertToForum.gtmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@

<div id="converting" class="ms-Grid-row centered" style="display: none;">
<div class="ms-Grid-col ms-u-sm1 ms-u-md2 ms-u-lg2"></div>
<div class="ms-Grid-col ms-u-sm8 text-centered">
<div class="ms-Grid-col ms-u-sm10 text-centered">
<div>&{Outlook.convertingToForum}</div>
<div class="ms-Spinner" style="display: inline-block;"></div>
</div>
<div class="ms-Grid-col ms-u-sm1 ms-u-md2 ms-u-lg2"></div>
</div>
<div id="converted" class="ms-Grid-row" style="display: none;">
<div class="ms-Grid-col ms-u-sm1 ms-u-md2 ms-u-lg2"></div>
<div class="ms-Grid-col ms-u-sm8">
<div class="ms-Grid-col ms-u-sm10">
<div class="convertedInfo"></div>
</div>
<div class="ms-Grid-col ms-u-sm1 ms-u-md2 ms-u-lg2"></div>
Expand Down
4 changes: 2 additions & 2 deletions webapp/src/main/java/org/exoplatform/outlook/portlet/templates/convertToStatus.gtmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@

<div id="converting" class="ms-Grid-row centered" style="display: none;">
<div class="ms-Grid-col ms-u-sm1 ms-u-md2 ms-u-lg2"></div>
<div class="ms-Grid-col ms-u-sm8 text-centered">
<div class="ms-Grid-col ms-u-sm10 text-centered">
<div>&{Outlook.convertingToStatus}</div>
<div class="ms-Spinner" style="display: inline-block;"></div>
</div>
<div class="ms-Grid-col ms-u-sm1 ms-u-md2 ms-u-lg2"></div>
</div>
<div id="converted" class="ms-Grid-row" style="display: none;">
<div class="ms-Grid-col ms-u-sm1 ms-u-md2 ms-u-lg2"></div>
<div class="ms-Grid-col ms-u-sm8">
<div class="ms-Grid-col ms-u-sm10">
<div class="convertedInfo"></div>
</div>
<div class="ms-Grid-col ms-u-sm1 ms-u-md2 ms-u-lg2"></div>
Expand Down
4 changes: 2 additions & 2 deletions webapp/src/main/java/org/exoplatform/outlook/portlet/templates/convertToWiki.gtmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@

<div id="converting" class="ms-Grid-row centered" style="display: none;">
<div class="ms-Grid-col ms-u-sm1 ms-u-md2 ms-u-lg2"></div>
<div class="ms-Grid-col ms-u-sm8 text-centered">
<div class="ms-Grid-col ms-u-sm10 text-centered">
<div>&{Outlook.convertingToWiki}</div>
<div class="ms-Spinner" style="display: inline-block;"></div>
</div>
<div class="ms-Grid-col ms-u-sm1 ms-u-md2 ms-u-lg2"></div>
</div>
<div id="converted" class="ms-Grid-row" style="display: none;">
<div class="ms-Grid-col ms-u-sm1 ms-u-md2 ms-u-lg2"></div>
<div class="ms-Grid-col ms-u-sm8">
<div class="ms-Grid-col ms-u-sm10">
<div class="convertedInfo"></div>
</div>
<div class="ms-Grid-col ms-u-sm1 ms-u-md2 ms-u-lg2"></div>
Expand Down
4 changes: 2 additions & 2 deletions webapp/src/main/java/org/exoplatform/outlook/portlet/templates/postStatus.gtmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@

<div id="posting" class="ms-Grid-row centered" style="display: none;">
<div class="ms-Grid-col ms-u-sm1 ms-u-md2 ms-u-lg2"></div>
<div class="ms-Grid-col ms-u-sm8 text-centered">
<div class="ms-Grid-col ms-u-sm10 text-centered">
<div>&{Outlook.postingStatus}</div>
<div class="ms-Spinner" style="display: inline-block;"></div>
</div>
<div class="ms-Grid-col ms-u-sm1 ms-u-md2 ms-u-lg2"></div>
</div>
<div id="posted" class="ms-Grid-row" style="display: none;">
<div class="ms-Grid-col ms-u-sm1 ms-u-md2 ms-u-lg2"></div>
<div class="ms-Grid-col ms-u-sm8">
<div class="ms-Grid-col ms-u-sm10">
<div class="postedInfo"></div>
</div>
<div class="ms-Grid-col ms-u-sm1 ms-u-md2 ms-u-lg2"></div>
Expand Down
4 changes: 2 additions & 2 deletions webapp/src/main/java/org/exoplatform/outlook/portlet/templates/search.gtmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,15 @@

<div id="searching" class="ms-Grid-row centered" style="display: none;">
<div class="ms-Grid-col ms-u-sm1 ms-u-md2 ms-u-lg2"></div>
<div class="ms-Grid-col ms-u-sm8 text-centered">
<div class="ms-Grid-col ms-u-sm10 text-centered">
<div>&{Outlook.searching}</div>
<div class="ms-Spinner" style="display: inline-block;"></div>
</div>
<div class="ms-Grid-col ms-u-sm1 ms-u-md2 ms-u-lg2"></div>
</div>
<div id="search-result" class="ms-Grid-row" style="display: none;">
<div class="ms-Grid-col ms-u-sm1 ms-u-md2 ms-u-lg2"></div>
<div class="ms-Grid-col ms-u-sm8">
<div class="ms-Grid-col ms-u-sm10">
<div class="searchResult"></div>
</div>
<div class="ms-Grid-col ms-u-sm1 ms-u-md2 ms-u-lg2"></div>
Expand Down
4 changes: 2 additions & 2 deletions webapp/src/main/java/org/exoplatform/outlook/portlet/templates/startDiscussion.gtmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,15 @@

<div id="starting" class="ms-Grid-row centered" style="display: none;">
<div class="ms-Grid-col ms-u-sm1 ms-u-md2 ms-u-lg2"></div>
<div class="ms-Grid-col ms-u-sm8 text-centered">
<div class="ms-Grid-col ms-u-sm10 text-centered">
<div>&{Outlook.creatingTopic}</div>
<div class="ms-Spinner" style="display: inline-block;"></div>
</div>
<div class="ms-Grid-col ms-u-sm1 ms-u-md2 ms-u-lg2"></div>
</div>
<div id="started" class="ms-Grid-row" style="display: none;">
<div class="ms-Grid-col ms-u-sm1 ms-u-md2 ms-u-lg2"></div>
<div class="ms-Grid-col ms-u-sm8">
<div class="ms-Grid-col ms-u-sm10">
<div class="startedInfo"></div>
</div>
<div class="ms-Grid-col ms-u-sm1 ms-u-md2 ms-u-lg2"></div>
Expand Down
5 changes: 4 additions & 1 deletion webapp/src/main/java/org/exoplatform/outlook/portlet/templates/userInfoConnections.gtmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,16 @@
<div class="ms-Persona-compase">
<div class="ms-Persona-imageArea">
<div class="ms-Persona-initials ms-Persona-initials--darkBlue">
<i class="ms-Icon ms-Icon--person default-user-icon"></i>
<font style="vertical-align: inherit;">
<font style="vertical-align: inherit;">
${conn.firstName}${conn.lastName}
</font>
</font>
</div>
<img class="ms-Persona-image" src="${conn.avatarUrl}">
<% if (conn.avatarUrl) { %>
<img class="ms-Persona-image" src="${conn.avatarUrl}">
<% } %>
</div>
<div class="ms-Persona-details less-details">
<div class="ms-Persona-primaryText">
Expand Down
19 changes: 13 additions & 6 deletions webapp/src/main/java/org/exoplatform/outlook/portlet/templates/userInfoDetails.gtmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,15 @@
<ul class="ms--list">
<% if (activity.title) { %>
<li class="activity-title">
<a href="${activity.link}" class="ms-Link ms-font-m-plus ms-fwt-sl ms-fcl-np a-link"
target="_blank">
${activity.title}</a>
<div class="activity-link-shell">
<a href="${activity.link}" class="ms-Link ms-font-m-plus ms-fwt-sl ms-fcl-np a-link"
target="_blank">
${activity.title}</a>
</div>
</li>
<% } %>
<% if (activity.postedDate) { %>
<time class=" ms-fwt-sl ms-fcl-ns postedDate">${activity.postedDate}</time>
<time class=" ms-fwt-sl ms-fcl-ns postedDate">${activity.postedDate}</time>
<% } %>
<% } %>
</ul>
</div>
Expand All @@ -45,11 +47,14 @@
<div class="ms-Persona">
<div class="ms-Persona-imageArea">
<div class="ms-Persona-initials ms-Persona-initials--darkBlue">
<i class="ms-Icon ms-Icon--person default-user-icon"></i>
<font style="vertical-align: inherit;"><font style="vertical-align: inherit;">
${conn.firstName}${conn.lastName}</font>
</font>
</div>
<img class="ms-Persona-image" src="${conn.avatarUrl}">
<% if (conn.avatarUrl) { %>
<img class="ms-Persona-image" src="${conn.avatarUrl}">
<% } %>
</div>
<div class="ms-Persona-details">
<div class="ms-Persona-primaryText">
Expand All @@ -75,6 +80,7 @@
</div>
</li>
<li class="ms-PersonaCard-actionDetails detail-6 contact-detail personalPhones">
<div class="ms-PersonaCard-detailLine">
<% if (userDet.isPhoneNumberPresent()) { %>
<span class="ms-PersonaCard-detailLabel">&{Outlook.phone}</span>
<% userDet.getPhones().each { phName, phNumber -> %>
Expand Down Expand Up @@ -130,6 +136,7 @@
<% } else { %>
<span class="ms-PersonaCard-detailLabel">&{Outlook.noInfo}</span>
<% } %>
</div>
</li>
<li class="ms-PersonaCard-actionDetails detail-6 contact-detail personalIms">
<div class="ms-PersonaCard-detailLine">
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/main/resources/locale/outlook/Outlook.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<pathAddDescription>Create a new folder</pathAddDescription>
<pathOpenDescription>Open in new window</pathOpenDescription>
<savingAttachment>Saving your files...</savingAttachment>
<savedAttachment>Your files were successfully saved</savedAttachment>
<savedAttachment>Your files were successfully saved in</savedAttachment>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We already have i18n string for in text - <in>in</in>, is it not used? This text should not be changed and if but not this way to fix it.

Copy link
Author

@NickEngineer NickEngineer Dec 23, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<in>in</in> isn't used anywhere (about savedAttachment context). That's why the "in" added here.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

<savedClickToOpen>Click a file in the list below to open it inside the intranet</savedClickToOpen>
<addingNewFolder>Adding new folder</addingNewFolder>
<enterFolderNameAndCreate>Provide a name for this new folder and then click "Add".</enterFolderNameAndCreate>
Expand Down
Loading