From 9b1ca198bccd04bed0a38eb75fd8d137703d1b01 Mon Sep 17 00:00:00 2001 From: Guan Xiying Date: Thu, 26 Aug 2021 16:45:29 +0800 Subject: [PATCH] * Adjust style of view MR page. --- module/mr/lang/zh-cn.php | 65 +++++++++++++++++++----------------- module/mr/view/view.html.php | 31 ++++++++++------- 2 files changed, 53 insertions(+), 43 deletions(-) diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php index f51db88611..d6001b2136 100644 --- a/module/mr/lang/zh-cn.php +++ b/module/mr/lang/zh-cn.php @@ -1,14 +1,15 @@ mr->common = "合并请求"; -$lang->mr->create = "创建{$lang->mr->common}"; -$lang->mr->browse = "浏览{$lang->mr->common}"; -$lang->mr->list = $lang->mr->browse; -$lang->mr->edit = "编辑{$lang->mr->common}"; -$lang->mr->delete = "删除{$lang->mr->common}"; -$lang->mr->view = "{$lang->mr->common}详情"; -$lang->mr->source = '源项目分支'; -$lang->mr->target = '目标项目分支'; -$lang->mr->viewDiff = '查看Merge Request 改动'; +$lang->mr->common = "合并请求"; +$lang->mr->create = "创建{$lang->mr->common}"; +$lang->mr->browse = "浏览{$lang->mr->common}"; +$lang->mr->list = $lang->mr->browse; +$lang->mr->edit = "编辑{$lang->mr->common}"; +$lang->mr->delete = "删除{$lang->mr->common}"; +$lang->mr->view = "{$lang->mr->common}详情"; +$lang->mr->source = '源项目分支'; +$lang->mr->target = '目标项目分支'; +$lang->mr->viewDiff = '比对代码'; +$lang->mr->viewInGitlab = '在GitLab查看'; $lang->mr->id = 'ID'; $lang->mr->mriid = "MR原始ID"; @@ -17,7 +18,6 @@ $lang->mr->status = '状态'; $lang->mr->author = '创建人'; $lang->mr->assignee = '指派给'; $lang->mr->reviewer = '评审人'; -$lang->mr->link = 'GitLab链接'; $lang->mr->mergeStatus = '是否可合并'; $lang->mr->commits = '提交数'; $lang->mr->changes = '更改数'; @@ -33,7 +33,7 @@ $lang->mr->mergeStatusList['can_be_merged'] = '可合并'; $lang->mr->mergeStatusList['cannot_be_merged'] = '不可合并'; $lang->mr->description = '描述'; -$lang->mr->confirmDelete = '确认删除该merge request吗？'; +$lang->mr->confirmDelete = '确认删除该合并请求吗？'; $lang->mr->sourceProject = '源项目'; $lang->mr->sourceBranch = '源分支'; $lang->mr->targetProject = '目标项目'; @@ -45,11 +45,10 @@ $lang->mr->notFound = "此{$lang->mr->common}不存在。"; $lang->mr->createFailedFromAPI = "创建合并请求失败。"; $lang->mr->accessGitlabFailed = "当前无法连接到GitLab服务器。"; -$lang->mr->description = "描述"; - -$lang->mr->from = "请求合并"; -$lang->mr->to = "入"; +$lang->mr->from = "从"; +$lang->mr->to = "合并到"; $lang->mr->at = "于"; + $lang->mr->pipeline = "流水线"; $lang->mr->pipelineSuccess = "已通过"; $lang->mr->pipelineFailed = "未通过"; @@ -65,7 +64,7 @@ $lang->mr->MRHasConflicts = "是否存在合并冲突"; $lang->mr->hasConflicts = "存在合并冲突"; $lang->mr->hasNoConflict = "可以合并请求"; $lang->mr->mergeByManual = "此合并请求可以手动合并，请使用以下"; -$lang->mr->commandLine = "命令行"; +$lang->mr->commandLine = "合并命令"; /** * Merge Command Document. @@ -78,23 +77,27 @@ $lang->mr->commandLine = "命令行"; * %s mr::target_branch */ $lang->mr->commandDocument = <<< EOD -

在本地检出、审核和合并

- 第 1 步. 获取并查看此合并请求的分支 +
在本地检出、审核和合并
+
+

+ 第 1 步. 获取并查看此合并请求的分支 

     git fetch "%s" %s
-    git checkout -b "%s" FETCH_HEAD
-
- 第 2 步. 在本地查看更改 -
- 第 3 步. 合并分支并解决出现的任何冲突 + git checkout -b "%s" FETCH_HEAD +

+

+ 第 2 步. 在本地查看更改 +

+

+ 第 3 步. 合并分支并解决出现的任何冲突 

     git fetch origin
     git checkout "%s"
-    git merge --no-ff "%s"
-
- 第 4 步. 将合并结果推送到GitLab - 
-    git push origin "%s"
-
+ git merge --no-ff "%s" +

+

+ 第 4 步. 将合并结果推送到GitLab + 

 git push origin "%s"
+

+
EOD; - diff --git a/module/mr/view/view.html.php b/module/mr/view/view.html.php index bd7af3990c..7a2a42698c 100644 --- a/module/mr/view/view.html.php +++ b/module/mr/view/view.html.php @@ -16,12 +16,28 @@
id?> - web_url, $MR->title, "_blank", "class='btn btn-link btn-active-text' style='color: blue'");?> + title;?> + web_url, $lang->mr->viewInGitlab, "_blank", "class='btn btn-link btn-active-text' style='color: blue'");?>
+
+
+
+
mr->from . html::a($sourceProjectURL, $sourceProjectName . ":" . $MR->sourceBranch, "_blank", "class='btn btn-link btn-active-text' style='color: blue'") . $lang->mr->to . html::a($targetProjectURL, $targetProjectName . ":" . $MR->targetBranch, "_blank", "class='btn btn-link btn-active-text' style='color: blue'");?>
+
head_pipeline->status)) echo $lang->mr->pipeline . $lang->mr->status . ": " . zget($lang->mr->pipelineStatus, $rawMR->head_pipeline->status, $lang->mr->pipelineUnknown);?>
+
+
+ mr->mergeStatus;?> + mr->mergeStatusList, $rawMR->merge_status);?> +
+ mr->MRHasConflicts. $lang->colon;?> + has_conflicts ? $lang->mr->hasConflicts : $lang->mr->hasNoConflict);?> +
+
+
mr->description;?>
@@ -30,17 +46,8 @@
- -
-
mr->from . html::a($sourceProjectURL, $sourceProjectName . ":" . $MR->sourceBranch, "_blank", "class='btn btn-link btn-active-text' style='color: blue'") . $lang->mr->to . html::a($targetProjectURL, $targetProjectName . ":" . $MR->targetBranch, "_blank", "class='btn btn-link btn-active-text' style='color: blue'");?>
-
head_pipeline->status)) echo $lang->mr->pipeline . $lang->mr->status . ": " . zget($lang->mr->pipelineStatus, $rawMR->head_pipeline->status, $lang->mr->pipelineUnknown);?>
-
mr->mergeStatus . ": " . zget($lang->mr->mergeStatusList, $rawMR->merge_status);?>
-
mr->MRHasConflicts . ": " . ($rawMR->has_conflicts ? $lang->mr->hasConflicts : $lang->mr->hasNoConflict);?>
-
- -
mr->commandDocument, $httpRepoURL, $MR->sourceBranch, $branchPath, $MR->targetBranch, $branchPath, $MR->targetBranch);?>
+
mr->commandDocument, $httpRepoURL, $MR->sourceBranch, $branchPath, $MR->targetBranch, $branchPath, $MR->targetBranch);?>
- - +