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:36 UTC
[openmeetings] branch master updated (f2497f3a1 -> 77df42f4f)
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
from f2497f3a1 [OPENMEETINGS-2770] commons-io, swagger, plugins
new 282893bed fixed #188
new 186ba54f6 updated #188 - removed external resources and comments, added new line at end of files, style still in inline CSS
new affd8589f update - removed inline styles and updated email templates - #188
new b73f721c2 update #188 - fixed the style and moved repeated div to parent template (AbstractTemplatePage)
new f7c829e5c minor update #188 - .vscode/settings.json, style sass attibutes removed
new a2e5b6372 fixes #188 - removed head tags fixed the style
new 77df42f4f fixes apache#188 - removed head tags fixed the style
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../mail/template/AbstractTemplatePage.html | 159 +++++++++++----------
.../service/mail/template/FeedbackTemplate.html | 22 ++-
.../service/mail/template/InvitationTemplate.html | 29 ++--
.../mail/template/RegisterUserTemplate.html | 28 ++--
.../template/RequestContactConfirmTemplate.html | 12 +-
.../mail/template/RequestContactTemplate.html | 20 ++-
.../mail/template/ResetPasswordTemplate.html | 26 +++-
7 files changed, 182 insertions(+), 114 deletions(-)
[openmeetings] 06/07: fixes #188 - removed head tags fixed the style
Posted by so...@apache.org.
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 a2e5b63729be89c5f5241bd61e8521d6d169d94f
Author: Geoffrey Logovi <52...@users.noreply.github.com>
AuthorDate: Wed May 24 09:34:10 2023 +0000
fixes #188 - removed head tags fixed the style
---
.../service/mail/template/AbstractTemplatePage.html | 21 +++++++++++----------
.../service/mail/template/InvitationTemplate.html | 1 -
.../service/mail/template/RegisterUserTemplate.html | 6 ------
.../mail/template/ResetPasswordTemplate.html | 6 ------
4 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePage.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePage.html
index 8ce1c3252..d726837c7 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePage.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePage.html
@@ -86,20 +86,21 @@
}
.wrapper {
- max-width: 560px;
+ max-width: 540px;
margin: 0 auto;
padding: 10px;
+ }
- .action {
- text-align: center;
- margin-top: 25px;
- }
+ .wrapper .action {
+ text-align: center;
+ margin-top: 25px;
+ padding: 0 15px;
+ }
- .action a {
- display: block;
- margin: 0;
- padding: 12px 25px;
- }
+ .wrapper .action a {
+ display: block;
+ margin: 0;
+ padding: 12px 25px;
}
}
</style>
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 887264c0a..804984767 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
@@ -20,7 +20,6 @@
<!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">
</head>
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 46a03057d..8707592a8 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,12 +19,6 @@
-->
<!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">
-</head>
-
<wicket:extend>
<h2>
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 4b288b6c3..92baebd97 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,12 +19,6 @@
-->
<!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">
-</head>
-
<wicket:extend>
<h2>
[openmeetings] 01/07: fixed #188
Posted by so...@apache.org.
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
[openmeetings] 04/07: update #188 - fixed the style and moved repeated div to parent template (AbstractTemplatePage)
Posted by so...@apache.org.
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 b73f721c2e545b18307f50a47f4c22b0a1965918
Author: Geoffrey Logovi <52...@users.noreply.github.com>
AuthorDate: Fri May 19 06:54:36 2023 +0000
update #188 - fixed the style and moved repeated div to parent template (AbstractTemplatePage)
---
.vscode/settings.json | 4 +
.../mail/template/AbstractTemplatePage.html | 153 +++++++++++----------
.../service/mail/template/FeedbackTemplate.html | 37 +++--
.../service/mail/template/InvitationTemplate.html | 50 ++++---
.../mail/template/RegisterUserTemplate.html | 56 ++++----
.../template/RequestContactConfirmTemplate.html | 21 ++-
.../mail/template/RequestContactTemplate.html | 29 ++--
.../mail/template/ResetPasswordTemplate.html | 51 ++++---
8 files changed, 199 insertions(+), 202 deletions(-)
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..163b71c1d
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,4 @@
+{
+ "files.insertFinalNewline": true,
+ "prettier.useTabs": true
+}
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePage.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePage.html
index 6cac8cf76..8ba38bc1f 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePage.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePage.html
@@ -19,91 +19,102 @@
-->
<!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>
+
+<head>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <style>
+ body {
+ background-color: #f5f5f5;
+ font-family: 'Segoe UI', sans-serif;
+ font-size: 14px;
+ line-height: 1.4;
+ margin: 0;
+ padding: 0;
+ }
+
+ h2 {
+ font-size: 25px;
+ font-weight: normal;
+ margin: 0;
+ margin-bottom: 15px;
+ }
+
+ p,
+ span {
+ margin-bottom: 1em;
+ }
+
+ a {
+ color: #007bff;
+ text-decoration: none;
+ }
+
+ .main {
+ max-width: 600px;
+ margin: 0 auto;
+ padding: 20px;
+ width: 100%;
+ }
+
+ .wrapper {
+ max-width: 580px;
+ margin: 0 auto;
+ padding: 15px;
+ width: 100%;
+ border-radius: 5px;
+ background-color: #fff;
+ }
+
+ .action a {
+ box-sizing: border-box;
+ cursor: pointer;
+ display: inline-block;
+ font-weight: bold;
+ margin: 0;
+ border-radius: 5px;
+ padding: 12px 25px;
+ background-color: #3498db;
+ border-color: #3498db;
+ color: #ffffff;
+ }
+
+ @media only screen and (max-width: 600px) {
.main {
- background-color: #f5f5f5;
- font-family: 'Segoe UI', 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-size: 14px;
- }
- h2 {
- font-size: 25px;
- font-weight: normal;
- margin: 0;
- margin-bottom: 15px;
- }
- p, span {
- margin-bottom: 1em;
- }
- a {
- color: #007bff;
- text-decoration: none;
- }
- .container {
- max-width: 580px;
- margin: 0 auto;
- padding: 20px;
width: 100%;
}
+
.wrapper {
- max-width: 540px;
+ max-width: 560px;
margin: 0 auto;
- padding: 15px;
- width: 100%;
- border-radius: 5px;
- background-color: #fff;
- }
- .action a {
- box-sizing: border-box;
- cursor: pointer;
- display: inline-block;
- font-weight: bold;
- margin: 0;
- border-radius: 5px;
- padding: 12px 25px;
- background-color: #3498db;
- border-color: #3498db;
- color: #ffffff;
- }
- @media only screen and (max-width: 620px) {
- .container {
- padding: 0;
- width: 100%;
- text-align: center;
- }
- .wrapper {
- max-width: 560px;
- margin: 0 auto;
- padding: 10px;
- border-left-width: 0;
- border-radius: 0;
- border-right-width: 0;
- }
- .wrapper .action {
+ padding: 10px;
+ border-left-width: 0;
+ border-radius: 0;
+ border-right-width: 0;
+
+ .action {
text-align: center;
margin-top: 25px;
}
- .wrapper .action a {
+ .action a {
display: block;
margin: 0;
padding: 12px 25px;
}
}
- </style>
- </head>
- <body>
- <div wicket:id="container">
- <wicket:child/>
+ }
+ </style>
+
+</head>
+
+<body>
+ <div wicket:id="container" class="main">
+ <div class="wrapper">
+ <wicket:child />
</div>
- </body>
+ </div>
+</body>
+
</html>
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.html
index c2c00c783..0bafa90a0 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.html
@@ -20,23 +20,22 @@
-->
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd">
-<div class="main">
- <div class="container">
- <div class="wrapper">
- <h2>
- <strong><span wicket:id="appname"></span> - Feedback</strong>
- </h2>
- Message from User: <span wicket:id="username"></span><br />
- Mail: <span wicket:id="email"></span><br />
- Message: <span wicket:id="message"></span><br /><br />
- <div class="action">
- <span>
- <strong>Click on this link to participate in the Meeting:</strong><br />
- </span><br />
- <a wicket:id="invitation_link">Click here to enter room</a>
- <br />
- </div>
- </div>
- </div>
-</div>
+<wicket:extend>
+
+ <h2>
+ <strong><span wicket:id="appname"></span> - Feedback</strong>
+ </h2>
+ Message from User: <span wicket:id="username"></span><br />
+ Mail: <span wicket:id="email"></span><br />
+ Message: <span wicket:id="message"></span><br /><br />
+ <div class="action">
+ <span>
+ <strong>Click on this link to participate in the Meeting:</strong><br />
+ </span><br />
+ <a wicket:id="invitation_link">Click here to enter room</a>
+ <br />
+ </div>
+
+</wicket:extend>
+
</html>
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 5baa664fa..887264c0a 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
@@ -21,36 +21,32 @@
<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">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<wicket:extend>
- <div class="main">
- <div class="container">
- <div class="wrapper">
- <h2>
- <strong>
- <span wicket:id="titleLbl"></span>
- </strong>
- </h2>
- <span wicket:id="userLbl"></span> <span wicket:id="user"></span><br />
- <span wicket:id="messageLbl"></span> <span wicket:id="message"></span>
- <br /><br />
- <div wicket:id="links" class="action">
- <span wicket:id="comment_for_link1"></span><br /><br>
- <a wicket:id="invitation_link1">
- <span wicket:id="clickMe"></span>
- </a>
- <br><br />
- <span wicket:id="comment_for_link2"></span>
- <br /><br />
- <span wicket:id="invitation_link2"></span>
- <br />
- </div>
- </div>
- </div>
- </div>
+
+ <h2>
+ <strong>
+ <span wicket:id="titleLbl"></span>
+ </strong>
+ </h2>
+ <span wicket:id="userLbl"></span> <span wicket:id="user"></span><br />
+ <span wicket:id="messageLbl"></span> <span wicket:id="message"></span>
+ <br /><br />
+ <div wicket:id="links" class="action">
+ <span wicket:id="comment_for_link1"></span><br /><br>
+ <a wicket:id="invitation_link1">
+ <span wicket:id="clickMe"></span>
+ </a>
+ <br><br />
+ <span wicket:id="comment_for_link2"></span>
+ <br /><br />
+ <span wicket:id="invitation_link2"></span>
+ <br />
+ </div>
+
</wicket:extend>
</html>
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 dbde23ff0..46a03057d 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
@@ -21,39 +21,35 @@
<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">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<wicket:extend>
- <div class="main">
- <div class="container">
- <div class="wrapper">
- <h2>
- <span wicket:id="registrationLbl"></span>
- </h2>
- <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 />
- <span><a wicket:id="url"></a></span><br /><br />
- <div wicket:id="verification" class="action">
- <span>
- <wicket:message key="667" />
- </span><br /><br>
- <a wicket:id="verification_url1">
- <wicket:message key="668" />
- </a>
- <br /><br />
- <span wicket:id="verification_url2"></span> <br />
- <br />
- </div>
- <span wicket:id="groupLbl"></span>
- </div>
- </div>
- </div>
+
+ <h2>
+ <span wicket:id="registrationLbl"></span>
+ </h2>
+ <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 />
+ <span><a wicket:id="url"></a></span><br /><br />
+ <div wicket:id="verification" class="action">
+ <span>
+ <wicket:message key="667" />
+ </span><br /><br>
+ <a wicket:id="verification_url1">
+ <wicket:message key="668" />
+ </a>
+ <br /><br />
+ <span wicket:id="verification_url2"></span> <br />
+ <br />
+ </div>
+ <span wicket:id="groupLbl"></span>
+
</wicket:extend>
</html>
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.html
index 23e2e8a88..06c0711ad 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.html
@@ -21,17 +21,14 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd">
<wicket:extend>
- <div class="main">
- <div class="container">
- <div class="wrapper">
- <h2>
- <span wicket:id="hi"></span> <span wicket:id="displayName"></span><br />
- </h2>
- <p>
- <span wicket:id="addedName"></span> <span wicket:id="confirmed"></span><br />
- </p>
- </div>
- </div>
- </div>
+
+ <h2>
+ <span wicket:id="hi"></span> <span wicket:id="displayName"></span><br />
+ </h2>
+ <p>
+ <span wicket:id="addedName"></span> <span wicket:id="confirmed"></span><br />
+ </p>
+
</wicket:extend>
+
</html>
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.html
index 155f1538f..94df25544 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.html
@@ -21,21 +21,18 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd">
<wicket:extend>
- <div class="main">
- <div class="container">
- <div class="wrapper">
- <h2>
- <span wicket:id="hi"></span> <span wicket:id="addedName"></span><br />
- </h2>
- <p>
- <span wicket:id="displayName"></span> <span wicket:id="likeToAdd"></span><br />
- <span wicket:id="check"></span><br />
- </p>
- <div class="action">
- <a wicket:id="link"><span wicket:id="contactList"></span></a><br />
- </div>
- </div>
- </div>
- </div>
+
+ <h2>
+ <span wicket:id="hi"></span> <span wicket:id="addedName"></span><br />
+ </h2>
+ <p>
+ <span wicket:id="displayName"></span> <span wicket:id="likeToAdd"></span><br />
+ <span wicket:id="check"></span><br />
+ </p>
+ <div class="action">
+ <a wicket:id="link"><span wicket:id="contactList"></span></a><br />
+ </div>
+
</wicket:extend>
+
</html>
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 166dbda65..4b288b6c3 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
@@ -1,4 +1,4 @@
- <?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -21,34 +21,31 @@
<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">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<wicket:extend>
- <div class="main">
- <div class="container">
- <div class="wrapper">
- <h2>
- <strong>
- <span wicket:id="reset-header"></span>
- </strong>
- </h2>
- <p>
- <wicket:message key="514" />
- </p>
- <div class="action">
- <a wicket:id="reset_link1">
- <wicket:message key="515" />
- </a>
- </div>
- <p>
- <wicket:message key="505" />
- </p>
- <span wicket:id="reset_link2">
- </span><br />
- </div>
- </div>
- </div>
+
+ <h2>
+ <strong>
+ <span wicket:id="reset-header"></span>
+ </strong>
+ </h2>
+ <p>
+ <wicket:message key="514" />
+ </p>
+ <div class="action">
+ <a wicket:id="reset_link1">
+ <wicket:message key="515" />
+ </a>
+ </div>
+ <p>
+ <wicket:message key="505" />
+ </p>
+ <span wicket:id="reset_link2">
+ </span><br />
+
</wicket:extend>
+
</html>
[openmeetings] 02/07: updated #188 - removed external resources and comments, added new line at end of files, style still in inline CSS
Posted by so...@apache.org.
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 186ba54f602583862a461a3ba6da5c7da27a71e8
Author: Geoffrey Logovi <52...@users.noreply.github.com>
AuthorDate: Sun May 14 17:15:27 2023 +0000
updated #188 - removed external resources and comments, added new line at end of files, style still in inline CSS
---
.../service/mail/template/InvitationTemplate.html | 183 +++-----------------
.../mail/template/RegisterUserTemplate.html | 188 ++++-----------------
.../mail/template/ResetPasswordTemplate.html | 177 +++----------------
3 files changed, 81 insertions(+), 467 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 416476c68..621ec41a9 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
@@ -23,165 +23,34 @@
<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>
-
- <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>
-
+ <div class="main" style="background-color: #f5f5f5;font-family: 'Segoe UI', 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%;">
+ <div class="container" style="max-width: 580px;margin: 0 auto;padding: 20px;width: 100%;">
+ <div class="wrapper" style="max-width: 540px;margin: 0 auto;padding: 15px;width: 100%;border-radius: 5px;background-color: #fff;">
+ <h2 style="font-size: 25px;font-weight: normal;margin: 0;margin-bottom: 15px;">
+ <strong>
+ <span wicket:id="titleLbl" style="margin-bottom: 1em;"></span>
+ </strong>
+ </h2>
+ <span wicket:id="userLbl" style="margin-bottom: 1em;"></span> <span wicket:id="user" style="margin-bottom: 1em;"></span><br>
+ <span wicket:id="messageLbl" style="margin-bottom: 1em;"></span> <span wicket:id="message" style="margin-bottom: 1em;"></span>
+ <br><br>
+ <div wicket:id="links" class="action">
+ <span wicket:id="comment_for_link1" style="margin-bottom: 1em;"></span><br><br>
+ <a wicket:id="invitation_link1" style="color: #ffffff;text-decoration: none;box-sizing: border-box;cursor: pointer;display: inline-block;font-weight: bold;margin: 0;border-radius: 5px;padding: 12px 25px;background-color: #3498db;border-color: #3498db;">
+ <span wicket:id="clickMe" style="margin-bottom: 1em;"></span>
+ </a>
+ <br><br>
+ <span wicket:id="comment_for_link2" style="margin-bottom: 1em;"></span>
+ <br><br>
+ <span wicket:id="invitation_link2" style="margin-bottom: 1em;"></span>
+ <br><br>
+ </div>
+ </div>
+ </div>
+ </div>
</wicket:extend>
-</html>
\ No newline at end of file
+</html>
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 becba282a..a72a43703 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
@@ -23,167 +23,37 @@
<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>
-
- <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>
-
+ <div class="main" style="background-color: #f5f5f5;font-family: 'Segoe UI', 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%;">
+ <div class="container" style="max-width: 580px;margin: 0 auto;padding: 20px;width: 100%;">
+ <div class="wrapper" style="max-width: 540px;margin: 0 auto;padding: 15px;width: 100%;border-radius: 5px;background-color: #fff;">
+ <h2 style="font-size: 25px;font-weight: normal;margin: 0;margin-bottom: 15px;">
+ <span wicket:id="registrationLbl" style="margin-bottom: 1em;"></span>
+ </h2>
+ <strong>
+ <wicket:message key="507"></wicket:message>
+ </strong>
+ <br>
+ <wicket:message key="108"></wicket:message> <span wicket:id="username" style="margin-bottom: 1em;"></span><br>
+ <wicket:message key="lbl.email"></wicket:message> <span wicket:id="email" style="margin-bottom: 1em;"></span><br>
+ <span style="margin-bottom: 1em;"><a wicket:id="url" style="color: #007bff;text-decoration: none;"></a></span><br><br>
+ <div wicket:id="verification" class="action">
+ <span style="margin-bottom: 1em;">
+ <wicket:message key="667"></wicket:message>
+ </span><br><br>
+ <a wicket:id="verification_url1" style="color: #ffffff;text-decoration: none;box-sizing: border-box;cursor: pointer;display: inline-block;font-weight: bold;margin: 0;border-radius: 5px;padding: 12px 25px;background-color: #3498db;border-color: #3498db;">
+ <wicket:message key="668"></wicket:message>
+ </a>
+ <br><br>
+ <span wicket:id="verification_url2" style="margin-bottom: 1em;"></span> <br>
+ <br>
+ </div>
+ <span wicket:id="groupLbl" style="margin-bottom: 1em;"></span>
+ </div>
+ </div>
+ </div>
</wicket:extend>
-</html>
\ No newline at end of file
+</html>
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 b98a99e7f..c6f5382cc 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
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+ <?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -23,158 +23,33 @@
<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>
-
- <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>
-
+ <div class="main" style="background-color: #f5f5f5;font-family: 'Segoe UI', 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%;">
+ <div class="container" style="max-width: 580px;margin: 0 auto;padding: 20px;width: 100%;">
+ <div class="wrapper" style="max-width: 540px;margin: 0 auto;padding: 15px;width: 100%;border-radius: 5px;background-color: #fff;">
+ <h2 style="font-size: 20px;font-weight: normal;margin: 0;margin-bottom: 15px;">
+ <strong>
+ <span wicket:id="reset-header" style="margin-bottom: 1em;"></span>
+ </strong>
+ </h2>
+ <p style="margin-bottom: 1em;">
+ <wicket:message key="514"></wicket:message>
+ </p>
+ <div class="action">
+ <a wicket:id="reset_link1" style="color: #ffffff;text-decoration: none;box-sizing: border-box;cursor: pointer;display: inline-block;font-weight: bold;margin: 0;border-radius: 5px;padding: 12px 25px;background-color: #3498db;border-color: #3498db;">
+ <wicket:message key="515"></wicket:message>
+ </a>
+ </div>
+ <p style="margin-bottom: 1em;">
+ <wicket:message key="505"></wicket:message>
+ </p>
+ <span wicket:id="reset_link2" style="margin-bottom: 1em;">
+ </span><br><br>
+ </div>
+ </div>
+ </div>
</wicket:extend>
-</html>
\ No newline at end of file
+</html>
[openmeetings] 05/07: minor update #188 - .vscode/settings.json, style sass attibutes removed
Posted by so...@apache.org.
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 f7c829e5cfa168ee138f9a6b32629883cb93750e
Author: Geoffrey Logovi <52...@users.noreply.github.com>
AuthorDate: Fri May 19 09:42:45 2023 +0000
minor update #188 - .vscode/settings.json, style sass attibutes removed
---
.vscode/settings.json | 4 ----
.../openmeetings/service/mail/template/AbstractTemplatePage.html | 5 +----
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 163b71c1d..000000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "files.insertFinalNewline": true,
- "prettier.useTabs": true
-}
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePage.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePage.html
index 8ba38bc1f..8ce1c3252 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePage.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePage.html
@@ -58,7 +58,7 @@
}
.wrapper {
- max-width: 580px;
+ max-width: 560px;
margin: 0 auto;
padding: 15px;
width: 100%;
@@ -89,9 +89,6 @@
max-width: 560px;
margin: 0 auto;
padding: 10px;
- border-left-width: 0;
- border-radius: 0;
- border-right-width: 0;
.action {
text-align: center;
[openmeetings] 03/07: update - removed inline styles and updated email templates - #188
Posted by so...@apache.org.
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 affd8589f10300d387ebdfe4bc489fdce448be98
Author: Geoffrey Logovi <52...@users.noreply.github.com>
AuthorDate: Wed May 17 06:22:22 2023 +0000
update - removed inline styles and updated email templates - #188
---
.../service/mail/template/FeedbackTemplate.html | 27 ++++++++----
.../service/mail/template/InvitationTemplate.html | 32 +++++++-------
.../mail/template/RegisterUserTemplate.html | 50 +++++++++++-----------
.../template/RequestContactConfirmTemplate.html | 15 +++++--
.../mail/template/RequestContactTemplate.html | 23 +++++++---
.../mail/template/ResetPasswordTemplate.html | 45 ++++++++++---------
6 files changed, 110 insertions(+), 82 deletions(-)
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.html
index 23808ff8e..c2c00c783 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.html
@@ -20,12 +20,23 @@
-->
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd">
-<wicket:extend>
- <strong><span wicket:id="appname"></span> - Feedback</strong><br />
- Message from User: <span wicket:id="username"></span><br/>
- Mail: <span wicket:id="email"></span><br/>
- Message: <span wicket:id="message"></span><br/><br/>
- <strong>Click on this link to participate in the Meeting:</strong><br/>
- <a wicket:id="invitation_link">Click here to enter room</a><br/>
-</wicket:extend>
+<div class="main">
+ <div class="container">
+ <div class="wrapper">
+ <h2>
+ <strong><span wicket:id="appname"></span> - Feedback</strong>
+ </h2>
+ Message from User: <span wicket:id="username"></span><br />
+ Mail: <span wicket:id="email"></span><br />
+ Message: <span wicket:id="message"></span><br /><br />
+ <div class="action">
+ <span>
+ <strong>Click on this link to participate in the Meeting:</strong><br />
+ </span><br />
+ <a wicket:id="invitation_link">Click here to enter room</a>
+ <br />
+ </div>
+ </div>
+ </div>
+</div>
</html>
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 621ec41a9..5baa664fa 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
@@ -26,27 +26,27 @@
</head>
<wicket:extend>
- <div class="main" style="background-color: #f5f5f5;font-family: 'Segoe UI', 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%;">
- <div class="container" style="max-width: 580px;margin: 0 auto;padding: 20px;width: 100%;">
- <div class="wrapper" style="max-width: 540px;margin: 0 auto;padding: 15px;width: 100%;border-radius: 5px;background-color: #fff;">
- <h2 style="font-size: 25px;font-weight: normal;margin: 0;margin-bottom: 15px;">
+ <div class="main">
+ <div class="container">
+ <div class="wrapper">
+ <h2>
<strong>
- <span wicket:id="titleLbl" style="margin-bottom: 1em;"></span>
+ <span wicket:id="titleLbl"></span>
</strong>
</h2>
- <span wicket:id="userLbl" style="margin-bottom: 1em;"></span> <span wicket:id="user" style="margin-bottom: 1em;"></span><br>
- <span wicket:id="messageLbl" style="margin-bottom: 1em;"></span> <span wicket:id="message" style="margin-bottom: 1em;"></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 /><br />
<div wicket:id="links" class="action">
- <span wicket:id="comment_for_link1" style="margin-bottom: 1em;"></span><br><br>
- <a wicket:id="invitation_link1" style="color: #ffffff;text-decoration: none;box-sizing: border-box;cursor: pointer;display: inline-block;font-weight: bold;margin: 0;border-radius: 5px;padding: 12px 25px;background-color: #3498db;border-color: #3498db;">
- <span wicket:id="clickMe" style="margin-bottom: 1em;"></span>
+ <span wicket:id="comment_for_link1"></span><br /><br>
+ <a wicket:id="invitation_link1">
+ <span wicket:id="clickMe"></span>
</a>
- <br><br>
- <span wicket:id="comment_for_link2" style="margin-bottom: 1em;"></span>
- <br><br>
- <span wicket:id="invitation_link2" style="margin-bottom: 1em;"></span>
- <br><br>
+ <br><br />
+ <span wicket:id="comment_for_link2"></span>
+ <br /><br />
+ <span wicket:id="invitation_link2"></span>
+ <br />
</div>
</div>
</div>
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 a72a43703..dbde23ff0 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
@@ -26,34 +26,34 @@
</head>
<wicket:extend>
- <div class="main" style="background-color: #f5f5f5;font-family: 'Segoe UI', 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%;">
- <div class="container" style="max-width: 580px;margin: 0 auto;padding: 20px;width: 100%;">
- <div class="wrapper" style="max-width: 540px;margin: 0 auto;padding: 15px;width: 100%;border-radius: 5px;background-color: #fff;">
- <h2 style="font-size: 25px;font-weight: normal;margin: 0;margin-bottom: 15px;">
- <span wicket:id="registrationLbl" style="margin-bottom: 1em;"></span>
- </h2>
- <strong>
- <wicket:message key="507"></wicket:message>
- </strong>
- <br>
- <wicket:message key="108"></wicket:message> <span wicket:id="username" style="margin-bottom: 1em;"></span><br>
- <wicket:message key="lbl.email"></wicket:message> <span wicket:id="email" style="margin-bottom: 1em;"></span><br>
- <span style="margin-bottom: 1em;"><a wicket:id="url" style="color: #007bff;text-decoration: none;"></a></span><br><br>
- <div wicket:id="verification" class="action">
- <span style="margin-bottom: 1em;">
- <wicket:message key="667"></wicket:message>
- </span><br><br>
- <a wicket:id="verification_url1" style="color: #ffffff;text-decoration: none;box-sizing: border-box;cursor: pointer;display: inline-block;font-weight: bold;margin: 0;border-radius: 5px;padding: 12px 25px;background-color: #3498db;border-color: #3498db;">
- <wicket:message key="668"></wicket:message>
- </a>
- <br><br>
- <span wicket:id="verification_url2" style="margin-bottom: 1em;"></span> <br>
- <br>
+ <div class="main">
+ <div class="container">
+ <div class="wrapper">
+ <h2>
+ <span wicket:id="registrationLbl"></span>
+ </h2>
+ <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 />
+ <span><a wicket:id="url"></a></span><br /><br />
+ <div wicket:id="verification" class="action">
+ <span>
+ <wicket:message key="667" />
+ </span><br /><br>
+ <a wicket:id="verification_url1">
+ <wicket:message key="668" />
+ </a>
+ <br /><br />
+ <span wicket:id="verification_url2"></span> <br />
+ <br />
+ </div>
+ <span wicket:id="groupLbl"></span>
</div>
- <span wicket:id="groupLbl" style="margin-bottom: 1em;"></span>
</div>
</div>
- </div>
</wicket:extend>
</html>
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.html
index bfc6f0310..23e2e8a88 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.html
@@ -21,8 +21,17 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd">
<wicket:extend>
- <span wicket:id="hi"></span> <span wicket:id="displayName"></span><br/>
- <br/>
- <span wicket:id="addedName"></span> <span wicket:id="confirmed"></span><br/>
+ <div class="main">
+ <div class="container">
+ <div class="wrapper">
+ <h2>
+ <span wicket:id="hi"></span> <span wicket:id="displayName"></span><br />
+ </h2>
+ <p>
+ <span wicket:id="addedName"></span> <span wicket:id="confirmed"></span><br />
+ </p>
+ </div>
+ </div>
+ </div>
</wicket:extend>
</html>
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.html
index bda960d5a..155f1538f 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.html
@@ -21,12 +21,21 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd">
<wicket:extend>
- <span wicket:id="hi"></span> <span wicket:id="addedName"></span><br/>
- <br/>
- <span wicket:id="displayName"></span> <span wicket:id="likeToAdd"></span><br/>
- <span wicket:id="check"></span><br/>
- <br/>
- <br/>
- <a wicket:id="link"><span wicket:id="contactList"></span></a><br/>
+ <div class="main">
+ <div class="container">
+ <div class="wrapper">
+ <h2>
+ <span wicket:id="hi"></span> <span wicket:id="addedName"></span><br />
+ </h2>
+ <p>
+ <span wicket:id="displayName"></span> <span wicket:id="likeToAdd"></span><br />
+ <span wicket:id="check"></span><br />
+ </p>
+ <div class="action">
+ <a wicket:id="link"><span wicket:id="contactList"></span></a><br />
+ </div>
+ </div>
+ </div>
+ </div>
</wicket:extend>
</html>
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 c6f5382cc..166dbda65 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
@@ -26,30 +26,29 @@
</head>
<wicket:extend>
- <div class="main" style="background-color: #f5f5f5;font-family: 'Segoe UI', 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%;">
- <div class="container" style="max-width: 580px;margin: 0 auto;padding: 20px;width: 100%;">
- <div class="wrapper" style="max-width: 540px;margin: 0 auto;padding: 15px;width: 100%;border-radius: 5px;background-color: #fff;">
- <h2 style="font-size: 20px;font-weight: normal;margin: 0;margin-bottom: 15px;">
- <strong>
- <span wicket:id="reset-header" style="margin-bottom: 1em;"></span>
- </strong>
- </h2>
- <p style="margin-bottom: 1em;">
- <wicket:message key="514"></wicket:message>
- </p>
- <div class="action">
- <a wicket:id="reset_link1" style="color: #ffffff;text-decoration: none;box-sizing: border-box;cursor: pointer;display: inline-block;font-weight: bold;margin: 0;border-radius: 5px;padding: 12px 25px;background-color: #3498db;border-color: #3498db;">
- <wicket:message key="515"></wicket:message>
- </a>
+ <div class="main">
+ <div class="container">
+ <div class="wrapper">
+ <h2>
+ <strong>
+ <span wicket:id="reset-header"></span>
+ </strong>
+ </h2>
+ <p>
+ <wicket:message key="514" />
+ </p>
+ <div class="action">
+ <a wicket:id="reset_link1">
+ <wicket:message key="515" />
+ </a>
+ </div>
+ <p>
+ <wicket:message key="505" />
+ </p>
+ <span wicket:id="reset_link2">
+ </span><br />
</div>
- <p style="margin-bottom: 1em;">
- <wicket:message key="505"></wicket:message>
- </p>
- <span wicket:id="reset_link2" style="margin-bottom: 1em;">
- </span><br><br>
</div>
- </div>
- </div>
+ </div>
</wicket:extend>
-
</html>
[openmeetings] 07/07: fixes apache#188 - removed head tags fixed the style
Posted by so...@apache.org.
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 77df42f4f584a8a56a7930921575f331c60a62ce
Author: Geoffrey Logovi <52...@users.noreply.github.com>
AuthorDate: Wed May 24 09:39:54 2023 +0000
fixes apache#188 - removed head tags fixed the style
---
.../openmeetings/service/mail/template/InvitationTemplate.html | 5 -----
1 file changed, 5 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 804984767..6f1f93ea2 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
@@ -19,11 +19,6 @@
-->
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd">
-
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-
<wicket:extend>
<h2>