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:39 UTC
[openmeetings] 03/07: update - removed inline styles and updated email templates - #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 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>