diff --git a/module/block/control.php b/module/block/control.php index db7582229c..08bdf7e039 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -299,7 +299,7 @@ class block extends control echo "{$this->lang->block->lblBlock}"; echo '' . html::select('moduleBlock', $blockPairs, ($block and $block->source != '') ? $block->block : '', "class='form-control' onchange='getBlockParams(this.value, \"$module\")'") . ''; - if(isset($block->source)) echo ""; + if(isset($block->source)) echo ""; } elseif($mode == 'getblockform') { diff --git a/module/block/view/bugblock.html.php b/module/block/view/bugblock.html.php index 667df34e49..35f9c125f0 100644 --- a/module/block/view/bugblock.html.php +++ b/module/block/view/bugblock.html.php @@ -14,9 +14,10 @@ idAB?> - bug->severityAB?> - priAB?> + priAB?> bug->title;?> + bug->severityAB?> + bug->statusAB;?> @@ -25,10 +26,11 @@ $viewLink = $this->createLink('bug', 'view', "bugID={$bug->id}"); ?> > - id;?> - bug->severityList, $bug->severity, $bug->severity)?> - bug->priList, $bug->pri, $bug->pri)?> + id;?> + bug->priList, $bug->pri, $bug->pri)?> title?> + bug->severityList, $bug->severity, $bug->severity)?> + bug->statusList, $bug->status, $bug->status)?> diff --git a/module/block/view/caseblock.html.php b/module/block/view/caseblock.html.php index f9c574e93b..d3d01d9711 100644 --- a/module/block/view/caseblock.html.php +++ b/module/block/view/caseblock.html.php @@ -14,11 +14,11 @@ idAB?> - priAB?> + priAB?> case->title;?> testtask->lastRunTime;?> testtask->lastRunResult;?> - statusAB;?> + statusAB;?> @@ -27,12 +27,12 @@ $viewLink = $this->createLink('testcase', 'view', "caseID={$case->id}"); ?> > - id;?> - case->priList, $case->pri, $case->pri)?> + id;?> + case->priList, $case->pri, $case->pri)?> title?> - lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?> - lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?> - testcase->statusList[$case->status];?> + lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?> + lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?> + testcase->statusList[$case->status];?> diff --git a/module/block/view/releaseblock.html.php b/module/block/view/releaseblock.html.php index 8d0f606017..3aae1d87aa 100644 --- a/module/block/view/releaseblock.html.php +++ b/module/block/view/releaseblock.html.php @@ -18,7 +18,7 @@ release->name;?> release->build;?> release->date;?> - release->status;?> + release->status;?> @@ -28,11 +28,11 @@ ?> > id;?> - productName?> - name?> - buildName?> - date?> - release->statusList[$release->status]?> + productName?> + name?> + buildName?> + date?> + release->statusList[$release->status]?> diff --git a/module/block/view/storyblock.html.php b/module/block/view/storyblock.html.php index cc26ad32c0..fe6aa0fc4e 100644 --- a/module/block/view/storyblock.html.php +++ b/module/block/view/storyblock.html.php @@ -17,8 +17,8 @@ priAB?> story->title;?> story->estimateAB;?> - statusAB;?> - story->stageAB;?> + statusAB;?> + story->stageAB;?> @@ -27,12 +27,12 @@ $viewLink = $this->createLink('story', 'view', "storyID={$story->id}"); ?> > - id;?> - story->priList, $story->pri, $story->pri)?> + id;?> + story->priList, $story->pri, $story->pri)?> title?> - estimate?> - story->statusList, $story->status, $story->status);?> - story->stageList, $story->stage, $story->stage);?> + estimate?> + story->statusList, $story->status, $story->status);?> + story->stageList, $story->stage, $story->stage);?> diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php index c845b3beff..7144562fd2 100644 --- a/module/block/view/taskblock.html.php +++ b/module/block/view/taskblock.html.php @@ -21,7 +21,7 @@ td.delayed{background: #e84e0f!important; color: white;} task->name;?> task->estimateAB;?> task->deadline;?> - statusAB;?> + statusAB;?> @@ -30,12 +30,12 @@ td.delayed{background: #e84e0f!important; color: white;} $viewLink = $this->createLink('task', 'view', "taskID={$task->id}"); ?> > - id;?> - task->priList, $task->pri, $task->pri)?> + id;?> + task->priList, $task->pri, $task->pri)?> name?> - estimate?> + estimate?> '>deadline, 0, 4) > 0) echo $task->deadline;?> - task->statusList, $task->status, $task->status);?> + task->statusList, $task->status, $task->status);?> diff --git a/module/block/view/testtaskblock.html.php b/module/block/view/testtaskblock.html.php index f08e7a78e0..b36820fef9 100644 --- a/module/block/view/testtaskblock.html.php +++ b/module/block/view/testtaskblock.html.php @@ -16,7 +16,7 @@ idAB?> testtask->product;?> testtask->name;?> - testtask->project . '/' . $lang->testtask->project;?> + testtask->project . '/' . $lang->testtask->build;?> testtask->begin;?> testtask->end;?> @@ -30,7 +30,7 @@ id;?> productName?> name?> - buildName?>'>projectName . '/' . $testtask->buildName?> + buildName?>'>projectName . '/' . $testtask->buildName?> begin?> end?> diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 7ba77ff5c0..8d1de2705d 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -178,7 +178,7 @@ $lang->todo->menu = $lang->my->menu; $lang->product = new stdclass(); $lang->product->menu = new stdclass(); -$lang->product->menu->list = array('link' => '%s' . $lang->arrow, 'fixed' => true); +$lang->product->menu->list = array('link' => '%s', 'fixed' => true); $lang->product->menu->index = 'Index|product|index|locate=no'; $lang->product->menu->story = array('link' => 'Story|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story'); $lang->product->menu->dynamic = 'Dynamic|product|dynamic|productID=%s'; diff --git a/module/file/view/buildexporttpl.html.php b/module/file/view/buildexporttpl.html.php index b6e67db753..eb30c74807 100644 --- a/module/file/view/buildexporttpl.html.php +++ b/module/file/view/buildexporttpl.html.php @@ -1,3 +1,7 @@ + $template) echo ""; diff --git a/module/release/js/view.js b/module/release/js/view.js index 49fd05a32f..0e47fd4dfe 100644 --- a/module/release/js/view.js +++ b/module/release/js/view.js @@ -25,7 +25,6 @@ $(function() if(tabPane.size() == 0) return; var formID = tabPane.find('.linkBox').find('form:last'); if(formID.size() == 0) formID = tabPane.find('form:last'); - console.log(formID); setTimeout(function(){fixedTfootAction(formID)}, 100); }); }) diff --git a/module/search/lang/en.php b/module/search/lang/en.php index 1aeb0012cb..1ac2eec284 100644 --- a/module/search/lang/en.php +++ b/module/search/lang/en.php @@ -22,6 +22,8 @@ $lang->search->deleteQuery = 'Delete query'; $lang->search->setQueryTitle = 'Please input the title(execute searching before save):'; $lang->search->select = 'Stories/Tasks filter'; $lang->search->me = 'Me'; +$lang->search->shortcut = 'Shortcut'; +$lang->search->noQuery = 'Save no query!'; $lang->search->operators['='] = '='; $lang->search->operators['!='] = '!='; diff --git a/module/tutorial/view/index.html.php b/module/tutorial/view/index.html.php index 221ed55f31..ea301d9e87 100644 --- a/module/tutorial/view/index.html.php +++ b/module/tutorial/view/index.html.php @@ -440,7 +440,6 @@ $(function() $progress.find('.progress-text').text(progress + '%'); showTask(current); - console.log('totalCount', totalCount, 'finishCount', finishCount); }; updateUI();