Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
taskonsite-архив-перенесен
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitry Korolev
taskonsite-архив-перенесен
Commits
da067ab9
Commit
da067ab9
authored
May 27, 2016
by
Олег Гиммельшпах
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix templates
parent
b0f0fc11
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
519 additions
and
350 deletions
+519
-350
common/mail/layouts/html.php
common/mail/layouts/html.php
+31
-1
common/mail/messageBid-html.php
common/mail/messageBid-html.php
+255
-54
common/mail/passwordResetToken-html.php
common/mail/passwordResetToken-html.php
+0
-28
common/mail/sendNewPassword-html.php
common/mail/sendNewPassword-html.php
+232
-263
common/modules/bids/models/Bid.php
common/modules/bids/models/Bid.php
+1
-4
No files found.
common/mail/layouts/html.php
View file @
da067ab9
...
...
@@ -124,8 +124,38 @@ use yii\helpers\Html;
<body
merkle=
"fix"
style=
"margin:0; padding:0; -webkit-text-size-adjust: none;"
bgcolor=
"#f2f2f2"
>
<?php
$this
->
beginBody
()
?>
<div
style=
"background-color:#f2f2f2;"
align=
"center"
>
<!--[if gte mso 9]>
<v:background xmlns:v="urn:schemas-microsoft-com:vml" fill="t">
<v:fill type="tile" src="" color="#efefef"/>
</v:background>
<![endif]-->
<table
height=
"100%"
width=
"100%"
cellpadding=
"0"
cellspacing=
"0"
border=
"0"
bgcolor=
"#424242"
>
<tr>
<td
valign=
"top"
align=
"center"
bgcolor=
"#424242"
>
<!--Begin Header1 -->
<table
width=
"600"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
class=
"width270"
>
<tr>
<td
align=
"center"
valign=
"top"
style=
"font-family: 'Trebuchet MS', Arial, Helvetica, sans-serif; font-size:12px; mso-line-height-rule:exactly; line-height:16px; color:#ffffff; padding-top:8px; padding-bottom:8px"
>
Если письмо отображается неккоректно, нажмите
<a
href=
"#"
target=
"_blank"
style=
"color:#ffffff"
>
здесь
</a></td>
</tr>
</table>
</td>
</tr>
</table>
<?=
$content
?>
<?=
$content
?>
<!--begin spacer -->
<table
width=
"600"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
class=
"width270"
>
<tr>
<td
align=
"left"
valign=
"top"
style=
"font-size:20px; line-height:20px"
><img
src=
"
<?=
Yii
::
$app
->
params
[
'frontUrl'
];
?>
/images/letter/spacer.gif"
width=
"1"
height=
"20"
border=
"0"
/></td>
</tr>
</table>
<!--end spacer -->
</div>
<?php
$this
->
endBody
()
?>
...
...
common/mail/messageBid-html.php
View file @
da067ab9
This diff is collapsed.
Click to expand it.
common/mail/passwordResetToken-html.php
View file @
da067ab9
...
...
@@ -10,25 +10,6 @@ $resetLink = Yii::$app->urlManager->createAbsoluteUrl(['site/reset-password', 't
?>
<div
style=
"background-color:#f2f2f2;"
align=
"center"
>
<!--[if gte mso 9]>
<v:background xmlns:v="urn:schemas-microsoft-com:vml" fill="t">
<v:fill type="tile" src="" color="#efefef"/>
</v:background>
<![endif]-->
<table
height=
"100%"
width=
"100%"
cellpadding=
"0"
cellspacing=
"0"
border=
"0"
bgcolor=
"#424242"
>
<tr>
<td
valign=
"top"
align=
"center"
bgcolor=
"#424242"
>
<!--Begin Header1 -->
<table
width=
"600"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
class=
"width270"
>
<tr>
<td
align=
"center"
valign=
"top"
style=
"font-family: 'Trebuchet MS', Arial, Helvetica, sans-serif; font-size:12px; mso-line-height-rule:exactly; line-height:16px; color:#ffffff; padding-top:8px; padding-bottom:8px"
>
Если письмо отображается неккоректно, нажмите
<a
href=
"#"
target=
"_blank"
style=
"color:#ffffff"
>
здесь
</a></td>
</tr>
</table>
</td>
</tr>
</table>
<table
height=
"100%"
width=
"100%"
cellpadding=
"0"
cellspacing=
"0"
border=
"0"
>
...
...
@@ -275,12 +256,3 @@ $resetLink = Yii::$app->urlManager->createAbsoluteUrl(['site/reset-password', 't
</td>
</tr>
</table>
<!--begin spacer -->
<table
width=
"600"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
class=
"width270"
>
<tr>
<td
align=
"left"
valign=
"top"
style=
"font-size:20px; line-height:20px"
><img
src=
"
<?=
Yii
::
$app
->
params
[
'frontUrl'
];
?>
/images/letter/spacer.gif"
width=
"1"
height=
"20"
border=
"0"
/></td>
</tr>
</table>
<!--end spacer -->
</div>
common/mail/sendNewPassword-html.php
View file @
da067ab9
This diff is collapsed.
Click to expand it.
common/modules/bids/models/Bid.php
View file @
da067ab9
...
...
@@ -126,10 +126,7 @@ class Bid extends \common\components\ActiveRecordModel
$session
=
Session
::
findOne
(
Yii
::
$app
->
session
->
get
(
'SessionId'
));
}
return
Yii
::
$app
->
mailer
->
compose
([
'html'
=>
'messageBid-html'
,
'text'
=>
'messageBid-text'
],
[
'model'
=>
$this
,
'session'
=>
$session
,
])
return
Yii
::
$app
->
mailer
->
compose
([
'html'
=>
'messageBid-html'
,
'text'
=>
'messageBid-text'
],
[
'model'
=>
$this
,
'session'
=>
$session
])
->
setFrom
([
Settings
::
getValue
(
'bids-support-email-from'
)
=>
'Заявка с сайта TaskOn'
])
->
setTo
(
Settings
::
getValue
(
'bids-support-email'
))
->
setSubject
(
"Заявка №"
.
$this
->
id
.
". С сайта task-on.com поступила заявка с формы: "
.
static
::
$form_titles
[
$this
->
form
])
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment