diff --git a/module/project/css/burn.css b/module/project/css/burn.css index 8c592e0787..9248966d3d 100644 --- a/module/project/css/burn.css +++ b/module/project/css/burn.css @@ -1,4 +1,5 @@ .pr-25px{padding-right:25px;} #burn h1{font-size:14px;} .icon-question-sign{color:#666} -#computeBurn{padding:2px 10px;} +a.btn{padding:1.5px 10px;} +#interval{margin-right:10px;} diff --git a/module/project/js/burn.js b/module/project/js/burn.js index 30d33bbef9..630354c2b4 100644 --- a/module/project/js/burn.js +++ b/module/project/js/burn.js @@ -1,13 +1,9 @@ -$('#interval').change(function() +$(function() { - location.href = createLink('project', 'burn', 'projectID=' + projectID + '&type=' + type + '&interval=' + $(this).val()); -}) + $('#burnTab').addClass('active'); -var weekendType = $('#weekend').attr('checked'); -$('#weekend').click(function() -{ - weekendType = weekendType ? 'noweekend' : 'widthweekend'; - params = 'projectID=' + projectID + '&type=' + weekendType; - if(interval) params = params + '&interval=' + interval; - location.href = createLink('project', 'burn', params); + $('#interval').change(function() + { + location.href = createLink('project', 'burn', 'projectID=' + projectID + '&type=' + type + '&interval=' + $(this).val()); + }) }) diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 385c23887b..eb4134ff28 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -193,7 +193,8 @@ $lang->project->linkStory = 'Link story'; $lang->project->createTask = 'Create task'; $lang->project->goback = 'Go back'; $lang->project->linkProduct = 'Select product to link...'; -$lang->project->weekend = 'Weekend'; +$lang->project->noweekend = 'No weekend'; +$lang->project->widthweekend = 'Width weekend'; $lang->project->interval = 'Interval'; /* Report. */ diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 393f442308..36e7ba0bdb 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -193,7 +193,8 @@ $lang->project->linkStory = '关联需求'; $lang->project->createTask = '添加任务'; $lang->project->goback = '返回项目首页'; $lang->project->linkProduct = '选择产品关联...'; -$lang->project->weekend = '周末'; +$lang->project->noweekend = '去除周末'; +$lang->project->withweekend = '显示周末'; $lang->project->interval = '间隔'; /* 统计。*/ diff --git a/module/project/view/burn.html.php b/module/project/view/burn.html.php index df9ee9e263..9f2fbbae10 100644 --- a/module/project/view/burn.html.php +++ b/module/project/view/burn.html.php @@ -12,16 +12,13 @@ ?> - -
+ $lang->project->weekend), $checked); - if($interval) echo html::select('interval', $dayList, $interval); - + $weekend = ($type == 'noweekend') ? 'withweekend' : "noweekend"; + echo html::a($this->createLink('project', 'burn', "projectID=$projectID&type=$weekend&interval=$interval"), $lang->project->$weekend, '', "class='btn'"); common::printLink('project', 'computeBurn', 'reload=yes', $lang->project->computeBurn, 'hiddenwin', "title='{$lang->project->computeBurn}{$lang->project->burn}' class='btn' id='computeBurn'"); echo $lang->project->howToUpdateBurn; ?> @@ -30,8 +27,9 @@