diff --git a/module/bug/view/sendmail.html.php b/module/bug/view/sendmail.html.php index 5f4e4e3584..2d79351921 100644 --- a/module/bug/view/sendmail.html.php +++ b/module/bug/view/sendmail.html.php @@ -16,8 +16,7 @@ - - +
BUG #id . '  ' . html::a(common::getSysURL() . $this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, '', "style='color: #333'");?>createLink('bug', 'view', "bugID=$bug->id"), '[+]', 'target="_blank"');?>createLink('bug', 'view', "bugID=$bug->id"), $mailTitle, '', "style='color: #333'");?>
@@ -26,7 +25,7 @@
bug->legendSteps;?> -
steps;?>
+
steps;?>
diff --git a/module/common/view/mail.css.php b/module/common/view/mail.css.php deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/common/view/mail.header.html.php b/module/common/view/mail.header.html.php index c3c6c51c43..a9375b5b32 100644 --- a/module/common/view/mail.header.html.php +++ b/module/common/view/mail.header.html.php @@ -17,7 +17,6 @@ if($onlybody) $_GET['onlybody'] = 'no'; -
company->name ?>' />
- +
diff --git a/module/common/view/mail.html.php b/module/common/view/mail.html.php deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/module/project/view/sendmail.html.php b/module/project/view/sendmail.html.php index 204ab0c3ee..5dc09ff767 100644 --- a/module/project/view/sendmail.html.php +++ b/module/project/view/sendmail.html.php @@ -16,8 +16,7 @@ @@ -26,7 +25,7 @@ diff --git a/module/report/control.php b/module/report/control.php index 504654cdab..20bc0985a9 100644 --- a/module/report/control.php +++ b/module/report/control.php @@ -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.*/ diff --git a/module/report/lang/zh-cn.php b/module/report/lang/zh-cn.php index 5295a71129..32a4508def 100644 --- a/module/report/lang/zh-cn.php +++ b/module/report/lang/zh-cn.php @@ -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 = '更多精彩,尽在专业版!'; diff --git a/module/report/view/dailyreminder.html.php b/module/report/view/dailyreminder.html.php index 3dcadf4080..714817473e 100755 --- a/module/report/view/dailyreminder.html.php +++ b/module/report/view/dailyreminder.html.php @@ -6,7 +6,7 @@
- - +
id . '  ' . html::a(common::getSysURL() . $this->createLink('task', 'view', "taskID=$task->id"), $task->name, '', "style='color: #333; text-decoration: none;'");?>createLink('task', 'view', "taskID=$task->id"), '[+]', 'target="_blank"');?>createLink('task', 'view', "taskID=$task->id"), $mailTitle, '', "style='color: #333; text-decoration: none;'");?>
task->legendDesc;?> -
desc;?>
+
desc;?>
- +
createLink('my', 'index'), '[+]', 'target="_blank"');?>
@@ -15,7 +15,7 @@ bugs)):?> -
report->mailtitle->bug, count($mail->bugs)), ',') ?>
+
report->mailTitle->bug, count($mail->bugs)), ',') ?>
@@ -41,7 +41,7 @@ tasks)):?>
report->idAB;?>
-
report->mailtitle->task, count($mail->tasks)), ',') ?>
+
report->mailTitle->task, count($mail->tasks)), ',') ?>
@@ -67,7 +67,7 @@ todos)):?>
report->idAB;?>
-
report->mailtitle->todo, count($mail->todos)), ',') ?>
+
report->mailTitle->todo, count($mail->todos)), ',') ?>
@@ -93,7 +93,7 @@ testTasks)):?>
report->idAB;?>
-
report->mailtitle->testTask, count($mail->testTasks)), ',') ?>
+
report->mailTitle->testTask, count($mail->testTasks)), ',') ?>
diff --git a/module/story/view/sendmail.html.php b/module/story/view/sendmail.html.php index 49f3de8f63..15e264bd02 100644 --- a/module/story/view/sendmail.html.php +++ b/module/story/view/sendmail.html.php @@ -16,8 +16,7 @@ @@ -26,7 +25,7 @@ diff --git a/module/task/view/sendmail.html.php b/module/task/view/sendmail.html.php index d3af7fc20e..5b84d52e91 100644 --- a/module/task/view/sendmail.html.php +++ b/module/task/view/sendmail.html.php @@ -16,8 +16,7 @@ @@ -26,7 +25,7 @@ diff --git a/module/testtask/view/sendmail.html.php b/module/testtask/view/sendmail.html.php index 6473b518c7..240974b27c 100644 --- a/module/testtask/view/sendmail.html.php +++ b/module/testtask/view/sendmail.html.php @@ -16,8 +16,7 @@ @@ -26,7 +25,7 @@
report->idAB;?> - - +
id . '  ' . html::a(common::getSysURL() . $this->createLink('story', 'view', "storyID=$story->id"), $story->title, '', "style='color: #333; text-decoration: none;'");?>createLink('story', 'view', "storyID=$story->id"), '[+]', 'target="_blank"');?>createLink('story', 'view', "storyID=$story->id"), $mailTitle, '', "style='color: #333; text-decoration: none;'");?>
story->legendSpec;?> -
spec;?>
+
spec;?>
- - +
id . '  ' . html::a(common::getSysURL() . $this->createLink('task', 'view', "taskID=$task->id"), $task->name, '', "style='color: #333; text-decoration: none;'");?>createLink('task', 'view', "taskID=$task->id"), '[+]', 'target="_blank"');?>createLink('task', 'view', "taskID=$task->id"), $mailTitle, '', "style='color: #333; text-decoration: none;'");?>
task->legendDesc;?> -
desc;?>
+
desc;?>
- - +
id . '  ' . html::a(common::getSysURL() . $this->createLink('testtask', 'view', "testtaskID=$testtask->id"), $testtask->name, '', "style='color: #333; text-decoration: none;'");?>createLink('testtask', 'view', "testtaskID=$testtask->id"), '[+]', 'target="_blank"');?>createLink('testtask', 'view', "testtaskID=$testtask->id"), $mailTitle, '', "style='color: #333; text-decoration: none;'");?>
testtask->desc;?> -
desc;?>
+
desc;?>