diff --git a/resources/email/finance.tpl b/resources/email/finance.tpl index 5caacd78a..551f5b075 100755 --- a/resources/email/finance.tpl +++ b/resources/email/finance.tpl @@ -24,7 +24,7 @@ class="oneColumn">
-

+

{$text}

diff --git a/resources/email/new_user.tpl b/resources/email/new_user.tpl index 95e9fa304..5d88067ec 100755 --- a/resources/email/new_user.tpl +++ b/resources/email/new_user.tpl @@ -24,7 +24,7 @@ class="oneColumn">
-

+

{$text}

diff --git a/resources/email/one.tpl b/resources/email/one.tpl index f6c434d57..3556450ac 100755 --- a/resources/email/one.tpl +++ b/resources/email/one.tpl @@ -1,29 +1,24 @@ {include file='header.tpl'} - +
+ style="padding-top:30px;table-layout:fixed;background-color:#EEEEEE;" id="bodyTable">
-
-

- -

-
- -

-

 

+ style="padding-bottom:60px;padding-top:60px;padding-left:20px;padding-right:20px;" class="description"> +

{$text} -

 

-
+ {include file='footer.tpl'} diff --git a/resources/email/one_reng.tpl b/resources/email/one_reng.tpl new file mode 100755 index 000000000..f6c434d57 --- /dev/null +++ b/resources/email/one_reng.tpl @@ -0,0 +1,29 @@ +{include file='header.tpl'} + + +
+
+
+
+
+

+ +

+
+
+ +

+

 

+ {$text} +

 

+

+ +
+
+
+
+ {include file='footer.tpl'} diff --git a/resources/email/password_reset.tpl b/resources/email/password_reset.tpl index 2409f2feb..e86d23531 100755 --- a/resources/email/password_reset.tpl +++ b/resources/email/password_reset.tpl @@ -24,7 +24,7 @@ class="oneColumn">
-

+

你收到此邮件是因为你在 {$config['appName']} 系统申请了密码重置，如果非本人申请，请忽略此邮件。

点击此链接重置密码 diff --git a/resources/email/test.tpl b/resources/email/test.tpl index f6adcb39c..d13ae4ae7 100755 --- a/resources/email/test.tpl +++ b/resources/email/test.tpl @@ -24,7 +24,7 @@ class="oneColumn">

-

+

这是一封测试邮件。如果你能收到，说明邮件发送配置有效，可以正常工作。

diff --git a/resources/email/tip.tpl b/resources/email/tip.tpl index 9bbeb945c..f61bb4b4c 100755 --- a/resources/email/tip.tpl +++ b/resources/email/tip.tpl @@ -24,7 +24,7 @@ class="oneColumn">
-

+

{$text}

diff --git a/resources/email/traffic_report.tpl b/resources/email/traffic_report.tpl index cec513263..422de4cee 100755 --- a/resources/email/traffic_report.tpl +++ b/resources/email/traffic_report.tpl @@ -24,7 +24,7 @@ class="oneColumn">
-

+

用户名: {$user->user_name}
Email: {$user->email} diff --git a/resources/email/verify_code.tpl b/resources/email/verify_code.tpl index 14bb732a2..0ed2b8b6c 100755 --- a/resources/email/verify_code.tpl +++ b/resources/email/verify_code.tpl @@ -24,7 +24,7 @@ class="oneColumn">

-

+

你请求的邮箱验证代码为: {$code}
本验证代码在 {$expire} 前有效。
如果此验证码非你本人申请，请忽视此邮件。
diff --git a/resources/email/war.tpl b/resources/email/war.tpl index 89eec515b..f839ddad8 100755 --- a/resources/email/war.tpl +++ b/resources/email/war.tpl @@ -24,7 +24,7 @@ class="oneColumn">

-

+

{$text}

diff --git a/resources/email/warn.tpl b/resources/email/warn.tpl index 55fe232f0..1fa63a274 100755 --- a/resources/email/warn.tpl +++ b/resources/email/warn.tpl @@ -24,7 +24,7 @@ class="oneColumn">
-

+

{$text}

diff --git a/resources/views/tabler/email_test/finance.tpl b/resources/views/tabler/email_test/finance.tpl index 5caacd78a..551f5b075 100755 --- a/resources/views/tabler/email_test/finance.tpl +++ b/resources/views/tabler/email_test/finance.tpl @@ -24,7 +24,7 @@ class="oneColumn">
-

+

{$text}

diff --git a/resources/views/tabler/email_test/new_user.tpl b/resources/views/tabler/email_test/new_user.tpl index 95e9fa304..5d88067ec 100755 --- a/resources/views/tabler/email_test/new_user.tpl +++ b/resources/views/tabler/email_test/new_user.tpl @@ -24,7 +24,7 @@ class="oneColumn">
-

+

{$text}

diff --git a/resources/views/tabler/email_test/one.tpl b/resources/views/tabler/email_test/one.tpl index f6c434d57..3556450ac 100755 --- a/resources/views/tabler/email_test/one.tpl +++ b/resources/views/tabler/email_test/one.tpl @@ -1,29 +1,24 @@ {include file='header.tpl'} - +
+ style="padding-top:30px;table-layout:fixed;background-color:#EEEEEE;" id="bodyTable">
-
-

- -

-
- -

-

 

+ style="padding-bottom:60px;padding-top:60px;padding-left:20px;padding-right:20px;" class="description"> +

{$text} -

 

-
+ {include file='footer.tpl'} diff --git a/resources/views/tabler/email_test/one_reng.tpl b/resources/views/tabler/email_test/one_reng.tpl new file mode 100755 index 000000000..f6c434d57 --- /dev/null +++ b/resources/views/tabler/email_test/one_reng.tpl @@ -0,0 +1,29 @@ +{include file='header.tpl'} + + +
+
+
+
+
+

+ +

+
+
+ +

+

 

+ {$text} +

 

+

+ +
+
+
+
+ {include file='footer.tpl'} diff --git a/resources/views/tabler/email_test/password_reset.tpl b/resources/views/tabler/email_test/password_reset.tpl index 2409f2feb..e86d23531 100755 --- a/resources/views/tabler/email_test/password_reset.tpl +++ b/resources/views/tabler/email_test/password_reset.tpl @@ -24,7 +24,7 @@ class="oneColumn">
-

+

你收到此邮件是因为你在 {$config['appName']} 系统申请了密码重置，如果非本人申请，请忽略此邮件。

点击此链接重置密码 diff --git a/resources/views/tabler/email_test/test.tpl b/resources/views/tabler/email_test/test.tpl index f6adcb39c..d13ae4ae7 100755 --- a/resources/views/tabler/email_test/test.tpl +++ b/resources/views/tabler/email_test/test.tpl @@ -24,7 +24,7 @@ class="oneColumn">

-

+

这是一封测试邮件。如果你能收到，说明邮件发送配置有效，可以正常工作。

diff --git a/resources/views/tabler/email_test/tip.tpl b/resources/views/tabler/email_test/tip.tpl index 9bbeb945c..f61bb4b4c 100755 --- a/resources/views/tabler/email_test/tip.tpl +++ b/resources/views/tabler/email_test/tip.tpl @@ -24,7 +24,7 @@ class="oneColumn">
-

+

{$text}

diff --git a/resources/views/tabler/email_test/traffic_report.tpl b/resources/views/tabler/email_test/traffic_report.tpl index cec513263..422de4cee 100755 --- a/resources/views/tabler/email_test/traffic_report.tpl +++ b/resources/views/tabler/email_test/traffic_report.tpl @@ -24,7 +24,7 @@ class="oneColumn">
-

+

用户名: {$user->user_name}
Email: {$user->email} diff --git a/resources/views/tabler/email_test/verify_code.tpl b/resources/views/tabler/email_test/verify_code.tpl index 14bb732a2..0ed2b8b6c 100755 --- a/resources/views/tabler/email_test/verify_code.tpl +++ b/resources/views/tabler/email_test/verify_code.tpl @@ -24,7 +24,7 @@ class="oneColumn">

-

+

你请求的邮箱验证代码为: {$code}
本验证代码在 {$expire} 前有效。
如果此验证码非你本人申请，请忽视此邮件。
diff --git a/resources/views/tabler/email_test/war.tpl b/resources/views/tabler/email_test/war.tpl index 89eec515b..f839ddad8 100755 --- a/resources/views/tabler/email_test/war.tpl +++ b/resources/views/tabler/email_test/war.tpl @@ -24,7 +24,7 @@ class="oneColumn">

-

+

{$text}

diff --git a/resources/views/tabler/email_test/warn.tpl b/resources/views/tabler/email_test/warn.tpl index 55fe232f0..1fa63a274 100755 --- a/resources/views/tabler/email_test/warn.tpl +++ b/resources/views/tabler/email_test/warn.tpl @@ -24,7 +24,7 @@ class="oneColumn">
-

+

{$text}