* Adjust style of view MR page.

2021-08-26 16:45:29 +08:00
parent 7239c66129
commit 9b1ca198bc
2 changed files with 53 additions and 43 deletions
@@ -1,14 +1,15 @@
 <?php
-$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 = '查看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
-<h4>在本地检出、审核和合并</h4>
-    <strong>第 1 步</strong>. 获取并查看此合并请求的分支
+<div class='detail-title'>在本地检出、审核和合并</div>
+<div class='detail-content'>
+  <p>
+    第 1 步. 获取并查看此合并请求的分支
    <pre>
    git fetch "%s" %s
-    git checkout -b "%s" FETCH_HEAD
-    </pre>
-    <strong>第 2 步</strong>. 在本地查看更改
-    <br>
-    <strong>第 3 步</strong>. 合并分支并解决出现的任何冲突
+    git checkout -b "%s" FETCH_HEAD</pre>
+  </p>
+  <p>
+    第 2 步. 在本地查看更改
+  </p>
+  <p>
+    第 3 步. 合并分支并解决出现的任何冲突
    <pre>
    git fetch origin
    git checkout "%s"
-    git merge --no-ff "%s"
-    </pre>
-    <strong>第 4 步</strong>. 将合并结果推送到GitLab
-    <pre>
-    git push origin "%s"
-    </pre>
+    git merge --no-ff "%s"</pre>
+  </p>
+  <p>
+    第 4 步. 将合并结果推送到GitLab
+    <pre> git push origin "%s" </pre>
+  </p>
+</div>
 EOD;
-
@@ -16,12 +16,28 @@
    <div class="divider"></div>
    <div class="page-title">
      <span class="label label-id"><?php echo $MR->id?></span>
-      <span class="text" title='<?php echo $MR->title;?>' style='color: blue'><?php echo html::a($rawMR->web_url, $MR->title, "_blank", "class='btn btn-link btn-active-text' style='color: blue'");?></span>
+      <span class="text" title='<?php echo $MR->title;?>'><?php echo  $MR->title;?></span>
+      <span class="text" title='<?php echo $MR->title;?>' style='color: blue'><?php echo html::a($rawMR->web_url, $lang->mr->viewInGitlab, "_blank", "class='btn btn-link btn-active-text' style='color: blue'");?></span>
    </div>
  </div>

  <div id="mainContent" class="main-row">
    <div class="main-col">
+      <div class="cell">
+        <div class="detail">
+          <div class="detail-title">
+            <div><?php echo $lang->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'");?></div>
+            <div><?php if(isset($rawMR->head_pipeline->status)) echo $lang->mr->pipeline . $lang->mr->status . ": " . zget($lang->mr->pipelineStatus, $rawMR->head_pipeline->status, $lang->mr->pipelineUnknown);?></div>
+          </div>
+          <div class="detail-content article-content">
+            <strong><?php echo $lang->mr->mergeStatus;?> </strong>
+            <?php echo zget($lang->mr->mergeStatusList, $rawMR->merge_status);?>
+            <br>
+            <strong><?php echo $lang->mr->MRHasConflicts. $lang->colon;?></strong>
+            <?php echo ($rawMR->has_conflicts ? $lang->mr->hasConflicts : $lang->mr->hasNoConflict);?>
+          </div>
+        </div>
+      </div>
      <div class="cell">
        <div class="detail">
          <div class="detail-title"><?php echo $lang->mr->description;?></div>
@@ -30,17 +46,8 @@
          </div>
        </div>
      </div>
-
-      <div class="cell">
-       <div><?php echo $lang->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'");?></div>
-       <div><?php if(isset($rawMR->head_pipeline->status)) echo $lang->mr->pipeline . $lang->mr->status . ": " . zget($lang->mr->pipelineStatus, $rawMR->head_pipeline->status, $lang->mr->pipelineUnknown);?></div>
-       <div><?php echo $lang->mr->mergeStatus . ": " . zget($lang->mr->mergeStatusList, $rawMR->merge_status);?></div>
-       <div><?php echo $lang->mr->MRHasConflicts . ": " . ($rawMR->has_conflicts ? $lang->mr->hasConflicts : $lang->mr->hasNoConflict);?></div>
-      </div>
-
-    <div class="cell"><?php echo sprintf($lang->mr->commandDocument, $httpRepoURL, $MR->sourceBranch, $branchPath, $MR->targetBranch, $branchPath, $MR->targetBranch);?></div>
+      <div class="cell"><?php echo sprintf($lang->mr->commandDocument, $httpRepoURL, $MR->sourceBranch, $branchPath, $MR->targetBranch, $branchPath, $MR->targetBranch);?></div>
    </div>
- </div>
-
+  </div>
 <?php endif;?>
 <?php include '../../common/view/footer.html.php';?>