diff --git a/module/bug/control.php b/module/bug/control.php index d337da3ca3..47a8720a61 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -141,7 +141,7 @@ class bug extends control /* Set view. */ $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->bug->common; - $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]); + $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID],'','title=' . $this->products[$productID]); $this->view->position[] = $this->lang->bug->common; $this->view->productID = $productID; $this->view->product = $this->product->getById($productID); @@ -1542,7 +1542,8 @@ class bug extends control $bug->closedDate = substr($bug->closedDate, 0, 10); $bug->resolvedDate = substr($bug->resolvedDate, 0, 10); $bug->lastEditedDate = substr($bug->lastEditedDate, 0, 10); - + $bug->title = htmlspecialchars_decode($bug->title,ENT_QUOTES); + if($bug->linkBug) { $tmpLinkBugs = array(); diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 3c046d3695..27c041af74 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -54,13 +54,13 @@ $lang->public = 'Public'; $lang->trunk = 'Trunk'; $lang->sort = 'Sort'; $lang->required = 'Required'; -$lang->noData = 'No record'; +$lang->noData = 'No data.'; $lang->actions = 'Actions'; $lang->restore = 'Restore'; $lang->comment = 'Note'; $lang->history = 'History'; -$lang->attatch = 'Attachment'; +$lang->attatch = 'File'; $lang->reverse = 'Reverse'; $lang->switchDisplay = 'Toggle'; $lang->expand = 'Expand All'; @@ -342,7 +342,7 @@ $lang->report->menu->test = array('link' => 'Test|report|bugcreate', 'alias' $lang->report->menu->staff = array('link' => 'Company|report|workload'); $lang->report->notice = new stdclass(); -$lang->report->notice->help = 'Note: Report is generated from search results. Please search in the list page before you generate a report.'; +$lang->report->notice->help = 'Note: Report is generated from search results. Please search in the list before you generate a report.'; /* Company menu settings. */ $lang->company = new stdclass(); @@ -467,7 +467,7 @@ $lang->error->tutorialData = 'No data can be imported in tutorial mode. Pleas /* Page info. */ $lang->pager = new stdclass(); -$lang->pager->noRecord = "No Records"; +$lang->pager->noRecord = "No records."; $lang->pager->digest = " %s in total. %s %s/%s   "; $lang->pager->recPerPage = " %s per page"; $lang->pager->first = ""; @@ -487,15 +487,15 @@ $lang->suhosinInfo = "Warning! Data is reaching the limit. Please change maxVarsInfo = "Warning! Data is reaching the limit. Please change max_input_vars (set larger %s value) in php.ini, then save and restart Apache or php-fpm, or some data will not be saved."; $lang->pasteTextInfo = "Paste text here. Each line will be the title of each record. "; $lang->noticeImport = "Imported data contains data that has already existed in system. Please confirm you actions on the date."; -$lang->importConfirm = "Import Confirm"; +$lang->importConfirm = "Confirm"; $lang->importAndCover = "Override"; -$lang->importAndInsert = "New Insertion"; +$lang->importAndInsert = "Insert"; $lang->noResultsMatch = "No results match!"; $lang->searchMore = "More results:"; $lang->chooseUsersToMail = "Choose users that will be notified."; -$lang->browserNotice = 'Your current browser might not show the best effect. Please use Chrome, Firefox, IE9+, Opera or Safari.'; +$lang->browserNotice = 'Your current browser might not display the best effect. Use Chrome, Firefox, IE9+, Opera or Safari.'; $lang->noticePasteImg = "Paste images here"; /* Time formats settings. */ @@ -732,7 +732,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest') $lang->bug->subMenu->more->longlifebugs = 'Pending|bug|browse|productID=%s&branch=%s&browseType=longlifebugs¶m=%s'; $lang->bug->subMenu->more->postponedbugs = 'PostPoned|bug|browse|productID=%s&branch=%s&browseType=postponedbugs¶m=%s'; $lang->bug->subMenu->more->overduebugs = 'Overdue|bug|browse|productID=%s&branch=%s&browseType=overduebugs¶m=%s'; - $lang->bug->subMenu->more->needconfirm = 'NeedConfirm|bug|browse|productID=%s&branch=%s&browseType=needconfirm¶m=%s'; + $lang->bug->subMenu->more->needconfirm = 'ToConfirm|bug|browse|productID=%s&branch=%s&browseType=needconfirm¶m=%s'; $lang->bug->menuOrder[5] = 'product'; $lang->bug->menuOrder[10] = 'all'; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 906cef06cb..e022fc093e 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -39,6 +39,7 @@ $lang->task->confirmStoryChange = "Confirm Story Change"; $lang->task->progress = 'Progress'; $lang->task->progressTips = 'Cost/(Cost+Left)'; $lang->task->copy = 'Duplicate Task'; +$lang->task->undoneTask = 'Undone Task'; $lang->task->common = 'Task'; $lang->task->id = 'ID'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index cae335973e..46eb851178 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -39,6 +39,7 @@ $lang->task->confirmStoryChange = "确认需求变动"; $lang->task->progress = '进度'; $lang->task->progressTips = '已消耗/(已消耗+剩余)'; $lang->task->copy = '复制任务'; +$lang->task->undoneTask = '未完成的任务'; $lang->task->common = '任务'; $lang->task->id = '编号'; diff --git a/module/testsuite/lang/en.php b/module/testsuite/lang/en.php index 10d344c17b..c66e8bf2e6 100644 --- a/module/testsuite/lang/en.php +++ b/module/testsuite/lang/en.php @@ -18,13 +18,13 @@ $lang->testsuite->browse = "Suite List"; $lang->testsuite->linkCase = "Link Cases"; $lang->testsuite->linkVersion = "Version"; $lang->testsuite->unlinkCase = "Unlink"; -$lang->testsuite->batchUnlinkCases = "Batch unlink cases"; -$lang->testsuite->deleted = 'deleted'; +$lang->testsuite->batchUnlinkCases = "Batch Unlink Case"; +$lang->testsuite->deleted = 'Deleted'; $lang->testsuite->exportTemplet = 'Export template'; -$lang->testsuite->batchCreateCase = 'Batch create cases'; +$lang->testsuite->batchCreateCase = 'Batch Create Case'; $lang->testsuite->import = 'Import'; -$lang->testsuite->showImport = 'Show import data'; -$lang->testsuite->successSaved = 'Success Saved'; +$lang->testsuite->showImport = 'Show Imported Data'; +$lang->testsuite->successSaved = 'Saved'; $lang->testsuite->common = 'Test Suite'; $lang->testsuite->product = $lang->productCommon; @@ -35,7 +35,7 @@ $lang->testsuite->addedBy = 'Creator'; $lang->testsuite->addedDate = 'Date'; $lang->testsuite->legendDesc = 'Description'; -$lang->testsuite->legendBasicInfo = 'Base Info'; +$lang->testsuite->legendBasicInfo = 'Basic Info'; $lang->testsuite->unlinkedCases = 'Unlinked Cases'; @@ -57,6 +57,6 @@ $lang->caselib->all = 'All'; $lang->testsuite->createLib = 'Create Library'; $lang->testsuite->editLib = 'Edit'; -$lang->testsuite->library = 'Browse cases in Library'; +$lang->testsuite->library = 'View cases in Library'; $lang->testsuite->createCase = 'Create Case'; $lang->testsuite->libView = 'Overview'; diff --git a/www/js/zui/min.js b/www/js/zui/min.js index 2563514c00..369ee9cd43 100644 --- a/www/js/zui/min.js +++ b/www/js/zui/min.js @@ -1,5 +1,5 @@ /*! - * ZUI: Zentao template - v1.8.1 - 2018-10-24 + * ZUI: Zentao template - v1.8.1 - 2018-10-31 * http://zui.sexy * GitHub: https://github.com/easysoft/zui.git * Copyright (c) 2018 cnezsoft.com; Licensed MIT @@ -75,4 +75,4 @@ function(t){"function"==typeof define&&define.amd?define(["jquery"],t):"object"= * Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/ */ function(t){function e(e){if("string"==typeof e.data){var i=e.handler,n=e.data.toLowerCase().split(" ");e.handler=function(e){if(this===e.target||!/textarea|select/i.test(e.target.nodeName)&&"text"!==e.target.type){var s="keypress"!==e.type&&t.hotkeys.specialKeys[e.which],o=String.fromCharCode(e.which).toLowerCase(),a="",r={};e.altKey&&"alt"!==s&&(a+="alt+"),e.ctrlKey&&"ctrl"!==s&&(a+="ctrl+"),e.metaKey&&!e.ctrlKey&&"meta"!==s&&(a+="meta+"),e.shiftKey&&"shift"!==s&&(a+="shift+"),s?r[a+s]=!0:(r[a+o]=!0,r[a+t.hotkeys.shiftNums[o]]=!0,"shift+"===a&&(r[t.hotkeys.shiftNums[o]]=!0));for(var l=0,h=n.length;l","/":"?","\\":"|"}},t.each(["keydown","keyup","keypress"],function(){t.event.special[this]={add:e}})}(jQuery),function(t){"use strict";function e(e,i){if(e===!1)return e;if(!e)return i;e===!0?e={add:!0,"delete":!0,edit:!0,sort:!0}:"string"==typeof e&&(e=e.split(","));var n;return t.isArray(e)&&(n={},t.each(e,function(e,i){t.isPlainObject(i)?n[i.action]=i:n[i]=!0}),e=n),t.isPlainObject(e)&&(n={},t.each(e,function(e,i){i?n[e]=t.extend({type:e},a[e],t.isPlainObject(i)?i:null):n[e]=!1}),e=n),i?t.extend(!0,{},i,e):e}function i(e,i,n){return i=i||e.type,t(n||e.template).addClass("tree-action").attr(t.extend({"data-type":i,title:e.title||""},e.attr)).data("action",e)}var n="zui.tree",s=0,o=function(e,i){this.name=n,this.$=t(e),this.getOptions(i),this._init()},a={sort:{template:''},add:{template:''},edit:{template:''},"delete":{template:''}};o.DEFAULTS={animate:null,initialState:"normal",toggleTemplate:''},o.prototype.add=function(e,i,n,s,o){var a,r=t(e),l=this.options;if(r.is("li")?(a=r.children("ul"),a.length||(a=t("