From 77c3c7210e243e9b14e8bffe7a6ae3e9a9472078 Mon Sep 17 00:00:00 2001 From: tengfei Date: Wed, 23 May 2018 10:35:10 +0800 Subject: [PATCH 01/10] *todo trans change --- module/todo/lang/en.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php index 676a55002b..2b0a7fff90 100644 --- a/module/todo/lang/en.php +++ b/module/todo/lang/en.php @@ -11,11 +11,11 @@ */ $lang->todo->common = 'Todo'; $lang->todo->index = "Home"; -$lang->todo->create = "Create Todo"; -$lang->todo->createCycle = "Create Cycle Todo"; +$lang->todo->create = "Add a Todo"; +$lang->todo->createCycle = "Add Recurring Todo"; $lang->todo->assignTo = "Assign"; $lang->todo->activate = "Activate"; -$lang->todo->batchCreate = "Batch Create"; +$lang->todo->batchCreate = "Batch Add"; $lang->todo->edit = "Edit"; $lang->todo->close = "Close"; $lang->todo->batchEdit = "Batch Edit"; @@ -27,8 +27,8 @@ $lang->todo->delete = "Delete"; $lang->todo->import2Today = "Import to Today"; $lang->todo->import = "Import"; $lang->todo->legendBasic = "Basic Info"; -$lang->todo->cycle = "Cycle"; -$lang->todo->cycleConfig = "Cycle Config"; +$lang->todo->cycle = "Recurrence"; +$lang->todo->cycleConfig = "Set Recurrence"; $lang->todo->reasonList['story'] = "Transfer Story"; $lang->todo->reasonList['task'] = "Transfer Task"; @@ -46,7 +46,7 @@ $lang->todo->beginAndEnd = 'Duration'; $lang->todo->idvalue = 'Link ID'; $lang->todo->type = 'Type'; $lang->todo->pri = 'Priority'; -$lang->todo->name = 'Todo Name'; +$lang->todo->name = 'Title'; $lang->todo->status = 'Status'; $lang->todo->desc = 'Description'; $lang->todo->private = 'Private'; @@ -77,7 +77,7 @@ $lang->todo->priList[4] = 'Low'; $lang->todo->priList[0] = ''; $lang->todo->typeList['custom'] = 'Custom'; -$lang->todo->typeList['cycle'] = 'Periodic'; +$lang->todo->typeList['cycle'] = 'Recurrence'; $lang->todo->typeList['bug'] = 'Bug'; $lang->todo->typeList['task'] = $lang->projectCommon . 'Task'; $lang->todo->typeList['story'] = $lang->projectCommon . 'Story'; @@ -98,7 +98,7 @@ $lang->todo->periods['all'] = 'All'; $lang->todo->periods['thisYear'] = 'ThisYear'; $lang->todo->periods['future'] = 'Pending'; $lang->todo->periods['before'] = 'Unfinished'; -$lang->todo->periods['cycle'] = 'Cycle'; +$lang->todo->periods['cycle'] = 'Recurrence'; $lang->todo->action = new stdclass(); $lang->todo->action->finished = array('main' => '$date, is $extra by $actor.', 'extra' => 'reasonList'); From 75a4a63a37bb2de7615bd55bae657efbad6ecb1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= Date: Fri, 25 May 2018 14:31:23 +0800 Subject: [PATCH 02/10] * Finish task#4278. --- module/task/view/view.html.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index 68d5969d66..483118c4f6 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -128,7 +128,7 @@ - + fetch('file', 'printFiles', array('files' => $task->files, 'fieldset' => 'true'));?> @@ -344,25 +344,25 @@
+
";?> deleted):?> -
project&taskID=$task->id", $task, 'button', '', '', 'iframe', true, '', empty($task->team) ? $lang->task->assignTo : $lang->task->transfer); - common::printIcon('task', 'start', "taskID=$task->id", $task, 'button', '', '', 'iframe', true); - common::printIcon('task', 'restart', "taskID=$task->id", $task, 'button', '', '', 'iframe', true); - common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'button', '', '', 'iframe', true); - common::printIcon('task', 'pause', "taskID=$task->id", $task, 'button', '', '', 'iframe', true); + common::printIcon('task', 'start', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true); + common::printIcon('task', 'restart', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true); + common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true); + common::printIcon('task', 'pause', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true); common::printIcon('task', 'finish', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody text-success', true); - common::printIcon('task', 'activate', "taskID=$task->id", $task, 'button', '', '', 'iframe text-success', true); - common::printIcon('task', 'close', "taskID=$task->id", $task, 'button', '', '', 'iframe', true); - common::printIcon('task', 'cancel', "taskID=$task->id", $task, 'button', '', '', 'iframe', true); - - echo "
"; + common::printIcon('task', 'activate', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody text-success', true); + common::printIcon('task', 'close', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true); + common::printIcon('task', 'cancel', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true); + + if(!isonlybody()) echo "
"; if(empty($task->team) or empty($task->children)) common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id", $task, 'button','plus','','','','',' '); common::printIcon('task', 'edit', "taskID=$task->id", $task); common::printIcon('task', 'create', "productID=0&storyID=0&moduleID=0&taskID=$task->id", $task, 'button', 'copy'); common::printIcon('task', 'delete', "projectID=$task->project&taskID=$task->id", $task, 'button', '', 'hiddenwin'); - + if(!empty($task->parent)) echo html::a(helper::createLink('task', 'view', "taskID=$task->parent"), "", '', "class='btn btn-link' title='{$lang->task->parent}'"); ?> From 23973cbdb68d56f5a997e6a6bef13903adcc1cca Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 25 May 2018 14:40:49 +0800 Subject: [PATCH 03/10] * finish task #4164. --- module/bug/js/browse.js | 8 +--- module/bug/view/browse.html.php | 51 ++++++++++++++++-------- module/custom/model.php | 9 +++-- module/product/js/browse.js | 7 +--- module/product/view/browse.html.php | 44 +++++++++++++------- module/project/js/task.js | 15 ++----- module/project/view/task.html.php | 42 ++++++++++++------- module/search/control.php | 4 +- module/search/model.php | 39 +----------------- module/testcase/js/browse.js | 18 +-------- module/testcase/view/browse.html.php | 12 ++---- module/testcase/view/caseheader.html.php | 28 +++++++++++-- 12 files changed, 130 insertions(+), 147 deletions(-) diff --git a/module/bug/js/browse.js b/module/bug/js/browse.js index 07b9ece2ef..157727287f 100644 --- a/module/bug/js/browse.js +++ b/module/bug/js/browse.js @@ -1,7 +1,6 @@ $(function() { - if(browseType == 'bysearch') ajaxGetSearchForm(); - if($('#bugList thead th.w-title').width() < 150) $('#bugList thead th.w-title').width(150); + if($('#bugList thead th.c-title').width() < 150) $('#bugList thead th.c-title').width(150); if(flow == 'onlyTest') { @@ -38,8 +37,3 @@ $(function() }) } }); - -function setQueryBar(queryID, title) -{ - $('#bysearchTab').before("
  • " + title + "
    • "); -} diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 8ff34d2ca1..a525a529da 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -101,14 +101,13 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow } foreach($menus as $menuItem) { - if(isset($menuItem->hidden)) continue; + if(isset($menuItem->hidden) and $menuItem->name != 'QUERY') continue; if($this->config->global->flow == 'onlyTest' and $menuItem->name == 'needconfirm') continue; $menuBrowseType = strpos($menuItem->name, 'QUERY') === 0 ? 'bySearch' : $menuItem->name; - $barParam = strpos($menuItem->name, 'QUERY') === 0 ? (int)substr($menuItem->name, 5) : 0; - $label = "{$menuItem->text}"; - $label .= $menuBrowseType == $browseType ? "{$pager->recTotal}" : ''; - $active = $menuBrowseType == $browseType ? 'btn-active-text' : ''; + $label = "{$menuItem->text}"; + $label .= $menuBrowseType == $browseType ? "{$pager->recTotal}" : ''; + $active = $menuBrowseType == $browseType ? 'btn-active-text' : ''; if($menuItem->name == 'my') { @@ -118,10 +117,35 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow foreach($lang->bug->mySelects as $key => $value) { echo ''; - echo html::a($this->createLink('bug', 'browse', "productid=$productID&branch=$branch&browseType=$key¶m=$barParam"), $value); + echo html::a($this->createLink('bug', 'browse', "productid=$productID&branch=$branch&browseType=$key"), $value); } echo ''; } + elseif($menuItem->name == 'QUERY') + { + if(isset($lang->custom->queryList)) + { + echo '
    '; + $active = ''; + $current = $menuItem->text; + $dropdownHtml = "
      "; + foreach($lang->custom->queryList as $queryID => $queryTitle) + { + if($browseType == 'bysearch' and $queryID == $param) + { + $active = 'btn-active-text'; + $current = "{$queryTitle} {$pager->recTotal}"; + } + $dropdownHtml .= ''; + $dropdownHtml .= html::a($this->inlink('browse', "productID=$productID&branch=$branch&browseType=bySearch¶m=$queryID"), $queryTitle); + } + $dropdownHtml .= '
    '; + + echo html::a('javascript:;', $current . " ", '', "data-toggle='dropdown' class='btn btn-link $active'"); + echo $dropdownHtml; + echo '
    '; + } + } else { if(strpos(',unconfirmed,assigntonull,longlifebugs,postponedbugs,overduebugs,needconfirm,', $menuItem->name) !== false) @@ -131,12 +155,12 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow echo "
    {$moreLabel} "; echo "
      "; } - echo '
    • ' . html::a($this->createLink('bug', 'browse', "productid=$productID&branch=$branch&browseType=$menuBrowseType¶m=$barParam"), "{$menuItem->text}", '', "class='btn btn-link $active'") . '
      • '; + echo '
    • ' . html::a($this->createLink('bug', 'browse', "productid=$productID&branch=$branch&browseType=$menuBrowseType"), "{$menuItem->text}", '', "class='btn btn-link $active'") . '
      • '; if($menuItem->name == 'needconfirm') echo '
    '; } else { - echo html::a($this->createLink('bug', 'browse', "productid=$productID&branch=$branch&browseType=$menuBrowseType¶m=$barParam"), $label, '', "class='btn btn-link $active'"); + echo html::a($this->createLink('bug', 'browse', "productid=$productID&branch=$branch&browseType=$menuBrowseType"), $label, '', "class='btn btn-link $active'"); } } } @@ -387,16 +411,9 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php index 84e78caf0c..4ec606cc2a 100644 --- a/module/testcase/view/caseheader.html.php +++ b/module/testcase/view/caseheader.html.php @@ -85,14 +85,34 @@ ?> hidden)) continue; + if(isset($menuItem->hidden) and $menuItem->name != 'QUERY') continue; $menuType = $menuItem->name; if(!$config->testcase->needReview and empty($config->testcase->forceReview) and $menuType == 'wait') continue; if($this->config->global->flow == 'onlyTest' and (strpos(',needconfirm,group,zerocase,', ',' . $menuType . ',') !== false)) continue; - if($hasBrowsePriv and strpos($menuType, 'QUERY') === 0) + if($hasBrowsePriv and $menuType == 'QUERY') { - $queryID = (int)substr($menuType, 5); - echo html::a($this->createLink('testcase', 'browse', "productid=$productID&branch=$branch&browseType=bySearch¶m=$queryID"), "{$menuItem->text}", '', "class='btn btn-link' id='{$menuType}Tab'"); + if(isset($lang->custom->queryList)) + { + echo '
    '; + $active = ''; + $current = $menuItem->text; + $dropdownHtml = "
      "; + foreach($lang->custom->queryList as $queryID => $queryTitle) + { + if($browseType == 'bysearch' and $queryID == $param) + { + $active = 'btn-active-text'; + $current = "{$queryTitle} {$pager->recTotal}"; + } + $dropdownHtml .= ''; + $dropdownHtml .= html::a($this->inlink('browse', "productID=$productID&branch=$branch&browseType=bySearch¶m=$queryID"), $queryTitle); + } + $dropdownHtml .= '
    '; + + echo html::a('javascript:;', $current . " ", '', "data-toggle='dropdown' class='btn btn-link $active'"); + echo $dropdownHtml; + echo '
    '; + } } elseif($hasBrowsePriv and ($menuType == 'all' or $menuType == 'needconfirm' or $menuType == 'wait')) { From 613231b9f56d400dcc1b7216f19fe9eab6ce14c9 Mon Sep 17 00:00:00 2001 From: tengfei Date: Fri, 25 May 2018 14:44:24 +0800 Subject: [PATCH 04/10] *changed story translation --- module/block/lang/en.php | 68 ++++++++++++++++++++-------------------- module/bug/lang/en.php | 26 +++++++-------- module/story/lang/en.php | 24 +++++++------- module/task/lang/en.php | 2 +- module/todo/lang/en.php | 12 +++---- 5 files changed, 66 insertions(+), 66 deletions(-) diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 94c9031a2b..5a38432b62 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -33,7 +33,7 @@ $lang->block->assignToMe = 'Assign To Me'; $lang->block->lblFlowchart = 'Workflow'; $lang->block->welcome = 'Welcome'; -$lang->block->leftToday = 'The rest of the work today'; +$lang->block->leftToday = 'Work for Today'; $lang->block->myTask = 'My Task'; $lang->block->myStory = 'My Story'; $lang->block->myBug = 'My Bug'; @@ -45,7 +45,7 @@ $lang->block->params = new stdclass(); $lang->block->params->name = 'Name'; $lang->block->params->value = 'Value'; -$lang->block->createBlock = 'Add'; +$lang->block->createBlock = 'Add a Block'; $lang->block->editBlock = 'Edit'; $lang->block->ordersSaved = 'Order is saved.'; $lang->block->confirmRemoveBlock = 'Do you want to remove Block?'; @@ -75,7 +75,7 @@ $lang->block->default['product']['3']['grid'] = 8; $lang->block->default['product']['3']['params']['num'] = 15; $lang->block->default['product']['3']['params']['type'] = 'noclosed'; -$lang->block->default['product']['4']['title'] = 'My Stories'; +$lang->block->default['product']['4']['title'] = 'My Story'; $lang->block->default['product']['4']['block'] = 'story'; $lang->block->default['product']['4']['grid'] = 4; @@ -83,7 +83,7 @@ $lang->block->default['product']['4']['params']['num'] = 15; $lang->block->default['product']['4']['params']['orderBy'] = 'id_desc'; $lang->block->default['product']['4']['params']['type'] = 'assignedTo'; -$lang->block->default['project']['1']['title'] = $lang->projectCommon . 'statistic'; +$lang->block->default['project']['1']['title'] = $lang->projectCommon . ' Report'; $lang->block->default['project']['1']['block'] = 'statistic'; $lang->block->default['project']['1']['grid'] = 8; @@ -91,7 +91,7 @@ $lang->block->default['project']['1']['params']['orderBy'] = 'id_desc'; $lang->block->default['project']['1']['params']['type'] = 'noclosed'; $lang->block->default['project']['1']['params']['num'] = 5; -$lang->block->default['project']['2']['title'] = $lang->projectCommon . 'overview'; +$lang->block->default['project']['2']['title'] = $lang->projectCommon . ' Overview'; $lang->block->default['project']['2']['block'] = 'overview'; $lang->block->default['project']['2']['grid'] = 4; @@ -111,7 +111,7 @@ $lang->block->default['project']['4']['params']['num'] = 15; $lang->block->default['project']['4']['params']['orderBy'] = 'id_desc'; $lang->block->default['project']['4']['params']['type'] = 'assignedTo'; -$lang->block->default['qa']['1']['title'] = 'Test Statistic'; +$lang->block->default['qa']['1']['title'] = 'Test Report'; $lang->block->default['qa']['1']['block'] = 'statistic'; $lang->block->default['qa']['1']['grid'] = 8; @@ -122,7 +122,7 @@ $lang->block->default['qa']['1']['params']['type'] = 'noclosed'; //$lang->block->default['qa']['2']['block'] = 'overview'; //$lang->block->default['qa']['2']['grid'] = 4; -$lang->block->default['qa']['2']['title'] = 'My Bugs'; +$lang->block->default['qa']['2']['title'] = 'My Bug'; $lang->block->default['qa']['2']['block'] = 'bug'; $lang->block->default['qa']['2']['grid'] = 4; @@ -130,7 +130,7 @@ $lang->block->default['qa']['2']['params']['num'] = 15; $lang->block->default['qa']['2']['params']['orderBy'] = 'id_desc'; $lang->block->default['qa']['2']['params']['type'] = 'assignedTo'; -$lang->block->default['qa']['3']['title'] = 'My Cases'; +$lang->block->default['qa']['3']['title'] = 'My Case'; $lang->block->default['qa']['3']['block'] = 'case'; $lang->block->default['qa']['3']['grid'] = 4; @@ -229,16 +229,16 @@ $lang->block->orderBy = 'Order by'; $lang->block->availableBlocks = new stdclass(); $lang->block->availableBlocks->todo = 'My Todo'; -$lang->block->availableBlocks->task = 'My Tasks'; -$lang->block->availableBlocks->bug = 'My Bugs'; -$lang->block->availableBlocks->case = 'My Cases'; -$lang->block->availableBlocks->story = 'My Stories'; +$lang->block->availableBlocks->task = 'My Task'; +$lang->block->availableBlocks->bug = 'My Bug'; +$lang->block->availableBlocks->case = 'My Case'; +$lang->block->availableBlocks->story = 'My Story'; $lang->block->availableBlocks->product = $lang->productCommon . 'List'; $lang->block->availableBlocks->project = $lang->projectCommon . 'List'; -$lang->block->availableBlocks->plan = 'Plans'; -$lang->block->availableBlocks->release = 'Releases'; -$lang->block->availableBlocks->build = 'Builds'; -$lang->block->availableBlocks->testtask = 'Test Builds'; +$lang->block->availableBlocks->plan = 'Plan'; +$lang->block->availableBlocks->release = 'Release'; +$lang->block->availableBlocks->build = 'Build'; +$lang->block->availableBlocks->testtask = 'Test Build'; $lang->block->moduleList['product'] = $lang->productCommon; $lang->block->moduleList['project'] = $lang->projectCommon; @@ -249,24 +249,24 @@ $lang->block->modules['product'] = new stdclass(); $lang->block->modules['product']->availableBlocks = new stdclass(); $lang->block->modules['product']->availableBlocks->statistic = $lang->productCommon . ' Report'; $lang->block->modules['product']->availableBlocks->overview = $lang->productCommon . ' Overview'; -$lang->block->modules['product']->availableBlocks->list = $lang->productCommon . 'List'; -$lang->block->modules['product']->availableBlocks->story = 'Stories'; -$lang->block->modules['product']->availableBlocks->plan = 'Plans'; -$lang->block->modules['product']->availableBlocks->release = 'Releases'; +$lang->block->modules['product']->availableBlocks->list = $lang->productCommon . ' List'; +$lang->block->modules['product']->availableBlocks->story = 'Story'; +$lang->block->modules['product']->availableBlocks->plan = 'Plan'; +$lang->block->modules['product']->availableBlocks->release = 'Release'; $lang->block->modules['project'] = new stdclass(); $lang->block->modules['project']->availableBlocks = new stdclass(); -$lang->block->modules['project']->availableBlocks->statistic = $lang->projectCommon . 'statistic'; -$lang->block->modules['project']->availableBlocks->overview = $lang->projectCommon . 'overview'; -$lang->block->modules['project']->availableBlocks->list = $lang->projectCommon . 'List'; -$lang->block->modules['project']->availableBlocks->task = 'Tasks'; -$lang->block->modules['project']->availableBlocks->build = 'Builds'; +$lang->block->modules['project']->availableBlocks->statistic = $lang->projectCommon . ' Report'; +$lang->block->modules['project']->availableBlocks->overview = $lang->projectCommon . ' Overview'; +$lang->block->modules['project']->availableBlocks->list = $lang->projectCommon . ' List'; +$lang->block->modules['project']->availableBlocks->task = 'Task'; +$lang->block->modules['project']->availableBlocks->build = 'Build'; $lang->block->modules['qa'] = new stdclass(); $lang->block->modules['qa']->availableBlocks = new stdclass(); -$lang->block->modules['qa']->availableBlocks->statistic = 'Test Statistic'; +$lang->block->modules['qa']->availableBlocks->statistic = 'Test Report'; //$lang->block->modules['qa']->availableBlocks->overview = 'Testcase Overview'; -$lang->block->modules['qa']->availableBlocks->bug = 'Bugs'; -$lang->block->modules['qa']->availableBlocks->case = 'Cases'; -$lang->block->modules['qa']->availableBlocks->testtask = 'Test Builds'; +$lang->block->modules['qa']->availableBlocks->bug = 'Bug'; +$lang->block->modules['qa']->availableBlocks->case = 'Case'; +$lang->block->modules['qa']->availableBlocks->testtask = 'Test Build'; $lang->block->modules['todo'] = new stdclass(); $lang->block->modules['todo']->availableBlocks = new stdclass(); $lang->block->modules['todo']->availableBlocks->list = 'Todo'; @@ -321,9 +321,9 @@ $lang->block->orderByList->story['status_desc'] = 'Status Descending'; $lang->block->orderByList->story['stage_asc'] = 'Phase Ascending'; $lang->block->orderByList->story['stage_desc'] = 'Phase Descending'; -$lang->block->todoNum = 'Todo Number'; -$lang->block->taskNum = 'Task Number'; -$lang->block->bugNum = 'Bug Number'; +$lang->block->todoNum = 'Todo'; +$lang->block->taskNum = 'Task'; +$lang->block->bugNum = 'Bug'; $lang->block->typeList = new stdclass(); @@ -388,7 +388,7 @@ $lang->block->gridOptions[4] = 'Right'; $lang->block->flowchart = array(); $lang->block->flowchart[] = array('Administlrator', 'Add Departments', 'Add Users', 'Maintain Privileges'); -$lang->block->flowchart[] = array($lang->productCommon . ' Owner', 'Add ' . $lang->productCommon, 'Maintain Modules', 'Maintain Plans', 'Maintain Stories', 'Create Release'); +$lang->block->flowchart[] = array($lang->productCommon . ' Owner', 'Add ' . $lang->productCommon, 'Maintain Modules', 'Maintain Plans', 'Maintain Stories', 'Create Releases'); $lang->block->flowchart[] = array('Scrum Master', 'Add ' . $lang->projectCommon, 'Maintain Teams', 'Link ' . $lang->productCommon . 's', 'Link Stories', 'Decompose Tasks'); $lang->block->flowchart[] = array('Dev Team', 'Claim Tasks/Bugs', 'Update Status', 'Finish Tasks/Bugs'); -$lang->block->flowchart[] = array('QA Team', 'Write Cases', 'Execute Cases', 'Report Bugs', 'Check Bugs', 'Close Bugs'); +$lang->block->flowchart[] = array('QA Team', 'Write Cases', 'Run Cases', 'Report Bugs', 'Verify Bugs', 'Close Bugs'); diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 9f019ccd18..8c0f52c329 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -128,8 +128,8 @@ $lang->bug->resolvedByMeAB = 'Resolved By Me'; $lang->bug->ditto = 'Ditto'; $lang->bug->dittoNotice = 'This bug is not linked to the same product as the last one!'; -$lang->bug->noAssigned = 'Not Assigned'; -$lang->bug->noBug = 'No BUG. You could '; +$lang->bug->noAssigned = 'Assign'; +$lang->bug->noBug = 'No bugs. You could '; $lang->bug->noModule = '
    You have no modules
    Manage now
    '; /* 页面标签。*/ @@ -145,11 +145,11 @@ $lang->bug->createBuild = 'New'; $lang->bug->legendBasicInfo = 'Basic Info'; $lang->bug->legendAttatch = 'Attachment'; $lang->bug->legendPrjStoryTask = $lang->projectCommon . '/Story/Task'; -$lang->bug->lblTypeAndSeverity = 'Type/Priority Level'; +$lang->bug->lblTypeAndSeverity = 'Type/Severity'; $lang->bug->lblSystemBrowserAndHardware = 'System/Browser'; $lang->bug->legendSteps = 'Repro Steps'; $lang->bug->legendComment = 'Note'; -$lang->bug->legendLife = 'Life of Bug'; +$lang->bug->legendLife = 'About the Bug'; $lang->bug->legendMisc = 'Misc'; $lang->bug->legendRelated = 'Related Info'; @@ -238,10 +238,10 @@ $lang->bug->typeList['performance'] = 'Performance'; $lang->bug->typeList['standard'] = 'Standard'; $lang->bug->typeList['automation'] = 'Testing Script'; $lang->bug->typeList['others'] = 'Other'; -$lang->bug->typeList['designchange'] = 'Design Changed'; +$lang->bug->typeList['designchange'] = 'Design Change'; $lang->bug->typeList['newfeature'] = 'New Feature'; $lang->bug->typeList['designdefect'] = 'Design Defect'; -$lang->bug->typeList['trackthings'] = 'Track Things'; +$lang->bug->typeList['trackthings'] = 'Track Work'; $lang->bug->statusList[''] = ''; $lang->bug->statusList['active'] = 'Active'; @@ -252,19 +252,19 @@ $lang->bug->confirmedList[1] = 'Yes'; $lang->bug->confirmedList[0] = 'No'; $lang->bug->resolutionList[''] = ''; -$lang->bug->resolutionList['bydesign'] = 'By Design'; -$lang->bug->resolutionList['duplicate'] = 'Duplicated'; -$lang->bug->resolutionList['external'] = 'External'; +$lang->bug->resolutionList['bydesign'] = 'As Design'; +$lang->bug->resolutionList['duplicate'] = 'Duplicated Bug'; +$lang->bug->resolutionList['external'] = 'External Cause'; $lang->bug->resolutionList['fixed'] = 'Resolved'; $lang->bug->resolutionList['notrepro'] = 'Irreproducible'; -$lang->bug->resolutionList['postponed'] = 'Postponed'; -$lang->bug->resolutionList['willnotfix'] = "Not to Resolve"; -$lang->bug->resolutionList['tostory'] = 'Converted to Story'; +$lang->bug->resolutionList['postponed'] = 'Postpone'; +$lang->bug->resolutionList['willnotfix'] = "Ignore"; +$lang->bug->resolutionList['tostory'] = 'Convert to Story'; /* 统计报表。*/ $lang->bug->report = new stdclass(); $lang->bug->report->common = 'Report'; -$lang->bug->report->select = 'Select Report Type '; +$lang->bug->report->select = 'Select Type '; $lang->bug->report->create = 'Generate Report'; $lang->bug->report->charts['bugsPerProject'] = $lang->projectCommon . ' Bugs'; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index ea82623b69..b4fd79d506 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -9,8 +9,8 @@ * @version $Id: en.php 5141 2013-07-15 05:57:15Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ -$lang->story->create = "Create Story"; -$lang->story->batchCreate = "Batch Create"; +$lang->story->create = "Add a Story"; +$lang->story->batchCreate = "Batch Add"; $lang->story->change = "Change"; $lang->story->changed = 'Change'; $lang->story->review = 'Review'; @@ -37,7 +37,7 @@ $lang->story->linkStory = 'Link'; $lang->story->unlinkStory = 'UnLinked'; $lang->story->export = "Export Data"; $lang->story->zeroCase = "Story w/o cases"; -$lang->story->zeroTask = "Only show stories w/o tasks"; +$lang->story->zeroTask = "Display stories w/o tasks"; $lang->story->reportChart = "Report"; $lang->story->copyTitle = "Copy Title"; $lang->story->batchChangePlan = "Batch Change Plans"; @@ -45,7 +45,7 @@ $lang->story->batchChangeBranch = "Batch Change Branches"; $lang->story->batchChangeStage = "Batch Change Phases"; $lang->story->batchAssignTo = "Batch Assign"; $lang->story->batchChangeModule = "Batch Change Modules"; -$lang->story->viewAll = "View All"; +$lang->story->viewAll = "All"; $lang->story->common = 'Story'; $lang->story->id = 'ID'; @@ -66,7 +66,7 @@ $lang->story->hour = 'Hour'; $lang->story->status = 'Status'; $lang->story->stage = 'Phase'; $lang->story->stageAB = 'Phase'; -$lang->story->mailto = 'Mailto'; +$lang->story->mailto = 'Mail to'; $lang->story->openedBy = 'Creator'; $lang->story->openedDate = 'Create on'; $lang->story->assignedTo = 'Assignee'; @@ -86,10 +86,10 @@ $lang->story->comment = 'Comment'; $lang->story->linkStories = 'Linked Story'; $lang->story->childStories = 'Decompose Story'; $lang->story->duplicateStory = 'Copy Story'; -$lang->story->reviewResult = 'Review Results'; +$lang->story->reviewResult = 'Review Result'; $lang->story->preVersion = 'Previous Version'; $lang->story->keywords = 'Tags'; -$lang->story->newStory = 'Continue adding Story.'; +$lang->story->newStory = 'Continue adding'; $lang->story->colorTag = 'Color Tag'; $lang->story->files = 'Files'; $lang->story->copy = "Copy a Story"; @@ -98,7 +98,7 @@ $lang->story->allStories = 'All'; $lang->story->unclosed = 'Unclosed'; $lang->story->ditto = 'Ditto'; -$lang->story->dittoNotice = 'This Story does not belong to the same Product as the last Story does!'; +$lang->story->dittoNotice = 'This Story does not belong to the same Product as the last one does!'; $lang->story->useList[0] = 'Yes'; $lang->story->useList[1] = 'No'; @@ -164,7 +164,7 @@ $lang->story->priList[4] = '4'; $lang->story->legendBasicInfo = 'Basic Info'; $lang->story->legendLifeTime = 'Story Life '; $lang->story->legendRelated = 'Related Info'; -$lang->story->legendMailto = 'Mail To'; +$lang->story->legendMailto = 'Mail to'; $lang->story->legendAttatch = 'Files'; $lang->story->legendProjectAndTask = $lang->projectCommon . ' Task'; $lang->story->legendBugs = 'Linked Bug'; @@ -188,7 +188,7 @@ $lang->story->affectedCases = 'Case'; $lang->story->specTemplate = "As a < type of user >, I want < some goal > so that < some reason >."; $lang->story->needNotReview = 'No Review'; -$lang->story->successSaved = "Story saved!"; +$lang->story->successSaved = "Story is saved!"; $lang->story->confirmDelete = "Do you want to delete this Story?"; $lang->story->errorEmptyChildStory = '『Subdivide Story』canot be blank.'; $lang->story->mustChooseResult = 'Select a result.'; @@ -196,8 +196,8 @@ $lang->story->mustChoosePreVersion = 'Select a Version to revert to.'; $lang->story->form = new stdclass(); $lang->story->form->area = 'Story Scope'; -$lang->story->form->desc = 'What Story is it? How to verify it?'; -$lang->story->form->resource = 'How to finish it? How long does it take?'; +$lang->story->form->desc = 'What Story is it? What is the acceptance criteria?'; +$lang->story->form->resource = 'Who will allocate resources? How long does it take?'; $lang->story->form->file = 'If there are Story linked files, please click Here to upload it.'; $lang->story->action = new stdclass(); diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 69eeef69c1..f0f196162b 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -11,7 +11,7 @@ */ $lang->task->index = "Index"; $lang->task->create = "Create Task"; -$lang->task->batchCreate = "Batch Create Tasks"; +$lang->task->batchCreate = "Batch Create"; $lang->task->batchCreateChildren = "Batch Create Children"; $lang->task->batchEdit = "Batch Edit"; $lang->task->batchChangeModule = "Batch Change Module"; diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php index 2b0a7fff90..6731f879d3 100644 --- a/module/todo/lang/en.php +++ b/module/todo/lang/en.php @@ -86,13 +86,13 @@ global $config; if($config->global->flow == 'onlyTest' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['task']); if($config->global->flow == 'onlyTask' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['bug']); -$lang->todo->confirmDelete = "Are you sure to delete this Todo?"; +$lang->todo->confirmDelete = "Do you want to delete this Todo?"; $lang->todo->thisIsPrivate = 'This is a private Todo'; -$lang->todo->lblDisableDate = 'Set later.'; -$lang->todo->lblBeforeDays = "%s early in advance to be done"; -$lang->todo->lblClickCreate = "Clict to add todo"; -$lang->todo->noTodo = 'No this type of Todo.'; -$lang->todo->noAssignedTo = "The AssignedTo user can't be empty."; +$lang->todo->lblDisableDate = 'Set later'; +$lang->todo->lblBeforeDays = "Create a todo %s days(s) earlier"; +$lang->todo->lblClickCreate = "Click to add a todo"; +$lang->todo->noTodo = 'No todos of this type.'; +$lang->todo->noAssignedTo = "The AssignedTo should not be empty."; $lang->todo->periods['all'] = 'All'; $lang->todo->periods['thisYear'] = 'ThisYear'; From 167b26c2d5a105472f7cc8e837cbec6015db8c90 Mon Sep 17 00:00:00 2001 From: daitingting Date: Fri, 25 May 2018 15:00:12 +0800 Subject: [PATCH 05/10] * Adjust style for promotion. --- module/upgrade/css/afterexec.css | 54 ++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/module/upgrade/css/afterexec.css b/module/upgrade/css/afterexec.css index 8d820e952d..b5cd835689 100644 --- a/module/upgrade/css/afterexec.css +++ b/module/upgrade/css/afterexec.css @@ -1,5 +1,59 @@ .adbox{margin-top:20px;} +.card.ad{margin-bottom:0px;} +.card.ad > .img-wrapper { + background-position: center; + background-repeat: no-repeat; + height: 115px; + width: 100%; +} + +.card { + position: relative; + display: block; + padding: 0; + margin-bottom: 20px; + overflow: hidden; + border: 1px solid #ddd; + border-radius: 0; + -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.075); + box-shadow: 0 1px 2px rgba(0,0,0,.075); + -webkit-transition: all .5s cubic-bezier(.175,.885,.32,1); + -o-transition: all .5s cubic-bezier(.175,.885,.32,1); + transition: all .5s cubic-bezier(.175,.885,.32,1); +} + +.card .card-heading { + display: block; + padding: 10px; + margin: 0; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.card .card-content +{ + padding: 0 10px 10px 10px; + overflow: hidden; + text-overflow: ellipsis; +} + +.card > .card-reveal { + position: absolute; + top: 100%; + left: 0; + width: 100%; + height: 100%; + background-color: #f1f1f1; + -webkit-transition: all .8s cubic-bezier(.175,.885,.32,1); + -o-transition: all .8s cubic-bezier(.175,.885,.32,1); + transition: all .8s cubic-bezier(.175,.885,.32,1); +} + +.card>.card-reveal>.card-heading{padding:20px 10px} +.card:hover>.card-reveal{top:0} + .card.ad{margin-bottom:0px;} .card.ad > .img-wrapper { background-position: center; From 761c65bf72c7d3d83cde3372c0a97628a33c1d35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= Date: Fri, 25 May 2018 15:11:02 +0800 Subject: [PATCH 06/10] * Finish task#4277. --- module/file/view/export.html.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/file/view/export.html.php b/module/file/view/export.html.php index e84e3ac0e0..e0831d654d 100644 --- a/module/file/view/export.html.php +++ b/module/file/view/export.html.php @@ -162,7 +162,8 @@ if($isCustomExport) file->encoding;?> charsets[$this->cookie->lang], 'utf-8', key($lang->exportFileTypeList) == 'csv' ? "class='form-control'" : "class='form-control'");?> - + + > file->exportRange;?> exportTypeList, 'all', "class='form-control'");?> From c748ede499d466e1ab29d0f9424732adca96e9e4 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 25 May 2018 15:29:43 +0800 Subject: [PATCH 07/10] * fix for shortcut query. --- db/update10.0.alpha.sql | 1 + db/zentao.sql | 1 + 2 files changed, 2 insertions(+) create mode 100644 db/update10.0.alpha.sql diff --git a/db/update10.0.alpha.sql b/db/update10.0.alpha.sql new file mode 100644 index 0000000000..0d6b2557d6 --- /dev/null +++ b/db/update10.0.alpha.sql @@ -0,0 +1 @@ +ALTER TABLE `zt_userquery` ADD `shortcut` enum('0','1') COLLATE 'utf8_general_ci' NOT NULL DEFAULT '0'; diff --git a/db/zentao.sql b/db/zentao.sql index 9322e1dfcf..67a35ca9f1 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -833,6 +833,7 @@ CREATE TABLE IF NOT EXISTS `zt_userquery` ( `title` varchar(90) NOT NULL, `form` text NOT NULL, `sql` text NOT NULL, + `shortcut` enum('0','1') NOT NULL DEFAULT '0', PRIMARY KEY (`id`), KEY `query` (`account`, `module`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; From 3e31e43c049d7dc367f20e961c858265b9828375 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= Date: Fri, 25 May 2018 16:08:56 +0800 Subject: [PATCH 08/10] * Finish task#4262. --- module/testtask/view/cases.html.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php index ded7d2c4a8..23de2f9bcf 100644 --- a/module/testtask/view/cases.html.php +++ b/module/testtask/view/cases.html.php @@ -129,6 +129,10 @@ show('right', 'pagerjs');?> + +
    +

    testcase->noCase;?> " . $lang->testtask->linkCase, '', "class='btn btn-info'");?>

    +
    From 996c25cd4bccc05cf921167ff3167a3f98828a7d Mon Sep 17 00:00:00 2001 From: daitingting Date: Fri, 25 May 2018 16:20:33 +0800 Subject: [PATCH 09/10] * Load custom from db when upgradeVersion > 4.3.beta. --- module/common/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/common/model.php b/module/common/model.php index 74d3e8ebde..962a8b1a59 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -27,7 +27,7 @@ class commonModel extends model $this->setCompany(); $this->setUser(); $this->loadConfigFromDB(); - $this->loadCustomFromDB(); + if(version_compare($this->config->global->version, '4.3.beta') > 0) $this->loadCustomFromDB(); if(!$this->checkIP()) die($this->lang->ipLimited); $this->app->loadLang('company'); } From a220646406c6058561c2e7a9427e431ec6ab81e7 Mon Sep 17 00:00:00 2001 From: daitingting Date: Fri, 25 May 2018 16:47:48 +0800 Subject: [PATCH 10/10] * Adjust link for view story. --- module/testcase/view/create.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php index 1f3bb103ea..c44ae3fbe2 100644 --- a/module/testcase/view/create.html.php +++ b/module/testcase/view/create.html.php @@ -73,7 +73,7 @@ - createLink('story', 'view', "storyID=$storyID", '', true), $lang->preview, '', "class='btn iframe' id='preview'");?> + createLink('story', 'view', "storyID=$storyID", '', true), $lang->preview, '', "class='btn' id='preview'");?>