Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* adjust mail style.

Browse Source
This commit is contained in:
wangyidong
2016-03-11 17:31:39 +08:00
parent aea3e80a3f
commit 1a8a8a0be4
11 changed files with 28 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/view/sendmail.html.php
+2 -3
View File
@@ -16,8 +16,7 @@
<td>
<table cellpadding='0' cellspacing='0' width='600' style='border: none; border-collapse: collapse;'>
<tr>
<td style='padding: 10px; background-color: #F8FAFE; border: none; font-size: 14px; font-weight: 500; border-bottom: 1px solid #e5e5e5;'>BUG #<?php echo $bug->id . ' &nbsp;' . html::a(common::getSysURL() . $this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, '', "style='color: #333'");?></td>
<td style='width: 40px; text-align: right; background-color: #F8FAFE; border: none; vertical-align: top; padding: 10px; border-bottom: 1px solid #e5e5e5;'><?php echo html::a(common::getSysURL() . $this->createLink('bug', 'view', "bugID=$bug->id"), '[+]', 'target="_blank"');?></td>
<td style='padding: 10px; background-color: #F8FAFE; border: none; font-size: 14px; font-weight: 500; border-bottom: 1px solid #e5e5e5;'><?php echo html::a(common::getSysURL() . $this->createLink('bug', 'view', "bugID=$bug->id"), $mailTitle, '', "style='color: #333'");?></td>
</tr>
</table>
</td>
@@ -26,7 +25,7 @@
<td style='padding: 10px; border: none;'>
<fieldset style='border: 1px solid #e5e5e5'>
<legend style='color: #114f8e'><?php echo $lang->bug->legendSteps;?></legend>
<div class='content'><?php echo $bug->steps;?></div>
<div style='padding:5px;'><?php echo $bug->steps;?></div>
</fieldset>
</td>
</tr>
module/common/view/mail.css.php
View File
module/common/view/mail.header.html.php
+1 -2
View File
@@ -17,7 +17,6 @@ if($onlybody) $_GET['onlybody'] = 'no';
<table align='center' border='0' cellpadding='0' cellspacing='0' width='600' style='border: none; border-collapse: collapse;'>
<tr>
<td style='padding: 10px 0; border: none; vertical-align: middle;'><strong style='font-size: 16px'><?php echo $app->company->name ?></strong></td>
<td style='padding: 10px 0; text-align: right; border: none;'><a href='<?php echo common::getSysURL() ?>' target='_blank'><img width='100' src='<?php echo common::getSysURL() . '/theme/default/images/main/zentao.png'; ?>' /></a></td>
</tr>
</table>
<table align='center' border='0' cellpadding='0' cellspacing='0' width='600' style='border-collapse: collapse; background-color: #fff; border: 1px solid #cfcfcf; box-shadow: 0 0px 6px rgba(0, 0, 0, 0.1); margin-bottom: 20px'>
<table align='center' border='0' cellpadding='0' cellspacing='0' width='600' style='border-collapse: collapse; background-color: #fff; border: 1px solid #cfcfcf; box-shadow: 0 0px 6px rgba(0, 0, 0, 0.1); margin-bottom: 20px; font-size:13px;'>
module/common/view/mail.html.php
View File
module/project/view/sendmail.html.php
+2 -3
View File
@@ -16,8 +16,7 @@
<td>
<table cellpadding='0' cellspacing='0' width='600' style='border: none; border-collapse: collapse;'>
<tr>
<td style='padding: 10px; background-color: #F8FAFE; border: none; font-size: 14px; font-weight: 500; border-bottom: 1px solid #e5e5e5;'><?php echo 'TASK #' . $task->id . ' &nbsp;' . html::a(common::getSysURL() . $this->createLink('task', 'view', "taskID=$task->id"), $task->name, '', "style='color: #333; text-decoration: none;'");?></td>
<td style='width: 40px; text-align: right; background-color: #F8FAFE; border: none; vertical-align: top; padding: 10px; border-bottom: 1px solid #e5e5e5;'><?php echo html::a(common::getSysURL() . $this->createLink('task', 'view', "taskID=$task->id"), '[+]', 'target="_blank"');?></td>
<td style='padding: 10px; background-color: #F8FAFE; border: none; font-size: 14px; font-weight: 500; border-bottom: 1px solid #e5e5e5;'><?php echo html::a(common::getSysURL() . $this->createLink('task', 'view', "taskID=$task->id"), $mailTitle, '', "style='color: #333; text-decoration: none;'");?></td>
</tr>
</table>
</td>
@@ -26,7 +25,7 @@
<td style='padding: 10px; border: none;'>
<fieldset style='border: 1px solid #e5e5e5'>
<legend style='color: #114f8e'><?php echo $lang->task->legendDesc;?></legend>
<div class='content'><?php echo $task->desc;?></div>
<div style='padding:5px;'><?php echo $task->desc;?></div>
</fieldset>
</td>
</tr>
module/report/control.php
+6 -7
View File
@@ -188,16 +188,15 @@ class report extends control
/* Reset $this->output. */
$this->clear();
$mailTitle = $this->lang->report->mailtitle->begin;
$mailTitle .= isset($mail->bugs) ? sprintf($this->lang->report->mailtitle->bug, count($mail->bugs)) : '';
$mailTitle .= isset($mail->tasks) ? sprintf($this->lang->report->mailtitle->task, count($mail->tasks)) : '';
$mailTitle .= isset($mail->todos) ? sprintf($this->lang->report->mailtitle->todo, count($mail->todos)) : '';
$mailTitle .= isset($mail->testTasks) ? sprintf($this->lang->report->mailtitle->testTask, count($mail->testTasks)) : '';
$mailTitle = $this->lang->report->mailTitle->begin;
$mailTitle .= isset($mail->bugs) ? sprintf($this->lang->report->mailTitle->bug, count($mail->bugs)) : '';
$mailTitle .= isset($mail->tasks) ? sprintf($this->lang->report->mailTitle->task, count($mail->tasks)) : '';
$mailTitle .= isset($mail->todos) ? sprintf($this->lang->report->mailTitle->todo, count($mail->todos)) : '';
$mailTitle .= isset($mail->testTasks) ? sprintf($this->lang->report->mailTitle->testTask, count($mail->testTasks)) : '';
$mailTitle = rtrim($mailTitle, ',');
/* Get email content and title.*/
$this->view->mail = $mail;
$this->view->mailTitle = $mailTitle;
$this->view->mail = $mail;
$mailContent = $this->parse('report', 'dailyreminder');
/* Send email.*/
module/report/lang/zh-cn.php
+6 -6
View File
@@ -89,11 +89,11 @@ $lang->report->taskName = '任务名称';
$lang->report->todoName = '待办名称';
$lang->report->testTaskName = '版本名称';
$lang->report->mailtitle = new stdclass();
$lang->report->mailtitle->begin = '提醒：您有';
$lang->report->mailtitle->bug = " Bugs(%s),";
$lang->report->mailtitle->task = " 任务(%s),";
$lang->report->mailtitle->todo = " 待办(%s),";
$lang->report->mailtitle->testTask = " 测试版本(%s),";
$lang->report->mailTitle = new stdclass();
$lang->report->mailTitle->begin = '提醒：您有';
$lang->report->mailTitle->bug = " Bug(%s),";
$lang->report->mailTitle->task = " 任务(%s),";
$lang->report->mailTitle->todo = " 待办(%s),";
$lang->report->mailTitle->testTask = " 测试版本(%s),";
$lang->report->proVersion = '<a href="http://api.zentao.net/goto.php?item=proversion&from=reportpage" target="_blank">更多精彩，尽在专业版！</a>';
module/report/view/dailyreminder.html.php
+5 -5
View File
@@ -6,7 +6,7 @@
<table cellpadding='0' cellspacing='0' style='width: 100%; border: none; border-collapse: collapse;'>
<tr>
<td style='padding: 10px; background-color: #F8FAFE; border: none; font-size: 14px; font-weight: 500; border-bottom: 1px solid #e5e5e5;'><?php echo date('Y-m-d') ?></td>
<td style='width: 40px; text-align: right; background-color: #F8FAFE; border: none; vertical-align: top; padding: 10px; border-bottom: 1px solid #e5e5e5;'><?php echo html::a(common::getSysURL() . $this->createLink('my', 'index'), '[+]', 'target="_blank"');?></td>
<td style='width: 40px; text-align: right; background-color: #F8FAFE; border: none; vertical-align: top; padding: 10px; border-bottom: 1px solid #e5e5e5;'><?php echo html::a($url, $url, 'target="_blank"');?></td>
</tr>
</table>
</td>
@@ -15,7 +15,7 @@
<?php if(isset($mail->bugs)):?>
<tr>
<td style='padding: 10px; border: none;'>
<h5 style='margin: 8px 0; font-size: 14px;'><?php echo rtrim(sprintf($lang->report->mailtitle->bug, count($mail->bugs)), ',') ?></h5>
<h5 style='margin: 8px 0; font-size: 14px;'><?php echo rtrim(sprintf($lang->report->mailTitle->bug, count($mail->bugs)), ',') ?></h5>
<table cellpadding='0' cellspacing='0' style='width: 100%; border: 1px solid #e5e5e5; margin-bottom: 15px; border-collapse: collapse; font-size: 13px;'>
<tr>
<th style='width: 50px; border: 1px solid #e5e5e5; background-color: #f5f5f5; padding: 5px;'><?php echo $lang->report->idAB;?></th>
@@ -41,7 +41,7 @@
<?php if(isset($mail->tasks)):?>
<tr>
<td style='padding: 10px; border: none;'>
<h5 style='margin: 8px 0; font-size: 14px;'><?php echo rtrim(sprintf($lang->report->mailtitle->task, count($mail->tasks)), ',') ?></h5>
<h5 style='margin: 8px 0; font-size: 14px;'><?php echo rtrim(sprintf($lang->report->mailTitle->task, count($mail->tasks)), ',') ?></h5>
<table cellpadding='0' cellspacing='0' style='width: 100%; border: 1px solid #e5e5e5; margin-bottom: 15px; border-collapse: collapse; font-size: 13px;'>
<tr>
<th style='width: 50px; border: 1px solid #e5e5e5; background-color: #f5f5f5; padding: 5px;'><?php echo $lang->report->idAB;?></th>
@@ -67,7 +67,7 @@
<?php if(isset($mail->todos)):?>
<tr>
<td style='padding: 10px; border: none;'>
<h5 style='margin: 8px 0; font-size: 14px;'><?php echo rtrim(sprintf($lang->report->mailtitle->todo, count($mail->todos)), ',') ?></h5>
<h5 style='margin: 8px 0; font-size: 14px;'><?php echo rtrim(sprintf($lang->report->mailTitle->todo, count($mail->todos)), ',') ?></h5>
<table cellpadding='0' cellspacing='0' style='width: 100%; border: 1px solid #e5e5e5; margin-bottom: 15px; border-collapse: collapse; font-size: 13px;'>
<tr>
<th style='width: 50px; border: 1px solid #e5e5e5; background-color: #f5f5f5; padding: 5px;'><?php echo $lang->report->idAB;?></th>
@@ -93,7 +93,7 @@
<?php if(isset($mail->testTasks)):?>
<tr>
<td style='padding: 10px; border: none;'>
<h5 style='margin: 8px 0; font-size: 14px;'><?php echo rtrim(sprintf($lang->report->mailtitle->testTask, count($mail->testTasks)), ',') ?></h5>
<h5 style='margin: 8px 0; font-size: 14px;'><?php echo rtrim(sprintf($lang->report->mailTitle->testTask, count($mail->testTasks)), ',') ?></h5>
<table cellpadding='0' cellspacing='0' style='width: 100%; border: 1px solid #e5e5e5; margin-bottom: 15px; border-collapse: collapse; font-size: 13px;'>
<tr>
<th style='width: 50px; border: 1px solid #e5e5e5; background-color: #f5f5f5; padding: 5px;'><?php echo $lang->report->idAB;?></th>
module/story/view/sendmail.html.php
+2 -3
View File
@@ -16,8 +16,7 @@
<td>
<table cellpadding='0' cellspacing='0' width='600' style='border: none; border-collapse: collapse;'>
<tr>
<td style='padding: 10px; background-color: #F8FAFE; border: none; font-size: 14px; font-weight: 500; border-bottom: 1px solid #e5e5e5;'><?php echo 'STORY #' . $story->id . ' &nbsp;' . html::a(common::getSysURL() . $this->createLink('story', 'view', "storyID=$story->id"), $story->title, '', "style='color: #333; text-decoration: none;'");?></td>
<td style='width: 40px; text-align: right; background-color: #F8FAFE; border: none; vertical-align: top; padding: 10px; border-bottom: 1px solid #e5e5e5;'><?php echo html::a(common::getSysURL() . $this->createLink('story', 'view', "storyID=$story->id"), '[+]', 'target="_blank"');?></td>
<td style='padding: 10px; background-color: #F8FAFE; border: none; font-size: 14px; font-weight: 500; border-bottom: 1px solid #e5e5e5;'><?php echo html::a(common::getSysURL() . $this->createLink('story', 'view', "storyID=$story->id"), $mailTitle, '', "style='color: #333; text-decoration: none;'");?></td>
</tr>
</table>
</td>
@@ -26,7 +25,7 @@
<td style='padding: 10px; border: none;'>
<fieldset style='border: 1px solid #e5e5e5'>
<legend style='color: #114f8e'><?php echo $lang->story->legendSpec;?></legend>
<div class='content'><?php echo $story->spec;?></div>
<div style='padding:5px;'><?php echo $story->spec;?></div>
</fieldset>
</td>
</tr>
module/task/view/sendmail.html.php
+2 -3
View File
@@ -16,8 +16,7 @@
<td>
<table cellpadding='0' cellspacing='0' width='600' style='border: none; border-collapse: collapse;'>
<tr>
<td style='padding: 10px; background-color: #F8FAFE; border: none; font-size: 14px; font-weight: 500; border-bottom: 1px solid #e5e5e5;'><?php echo 'TASK #' . $task->id . ' &nbsp;' . html::a(common::getSysURL() . $this->createLink('task', 'view', "taskID=$task->id"), $task->name, '', "style='color: #333; text-decoration: none;'");?></td>
<td style='width: 40px; text-align: right; background-color: #F8FAFE; border: none; vertical-align: top; padding: 10px; border-bottom: 1px solid #e5e5e5;'><?php echo html::a(common::getSysURL() . $this->createLink('task', 'view', "taskID=$task->id"), '[+]', 'target="_blank"');?></td>
<td style='padding: 10px; background-color: #F8FAFE; border: none; font-size: 14px; font-weight: 500; border-bottom: 1px solid #e5e5e5;'><?php echo html::a(common::getSysURL() . $this->createLink('task', 'view', "taskID=$task->id"), $mailTitle, '', "style='color: #333; text-decoration: none;'");?></td>
</tr>
</table>
</td>
@@ -26,7 +25,7 @@
<td style='padding: 10px; border: none;'>
<fieldset style='border: 1px solid #e5e5e5'>
<legend style='color: #114f8e'><?php echo $lang->task->legendDesc;?></legend>
<div class='content'><?php echo $task->desc;?></div>
<div style='padding:5px;'><?php echo $task->desc;?></div>
</fieldset>
</td>
</tr>
module/testtask/view/sendmail.html.php
+2 -3
View File
@@ -16,8 +16,7 @@
<td>
<table cellpadding='0' cellspacing='0' width='600' style='border: none; border-collapse: collapse;'>
<tr>
<td style='padding: 10px; background-color: #F8FAFE; border: none; font-size: 14px; font-weight: 500; border-bottom: 1px solid #e5e5e5;'><?php echo 'TESTTASK #' . $testtask->id . ' &nbsp;' . html::a(common::getSysURL() . $this->createLink('testtask', 'view', "testtaskID=$testtask->id"), $testtask->name, '', "style='color: #333; text-decoration: none;'");?></td>
<td style='width: 40px; text-align: right; background-color: #F8FAFE; border: none; vertical-align: top; padding: 10px; border-bottom: 1px solid #e5e5e5;'><?php echo html::a(common::getSysURL() . $this->createLink('testtask', 'view', "testtaskID=$testtask->id"), '[+]', 'target="_blank"');?></td>
<td style='padding: 10px; background-color: #F8FAFE; border: none; font-size: 14px; font-weight: 500; border-bottom: 1px solid #e5e5e5;'><?php echo html::a(common::getSysURL() . $this->createLink('testtask', 'view', "testtaskID=$testtask->id"), $mailTitle, '', "style='color: #333; text-decoration: none;'");?></td>
</tr>
</table>
</td>
@@ -26,7 +25,7 @@
<td style='padding: 10px; border: none;'>
<fieldset style='border: 1px solid #e5e5e5'>
<legend style='color: #114f8e'><?php echo $lang->testtask->desc;?></legend>
<div class='content'><?php echo $testtask->desc;?></div>
<div style='padding:5px;'><?php echo $testtask->desc;?></div>
</fieldset>
</td>
</tr>