From edd857f5c2d9e98837dde0f950e00463daa6caf6 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 3 Jun 2019 13:47:18 +0800 Subject: [PATCH 1/9] * Finish task #5726. --- module/project/view/treetask.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/project/view/treetask.html.php b/module/project/view/treetask.html.php index f8626278e3..89be4fd5d1 100644 --- a/module/project/view/treetask.html.php +++ b/module/project/view/treetask.html.php @@ -2,6 +2,7 @@

id?> task->common?> + task->statusList, $task->status);?> parent > 0) echo '' . $this->lang->task->childrenAB . '';?> team)) echo '' . $this->lang->task->multipleAB . '';?> @@ -10,7 +11,6 @@

- task->statusList, $task->status);?> task->estimate;?> estimate . $lang->workingHour;?> task->consumed;?> consumed, 2) . $lang->workingHour;?> task->left;?> left . $lang->workingHour;?> From 6f5e5b2c13b6f86471b019fe71d6c9c4da229394 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 3 Jun 2019 13:56:12 +0800 Subject: [PATCH 2/9] * Finish task #5729. --- module/sso/lang/en.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/sso/lang/en.php b/module/sso/lang/en.php index a7acedae9f..67eb18421e 100644 --- a/module/sso/lang/en.php +++ b/module/sso/lang/en.php @@ -11,8 +11,8 @@ */ $lang->sso = new stdclass(); $lang->sso->settings = 'Settings'; -$lang->sso->turnon = 'On'; -$lang->sso->redirect = 'Auto Jump to Zdoo'; +$lang->sso->turnon = 'Zdoo'; +$lang->sso->redirect = 'Back to Zdoo'; $lang->sso->code = 'Code'; $lang->sso->key = 'Secret Key'; $lang->sso->addr = 'Address'; From faf7a8149cee5f8f9dd194b58c646e4c7045eb08 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 3 Jun 2019 13:59:56 +0800 Subject: [PATCH 3/9] * Finish task #5735. --- module/story/view/edit.html.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php index 30b605dab9..02aa3adadc 100644 --- a/module/story/view/edit.html.php +++ b/module/story/view/edit.html.php @@ -170,7 +170,7 @@
story->legendLifeTime;?>
- + @@ -206,7 +206,8 @@ - + app->getClientLang() == 'en' ? 'w-110px': 'w-70px'?> + From 8136066f1608be10c033b529335e5bd9ac903d48 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 3 Jun 2019 14:06:40 +0800 Subject: [PATCH 4/9] * Finish task #5736. --- module/task/view/edit.html.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index 99e5eeb29c..78bf79ff9d 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -20,6 +20,7 @@ task->confirmChangeProject);?> team) < 6 ? 6 - count($task->team) : 1);?> +app->getClientLang() == 'en' ? 'w-85px' : 'w-70px';?>
@@ -146,7 +147,7 @@
task->legendEffort;?>
story->openedBy;?>story->openedBy;?> openedBy];?>
story->linkStories;?>>story->linkStories;?> createLink('story', 'linkStory', "storyID=$story->id&type=linkStories", '', true), $lang->story->linkStory, '', "data-toggle='modal' data-type='iframe' data-width='95%'");?>
- + @@ -181,7 +182,7 @@
task->legendLife;?>
task->estStarted;?>>task->estStarted;?> estStarted, "class='form-control form-date'");?>
- + From 56f6d0e2e19ad531c51414a7476d2acbab7e52f3 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 3 Jun 2019 14:10:26 +0800 Subject: [PATCH 5/9] * Finish task #5737. --- module/task/view/edit.html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index 78bf79ff9d..d05d366764 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -90,12 +90,12 @@
task->openedBy;?>>task->openedBy;?> openedBy];?>
parent <= 0):?> - + - + global->flow != 'onlyTask' and $project->type != 'ops'):?> From 969a5c8d3b496c27ef0862a7fcf1ca40221c42c6 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 3 Jun 2019 14:17:04 +0800 Subject: [PATCH 6/9] * Finish task #5750. --- module/report/css/bugcreate.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/report/css/bugcreate.css b/module/report/css/bugcreate.css index 8b13789179..c46a3f4501 100644 --- a/module/report/css/bugcreate.css +++ b/module/report/css/bugcreate.css @@ -1 +1,2 @@ - +#begin{min-width: 85px} +#end{min-width: 85px} From 0fd9967fa82b4071331ea579c9811f6bba82bb77 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 3 Jun 2019 14:38:24 +0800 Subject: [PATCH 7/9] * Finish task #5751. --- module/bug/view/create.html.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php index 8b7499acac..0262905a65 100644 --- a/module/bug/view/create.html.php +++ b/module/bug/view/create.html.php @@ -21,6 +21,12 @@ js::set('createBuild', $lang->build->create); js::set('refresh', $lang->refresh); js::set('flow', $config->global->flow); ?> +app->getClientLang() == 'en'):?> + +
@@ -110,7 +116,7 @@ js::set('flow', $config->global->flow); -
task->project;?>>task->project;?> project, 'class="form-control chosen" onchange="loadAll(this.value)"');?>
task->module;?>>task->module;?> module, 'class="form-control chosen" onchange="loadModuleRelated()"');?>
+
bug->deadline?> From e56e9327233db146bef89f8876de2cbfb37a437a Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 3 Jun 2019 14:49:16 +0800 Subject: [PATCH 8/9] * Finish task #5759. --- module/search/view/buildform.html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php index e61695c771..3d106736bf 100644 --- a/module/search/view/buildform.html.php +++ b/module/search/view/buildform.html.php @@ -16,7 +16,7 @@ include '../../common/view/datepicker.html.php'; include '../../common/view/chosen.html.php'; $formId = 'searchForm-' . uniqid(''); $fieldWidth = $app->getClientLang() == 'en' ? 'w-130px' : 'w-110px'; -$operatorWidth = $app->getClientLang() == 'en' ? 'w-100px' : 'w-90px'; +$operatorWidth = $app->getClientLang() == 'en' ? 'w-110px' : 'w-90px'; ?>