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