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 <[email protected]> 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>
