You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2023/05/24 16:06:37 UTC
[openmeetings] 01/07: fixed #188
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 282893bedb3e2c97a55d9e6f30708fc5b2ed5d78
Author: Geoffrey Logovi <52...@users.noreply.github.com>
AuthorDate: Fri May 12 06:21:11 2023 +0000
fixed #188
---
.../service/mail/template/InvitationTemplate.html | 176 ++++++++++++++++++--
.../mail/template/RegisterUserTemplate.html | 180 +++++++++++++++++++--
.../mail/template/ResetPasswordTemplate.html | 163 ++++++++++++++++++-
3 files changed, 486 insertions(+), 33 deletions(-)
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.html
index ae9a4d9d7..416476c68 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.html
@@ -16,20 +16,172 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd">
+
+<head>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <style>
+ @import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500&display=swap');
+
+ @media only screen and (max-width: 620px) {
+ table.body h1 {
+ font-size: 28px !important;
+ margin-bottom: 10px !important;
+ }
+
+ table.body p,
+ table.body td,
+ table.body span,
+ table.body a {
+ font-size: 16px !important;
+ }
+
+ table.body .wrapper,
+ table.body .article {
+ padding: 10px !important;
+ }
+
+ table.body .content {
+ padding: 0 !important;
+ }
+
+ table.body .container {
+ padding: 0 !important;
+ width: 100% !important;
+ }
+
+ table.body .main {
+ border-left-width: 0 !important;
+ border-radius: 0 !important;
+ border-right-width: 0 !important;
+ }
+
+ table.body .btn table {
+ width: 100% !important;
+ }
+
+ table.body .btn a {
+ width: 100% !important;
+ }
+
+ }
+
+ @mwedia all {
+ body {
+ background-color: #f6f6f6;
+ font-family: sans-serif;
+ -webkit-font-smoothing: antialiased;
+ font-size: 14px;
+ line-height: 1.4;
+ margin: 0;
+ padding: 0;
+ -ms-text-size-adjust: 100%;
+ -webkit-text-size-adjust: 100%;
+ font-family: 'Montserrat', sans-serif;
+ font-size: 14px;
+ }
+
+ }
+ </style>
+</head>
+
<wicket:extend>
- <strong><span wicket:id="titleLbl"></span></strong><br />
- <span wicket:id="userLbl"></span> <span wicket:id="user"></span><br/>
- <span wicket:id="messageLbl"></span> <span wicket:id="message"></span><br/>
- <div wicket:id="links">
- <span wicket:id="comment_for_link1"></span><br/>
- <a wicket:id="invitation_link1"><span wicket:id="clickMe"></span></a><br/>
- <br/><br/>
- <span wicket:id="comment_for_link2"></span><br/>
- <span wicket:id="invitation_link2"></span>
- </div>
+
+ <table role="presentation" border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #f6f6f6; width: 100%;" width="100%" bgcolor="#f6f6f6">
+ <tr>
+ <td style="font-family: 'Montserrat', sans-serif; font-size: 14px; vertical-align: top;" valign="top"> </td>
+ <td class="container" style="font-family: 'Montserrat', sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 580px; padding: 10px; width: 580px; margin: 0 auto;" width="580" valign="top">
+ <div class="content" style="box-sizing: border-box; display: block; margin: 0 auto; max-width: 580px; padding: 10px;">
+ <!-- START CONTAINER -->
+ <table role="presentation" class="main" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; width: 100%;" width="100%">
+ <!-- START MAIN MSG -->
+ <tr>
+ <td class="wrapper" style="font-family: 'Montserrat', sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 20px;" valign="top">
+ <table role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;" width="100%">
+ <tr>
+ <td style="font-family: 'Montserrat', sans-serif; font-size: 14px; vertical-align: top;" valign="top">
+ <!-- INVITATION LABEL -->
+ <span wicket:id="titleLbl" style="font-family: 'Montserrat', sans-serif; font-size: 20px; font-weight: normal; margin: 0; margin-bottom: 15px;"></span>
+ <!-- END INVITATION LABEL -->
+ <br /><br />
+ <!-- INVITATION MSG -->
+ <!-- <span wicket:id="titleLbl" style="font-family: 'Montserrat', sans-serif; font-size: 14px; font-weight: bold; margin: 0; margin-bottom: 20px;"></span><br /><br /> -->
+ <span wicket:id="userLbl"></span> <span wicket:id="user"></span><br/>
+ <span wicket:id="messageLbl"></span> <span wicket:id="message"></span><br/>
+ <!-- END INVITATION MSG -->
+ <br />
+ <table
+ role="presentation"
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="btn btn-primary"
+ style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; box-sizing: border-box; width: 100%;"
+ width="100%"
+ >
+ <tbody>
+ <tr>
+ <td align="left" style="font-family: 'Montserrat', sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;" valign="top">
+ <table role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">
+ <tbody>
+ <tr>
+ <td>
+ <!-- URLs INVITATION -->
+ <div wicket:id="links"> <br>
+ <td
+ >
+ <span wicket:id="comment_for_link1"></span><br/><br />
+ <!-- URL 1 INVITATION BTN -->
+ <a wicket:id="invitation_link1"
+ style="border: solid 1px #3498db;
+ border-radius: 5px;
+ box-sizing: border-box;
+ cursor: pointer;
+ display: inline-block;
+ font-size: 14px;
+ font-weight: bold;
+ margin: 0;
+ padding: 12px 25px;
+ text-decoration: none;
+ text-transform: capitalize;
+ background-color: #3498db;
+ border-color: #3498db;
+ color: #ffffff;">
+ <span wicket:id="clickMe"></span>
+ </a>
+ <!-- END URL 1 INVITATION BTN -->
+ <br /><br />
+ <!-- URL 2 PLAIN TEXT -->
+ <span wicket:id="comment_for_link2"></span><br/><br />
+ <span wicket:id="invitation_link2"></span>
+ <!-- END URL 2 PLAIN TEXT -->
+ </td>
+ </div>
+ <!-- END URLs INVITATION -->
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <!-- END MAIN MSG -->
+ </table>
+ <!-- END CONTAINER -->
+ </div>
+ </td>
+ </tr>
+ </table>
+
</wicket:extend>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
index e663351d4..becba282a 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
@@ -19,21 +19,171 @@
-->
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd">
+
+<head>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <style>
+ @import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500&display=swap');
+
+ @media only screen and (max-width: 620px) {
+ table.body h1 {
+ font-size: 28px !important;
+ margin-bottom: 10px !important;
+ }
+
+ table.body p,
+ table.body td,
+ table.body span,
+ table.body a {
+ font-size: 16px !important;
+ }
+
+ table.body .wrapper,
+ table.body .article {
+ padding: 10px !important;
+ }
+
+ table.body .content {
+ padding: 0 !important;
+ }
+
+ table.body .container {
+ padding: 0 !important;
+ width: 100% !important;
+ }
+
+ table.body .main {
+ border-left-width: 0 !important;
+ border-radius: 0 !important;
+ border-right-width: 0 !important;
+ }
+
+ table.body .btn table {
+ width: 100% !important;
+ }
+
+ table.body .btn a {
+ width: 100% !important;
+ }
+
+ }
+
+ @mwedia all {
+ body {
+ background-color: #f6f6f6;
+ font-family: sans-serif;
+ -webkit-font-smoothing: antialiased;
+ font-size: 14px;
+ line-height: 1.4;
+ margin: 0;
+ padding: 0;
+ -ms-text-size-adjust: 100%;
+ -webkit-text-size-adjust: 100%;
+ font-family: 'Montserrat', sans-serif;
+ font-size: 14px;
+ }
+
+ }
+ </style>
+</head>
+
<wicket:extend>
- <span wicket:id="registrationLbl"></span>
- <br />
- <br />
- <strong><wicket:message key="507" /></strong><br />
- <wicket:message key="108" /> <span wicket:id="username"></span><br />
- <wicket:message key="lbl.email" /> <span wicket:id="email"></span><br />
- <a wicket:id="url"></a><br />
- <br />
- <div wicket:id="verification">
- <wicket:message key="667" /> <br />
- <a wicket:id="verification_url1"><wicket:message key="668" /></a> <br />
- <span wicket:id="verification_url2"></span> <br />
- </div>
- <span wicket:id="groupLbl"></span>
+
+ <table role="presentation" border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #f6f6f6; width: 100%;" width="100%" bgcolor="#f6f6f6">
+ <tr>
+ <td style="font-family: 'Montserrat', sans-serif; font-size: 14px; vertical-align: top;" valign="top"> </td>
+ <td class="container" style="font-family: 'Montserrat', sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 580px; padding: 10px; width: 580px; margin: 0 auto;" width="580" valign="top">
+ <div class="content" style="box-sizing: border-box; display: block; margin: 0 auto; max-width: 580px; padding: 10px;">
+ <!-- START CONTAINER -->
+ <table role="presentation" class="main" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; width: 100%;" width="100%">
+ <!-- START MAIN MSG -->
+ <tr>
+ <td class="wrapper" style="font-family: 'Montserrat', sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 20px;" valign="top">
+ <table role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;" width="100%">
+ <tr>
+ <td style="font-family: 'Montserrat', sans-serif; font-size: 14px; vertical-align: top;" valign="top">
+ <!-- REGISTRATION LABEL -->
+ <span wicket:id="registrationLbl" style="font-family: 'Montserrat', sans-serif; font-size: 20px; font-weight: normal; margin: 0; margin-bottom: 15px;"></span>
+ <!-- END REGISTRATION LABEL -->
+ <br /><br />
+ <!-- REGISTRATION MSG -->
+ <span style="font-family: 'Montserrat', sans-serif; font-size: 14px; font-weight: bold; margin: 0; margin-bottom: 20px;"><wicket:message key="507" /> </span><br /><br />
+ <wicket:message key="108" /> <span wicket:id="username"></span><br />
+ <wicket:message key="lbl.email" /> <span wicket:id="email"></span><br />
+ <!-- END REGISTRATION MSG -->
+ <br />
+ <table
+ role="presentation"
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="btn btn-primary"
+ style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; box-sizing: border-box; width: 100%;"
+ width="100%"
+ >
+ <tbody>
+ <tr>
+ <td align="left" style="font-family: 'Montserrat', sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;" valign="top">
+ <table role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">
+ <tbody>
+ <tr>
+ <td>
+ <!-- URLs VERIFICATION -->
+ <div wicket:id="verification">
+ <td
+ >
+ <wicket:message key="667" /> <br/><br />
+ <!-- URL 1 VERIFICATION BTN -->
+ <a wicket:id="verification_url1"
+ style="border: solid 1px #3498db;
+ border-radius: 5px;
+ box-sizing: border-box;
+ cursor: pointer;
+ display: inline-block;
+ font-size: 14px;
+ font-weight: bold;
+ margin: 0;
+ padding: 12px 25px;
+ text-decoration: none;
+ text-transform: capitalize;
+ background-color: #3498db;
+ border-color: #3498db;
+ color: #ffffff;">
+ <wicket:message key="668" /><br/>
+ </a>
+ <!-- END URL 1 VERIFICATION BTN -->
+ <br />
+ <!-- URL 2 PLAIN TEXT -->
+ <span wicket:id="verification_url2"></span> <br />
+ <!-- END URL 2 PLAIN TEXT -->
+ </td>
+ </div>
+ <!-- END URLs VERIFICATION -->
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <!-- GROUP LABEL -->
+ <span wicket:id="groupLbl" style="font-family: 'Montserrat', sans-serif; font-size: 14px; font-weight: normal; margin: 0; margin-bottom: 0px;"></span>
+ <!-- END GROUP LABEL -->
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <!-- END MAIN MSG -->
+ </table>
+ <!-- END CONTAINER -->
+ </div>
+ </td>
+ </tr>
+ </table>
+
</wicket:extend>
-</html>
+</html>
\ No newline at end of file
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html
index cdb2a46d9..b98a99e7f 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html
@@ -19,11 +19,162 @@
-->
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd">
+
+<head>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <style>
+ @import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500&display=swap');
+
+ @media only screen and (max-width: 620px) {
+ table.body h1 {
+ font-size: 28px !important;
+ margin-bottom: 10px !important;
+ }
+
+ table.body p,
+ table.body td,
+ table.body span,
+ table.body a {
+ font-size: 16px !important;
+ }
+
+ table.body .wrapper,
+ table.body .article {
+ padding: 10px !important;
+ }
+
+ table.body .content {
+ padding: 0 !important;
+ }
+
+ table.body .container {
+ padding: 0 !important;
+ width: 100% !important;
+ }
+
+ table.body .main {
+ border-left-width: 0 !important;
+ border-radius: 0 !important;
+ border-right-width: 0 !important;
+ }
+
+ table.body .btn table {
+ width: 100% !important;
+ }
+
+ table.body .btn a {
+ width: 100% !important;
+ }
+
+ }
+
+ @mwedia all {
+ body {
+ background-color: #f6f6f6;
+ font-family: sans-serif;
+ -webkit-font-smoothing: antialiased;
+ font-size: 14px;
+ line-height: 1.4;
+ margin: 0;
+ padding: 0;
+ -ms-text-size-adjust: 100%;
+ -webkit-text-size-adjust: 100%;
+ font-family: 'Montserrat', sans-serif;
+ font-size: 14px;
+ }
+
+ }
+ </style>
+</head>
+
<wicket:extend>
- <strong><span wicket:id="reset-header"></span></strong><br />
- <strong><wicket:message key="514"/></strong><br/>
- <a wicket:id="reset_link1"><wicket:message key="515"/></a><br/>
- <wicket:message key="505"/><br/>
- <span wicket:id="reset_link2"></span>
+
+ <table role="presentation" border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #f6f6f6; width: 100%;" width="100%" bgcolor="#f6f6f6">
+ <tr>
+ <td style="font-family: 'Montserrat', sans-serif; font-size: 14px; vertical-align: top;" valign="top"> </td>
+ <td class="container" style="font-family: 'Montserrat', sans-serif; font-size: 14px; vertical-align: top; display: block; max-width: 580px; padding: 10px; width: 580px; margin: 0 auto;" width="580" valign="top">
+ <div class="content" style="box-sizing: border-box; display: block; margin: 0 auto; max-width: 580px; padding: 10px;">
+ <!-- START CONTAINER -->
+ <table role="presentation" class="main" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background: #ffffff; border-radius: 3px; width: 100%;" width="100%">
+ <!-- START MAIN MSG -->
+ <tr>
+ <td class="wrapper" style="font-family: 'Montserrat', sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 20px;" valign="top">
+ <table role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;" width="100%">
+ <tr>
+ <td style="font-family: 'Montserrat', sans-serif; font-size: 14px; vertical-align: top;" valign="top">
+ <!-- RESET PWD HEADER -->
+ <span wicket:id="reset-header" style="font-family: 'Montserrat', sans-serif; font-size: 20px; font-weight: bold; margin: 0; margin-bottom: 15px;"></span>
+ <!-- END RESET PWD HEADER -->
+ <br /><br />
+ <table
+ role="presentation"
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ class="btn btn-primary"
+ style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; box-sizing: border-box; width: 100%;"
+ width="100%"
+ >
+ <tbody>
+ <tr>
+ <td align="left" style="font-family: 'Montserrat', sans-serif; font-size: 14px; vertical-align: top; padding-bottom: 15px;" valign="top">
+ <table role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">
+ <tbody>
+ <tr>
+ <td>
+ <!-- URLs RESET PWD -->
+ <div>
+ <td
+ >
+ <wicket:message key="667" /><br/><br />
+ <!-- URL 1 RESET PWD BTN -->
+ <a wicket:id="reset_link1"
+ style="border: solid 1px #3498db;
+ border-radius: 5px;
+ box-sizing: border-box;
+ cursor: pointer;
+ display: inline-block;
+ font-size: 14px;
+ font-weight: bold;
+ margin: 0;
+ padding: 12px 25px;
+ text-decoration: none;
+ text-transform: capitalize;
+ background-color: #3498db;
+ border-color: #3498db;
+ color: #ffffff;">
+ <wicket:message key="515" /><br/>
+ </a>
+ <!-- END URL 1 RESET PWD BTN -->
+ <br /><br/>
+ <!-- URL 2 RESET PWD PLAIN TEXT -->
+ <span wicket:id="reset_link2"></span> <br />
+ <!-- END URL 2 RESET PWD PLAIN TEXT -->
+ </td>
+ </div>
+ <!-- END URLs RESET PWD -->
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <!-- END MAIN MSG -->
+ </table>
+ <!-- END CONTAINER -->
+ </div>
+ </td>
+ </tr>
+ </table>
+
</wicket:extend>
-</html>
+
+</html>
\ No newline at end of file