Skip to content

Commit 7d78889

Browse files
ealonsobrianchandotcom
ealonso
authored and
brianchandotcom
committed
LPD-98853 Update the footer documentation and announcements links
1 parent 2fd8fb6 commit 7d78889

14 files changed

Lines changed: 69 additions & 47 deletions

File tree

‎workspaces/liferay-osbfaro-workspace/modules/osb-faro-api/src/main/java/com/liferay/osb/faro/util/EmailUtil.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,14 @@ public static String getCheckIconURL() {
2121
"/o/osb-faro-web/images/email/icon_check.png");
2222
}
2323

24+
public static String getDocumentationURL(FaroProject faroProject) {
25+
if (faroProject.isDataPlatform()) {
26+
return "https://learn.liferay.com/w/liferay-data-platform/index";
27+
}
28+
29+
return "https://learn.liferay.com/en/w/analytics-cloud/index";
30+
}
31+
2432
public static String getEmailHeaderURL() {
2533
return FaroPropsValues.FARO_URL.concat(
2634
"/o/osb-faro-web/images/email/email_header.png");

‎workspaces/liferay-osbfaro-workspace/modules/osb-faro-service/src/main/java/com/liferay/osb/faro/service/impl/FaroChannelLocalServiceImpl.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -259,11 +259,11 @@ private String _getBody(
259259
getClassLoader(),
260260
"com/liferay/osb/faro/dependencies/property-invite.html"),
261261
new String[] {
262-
"[$BUTTON_TEXT$]", "[$BUTTON_URL$]", "[$EMAIL_HEADER_URL$]",
263-
"[$EMAIL_TITLE$]", "[$FARO_URL$]", "[$FOOTER_MENU_1$]",
264-
"[$FOOTER_MENU_2$]", "[$FOOTER_MENU_3$]", "[$FOOTER_MSG_1$]",
265-
"[$FOOTER_MSG_2$]", "[$FOOTER_MSG_3$]", "[$FOOTER_MSG_4$]",
266-
"[$HEADER_MSG_1$]", "[$LIFERAY_LOGO_URL$]",
262+
"[$BUTTON_TEXT$]", "[$BUTTON_URL$]", "[$DOCUMENTATION_URL$]",
263+
"[$EMAIL_HEADER_URL$]", "[$EMAIL_TITLE$]", "[$FARO_URL$]",
264+
"[$FOOTER_MENU_1$]", "[$FOOTER_MENU_2$]", "[$FOOTER_MENU_3$]",
265+
"[$FOOTER_MSG_1$]", "[$FOOTER_MSG_2$]", "[$FOOTER_MSG_3$]",
266+
"[$FOOTER_MSG_4$]", "[$HEADER_MSG_1$]", "[$LIFERAY_LOGO_URL$]",
267267
"[$NOTIFICATION_MSG_1$]", "[$NOTIFICATION_MSG_2$]", "[$YEAR$]"
268268
},
269269
new String[] {
@@ -272,8 +272,10 @@ private String _getBody(
272272
EmailUtil.getLanguageKey(
273273
faroProject, "go-to-analytics-cloud",
274274
"go-to-liferay-data-platform")),
275-
EmailUtil.getShareIconURL(), EmailUtil.getEmailHeaderURL(),
276-
subject, FaroPropsValues.FARO_URL,
275+
EmailUtil.getShareIconURL(),
276+
EmailUtil.getDocumentationURL(faroProject),
277+
EmailUtil.getEmailHeaderURL(), subject,
278+
FaroPropsValues.FARO_URL,
277279
_language.get(resourceBundle, "contact-support"),
278280
_language.get(resourceBundle, "documentation"),
279281
_language.get(resourceBundle, "announcements"),

‎workspaces/liferay-osbfaro-workspace/modules/osb-faro-service/src/main/java/com/liferay/osb/faro/service/impl/FaroProjectLocalServiceImpl.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -342,11 +342,11 @@ private String _getBody(
342342
getClassLoader(),
343343
"com/liferay/osb/faro/dependencies/created-workspace.html"),
344344
new String[] {
345-
"[$BUTTON_TEXT$]", "[$BUTTON_URL$]", "[$EMAIL_HEADER_URL$]",
346-
"[$EMAIL_TITLE$]", "[$FARO_URL$]", "[$FOOTER_MENU_1$]",
347-
"[$FOOTER_MENU_2$]", "[$FOOTER_MENU_3$]", "[$FOOTER_MSG_1$]",
348-
"[$FOOTER_MSG_2$]", "[$FOOTER_MSG_3$]", "[$FOOTER_MSG_4$]",
349-
"[$HEADER_MSG_1$]", "[$ICON_CHECK_URL$]",
345+
"[$BUTTON_TEXT$]", "[$BUTTON_URL$]", "[$DOCUMENTATION_URL$]",
346+
"[$EMAIL_HEADER_URL$]", "[$EMAIL_TITLE$]", "[$FARO_URL$]",
347+
"[$FOOTER_MENU_1$]", "[$FOOTER_MENU_2$]", "[$FOOTER_MENU_3$]",
348+
"[$FOOTER_MSG_1$]", "[$FOOTER_MSG_2$]", "[$FOOTER_MSG_3$]",
349+
"[$FOOTER_MSG_4$]", "[$HEADER_MSG_1$]", "[$ICON_CHECK_URL$]",
350350
"[$LIFERAY_LOGO_URL$]", "[$NOTIFICATION_MSG_1$]",
351351
"[$NOTIFICATION_MSG_2$]", "[$NOTIFICATION_MSG_3$]",
352352
"[$NOTIFICATION_MSG_4$]", "[$NOTIFICATION_MSG_5$]",
@@ -358,8 +358,10 @@ private String _getBody(
358358
EmailUtil.getLanguageKey(
359359
faroProject, "go-to-analytics-cloud",
360360
"go-to-liferay-data-platform")),
361-
EmailUtil.getShareIconURL(), EmailUtil.getEmailHeaderURL(),
362-
subject, FaroPropsValues.FARO_URL,
361+
EmailUtil.getShareIconURL(),
362+
EmailUtil.getDocumentationURL(faroProject),
363+
EmailUtil.getEmailHeaderURL(), subject,
364+
FaroPropsValues.FARO_URL,
363365
_language.get(resourceBundle, "contact-support"),
364366
_language.get(resourceBundle, "documentation"),
365367
_language.get(resourceBundle, "announcements"),

‎workspaces/liferay-osbfaro-workspace/modules/osb-faro-service/src/main/java/com/liferay/osb/faro/service/impl/FaroUserLocalServiceImpl.java‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -285,11 +285,11 @@ private String _getBodyNewUser(
285285
return StringUtil.replace(
286286
StringUtil.read(getClassLoader(), template),
287287
new String[] {
288-
"[$BUTTON_TEXT$]", "[$BUTTON_URL$]", "[$EMAIL_HEADER_URL$]",
289-
"[$EMAIL_TITLE$]", "[$FARO_URL$]", "[$FOOTER_MENU_1$]",
290-
"[$FOOTER_MENU_2$]", "[$FOOTER_MENU_3$]", "[$FOOTER_MSG_1$]",
291-
"[$FOOTER_MSG_2$]", "[$FOOTER_MSG_3$]", "[$FOOTER_MSG_4$]",
292-
"[$HEADER_MSG_1$]", "[$LIFERAY_LOGO_URL$]",
288+
"[$BUTTON_TEXT$]", "[$BUTTON_URL$]", "[$DOCUMENTATION_URL$]",
289+
"[$EMAIL_HEADER_URL$]", "[$EMAIL_TITLE$]", "[$FARO_URL$]",
290+
"[$FOOTER_MENU_1$]", "[$FOOTER_MENU_2$]", "[$FOOTER_MENU_3$]",
291+
"[$FOOTER_MSG_1$]", "[$FOOTER_MSG_2$]", "[$FOOTER_MSG_3$]",
292+
"[$FOOTER_MSG_4$]", "[$HEADER_MSG_1$]", "[$LIFERAY_LOGO_URL$]",
293293
"[$NOTIFICATION_MSG_1$]", "[$NOTIFICATION_MSG_2$]", "[$YEAR$]"
294294
},
295295
new String[] {
@@ -298,8 +298,10 @@ private String _getBodyNewUser(
298298
EmailUtil.getLanguageKey(
299299
faroProject, "go-to-analytics-cloud",
300300
"go-to-liferay-data-platform")),
301-
EmailUtil.getShareIconURL(), EmailUtil.getEmailHeaderURL(),
302-
subject, FaroPropsValues.FARO_URL,
301+
EmailUtil.getShareIconURL(),
302+
EmailUtil.getDocumentationURL(faroProject),
303+
EmailUtil.getEmailHeaderURL(), subject,
304+
FaroPropsValues.FARO_URL,
303305
_language.get(resourceBundle, "contact-support"),
304306
_language.get(resourceBundle, "documentation"),
305307
_language.get(resourceBundle, "announcements"),
@@ -345,11 +347,11 @@ private String _getBodyRequest(
345347
getClassLoader(),
346348
"com/liferay/osb/faro/dependencies/join-request.html"),
347349
new String[] {
348-
"[$BUTTON_TEXT$]", "[$BUTTON_URL$]", "[$EMAIL_HEADER_URL$]",
349-
"[$EMAIL_TITLE$]", "[$FARO_URL$]", "[$FOOTER_MENU_1$]",
350-
"[$FOOTER_MENU_2$]", "[$FOOTER_MENU_3$]", "[$FOOTER_MSG_1$]",
351-
"[$FOOTER_MSG_2$]", "[$FOOTER_MSG_3$]", "[$FOOTER_MSG_4$]",
352-
"[$HEADER_MSG_1$]", "[$LIFERAY_LOGO_URL$]",
350+
"[$BUTTON_TEXT$]", "[$BUTTON_URL$]", "[$DOCUMENTATION_URL$]",
351+
"[$EMAIL_HEADER_URL$]", "[$EMAIL_TITLE$]", "[$FARO_URL$]",
352+
"[$FOOTER_MENU_1$]", "[$FOOTER_MENU_2$]", "[$FOOTER_MENU_3$]",
353+
"[$FOOTER_MSG_1$]", "[$FOOTER_MSG_2$]", "[$FOOTER_MSG_3$]",
354+
"[$FOOTER_MSG_4$]", "[$HEADER_MSG_1$]", "[$LIFERAY_LOGO_URL$]",
353355
"[$NOTIFICATION_MSG_1$]", "[$NOTIFICATION_MSG_2$]", "[$YEAR$]"
354356
},
355357
new String[] {
@@ -358,8 +360,10 @@ private String _getBodyRequest(
358360
EmailUtil.getLanguageKey(
359361
faroProject, "go-to-analytics-cloud",
360362
"go-to-liferay-data-platform")),
361-
EmailUtil.getShareIconURL(), EmailUtil.getEmailHeaderURL(),
362-
subject, FaroPropsValues.FARO_URL,
363+
EmailUtil.getShareIconURL(),
364+
EmailUtil.getDocumentationURL(faroProject),
365+
EmailUtil.getEmailHeaderURL(), subject,
366+
FaroPropsValues.FARO_URL,
363367
_language.get(resourceBundle, "contact-support"),
364368
_language.get(resourceBundle, "documentation"),
365369
_language.get(resourceBundle, "announcements"),

‎workspaces/liferay-osbfaro-workspace/modules/osb-faro-service/src/main/resources/com/liferay/osb/faro/dependencies/created-workspace.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@
537537
<table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
538538
<tr>
539539
<td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
540-
<div style="font-family:Source Sans Pro, system-ui, Segoe UI, Ubuntu, Cantarell, Helvetica Neue, Arial, sans-serif;font-size:13px;line-height:21px;text-align:center;color:#6B6C7E;"><a href="https://help.liferay.com/hc/en-us/requests/new" style="color: #0b5fff; margin: 5px; text-decoration: none" target="_blank">[$FOOTER_MENU_1$]</a> | <a href="https://learn.liferay.com/en/w/analytics-cloud/index" style="color: #0b5fff; margin: 5px; text-decoration: none" target="_blank">[$FOOTER_MENU_2$]</a> | <a href="https://help.liferay.com/hc/en-us/categories/360004131752-Liferay-Analytics-Cloud-Announcements" style="color: #0b5fff; margin: 5px; text-decoration: none" target="_blank">[$FOOTER_MENU_3$]</a></div>
540+
<div style="font-family:Source Sans Pro, system-ui, Segoe UI, Ubuntu, Cantarell, Helvetica Neue, Arial, sans-serif;font-size:13px;line-height:21px;text-align:center;color:#6B6C7E;"><a href="https://help.liferay.com/hc/en-us/requests/new" style="color: #0b5fff; margin: 5px; text-decoration: none" target="_blank">[$FOOTER_MENU_1$]</a> | <a href="[$DOCUMENTATION_URL$]" style="color: #0b5fff; margin: 5px; text-decoration: none" target="_blank">[$FOOTER_MENU_2$]</a> | <a href="https://support.liferay.com" style="color: #0b5fff; margin: 5px; text-decoration: none" target="_blank">[$FOOTER_MENU_3$]</a></div>
541541
</td>
542542
</tr>
543543
</table>

‎workspaces/liferay-osbfaro-workspace/modules/osb-faro-service/src/main/resources/com/liferay/osb/faro/dependencies/data-control-task-complete.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@
466466
<table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
467467
<tr>
468468
<td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
469-
<div style="font-family:Source Sans Pro, system-ui, Segoe UI, Ubuntu, Cantarell, Helvetica Neue, Arial, sans-serif;font-size:13px;line-height:21px;text-align:center;color:#6B6C7E;"><a href="https://help.liferay.com/hc/en-us/requests/new" style="color: #0b5fff; margin: 5px; text-decoration: none" target="_blank">[$FOOTER_MENU_1$]</a> | <a href="https://learn.liferay.com/en/w/analytics-cloud/index" style="color: #0b5fff; margin: 5px; text-decoration: none" target="_blank">[$FOOTER_MENU_2$]</a> | <a href="https://help.liferay.com/hc/en-us/categories/360004131752-Liferay-Analytics-Cloud-Announcements" style="color: #0b5fff; margin: 5px; text-decoration: none" target="_blank">[$FOOTER_MENU_3$]</a></div>
469+
<div style="font-family:Source Sans Pro, system-ui, Segoe UI, Ubuntu, Cantarell, Helvetica Neue, Arial, sans-serif;font-size:13px;line-height:21px;text-align:center;color:#6B6C7E;"><a href="https://help.liferay.com/hc/en-us/requests/new" style="color: #0b5fff; margin: 5px; text-decoration: none" target="_blank">[$FOOTER_MENU_1$]</a> | <a href="[$DOCUMENTATION_URL$]" style="color: #0b5fff; margin: 5px; text-decoration: none" target="_blank">[$FOOTER_MENU_2$]</a> | <a href="https://support.liferay.com" style="color: #0b5fff; margin: 5px; text-decoration: none" target="_blank">[$FOOTER_MENU_3$]</a></div>
470470
</td>
471471
</tr>
472472
</table>

‎workspaces/liferay-osbfaro-workspace/modules/osb-faro-service/src/main/resources/com/liferay/osb/faro/dependencies/email-daily-report.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1343,7 +1343,7 @@
13431343
>
13441344
13451345
<![endif]-->
1346-
<a class="mj-link" href="https://help.liferay.com/hc/en-us" target="_blank" style="display:inline-block;color:#0b5fff;font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:14px;font-weight:normal;line-height:22px;text-decoration:none;text-transform:none;padding:15px 10px;"> Contact Support </a>
1346+
<a class="mj-link" href="https://support.liferay.com" target="_blank" style="display:inline-block;color:#0b5fff;font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:14px;font-weight:normal;line-height:22px;text-decoration:none;text-transform:none;padding:15px 10px;"> Contact Support </a>
13471347
<!--[if mso | IE]>
13481348
13491349
</td>

‎workspaces/liferay-osbfaro-workspace/modules/osb-faro-service/src/main/resources/com/liferay/osb/faro/dependencies/email-monthly-report.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1343,7 +1343,7 @@
13431343
>
13441344
13451345
<![endif]-->
1346-
<a class="mj-link" href="https://help.liferay.com/hc/en-us" target="_blank" style="display:inline-block;color:#0b5fff;font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:14px;font-weight:normal;line-height:22px;text-decoration:none;text-transform:none;padding:15px 10px;"> Contact Support </a>
1346+
<a class="mj-link" href="https://support.liferay.com" target="_blank" style="display:inline-block;color:#0b5fff;font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:14px;font-weight:normal;line-height:22px;text-decoration:none;text-transform:none;padding:15px 10px;"> Contact Support </a>
13471347
<!--[if mso | IE]>
13481348
13491349
</td>

‎workspaces/liferay-osbfaro-workspace/modules/osb-faro-service/src/main/resources/com/liferay/osb/faro/dependencies/email-weekly-report.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1343,7 +1343,7 @@
13431343
>
13441344
13451345
<![endif]-->
1346-
<a class="mj-link" href="https://help.liferay.com/hc/en-us" target="_blank" style="display:inline-block;color:#0b5fff;font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:14px;font-weight:normal;line-height:22px;text-decoration:none;text-transform:none;padding:15px 10px;"> Contact Support </a>
1346+
<a class="mj-link" href="https://support.liferay.com" target="_blank" style="display:inline-block;color:#0b5fff;font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:14px;font-weight:normal;line-height:22px;text-decoration:none;text-transform:none;padding:15px 10px;"> Contact Support </a>
13471347
<!--[if mso | IE]>
13481348
13491349
</td>

‎workspaces/liferay-osbfaro-workspace/modules/osb-faro-service/src/main/resources/com/liferay/osb/faro/dependencies/invite-existing-user.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@
471471
<table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
472472
<tr>
473473
<td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
474-
<div style="font-family:Source Sans Pro, system-ui, Segoe UI, Ubuntu, Cantarell, Helvetica Neue, Arial, sans-serif;font-size:13px;line-height:21px;text-align:center;color:#6B6C7E;"><a href="https://help.liferay.com/hc/en-us/requests/new" style="color: #0b5fff; margin: 5px; text-decoration: none" target="_blank">[$FOOTER_MENU_1$]</a> | <a href="https://learn.liferay.com/en/w/analytics-cloud/index" style="color: #0b5fff; margin: 5px; text-decoration: none" target="_blank">[$FOOTER_MENU_2$]</a> | <a href="https://help.liferay.com/hc/en-us/categories/360004131752-Liferay-Analytics-Cloud-Announcements" style="color: #0b5fff; margin: 5px; text-decoration: none" target="_blank">[$FOOTER_MENU_3$]</a></div>
474+
<div style="font-family:Source Sans Pro, system-ui, Segoe UI, Ubuntu, Cantarell, Helvetica Neue, Arial, sans-serif;font-size:13px;line-height:21px;text-align:center;color:#6B6C7E;"><a href="https://help.liferay.com/hc/en-us/requests/new" style="color: #0b5fff; margin: 5px; text-decoration: none" target="_blank">[$FOOTER_MENU_1$]</a> | <a href="[$DOCUMENTATION_URL$]" style="color: #0b5fff; margin: 5px; text-decoration: none" target="_blank">[$FOOTER_MENU_2$]</a> | <a href="https://support.liferay.com" style="color: #0b5fff; margin: 5px; text-decoration: none" target="_blank">[$FOOTER_MENU_3$]</a></div>
475475
</td>
476476
</tr>
477477
</table>

0 commit comments

Comments
 (0)