From dfdde5d748888647c00309187e2b5de432b5cbd3 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Tue, 1 Sep 2015 10:52:23 +0800
Subject: [PATCH]  * code for task #2301.

---
 module/testtask/lang/zh-cn.php | 2 +-
 module/user/lang/en.php        | 2 +-
 module/user/lang/zh-cn.php     | 2 +-
 www/js/my.full.js              | 2 +-
 www/theme/default/style.css    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index 138d0b1a72..61a869fe8d 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -41,7 +41,7 @@ $lang->testtask->project        = '所属' . $lang->projectCommon;
 $lang->testtask->build          = '版本';
 $lang->testtask->owner          = '负责人';
 $lang->testtask->pri            = '优先级';
-$lang->testtask->name           = '任务名称';
+$lang->testtask->name           = '版本名称';
 $lang->testtask->begin          = '开始日期';
 $lang->testtask->end            = '结束日期';
 $lang->testtask->desc           = '描述';
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index 41b8b79ef5..64170a28ef 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -98,7 +98,7 @@ $lang->user->closedBy    = 'Closed by him';
 $lang->user->reviewedBy  = 'Reviewed by him';
 $lang->user->canceledBy  = 'Canceled by him';
 
-$lang->user->testTask2Him = 'His task';
+$lang->user->testTask2Him = 'His build';
 $lang->user->case2Him     = 'His case';
 $lang->user->caseByHim    = 'Case he opened';
 
diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php
index 96278dbd0d..0fc9f2680e 100644
--- a/module/user/lang/zh-cn.php
+++ b/module/user/lang/zh-cn.php
@@ -98,7 +98,7 @@ $lang->user->closedBy    = '由他关闭';
 $lang->user->reviewedBy  = '由他评审';
 $lang->user->canceledBy  = '由他取消';
 
-$lang->user->testTask2Him = '他的任务';
+$lang->user->testTask2Him = '负责版本';
 $lang->user->case2Him     = '给他的用例';
 $lang->user->caseByHim    = '他建的用例';
 
diff --git a/www/js/my.full.js b/www/js/my.full.js
index 14776062a9..8dc0739ad0 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -480,7 +480,7 @@ function saveWindowSize()
  */
 function setOuterBox()
 {
-    if($('.sub-featurebar').length) $('#featurebar').addClass('with-sub');
+//    if($('.sub-featurebar').length) $('#featurebar').addClass('with-sub');
 
     var side   = $('#wrap .outer > .side');
     var resetOuterHeight = function()
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 4af7cb8cc1..7c14bfdbc8 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -466,7 +466,7 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
 /* sub featurebar */
 .sub-featurebar {border-bottom: 1px solid #ddd; padding: 5px 10px; margin: -20px -20px 20px;}
 .sub-featurebar > .nav > li {float: left;}
-.sub-featurebar > .nav > li > a {padding: 5px 10px}
+.sub-featurebar > .nav > li > a {padding: 5px 4px}
 .sub-featurebar > .nav > li.active > a {color: #333; font-weight: bold;}
 
 #featurebar.with-sub > .nav > li.active > a {border: 1px solid #ddd; position: relative; border-bottom: none; background: #fff; padding: 2px 15px 5px}