From e38601e5ee6e0c4c4ea811c5073809f7870e8d0e Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 21 Sep 2018 15:17:09 +0800
Subject: [PATCH]  * finish task #4865.

---
 module/user/lang/en.php              |  1 +
 module/user/lang/zh-cn.php           |  1 +
 module/user/view/featurebar.html.php | 18 +++++++++---------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index fbe54e111c..c708ac598c 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -76,6 +76,7 @@ $lang->user->bug         = 'Bug';
 $lang->user->test        = 'Test';
 $lang->user->testTask    = 'TestTask';
 $lang->user->testCase    = 'TestCase';
+$lang->user->schedule    = 'Calendar';
 $lang->user->todo        = 'Todo';
 $lang->user->story       = 'Story';
 $lang->user->dynamic     = 'Dynamic';
diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php
index c8d852c127..e544e77bf8 100644
--- a/module/user/lang/zh-cn.php
+++ b/module/user/lang/zh-cn.php
@@ -76,6 +76,7 @@ $lang->user->bug         = 'Bug';
 $lang->user->test        = '测试';
 $lang->user->testTask    = '测试任务';
 $lang->user->testCase    = '测试用例';
+$lang->user->schedule    = '日程';
 $lang->user->todo        = '待办';
 $lang->user->story       = '需求';
 $lang->user->dynamic     = '动态';
diff --git a/module/user/view/featurebar.html.php b/module/user/view/featurebar.html.php
index 974316da49..201aaa0115 100755
--- a/module/user/view/featurebar.html.php
+++ b/module/user/view/featurebar.html.php
@@ -10,50 +10,50 @@
 
     if($config->global->flow == 'full')
     {
-        $label  = "<span class='text'>{$lang->user->todo}</span>";
+        $label  = "<span class='text'>{$lang->user->schedule}</span>";
         $active = $methodName == 'todo' ? ' btn-active-text' : '';
-        echo html::a($this->createLink('user', 'todo', "account=$account"), $label, '', "class='btn btn-link $active'");
+        common::printLink('user', 'todo', "account=$account", $label, '', "class='btn btn-link $active'");
     }
 
     if($config->global->flow != 'onlyTask' and $config->global->flow != 'onlyTest')
     {
         $label  = "<span class='text'>{$lang->user->story}</span>";
         $active = $methodName == 'story' ? ' btn-active-text' : '';
-        echo html::a($this->createLink('user', 'story', "account=$account"), $label, '', "class='btn btn-link $active'");
+        common::printLink('user', 'story', "account=$account", $label, '', "class='btn btn-link $active'");
     }
 
     if($config->global->flow == 'full' or $config->global->flow == 'onlyTask') 
     {
         $label  = "<span class='text'>{$lang->user->task}</span>";
         $active = $methodName == 'task' ? ' btn-active-text' : '';
-        echo html::a($this->createLink('user', 'task', "account=$account"), $label, '', "class='btn btn-link $active'");
+        common::printLink('user', 'task', "account=$account", $label, '', "class='btn btn-link $active'");
     }
 
     if($config->global->flow == 'full' or $config->global->flow == 'onlyTest') 
     {
         $label  = "<span class='text'>{$lang->user->bug}</span>";
         $active = $methodName == 'bug' ? ' btn-active-text' : '';
-        echo html::a($this->createLink('user', 'bug', "account=$account"), $label, '', "class='btn btn-link $active'");
+        common::printLink('user', 'bug', "account=$account", $label, '', "class='btn btn-link $active'");
 
         $label  = "<span class='text'>{$lang->user->test}</span>";
         $active = ($methodName == 'testtask' or $methodName == 'testcase')? ' btn-active-text' : '';
-        echo html::a($this->createLink('user', 'testtask', "account=$account"), $label, '', "class='btn btn-link $active'");
+        common::printLink('user', 'testtask', "account=$account", $label, '', "class='btn btn-link $active'");
     }
 
     $label  = "<span class='text'>{$lang->user->dynamic}</span>";
     $active = $methodName == 'dynamic' ? ' btn-active-text' : '';
-    echo html::a($this->createLink('user', 'dynamic',  "type=today&account=$account"), $label, '', "class='btn btn-link $active'");
+    common::printLink('user', 'dynamic',  "type=today&account=$account", $label, '', "class='btn btn-link $active'");
 
     if($config->global->flow == 'full' or $config->global->flow == 'onlyTask')
     {
         $label  = "<span class='text'>{$lang->user->project}</span>";
         $active = $methodName == 'project' ? ' btn-active-text' : '';
-        echo html::a($this->createLink('user', 'project',  "account=$account"), $label, '', "class='btn btn-link $active'");
+        common::printLink('user', 'project',  "account=$account", $label, '', "class='btn btn-link $active'");
     }
 
     $label  = "<span class='text'>{$lang->user->profile}</span>";
     $active = $methodName == 'profile' ? ' btn-active-text' : '';
-    echo html::a($this->createLink('user', 'profile',  "account=$account"), $label, '', "class='btn btn-link $active'");
+    common::printLink('user', 'profile',  "account=$account", $label, '', "class='btn btn-link $active'");
     ?>
   </div>
 </div>