From a23b12c9a4e4aa60f1afc8584f5ab28fb5c1c506 Mon Sep 17 00:00:00 2001 From: "DESKTOP-FUS91B7\\Showeasy" Date: Tue, 14 Mar 2023 19:51:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[what]=20=E4=BF=AE=E6=94=B9email=20?= =?UTF-8?q?=E6=A8=A3=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ShowEasy/EmailTemplate_CH.cs | 24 ++--- .../EasyBL.WEBAPP/ShowEasy/SignupService.cs | 87 ++++++++++--------- 2 files changed, 57 insertions(+), 54 deletions(-) diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/EmailTemplate_CH.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/EmailTemplate_CH.cs index 182a198..eb6c82c 100644 --- a/EuroTran/EasyBL.WEBAPP/ShowEasy/EmailTemplate_CH.cs +++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/EmailTemplate_CH.cs @@ -63,7 +63,7 @@ namespace EasyBL.WEBAPP.ShowEasy //Create one of these media queries for each additional viewport size you'd like to fix sb.Append("@media only screen and (min-device-width: 320px) and (max-device-width: 374px) {u ~ div.email-container {min-width: 320px !important;}}"); sb.Append("@media only screen and (min-device-width: 375px) and (max-device-width: 413px) {u ~ div.email-container {min-width: 375px !important;}}"); - sb.Append("@media only screen and (min-device-width: 414px) {u ~ div.email-container {min-width: 414px !important;}"); + sb.Append("@media only screen and (min-device-width: 414px) {u ~ div.email-container {min-width: 414px !important;} .logo-img {width: 200px!important;height: 24px!important;} .confirm-img {width: 50px!important;height: 50px!important;} .title1 {font-size: 18px!important;line-height:20px!important;} .has-markdown {font-size: 14px!important;line-height: 16px!important;}"); sb.Append(""); //CSS Style @@ -85,7 +85,7 @@ namespace EasyBL.WEBAPP.ShowEasy sb.Append(".bar {border-radius: 16px;}"); sb.Append(".btr {border-top-left-radius: 16px;border-top-right-radius: 16px;}"); sb.Append(".bbr {border-bottom-left-radius: 5px;border-bottom-right-radius: 5px;}"); - sb.Append("@media screen and (max-width: 500px) {"); + sb.Append("@media screen and (min-width: 300px) and (max-width: 640px) {"); //Forces table cells into full-width rows sb.Append(".stack-column,.stack-column-center {display: block!important;width: 100 % !important;max-width: 100 % !important;direction: ltr!important;}"); //And center justify these ones @@ -126,13 +126,13 @@ namespace EasyBL.WEBAPP.ShowEasy //3. mso conditional: For Windows 10 Mail sb.Append(" "); sb.Append("
"); - sb.Append("
"); - sb.Append(" "); + sb.Append("
"); + sb.Append("
"); //ShowEasy Logo sb.Append(""); - sb.Append(""); sb.Append(""); @@ -184,7 +184,7 @@ namespace EasyBL.WEBAPP.ShowEasy sb.Append("
"); + sb.Append(""); sb.Append(""); - sb.Append(" "); + sb.Append(" "); sb.Append(""); sb.Append("
"); sb.Append(""); sb.Append(""); @@ -195,13 +195,13 @@ namespace EasyBL.WEBAPP.ShowEasy sb.Append("
"); - sb.Append("

"); + sb.Append("

"); sb.Append("追蹤我們"); sb.Append("

"); sb.Append("
"); sb.Append(""); sb.Append(""); sb.Append(""); sb.Append(""); sb.Append(""); sb.Append("
"); - sb.Append(""); + sb.Append(""); sb.Append(""); - sb.Append(""); + sb.Append(""); sb.Append(""); - sb.Append(""); + sb.Append(""); sb.Append("
"); @@ -210,7 +210,7 @@ namespace EasyBL.WEBAPP.ShowEasy //Text：2022 Showeasy. All rights reserved. sb.Append(""); sb.Append(""); - sb.Append("

"); + sb.Append("

"); sb.Append("© 2023 Showeasy. All rights reserved."); sb.Append("

"); sb.Append(""); @@ -218,7 +218,7 @@ namespace EasyBL.WEBAPP.ShowEasy //Text：www.showeasy.com sb.Append(""); sb.Append(""); - sb.Append("

"); + sb.Append("

"); sb.Append("www.showeasy.com"); sb.Append("

"); sb.Append(""); diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/SignupService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/SignupService.cs index 24fb7d8..d805547 100644 --- a/EuroTran/EasyBL.WEBAPP/ShowEasy/SignupService.cs +++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/SignupService.cs @@ -280,32 +280,32 @@ namespace EasyBL.WEBAPP.SYS sb.Append(""); sb.Append(""); sb.Append("
"); - sb.Append(" "); + sb.Append("
"); sb.Append(""); - sb.Append(""); sb.Append(""); //Text：VerifyYourAccount sb.Append(""); - sb.Append(""); sb.Append(""); //Text：Hi,xxx sb.Append(""); - sb.Append(""); sb.Append(""); //Text：Welcome to.... sb.Append(""); - sb.Append(""); //Button：Verify my account sb.Append(""); - sb.Append(""); sb.Append(""); + + + //sb.Append(mailTemplate.MailButtom()); sb.Append(mailTemplate.MailFooter()); @@ -455,32 +458,32 @@ namespace EasyBL.WEBAPP.SYS sb.Append("
"); - sb.Append(" "); + sb.Append(" "); + sb.Append(" "); sb.Append("
"); - sb.Append("

"); + sb.Append("

"); + sb.Append("

"); sb.Append("EMAIL認證信"); sb.Append("

"); sb.Append("
"); - sb.Append("

"); + sb.Append("

"); + sb.Append("

"); sb.Append("您好 " + FirstName + ","); sb.Append("

"); sb.Append("
"); - sb.Append("

"); + sb.Append("

"); + sb.Append("

"); sb.Append("歡迎您加入ShowEasy成為會員!
"); sb.Append("請點選會員認證完成註冊並啟用您的帳戶
"); sb.Append("
"); @@ -317,7 +317,7 @@ namespace EasyBL.WEBAPP.SYS sb.Append("

"); + sb.Append(" "); sb.Append(""); sb.Append(""); sb.Append(""); //If the button isn't working, you can click sb.Append(""); - sb.Append(""); @@ -351,6 +351,9 @@ namespace EasyBL.WEBAPP.SYS sb.Append("
"); @@ -334,13 +334,13 @@ namespace EasyBL.WEBAPP.SYS sb.Append("
"); - sb.Append("

"); + sb.Append("

"); + sb.Append("

"); sb.Append("如果按鈕無法點擊，你可以直接點擊"); sb.Append(""); - sb.Append("這裡"); + sb.Append("\" style = \"color: #7997ff;font-size: 16px;font-weight: 400;font-family: 'Arial', '微軟正黑體','Microsoft JhengHei', 'Helvetica Neue',Helvetica, Arial, sans-serif;padding: 0;margin: 0;text-align: center;padding-left: 0px;padding-right: 30px;padding-top: 4px;text-decoration: underline;\">"); + sb.Append("這裡"); sb.Append(""); sb.Append("

"); sb.Append("
"); sb.Append("
"); sb.Append(""); sb.Append("
"); - sb.Append(" "); + sb.Append("
"); sb.Append(""); - sb.Append(""); sb.Append(""); //Text：VerifyYourAccount sb.Append(""); - sb.Append(""); sb.Append(""); //Text：Hi,xxx sb.Append(""); - sb.Append(""); sb.Append(""); //Text：oh no.... sb.Append(""); - sb.Append(""); //Button：Reset password sb.Append(""); - sb.Append("
"); - sb.Append(" "); + sb.Append(" "); + sb.Append(" "); sb.Append("
"); - sb.Append("

"); + sb.Append("

"); + sb.Append("

"); sb.Append("密碼重設信"); sb.Append("

"); sb.Append("
"); - sb.Append("

"); + sb.Append("

"); + sb.Append("

"); sb.Append(FirstName + ","); sb.Append("

"); sb.Append("
"); - sb.Append("

"); + sb.Append("

"); + sb.Append("

"); sb.Append("喔不您忘記您的密碼了嗎？
"); sb.Append("沒關係，我們一直都在!
"); sb.Append("
"); @@ -495,8 +498,8 @@ namespace EasyBL.WEBAPP.SYS sb.Append("

"); - sb.Append(""); + sb.Append("
"); + sb.Append(""); sb.Append(""); sb.Append(""); - sb.Append(""); sb.Append("
"); sb.Append(""); //If the button isn't working, you can click sb.Append("
"); - sb.Append("

"); + sb.Append("

"); + sb.Append("

"); sb.Append("如果按鈕無法點擊，你可以直接點擊"); sb.Append(""); sb.Append("

"); - sb.Append(" "); + sb.Append("
"); sb.Append(""); - sb.Append(""); sb.Append(""); //Text：PASSWORD CHANGE NOTICE sb.Append(""); - sb.Append(""); sb.Append(""); //Text：Hi,xxx sb.Append(""); - sb.Append(""); //Text：Don't forget.... sb.Append(""); - sb.Append(""); sb.Append(""); sb.Append(""); - sb.Append(""); sb.Append(""); sb.Append(""); - sb.Append(""); From a69d74e9a4daa46b1b899bf7fa335d5a442a39c0 Mon Sep 17 00:00:00 2001 From: alina <1449359159@qq.com> Date: Tue, 14 Mar 2023 21:28:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?Onsite=E5=B1=95=E6=9C=83=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Page/ShowEasy/ONSiteMaintain_Upd.html | 31 +---- .../pages/ShowEasy/ONSiteMaintain_Upd.js | 117 ++++++++++++++---- 2 files changed, 97 insertions(+), 51 deletions(-) diff --git a/EuroTran/WebApp/Page/ShowEasy/ONSiteMaintain_Upd.html b/EuroTran/WebApp/Page/ShowEasy/ONSiteMaintain_Upd.html index 550b83b..bb6ec0d 100644 --- a/EuroTran/WebApp/Page/ShowEasy/ONSiteMaintain_Upd.html +++ b/EuroTran/WebApp/Page/ShowEasy/ONSiteMaintain_Upd.html @@ -329,8 +329,8 @@
"); - sb.Append(" "); + sb.Append(" "); + sb.Append(" "); sb.Append("
"); - sb.Append("

"); + sb.Append("

"); + sb.Append("

"); sb.Append("密碼變更通知信"); sb.Append("

"); sb.Append("
"); - sb.Append("

"); + sb.Append("

"); + sb.Append("

"); sb.Append(FirstName + "，ShowEasy已成功為您更新密碼
"); //sb.Append("successfully."); sb.Append("

"); @@ -651,8 +654,8 @@ namespace EasyBL.WEBAPP.SYS sb.Append("
"); - sb.Append("

"); + sb.Append("

"); + sb.Append("

"); sb.Append("下次登入ShowEasy時記得使用新的密碼喔!
"); //sb.Append("SowEasy account!
"); sb.Append("
"); @@ -661,17 +664,17 @@ namespace EasyBL.WEBAPP.SYS sb.Append("

"); - sb.Append(""); - sb.Append(""); + sb.Append(""); + sb.Append(""); + sb.Append(""); sb.Append("886-2-2725-5000"); sb.Append(""); sb.Append("
"); - sb.Append(""); - sb.Append(""); + sb.Append(""); + sb.Append(""); + sb.Append(""); sb.Append("info@showeasy.com"); sb.Append(""); sb.Append(" - - + +
@@ -795,28 +795,7 @@ -
- - -
- -
- - -
- - - - - -
- -
- +
@@ -879,7 +858,7 @@
--> -