Skip to content

Commit

Permalink
Merge pull request #2210 from sspanel-uim/dev
Browse files Browse the repository at this point in the history 
Dev 20231021
  • Loading branch information
M1Screw authored Oct 20, 2023
2 parents 221afb0 + 8980609 commit b4494d7
Show file tree
Hide file tree
Showing 98 changed files with 4,898 additions and 4,136 deletions.
4 changes: 2 additions & 2 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ public/clients/*.*

storage/framework/smarty/cache/*
storage/framework/smarty/compile/*
storage/framework/views/*
storage/framework/twig/*
storage/*.*
!storage/framework/smarty/cache/.gitkeep
!storage/framework/smarty/compile/.gitkeep
!storage/framework/views/.gitkeep
!storage/framework/twig/.gitkeep

.user.ini
public/.user.ini
Expand Down
54 changes: 26 additions & 28 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 25 additions & 20 deletions resources/email/finance.tpl
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,35 @@
{include file='header.tpl'}

<body style="background-color:#EEEEEE;">
<div style="text-align: center">
<div border="0" cellpadding="0" cellspacing="0" width="100%" style="padding-top:30px;table-layout:fixed;background-color:#EEEEEE;" id="bodyTable">
<div align="center" valign="top" style="padding-right:10px;padding-left:10px;" id="bodyCell">
<div border="0" cellpadding="0" cellspacing="0" style="background-color:#FFFFFF;max-width:600px;text-align: center" width="100%" class="wrapperTable">
<div align="center" valign="top">
<div border="0" cellpadding="0" cellspacing="0" width="100%" class="logoTable">
<div align="center" valign="middle" style="padding-top:60px;padding-bottom:60px">
<h2 class="bigTitle">
{$title}
</h2>
</div>
<div style="text-align: center">
<div border="0" cellpadding="0" cellspacing="0" width="100%"
style="padding-top:30px;table-layout:fixed;background-color:#EEEEEE;" id="bodyTable">
<div align="center" valign="top" style="padding-right:10px;padding-left:10px;" id="bodyCell">
<div border="0" cellpadding="0" cellspacing="0"
style="background-color:#FFFFFF;max-width:600px;text-align: center" width="100%" class="wrapperTable">
<div align="center" valign="top">
<div border="0" cellpadding="0" cellspacing="0" width="100%" class="logoTable">
<div align="center" valign="middle" style="padding-top:60px;padding-bottom:60px">
<h2 class="bigTitle">
{$title}
</h2>
</div>
</div>
</div>
<div border="0" cellpadding="0" cellspacing="0" style="max-width:600px;text-align: center" width="100%" class="wrapperTable">
<div align="center" valign="top">
<div border="0" cellpadding="0" cellspacing="0" style="background-color:#FFFFFF" width="100%" class="oneColumn">
<div align="center" valign="top" style="padding-bottom:60px;padding-left:20px;padding-right:20px;" class="description">
<p class="midText">
{$text}
</p>
</div>
</div>
<div border="0" cellpadding="0" cellspacing="0" style="max-width:600px;text-align: center" width="100%"
class="wrapperTable">
<div align="center" valign="top">
<div border="0" cellpadding="0" cellspacing="0" style="background-color:#FFFFFF" width="100%"
class="oneColumn">
<div align="center" valign="top"
style="padding-bottom:60px;padding-left:20px;padding-right:20px;" class="description">
<p class="midText">
{$text}
</p>
</div>
</div>
</div>
</div>

{include file='footer.tpl'}
{include file='footer.tpl'}
13 changes: 9 additions & 4 deletions resources/email/footer.tpl
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
<div border="0" cellpadding="0" cellspacing="0" style="max-width:600px;text-align: center" width="100%" class="wrapperTable">
<div border="0" cellpadding="0" cellspacing="0" style="max-width:600px;text-align: center" width="100%"
class="wrapperTable">
<div align="center" valign="top">
<div border="0" cellpadding="0" cellspacing="0" width="100%" class="footer">
<div>
<div align="center" valign="top" style="padding-top:15px;padding-bottom:30px;padding-left:10px;padding-right:10px;" class="brandInfo">
<div align="center" valign="top"
style="padding-top:15px;padding-bottom:30px;padding-left:10px;padding-right:10px;"
class="brandInfo">
<p class="smlText">
<a href="{$config['baseUrl']}" style="color:#505050;text-decoration:none" target="_blank">{$config['appName']}</a> |
<a href="{$config['baseUrl']}/user/edit" style="color:#505050;text-decoration:none" target="_blank">修改邮件接收设置</a>
<a href="{$config['baseUrl']}" style="color:#505050;text-decoration:none"
target="_blank">{$config['appName']}</a> |
<a href="{$config['baseUrl']}/user/edit" style="color:#505050;text-decoration:none"
target="_blank">修改邮件接收设置</a>
</p>
</div>
</div>
Expand Down
52 changes: 26 additions & 26 deletions resources/email/header.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,38 +8,38 @@

<style>
.bigTitle {
color:#000000;
font-family:'Open Sans', Tahoma, Verdana, sans-serif;
font-size:24px;
font-weight:600;
font-style:normal;
letter-spacing:normal;
line-height:34px;
text-align:center;
padding:0;
margin:0;
color: #000000;
font-family: 'Open Sans', Tahoma, Verdana, sans-serif;
font-size: 24px;
font-weight: 600;
font-style: normal;
letter-spacing: normal;
line-height: 34px;
text-align: center;
padding: 0;
margin: 0;
}
.midText {
color:#000000 !important;
font-family:'Open Sans', Tahoma, Verdana, sans-serif !important;
font-size:16px !important;
font-weight:400 !important;
line-height:22px !important;
text-align:center !important;
padding:0 !important;
margin:0 !important;
color: #000000 !important;
font-family: 'Open Sans', Tahoma, Verdana, sans-serif !important;
font-size: 16px !important;
font-weight: 400 !important;
line-height: 22px !important;
text-align: center !important;
padding: 0 !important;
margin: 0 !important;
}
.smlText {
color:#313131;
font-family:'Open Sans', Tahoma, Verdana, sans-serif;
font-size:12px;
font-weight:400;
line-height:18px;
text-align:center;
margin:0;
padding:0;
color: #313131;
font-family: 'Open Sans', Tahoma, Verdana, sans-serif;
font-size: 12px;
font-weight: 400;
line-height: 18px;
text-align: center;
margin: 0;
padding: 0;
}
</style>
</head>
45 changes: 25 additions & 20 deletions resources/email/new_user.tpl
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,35 @@
{include file='header.tpl'}

<body style="background-color:#EEEEEE;">
<div style="text-align: center">
<div border="0" cellpadding="0" cellspacing="0" width="100%" style="padding-top:30px;table-layout:fixed;background-color:#EEEEEE;" id="bodyTable">
<div align="center" valign="top" style="padding-right:10px;padding-left:10px;" id="bodyCell">
<div border="0" cellpadding="0" cellspacing="0" style="background-color:#FFFFFF;max-width:600px;text-align: center" width="100%" class="wrapperTable">
<div align="center" valign="top">
<div border="0" cellpadding="0" cellspacing="0" width="100%" class="logoTable">
<div align="center" valign="middle" style="padding-top:60px;padding-bottom:60px">
<h2 class="bigTitle">
账户已经生成
</h2>
</div>
<div style="text-align: center">
<div border="0" cellpadding="0" cellspacing="0" width="100%"
style="padding-top:30px;table-layout:fixed;background-color:#EEEEEE;" id="bodyTable">
<div align="center" valign="top" style="padding-right:10px;padding-left:10px;" id="bodyCell">
<div border="0" cellpadding="0" cellspacing="0"
style="background-color:#FFFFFF;max-width:600px;text-align: center" width="100%" class="wrapperTable">
<div align="center" valign="top">
<div border="0" cellpadding="0" cellspacing="0" width="100%" class="logoTable">
<div align="center" valign="middle" style="padding-top:60px;padding-bottom:60px">
<h2 class="bigTitle">
账户已经生成
</h2>
</div>
</div>
</div>
<div border="0" cellpadding="0" cellspacing="0" style="max-width:600px;text-align: center" width="100%" class="wrapperTable">
<div align="center" valign="top">
<div border="0" cellpadding="0" cellspacing="0" style="background-color:#FFFFFF" width="100%" class="oneColumn">
<div align="center" valign="top" style="padding-bottom:60px;padding-left:20px;padding-right:20px;" class="description">
<p class="midText">
{$text}
</p>
</div>
</div>
<div border="0" cellpadding="0" cellspacing="0" style="max-width:600px;text-align: center" width="100%"
class="wrapperTable">
<div align="center" valign="top">
<div border="0" cellpadding="0" cellspacing="0" style="background-color:#FFFFFF" width="100%"
class="oneColumn">
<div align="center" valign="top"
style="padding-bottom:60px;padding-left:20px;padding-right:20px;" class="description">
<p class="midText">
{$text}
</p>
</div>
</div>
</div>
</div>

{include file='footer.tpl'}
{include file='footer.tpl'}
Loading

0 comments on commit b4494d7

Please sign in to comment.