From c14a618decdb5f7ef0714b86970691303a21f0f6 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 22 Jul 2022 13:35:30 +0800
Subject: [PATCH 01/10] * Optimize page.

---
 module/gitea/view/browse.html.php     | 10 +++++-----
 module/gitlab/view/browse.html.php    |  8 ++++----
 module/jenkins/view/browse.html.php   |  8 ++++----
 module/repo/view/maintain.html.php    |  8 ++++++++
 module/sonarqube/view/browse.html.php | 10 +++++-----
 5 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/module/gitea/view/browse.html.php b/module/gitea/view/browse.html.php
index fb02e955fc..db9bd2f243 100644
--- a/module/gitea/view/browse.html.php
+++ b/module/gitea/view/browse.html.php
@@ -35,16 +35,16 @@
       <thead>
         <tr>
           <?php $vars = "orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
-          <th class='c-id text-center'><?php common::printOrderLink('id', $orderBy, $vars, $lang->gitea->id);?></th>
-          <th class='c-name text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->gitea->name);?></th>
-          <th class='text-left'><?php common::printOrderLink('url', $orderBy, $vars, $lang->gitea->url);?></th>
+          <th class='c-id'><?php common::printOrderLink('id', $orderBy, $vars, $lang->gitea->id);?></th>
+          <th class='c-name w-300px'><?php common::printOrderLink('name', $orderBy, $vars, $lang->gitea->name);?></th>
+          <th class='text'><?php common::printOrderLink('url', $orderBy, $vars, $lang->gitea->url);?></th>
           <th class='c-actions-3'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>
         <?php foreach ($giteaList as $id => $gitea): ?>
         <tr class='text'>
-          <td class='text-center'><?php echo $id;?></td>
+          <td class='text'><?php echo $id;?></td>
           <td class='text-c-name' title='<?php echo $gitea->name;?>'>
             <?php if(common::hasPriv('gitea', 'view')):?>
             <a class="iframe" href="<?php echo $this->createLink('gitea', 'view', "giteaID=$id", '', true); ?>"><?php echo $gitea->name;?></a>
@@ -53,7 +53,7 @@
             <?php endif;?>
           </td>
           <td class='text' title='<?php echo $gitea->url;?>'><?php echo html::a($gitea->url, $gitea->url, '_target');?></td>
-          <td class='c-actions text-left'>
+          <td class='c-actions'>
             <?php
             common::printIcon('gitea', 'edit', "giteaID=$id", '', 'list', 'edit');
             echo common::buildIconButton('gitea', 'bindUser', "giteaID=$id", '', 'list', 'link', '', '', false, '', '', 0, $gitea->isBindUser);
diff --git a/module/gitlab/view/browse.html.php b/module/gitlab/view/browse.html.php
index a83c6de4bf..4b497517b5 100644
--- a/module/gitlab/view/browse.html.php
+++ b/module/gitlab/view/browse.html.php
@@ -35,8 +35,8 @@
       <thead>
         <tr>
           <?php $vars = "orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
-          <th class='c-id text-center'><?php common::printOrderLink('id', $orderBy, $vars, $lang->gitlab->id);?></th>
-          <th class='c-name text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->gitlab->name);?></th>
+          <th class='c-id'><?php common::printOrderLink('id', $orderBy, $vars, $lang->gitlab->id);?></th>
+          <th class='c-name w-300px'><?php common::printOrderLink('name', $orderBy, $vars, $lang->gitlab->name);?></th>
           <th class='text-left'><?php common::printOrderLink('url', $orderBy, $vars, $lang->gitlab->url);?></th>
           <th class='c-actions-3'><?php echo $lang->actions;?></th>
         </tr>
@@ -44,7 +44,7 @@
       <tbody>
         <?php foreach ($gitlabList as $id => $gitlab): ?>
         <tr class='text'>
-          <td class='text-center'><?php echo $id;?></td>
+          <td class='text'><?php echo $id;?></td>
           <td class='text-c-name' title='<?php echo $gitlab->name;?>'>
             <?php if(common::hasPriv('gitlab', 'browseProject')):?>
             <a href="<?php echo $this->createLink('gitlab', 'browseProject', "gitlabID=$id"); ?>"><?php echo $gitlab->name;?></a>
@@ -53,7 +53,7 @@
             <?php endif;?>
           </td>
           <td class='text' title='<?php echo $gitlab->url;?>'><?php echo html::a($gitlab->url, $gitlab->url, '_target');?></td>
-          <td class='c-actions text-left'>
+          <td class='c-actions'>
             <?php
             $disabled = $gitlab->isBindUser ? true : false;
             common::printIcon('gitlab', 'edit', "gitlabID=$id", '', 'list', 'edit');
diff --git a/module/jenkins/view/browse.html.php b/module/jenkins/view/browse.html.php
index dfa38962a3..bc4d4819b8 100644
--- a/module/jenkins/view/browse.html.php
+++ b/module/jenkins/view/browse.html.php
@@ -36,18 +36,18 @@
         <tr>
           <?php $vars = "orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"; ?>
           <th class='c-id'><?php common::printOrderLink('id', $orderBy, $vars, $lang->jenkins->id); ?></th>
-          <th class='c-name text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->jenkins->name); ?></th>
-          <th class='text-left'><?php common::printOrderLink('url', $orderBy, $vars, $lang->jenkins->url); ?></th>
+          <th class='c-name w-300px'><?php common::printOrderLink('name', $orderBy, $vars, $lang->jenkins->name); ?></th>
+          <th class='text'><?php common::printOrderLink('url', $orderBy, $vars, $lang->jenkins->url); ?></th>
           <th class='c-actions-2'><?php echo $lang->actions; ?></th>
         </tr>
       </thead>
       <tbody>
         <?php foreach ($jenkinsList as $id => $jenkins): ?>
         <tr>
-          <td class='text-center'><?php echo $id; ?></td>
+          <td class='text'><?php echo $id; ?></td>
           <td class='text' title='<?php echo $jenkins->name; ?>'><?php echo $jenkins->name; ?></td>
           <td class='text' title='<?php echo $jenkins->url; ?>'><?php echo html::a($jenkins->url, $jenkins->url, '_blank'); ?></td>
-          <td class='c-actions text-left'>
+          <td class='c-actions'>
             <?php
             common::printIcon('jenkins', 'edit', "jenkinsID=$id", '', 'list',  'edit');
             if(common::hasPriv('jenkins', 'delete')) echo html::a($this->createLink('jenkins', 'delete', "jenkinsID=$id"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->jenkins->delete}' class='btn'");
diff --git a/module/repo/view/maintain.html.php b/module/repo/view/maintain.html.php
index a6ca530c45..a1d931e8ae 100644
--- a/module/repo/view/maintain.html.php
+++ b/module/repo/view/maintain.html.php
@@ -11,6 +11,14 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<div id="mainMenu" class="clearfix">
+  <div class="btn-toolbar pull-left">
+    <?php echo html::a($this->createLink('repo', 'browse'), "<span class='text'>{$lang->repo->maintain}</span>", '', "class='btn btn-link btn-active-text'");?>
+  </div>
+  <div class='btn-toolbar pull-right'>
+    <?php if(common::hasPriv('repo', 'create')) echo html::a(helper::createLink('repo', 'create'), "<i class='icon icon-plus'></i> " . $this->lang->repo->create, '', "class='btn btn-primary'");?>
+  </div>
+</div>
 <div id='mainContent'>
   <form class='main-table' id='ajaxForm' method='post'>
     <table id='repoList' class='table has-sort-head table-fixed'>
diff --git a/module/sonarqube/view/browse.html.php b/module/sonarqube/view/browse.html.php
index d7585f7c2a..5712c34327 100644
--- a/module/sonarqube/view/browse.html.php
+++ b/module/sonarqube/view/browse.html.php
@@ -35,19 +35,19 @@
       <thead>
         <tr>
           <?php $vars = "orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
-          <th class='c-id text-center'><?php common::printOrderLink('id', $orderBy, $vars, $lang->sonarqube->id);?></th>
-          <th class='c-name text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->sonarqube->name);?></th>
-          <th class='text-left'><?php common::printOrderLink('url', $orderBy, $vars, $lang->sonarqube->url);?></th>
+          <th class='c-id'><?php common::printOrderLink('id', $orderBy, $vars, $lang->sonarqube->id);?></th>
+          <th class='c-name w-300px'><?php common::printOrderLink('name', $orderBy, $vars, $lang->sonarqube->name);?></th>
+          <th class='text'><?php common::printOrderLink('url', $orderBy, $vars, $lang->sonarqube->url);?></th>
           <th class='c-actions-3'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>
         <?php foreach ($sonarqubeList as $id => $sonarqube): ?>
         <tr class='text'>
-          <td class='text-center'><?php echo $id;?></td>
+          <td class='text'><?php echo $id;?></td>
           <td class='text-c-name' title='<?php echo $sonarqube->name;?>'><?php echo $sonarqube->name;?></td>
           <td class='text' title='<?php echo $sonarqube->url;?>'><?php echo html::a($sonarqube->url, $sonarqube->url, '_blank');?></td>
-          <td class='c-actions text-left'>
+          <td class='c-actions'>
             <?php
             common::printLink('sonarqube', 'browseProject', "sonarqubeID=$id", "<i class='icon icon-list-box'></i> ", '',"title='{$lang->sonarqube->browseProject}' class='btn btn-primary'");
             common::printLink('sonarqube', 'edit', "sonarqubeID=$id", "<i class='icon icon-edit'></i> ", '',"title='{$lang->sonarqube->edit}' class='btn btn-primary'");

From 94a3dea3f7c50f439f81e01f98b376aea4d61a46 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 22 Jul 2022 13:35:54 +0800
Subject: [PATCH 02/10] * Optimize pages.

---
 module/gitea/view/binduser.html.php       |  2 +-
 module/gitea/view/create.html.php         |  3 +--
 module/gitea/view/edit.html.php           |  3 +--
 module/gitlab/view/binduser.html.php      |  2 +-
 module/gitlab/view/browsebranch.html.php  |  2 +-
 module/gitlab/view/browsegroup.html.php   |  2 +-
 module/gitlab/view/browseproject.html.php | 10 +++++-----
 module/gitlab/view/browseuser.html.php    | 10 +++++-----
 module/gitlab/view/create.html.php        |  3 +--
 module/gitlab/view/creategroup.html.php   |  3 +--
 module/gitlab/view/createproject.html.php |  3 +--
 module/gitlab/view/createuser.html.php    |  3 +--
 module/gitlab/view/edit.html.php          |  3 +--
 module/gitlab/view/editgroup.html.php     |  3 +--
 module/gitlab/view/editproject.html.php   |  3 +--
 module/gitlab/view/edituser.html.php      |  3 +--
 module/gitlab/view/managetagpriv.html.php |  2 +-
 module/jenkins/view/create.html.php       |  3 +--
 module/jenkins/view/edit.html.php         |  3 +--
 module/job/view/create.html.php           |  3 +--
 module/job/view/edit.html.php             |  3 +--
 module/mr/css/view.css                    |  1 +
 module/mr/view/diff.html.php              |  8 ++++----
 module/repo/control.php                   |  1 -
 module/repo/css/browse.css                |  1 +
 module/repo/css/common.css                |  1 +
 module/repo/css/diff.css                  |  4 +++-
 module/repo/js/browse.js                  |  4 ++--
 module/repo/view/ajaxgetdropmenu.html.php |  1 -
 module/repo/view/ajaxsidecommits.html.php |  2 +-
 module/repo/view/create.html.php          |  3 +--
 module/repo/view/diff.html.php            | 10 +++++-----
 module/repo/view/edit.html.php            |  3 +--
 module/sonarqube/view/create.html.php     |  3 +--
 module/sonarqube/view/edit.html.php       |  3 +--
 35 files changed, 51 insertions(+), 66 deletions(-)

diff --git a/module/gitea/view/binduser.html.php b/module/gitea/view/binduser.html.php
index 554c875fd8..7a4a9f3897 100644
--- a/module/gitea/view/binduser.html.php
+++ b/module/gitea/view/binduser.html.php
@@ -72,7 +72,7 @@
         </tbody>
         <tfoot>
           <tr>
-            <td colspan="3" class="text-center form-actions">
+            <td colspan="5" class="text-center form-actions">
               <?php echo html::submitButton();?>
               <?php if(!isonlybody()) echo html::a(inlink('browse', ""), $lang->goback, '', 'class="btn btn-wide"');?>
             </td>
diff --git a/module/gitea/view/create.html.php b/module/gitea/view/create.html.php
index bab219de0a..5b2200f66e 100644
--- a/module/gitea/view/create.html.php
+++ b/module/gitea/view/create.html.php
@@ -33,8 +33,7 @@
             <td><?php echo html::input('token', '', "class='form-control'");?></td>
           </tr>
           <tr>
-            <th></th>
-            <td class='text-center form-actions'>
+            <td colspan='2' class='text-center form-actions'>
               <?php echo html::submitButton();?>
             </td>
           </tr>
diff --git a/module/gitea/view/edit.html.php b/module/gitea/view/edit.html.php
index 439206e9bf..048c824a80 100644
--- a/module/gitea/view/edit.html.php
+++ b/module/gitea/view/edit.html.php
@@ -33,8 +33,7 @@
             <td><?php echo html::input('token', isset($gitea->token) ? $gitea->token : '', "class='form-control'");?></td>
           </tr>
           <tr>
-            <th></th>
-            <td class='text-center form-actions'>
+            <td colspan='2' class='text-center form-actions'>
               <?php echo html::submitButton();?>
             </td>
           </tr>
diff --git a/module/gitlab/view/binduser.html.php b/module/gitlab/view/binduser.html.php
index 836fe3856e..714b43a683 100644
--- a/module/gitlab/view/binduser.html.php
+++ b/module/gitlab/view/binduser.html.php
@@ -72,7 +72,7 @@
         </tbody>
         <tfoot>
           <tr>
-            <td colspan="3" class="text-center form-actions">
+            <td colspan="5" class="text-center form-actions">
               <?php echo html::submitButton();?>
               <?php if(!isonlybody()) echo html::a(inlink('browse', ""), $lang->goback, '', 'class="btn btn-wide"');?>
             </td>
diff --git a/module/gitlab/view/browsebranch.html.php b/module/gitlab/view/browsebranch.html.php
index bd29860a2b..6aae1486a9 100644
--- a/module/gitlab/view/browsebranch.html.php
+++ b/module/gitlab/view/browsebranch.html.php
@@ -37,7 +37,7 @@
       <?php $vars = "gitlabID={$gitlabID}&projectID={$projectID}&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
       <thead>
         <tr>
-          <th class='c-name text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->gitlab->branch->name);?></th>
+          <th class='c-name text'><?php common::printOrderLink('name', $orderBy, $vars, $lang->gitlab->branch->name);?></th>
           <th class='text-left'><?php echo $lang->gitlab->branch->lastCommitter;?></th>
           <th class='text-left'><?php common::printOrderLink('lastCommittedDate', $orderBy, $vars, $lang->gitlab->branch->lastCommittedDate);?></th>
         </tr>
diff --git a/module/gitlab/view/browsegroup.html.php b/module/gitlab/view/browsegroup.html.php
index fb4315ff18..0e66006d8b 100644
--- a/module/gitlab/view/browsegroup.html.php
+++ b/module/gitlab/view/browsegroup.html.php
@@ -49,7 +49,7 @@
       <tbody>
         <?php foreach ($gitlabGroupList as $id => $gitlabGroup): ?>
         <tr class='text'>
-          <td class='text-center'><?php echo $gitlabGroup->id;?></td>
+          <td class='text'><?php echo $gitlabGroup->id;?></td>
           <td class='text-c-name' title='<?php echo $gitlabGroup->full_name;?>'>
             <?php $groupName = current(common::convert2Pinyin(array($gitlabGroup->name))); ?>
             <?php echo html::avatar(array('avatar' => $gitlabGroup->avatar_url, 'account' => $groupName), 20); ?>
diff --git a/module/gitlab/view/browseproject.html.php b/module/gitlab/view/browseproject.html.php
index 486412f9d7..522a666510 100644
--- a/module/gitlab/view/browseproject.html.php
+++ b/module/gitlab/view/browseproject.html.php
@@ -42,23 +42,23 @@
       <thead>
         <tr>
           <th class='c-id'><?php common::printOrderLink('id', $orderBy, $vars, $lang->gitlab->id);?></th>
-          <th class='c-name text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->gitlab->project->name);?></th>
-          <th class='text-left'></th>
-          <th class='text-left'><?php echo $lang->gitlab->lastUpdate;?></th>
+          <th class='c-name'><?php common::printOrderLink('name', $orderBy, $vars, $lang->gitlab->project->name);?></th>
+          <th class='text'></th>
+          <th class='text'><?php echo $lang->gitlab->lastUpdate;?></th>
           <th class='c-actions-8'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>
         <?php foreach ($gitlabProjectList as $id => $gitlabProject): ?>
         <tr class='text'>
-          <td class='text-center'><?php echo $gitlabProject->id;?></td>
+          <td class='text'><?php echo $gitlabProject->id;?></td>
           <td class='text-c-name' title='<?php echo $gitlabProject->name;?>'><?php echo $gitlabProject->name_with_namespace;?></td>
           <td class='text text-c-counts'>
             <span title="<?php echo $lang->gitlab->project->star;?>"><i class="icon icon-star"></i> <?php echo $gitlabProject->star_count;?></span>
             <span title="<?php echo $lang->gitlab->project->fork;?>"><i class="icon icon-code-fork"></i> <?php echo $gitlabProject->forks_count;?></span>
           </td>
           <td class='text' title='<?php echo substr($gitlabProject->last_activity_at, 0, 10);?>'><?php echo substr($gitlabProject->last_activity_at, 0, 10);?></td>
-          <td class='c-actions text-left'>
+          <td class='c-actions'>
             <?php
             echo common::buildIconButton('gitlab', 'manageBranchPriv', "gitlabID=$gitlabID&projectID=$gitlabProject->id", '', 'list', 'branch-lock', '', '', false, '', $this->lang->gitlab->browseBranchPriv, 0, ($gitlabProject->isMaintainer and $gitlabProject->default_branch));
             echo common::buildIconButton('gitlab', 'manageTagPriv', "gitlabID=$gitlabID&projectID=$gitlabProject->id", '', 'list', 'tag-lock', '', '', false, '', $this->lang->gitlab->browseTagPriv, 0, ($gitlabProject->isMaintainer and $gitlabProject->default_branch));
diff --git a/module/gitlab/view/browseuser.html.php b/module/gitlab/view/browseuser.html.php
index 66da47013d..499696782b 100644
--- a/module/gitlab/view/browseuser.html.php
+++ b/module/gitlab/view/browseuser.html.php
@@ -38,17 +38,17 @@
         <tr>
           <?php $vars = "gitlabID=$gitlabID&orderBy=%s";?>
           <th class='c-id'><?php common::printOrderLink('id', $orderBy, $vars, $lang->gitlab->user->id);?></th>
-          <th class='c-name text-left w-60px'><?php common::printOrderLink('name', $orderBy, $vars, $lang->gitlab->user->name);?></th>
-          <th class='c-name text-left'></th>
-          <th class='text-left'><?php echo $lang->gitlab->user->createOn;?></th>
-          <th class='text-left'><?php echo $lang->gitlab->user->lastActivity;?></th>
+          <th class='c-name text w-60px'><?php common::printOrderLink('name', $orderBy, $vars, $lang->gitlab->user->name);?></th>
+          <th class='c-name text w-400px'></th>
+          <th class='text'><?php echo $lang->gitlab->user->createOn;?></th>
+          <th class='text'><?php echo $lang->gitlab->user->lastActivity;?></th>
           <th class='c-actions-4'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>
         <?php foreach ($gitlabUserList as $id => $gitlabUser): ?>
         <tr>
-          <td class='text-center'><?php echo $gitlabUser->id;?></td>
+          <td class='text'><?php echo $gitlabUser->id;?></td>
           <td class='w-60px'><?php echo html::image($gitlabUser->avatar, "height=40");?></td>
           <td class='text-left'>
               <strong><?php echo $gitlabUser->realname;?></strong>
diff --git a/module/gitlab/view/create.html.php b/module/gitlab/view/create.html.php
index 224aaaded3..1a00c2222f 100644
--- a/module/gitlab/view/create.html.php
+++ b/module/gitlab/view/create.html.php
@@ -34,8 +34,7 @@
             <td><?php echo html::input('token', '', "class='form-control' placeholder='{$lang->gitlab->placeholder->token}'");?></td>
           </tr>
           <tr>
-            <th></th>
-            <td class='text-center form-actions'>
+            <td colspan='2' class='text-center form-actions'>
               <?php echo html::submitButton();?>
               <?php if(!isonlybody()) echo html::a(inlink('browse', ""), $lang->goback, '', 'class="btn btn-wide"');?>
             </td>
diff --git a/module/gitlab/view/creategroup.html.php b/module/gitlab/view/creategroup.html.php
index e8f913c8fa..877c533160 100644
--- a/module/gitlab/view/creategroup.html.php
+++ b/module/gitlab/view/creategroup.html.php
@@ -69,8 +69,7 @@
             <td><?php echo html::select('subgroup_creation_level', $lang->gitlab->group->subgroupCreationLevelList, 'maintainer', "class='form-control'");?></td>
           </tr>
           <tr>
-            <th></th>
-            <td class='text-center form-actions'>
+            <td colspan="2" class='text-center form-actions'>
               <?php echo html::submitButton();?>
               <?php if(!isonlybody()) echo html::a(inlink('browseGroup', "gitlabID=$gitlabID"), $lang->goback, '', 'class="btn btn-wide"');?>
             </td>
diff --git a/module/gitlab/view/createproject.html.php b/module/gitlab/view/createproject.html.php
index 99450d6e31..3f1ab9f9cb 100644
--- a/module/gitlab/view/createproject.html.php
+++ b/module/gitlab/view/createproject.html.php
@@ -52,8 +52,7 @@
             <td colspan='2'><?php echo nl2br(html::radio('visibility', $lang->gitlab->project->visibilityList, 'private', "", 'block'));?></td>
           </tr>
           <tr>
-            <th></th>
-            <td class='text-center form-actions'>
+            <td colspan="2" class='text-center form-actions'>
               <?php echo html::submitButton();?>
               <?php if(!isonlybody()) echo html::a(inlink('browseProject', "gitlabID=$gitlabID"), $lang->goback, '', 'class="btn btn-wide"');?>
             </td>
diff --git a/module/gitlab/view/createuser.html.php b/module/gitlab/view/createuser.html.php
index 5adf9ff875..04aca3bba9 100644
--- a/module/gitlab/view/createuser.html.php
+++ b/module/gitlab/view/createuser.html.php
@@ -81,8 +81,7 @@
           </tr>
           <?php endif;?>
           <tr>
-            <th></th>
-            <td class='text-center form-actions'>
+            <td colspan="2" class='text-center form-actions'>
               <?php echo html::submitButton();?>
               <?php if(!isonlybody()) echo html::a(inlink('browseUser', "gitlabID=$gitlabID"), $lang->goback, '', 'class="btn btn-wide"');?>
             </td>
diff --git a/module/gitlab/view/edit.html.php b/module/gitlab/view/edit.html.php
index 689ce8243a..6739d9a982 100644
--- a/module/gitlab/view/edit.html.php
+++ b/module/gitlab/view/edit.html.php
@@ -33,8 +33,7 @@
             <td><?php echo html::input('token', isset($gitlab->token) ? $gitlab->token : '', "class='form-control' placeholder='{$lang->gitlab->placeholder->token}'");?></td>
           </tr>
           <tr>
-            <th></th>
-            <td class='text-center form-actions'>
+            <td colspan='2' class='text-center form-actions'>
               <?php echo html::submitButton();?>
               <?php if(!isonlybody()) echo html::a(inlink('browse', ""), $lang->goback, '', 'class="btn btn-wide"');?>
             </td>
diff --git a/module/gitlab/view/editgroup.html.php b/module/gitlab/view/editgroup.html.php
index 10a602bb2e..b33d9ea25d 100644
--- a/module/gitlab/view/editgroup.html.php
+++ b/module/gitlab/view/editgroup.html.php
@@ -72,8 +72,7 @@
             <td><?php echo html::select('subgroup_creation_level', $lang->gitlab->group->subgroupCreationLevelList, $group->subgroup_creation_level, "class='form-control'");?></td>
           </tr>
           <tr>
-            <th></th>
-            <td class='text-center form-actions'>
+            <td colspan="2" class='text-center form-actions'>
               <?php echo html::submitButton();?>
               <?php if(!isonlybody()) echo html::a(inlink('browseGroup', "gitlabID=$gitlabID"), $lang->goback, '', 'class="btn btn-wide"');?>
             </td>
diff --git a/module/gitlab/view/editproject.html.php b/module/gitlab/view/editproject.html.php
index 24e97a639c..376197c168 100644
--- a/module/gitlab/view/editproject.html.php
+++ b/module/gitlab/view/editproject.html.php
@@ -40,8 +40,7 @@
             <td colspan='2'><?php echo nl2br(html::radio('visibility', $lang->gitlab->project->visibilityList, $project->visibility, "", 'block'));?></td>
           </tr>
           <tr>
-            <th></th>
-            <td class='text-center form-actions'>
+            <td colspan="2" class='text-center form-actions'>
               <?php echo html::submitButton();?>
               <?php if(!isonlybody()) echo html::a(inlink('browseProject', "gitlabID=$gitlabID"), $lang->goback, '', 'class="btn btn-wide"');?>
             </td>
diff --git a/module/gitlab/view/edituser.html.php b/module/gitlab/view/edituser.html.php
index d5ef0b6863..9ff06611dc 100644
--- a/module/gitlab/view/edituser.html.php
+++ b/module/gitlab/view/edituser.html.php
@@ -81,8 +81,7 @@
           </tr>
           <?php endif;?>
           <tr>
-            <th></th>
-            <td class='text-center form-actions'>
+            <td colspan="2" class='text-center form-actions'>
               <?php echo html::submitButton();?>
               <?php if(!isonlybody()) echo html::a(inlink('browseUser', "gitlabID=$gitlabID"), $lang->goback, '', 'class="btn btn-wide"');?>
             </td>
diff --git a/module/gitlab/view/managetagpriv.html.php b/module/gitlab/view/managetagpriv.html.php
index bca3de59b6..58a3c63c96 100644
--- a/module/gitlab/view/managetagpriv.html.php
+++ b/module/gitlab/view/managetagpriv.html.php
@@ -47,7 +47,7 @@
       </tbody>
       <tfoot>
         <tr>
-          <td colspan='4' class='text-center form-actions'>
+          <td colspan='3' class='text-center form-actions'>
             <?php
               echo html::submitButton('', '', 'hidden btn btn-wide btn-primary');
               echo html::commonButton($lang->save, 'onclick="savePriv()" id="saveBtn"', 'btn btn-wide btn-primary');
diff --git a/module/jenkins/view/create.html.php b/module/jenkins/view/create.html.php
index 34c988c862..4d52cb332b 100644
--- a/module/jenkins/view/create.html.php
+++ b/module/jenkins/view/create.html.php
@@ -44,8 +44,7 @@
             <td><?php echo $lang->jenkins->tips;?></td>
           </tr>
           <tr>
-            <th></th>
-            <td class='text-center form-actions'>
+            <td colspan='2' class='text-center form-actions'>
               <?php echo html::submitButton(); ?>
               <?php if(!isonlybody()) echo html::a(inlink('browse', ""), $lang->goback, '', 'class="btn btn-wide"');?>
             </td>
diff --git a/module/jenkins/view/edit.html.php b/module/jenkins/view/edit.html.php
index 303ff9d57f..9eed8ff5d9 100644
--- a/module/jenkins/view/edit.html.php
+++ b/module/jenkins/view/edit.html.php
@@ -44,8 +44,7 @@
             <td><?php echo $lang->jenkins->tips;?></td>
           </tr>
           <tr>
-            <th></th>
-            <td class='text-center form-actions'>
+            <td colspan='2' class='text-center form-actions'>
               <?php echo html::submitButton(); ?>
               <?php if(!isonlybody()) echo html::a(inlink('browse', ""), $lang->goback, '', 'class="btn btn-wide"');?>
             </td>
diff --git a/module/job/view/create.html.php b/module/job/view/create.html.php
index af31444465..fddeb4505b 100644
--- a/module/job/view/create.html.php
+++ b/module/job/view/create.html.php
@@ -139,8 +139,7 @@
             </td>
           </tr>
           <tr>
-            <th></th>
-            <td class='text-center form-actions'>
+            <td colspan="3" class='text-center form-actions'>
               <?php echo html::submitButton(); ?>
               <?php if(!isonlybody()) echo html::a(inlink('browse', ""), $lang->goback, '', 'class="btn btn-wide"');?>
               <?php echo html::hidden('repoType');?>
diff --git a/module/job/view/edit.html.php b/module/job/view/edit.html.php
index 4809a12cfb..6fd81f22cb 100644
--- a/module/job/view/edit.html.php
+++ b/module/job/view/edit.html.php
@@ -187,8 +187,7 @@
             </td>
           </tr>
           <tr>
-            <th></th>
-            <td colspan="2" class='text-center form-actions'>
+            <td colspan="3" class='text-center form-actions'>
               <?php echo html::submitButton();?>
               <?php if(!isonlybody()) echo html::a(inlink('browse', "repoID={$job->repo}"), $lang->goback, '', 'class="btn btn-wide"');?>
               <?php echo html::hidden('repoType', zget($repoTypes, $job->repo, 'Git'));?>
diff --git a/module/mr/css/view.css b/module/mr/css/view.css
index 4e42eafa41..3e38664325 100644
--- a/module/mr/css/view.css
+++ b/module/mr/css/view.css
@@ -10,3 +10,4 @@
     box-shadow: 0 1px 1px rgba(0,0,0,.05),0 2px 6px 0 rgba(0,0,0,.045)
 }
 .side-col{padding-top:5px;}
+.detail-content .btn-active-text {padding-top: 5px;}
diff --git a/module/mr/view/diff.html.php b/module/mr/view/diff.html.php
index 2684cc66ba..57716856e0 100644
--- a/module/mr/view/diff.html.php
+++ b/module/mr/view/diff.html.php
@@ -93,8 +93,8 @@
             <?php if($arrange == 'inline'):?>
             <?php foreach($content->lines as $line):?>
             <tr data-line='<?php echo $line->newlc ?>'>
-              <th class='w-num text-right'><?php if($line->type != 'new') echo $line->oldlc?></th>
-              <th class='w-num text-left'><?php if($line->type != 'old') echo $line->newlc?></th>
+              <th class='w-num text-center'><?php if($line->type != 'new') echo $line->oldlc?></th>
+              <th class='w-num text-center'><?php if($line->type != 'old') echo $line->newlc?></th>
               <td class='line-<?php echo $line->type?> code'><?php
               echo $line->type == 'old' ? preg_replace('/^\-/', '&ndash;', $line->line) : ($line->type == 'new' ? $line->line : ' ' . $line->line);
               ?></td>
@@ -121,12 +121,12 @@
                   if(!isset($content->new[$newlc])) continue;
               }
               ?>
-              <th class='w-num text-right'><?php echo $oldlc?></th>
+              <th class='w-num text-center'><?php echo $oldlc?></th>
               <td class='w-code line-<?php if($line->type != 'new')echo $line->type?> <?php if($line->type == 'custom') echo "line-old"?> code'><?php
               if(!isset($content->old[$oldlc])) $content->old[$oldlc] = '';
               if(!empty($oldlc)) echo $line->type != 'all' ? preg_replace('/^\-/', '&ndash;', $content->old[$oldlc]) : ' ' . $content->old[$oldlc];
               ?></td>
-              <th class='w-num text-right'><?php echo $newlc?></th>
+              <th class='w-num text-center'><?php echo $newlc?></th>
               <td class='w-code line-<?php if($line->type != 'old') echo $line->type?> <?php if($line->type == 'custom') echo "line-new"?> code'><?php
               if(!isset($content->new[$newlc])) $content->new[$newlc] = '';
               if(!empty($newlc)) echo $line->type != 'all' ? $content->new[$newlc] : ' ' . $content->new[$newlc];
diff --git a/module/repo/control.php b/module/repo/control.php
index 46b6837bd1..84bd9ba78a 100644
--- a/module/repo/control.php
+++ b/module/repo/control.php
@@ -80,7 +80,6 @@ class repo extends control
     {
         $repoID = $this->repo->saveState(0, $objectID);
         if($this->viewType !== 'json') $this->commonAction($repoID, $objectID);
-        if(common::hasPriv('repo', 'create')) $this->lang->TRActions = html::a(helper::createLink('repo', 'create'), "<i class='icon icon-plus'></i> " . $this->lang->repo->create, '', "class='btn btn-primary'");
 
         $repoList      = $this->repo->getList(0, '', $orderBy);
         $sonarRepoList = $this->loadModel('job')->getSonarqubeByRepo(array_keys($repoList));
diff --git a/module/repo/css/browse.css b/module/repo/css/browse.css
index 9ecc8cca58..fd9c9002de 100644
--- a/module/repo/css/browse.css
+++ b/module/repo/css/browse.css
@@ -31,3 +31,4 @@
 .popover-content {padding: 0;}
 .download-popover .table {margin-bottom: 0;}
 .download-popover .table td {padding-right: 0;}
+.download-popover .popover-title {padding: 8px;}
diff --git a/module/repo/css/common.css b/module/repo/css/common.css
index 141b05002f..307392df8f 100644
--- a/module/repo/css/common.css
+++ b/module/repo/css/common.css
@@ -190,3 +190,4 @@ h3 {font-size: 16px;}
 .header-btn .btn > .text {text-overflow: unset !important;}
 
 #repoPageSize {right: 90px;}
+.dropdown-menu li > a.selected {color: #3123ae !important; background: #f2eafc !important; line-height: 20px; border-radius: 5px;}
diff --git a/module/repo/css/diff.css b/module/repo/css/diff.css
index c35af3a9d7..42127daf7d 100644
--- a/module/repo/css/diff.css
+++ b/module/repo/css/diff.css
@@ -9,7 +9,7 @@ table.diff {margin-bottom: 0px;}
 .diff .line-new, .diff .line-new {background: #CFC;}
 .diff .line-old, .diff .line-old {background: #FCC;}
 .diff .line-all, .diff .line-all {background: #FFF;}
-.diff .w-num {width: 25px; border-right: 1px solid #E4E4E4; color: #999; border-left: 1px solid #E4E4E4; color: #999; font-weight: normal;}
+.diff .w-num {width: 25px; border-right: 1px solid #E4E4E4; color: #999; border-left: 1px solid #E4E4E4; color: #999; font-weight: normal; line-height: 2.5;}
 
 .repoCode .diff tr .comment-btn .icon-wrapper {left: -23px;}
 .repoCode .diff tr.over td.line-all, .repoCode .diff tr.over td.line-all {background: #f8eec7;}
@@ -22,3 +22,5 @@ table.diff {margin-bottom: 0px;}
 .btn-download {border-right: none;}
 .body-modal .repo-diff {display: none;}
 .body-modal #mainMenu {padding-bottom: 40px;}
+
+.repoCode td.code {white-space: inherit;}
diff --git a/module/repo/js/browse.js b/module/repo/js/browse.js
index 0dcfbce1f0..e3c7de1962 100644
--- a/module/repo/js/browse.js
+++ b/module/repo/js/browse.js
@@ -36,7 +36,7 @@ function getCloneHtml(cloneLang, url)
 {
     var content = '';
     content += "<tr>";
-    content += "<th>" + cloneLang + "</th>";
+    content += "<td>" + cloneLang + "</td>";
     content += "</tr>";
     content += "<tr>";
     content += "<td><input type='input' class='form-control' value='" + url + "' readonly></td>";
@@ -53,7 +53,7 @@ $(function()
         content: getDownload(),
         html: true,
         placement: 'bottom',
-        template: '<div class="popover"><h3 class="popover-title"></h3><div class="popover-content"></div></div',
+        template: '<div class="popover"><h3 class="popover-title strong repo-popover"></h3><div class="popover-content"></div></div',
         tipClass: 'download-popover',
         trigger: 'manual'
     };
diff --git a/module/repo/view/ajaxgetdropmenu.html.php b/module/repo/view/ajaxgetdropmenu.html.php
index 1e6a0b1899..74fb4b2a48 100644
--- a/module/repo/view/ajaxgetdropmenu.html.php
+++ b/module/repo/view/ajaxgetdropmenu.html.php
@@ -23,7 +23,6 @@
 #dropMenu {margin: 0;}
 #dropMenu ul > li > ul > li > a:hover {color: white; background-color: #0c64eb; text-decoration: none;}
 #dropMenu .tree .has-list > ul > li {padding-top: 0;}
-li > a.selected {color: #3123ae !important; background: #f2eafc !important; line-height: 20px; border-radius: 5px;}
 .search-list .list-group {padding: 7px 10px;}
 #swapper li>div.hide-in-search>a:focus, #swapper li>div.hide-in-search>a:hover {color: #838a9d; cursor: default;}
 #dropMenu .label-type {margin: 1px 10px;}
diff --git a/module/repo/view/ajaxsidecommits.html.php b/module/repo/view/ajaxsidecommits.html.php
index 74a1480b15..a78b02425a 100644
--- a/module/repo/view/ajaxsidecommits.html.php
+++ b/module/repo/view/ajaxsidecommits.html.php
@@ -20,7 +20,7 @@ if(isset($entry)) $pathInfo .= '&type=file';
     <thead>
       <tr>
         <?php if($repo->SCM != 'Gitea'):?>
-        <th class='c-checkbox'></th>
+        <th class='c-checkbox w-40px'></th>
         <?php endif;?>
         <th class='c-version'><?php echo $lang->repo->revisionA?></th>
         <?php if($repo->SCM != 'Subversion'):?>
diff --git a/module/repo/view/create.html.php b/module/repo/view/create.html.php
index ea5aa9a668..897b84c4f4 100644
--- a/module/repo/view/create.html.php
+++ b/module/repo/view/create.html.php
@@ -97,8 +97,7 @@
             <td colspan='2'><?php echo html::textarea('desc', '', "rows='3' class='form-control'"); ?></td>
           </tr>
           <tr>
-            <th></th>
-            <td colspan='2' class='text-center form-actions'>
+            <td colspan='3' class='text-center form-actions'>
               <?php echo html::submitButton(); ?>
               <?php if(!isonlybody()) echo html::a(inlink('maintain', ""), $lang->goback, '', 'class="btn btn-wide"');?>
             </td>
diff --git a/module/repo/view/diff.html.php b/module/repo/view/diff.html.php
index f867a31e32..5bff77e99f 100644
--- a/module/repo/view/diff.html.php
+++ b/module/repo/view/diff.html.php
@@ -101,8 +101,8 @@
       <?php if($arrange == 'inline'):?>
       <?php foreach($content->lines as $line):?>
       <tr data-line='<?php echo $line->newlc ?>'>
-        <th class='w-num text-right'><?php if($line->type != 'new') echo $line->oldlc?></th>
-        <th class='w-num text-left'><?php if($line->type != 'old') echo $line->newlc?></th>
+        <th class='w-num text'><?php if($line->type != 'new' and $line->oldlc) echo $line->oldlc?></th>
+        <th class='w-num text'><?php if($line->type != 'old' and $line->newlc) echo $line->newlc?></th>
         <td class='line-<?php echo $line->type?> code'><?php
         $line->line = $repo->SCM == 'Subversion' ? htmlSpecialString($line->line) : $line->line;
         echo $line->type == 'old' ? preg_replace('/^\-/', '&ndash;', $line->line) : ($line->type == 'new' ? $line->line : ' ' . $line->line);
@@ -125,18 +125,18 @@
         }
         else
         {
-            $oldlc = $line->oldlc;
+            $oldlc = $line->oldlc > 0 ? $line->oldlc : ' ';
             $newlc = $line->newlc;
             if(!isset($content->new[$newlc])) continue;
         }
         ?>
-        <th class='w-num text-right'><?php echo $oldlc?></th>
+        <th class='w-num text-center'><?php echo $oldlc?></th>
         <td class='w-code line-<?php if($line->type != 'new')echo $line->type?> <?php if($line->type == 'custom') echo "line-old"?> code'><?php
         if(!isset($content->old[$oldlc])) $content->old[$oldlc] = '';
         $content->old[$oldlc] = $repo->SCM == 'Subversion' ? htmlSpecialString($content->old[$oldlc]) : $content->old[$oldlc];
         if(!empty($oldlc)) echo $line->type != 'all' ? preg_replace('/^\-/', '&ndash;', $content->old[$oldlc]) : ' ' . $content->old[$oldlc];
         ?></td>
-        <th class='w-num text-right'><?php echo $newlc?></th>
+        <th class='w-num text-center'><?php echo $newlc?></th>
         <td class='w-code line-<?php if($line->type != 'old') echo $line->type?> <?php if($line->type == 'custom') echo "line-new"?> code'><?php
         if(!isset($content->new[$newlc])) $content->new[$newlc] = '';
         $content->new[$newlc] = $repo->SCM == 'Subversion' ? htmlSpecialString($content->new[$newlc]) : $content->new[$newlc];
diff --git a/module/repo/view/edit.html.php b/module/repo/view/edit.html.php
index 344d2535ba..db31220799 100644
--- a/module/repo/view/edit.html.php
+++ b/module/repo/view/edit.html.php
@@ -102,8 +102,7 @@
             <td colspan='2'><?php echo html::textarea('desc', $repo->desc, "rows='3' class='form-control'"); ?></td>
           </tr>
           <tr>
-            <th></th>
-            <td colspan='2' class='text-center form-actions'>
+            <td colspan='3' class='text-center form-actions'>
               <?php echo html::submitButton(); ?>
               <?php if(!isonlybody()) echo html::a(inlink('maintain', ""), $lang->goback, '', 'class="btn btn-wide"'); ?>
             </td>
diff --git a/module/sonarqube/view/create.html.php b/module/sonarqube/view/create.html.php
index 5404fddea5..58668209bb 100644
--- a/module/sonarqube/view/create.html.php
+++ b/module/sonarqube/view/create.html.php
@@ -37,8 +37,7 @@
             <td><?php echo html::password('password', '', "class='form-control'");?></td>
           </tr>
           <tr>
-            <th></th>
-            <td class='text-center form-actions'>
+            <td colspan='2' class='text-center form-actions'>
               <?php echo html::submitButton();?>
               <?php if(!isonlybody()) echo html::a(inlink('browse', ""), $lang->goback, '', 'class="btn btn-wide"');?>
             </td>
diff --git a/module/sonarqube/view/edit.html.php b/module/sonarqube/view/edit.html.php
index 6387b70dff..ecd2042561 100644
--- a/module/sonarqube/view/edit.html.php
+++ b/module/sonarqube/view/edit.html.php
@@ -37,8 +37,7 @@
             <td><?php echo html::password('password', isset($sonarqube->password) ? $sonarqube->password : '', "class='form-control'");?></td>
           </tr>
           <tr>
-            <th></th>
-            <td class='text-center form-actions'>
+            <td colspan='2' class='text-center form-actions'>
               <?php echo html::submitButton();?>
               <?php if(!isonlybody()) echo html::a(inlink('browse', ""), $lang->goback, '', 'class="btn btn-wide"');?>
             </td>

From 8d9aace2dedeadded2063292099641ef480766d6 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 22 Jul 2022 13:42:08 +0800
Subject: [PATCH 03/10] * Fix bug.

---
 module/action/model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/action/model.php b/module/action/model.php
index 510c61c9a2..30b1be5396 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -1223,8 +1223,8 @@ class actionModel extends model
         $requirements    = $relatedData['requirements'];
 
         $aclViews         = isset($this->app->user->rights['acls']['views']) ? $this->app->user->rights['acls']['views'] : array();
-        $authedProjects   = (empty($aclViews) or (!empty($aclViews) and !empty($aclViews['project'])))   ? ",{$this->app->user->view->projects}," : array();
-        $authedExecutions = (empty($aclViews) or (!empty($aclViews) and !empty($aclViews['execution']))) ? ",{$this->app->user->view->sprints},": array();
+        $authedProjects   = (empty($aclViews) or (!empty($aclViews) and !empty($aclViews['project'])))   ? ",{$this->app->user->view->projects}," : '';
+        $authedExecutions = (empty($aclViews) or (!empty($aclViews) and !empty($aclViews['execution']))) ? ",{$this->app->user->view->sprints},": '';
 
         foreach($actions as $i => $action)
         {

From b61a3ab9ef43509d2efa7035a8e94bddf8249272 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 22 Jul 2022 13:51:11 +0800
Subject: [PATCH 04/10] * Optimize page.

---
 module/repo/css/common.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/repo/css/common.css b/module/repo/css/common.css
index 307392df8f..639fb35b57 100644
--- a/module/repo/css/common.css
+++ b/module/repo/css/common.css
@@ -189,5 +189,5 @@ h3 {font-size: 16px;}
 
 .header-btn .btn > .text {text-overflow: unset !important;}
 
-#repoPageSize {right: 90px;}
+#repoPageSize {right: 90px; padding: 8px 5px 6px 10px;}
 .dropdown-menu li > a.selected {color: #3123ae !important; background: #f2eafc !important; line-height: 20px; border-radius: 5px;}

From f1998ad48514e10e63934e79e28418d914963b3a Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 22 Jul 2022 15:18:27 +0800
Subject: [PATCH 05/10] * Fix bug #24702.

---
 module/testcase/js/batchedit.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/module/testcase/js/batchedit.js b/module/testcase/js/batchedit.js
index e934894af4..23aa5d369e 100644
--- a/module/testcase/js/batchedit.js
+++ b/module/testcase/js/batchedit.js
@@ -101,15 +101,14 @@ $(function()
             var moduleID  = $('#modules' + num).val();
             var branchID  = typeof($('#branches' + num).val()) == 'undefined' ? 0 : $('#branches' + num).val();
             var storyID   = $("#story" + num).val();
-            var storyLink = createLink('story', 'ajaxGetProductStories', 'productID=' + productID + '&branch=' + branchID + '&moduleID=' + moduleID + '&storyID=0&onlyOption=false&status=noclosed&limit=50&type=full&hasParent=1&executionID=0&number=' + num);
+            var storyLink = createLink('story', 'ajaxGetProductStories', 'productID=' + productID + '&branch=' + branchID + '&moduleID=' + moduleID + '&storyID=' + storyID +'&onlyOption=false&status=noclosed&limit=0&type=full&hasParent=1&executionID=0&number=' + num);
             $.get(storyLink, function(stories)
             {
                 if(!stories) stories = '<select id="story' + num + '" name="story[' + num + ']" class="form-control"></select>';
                 $('#story' + num).replaceWith(stories);
                 $('#story' + num + "_chosen").remove();
                 $('#story' + num).next('.picker').remove();
-                $('#story' + num).attr('name', 'story[' + num + ']').chosen();
-                $('#story' + num).val(storyID).trigger('chosen:updated');
+                $('#story' + num).attr('name', 'story[' + num + ']').pricker();
             });
         });
     }

From 0277ee77d038588de5b74e8faa2c8204ea18c77d Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 22 Jul 2022 15:20:18 +0800
Subject: [PATCH 06/10] * Add tips for projects under the server.

---
 module/mr/js/create.js         | 2 ++
 module/mr/lang/de.php          | 1 +
 module/mr/lang/en.php          | 1 +
 module/mr/lang/fr.php          | 1 +
 module/mr/lang/vi.php          | 1 +
 module/mr/lang/zh-cn.php       | 1 +
 module/mr/view/create.html.php | 1 +
 module/repo/css/diff.css       | 2 +-
 8 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/module/mr/js/create.js b/module/mr/js/create.js
index c9f9cdef18..316ecb0368 100644
--- a/module/mr/js/create.js
+++ b/module/mr/js/create.js
@@ -162,6 +162,8 @@ $(function()
         }
         $.get(url, function(response)
         {
+            if(response == "<option value=''></option>" && confirm(mrLang.addForApp) == true) window.open(hosts[hostID].url);
+
             $('#sourceProject').html('').append(response);
             if(repo.project)
             {
diff --git a/module/mr/lang/de.php b/module/mr/lang/de.php
index dde731f59d..75fd977b34 100644
--- a/module/mr/lang/de.php
+++ b/module/mr/lang/de.php
@@ -199,3 +199,4 @@ $lang->mr->unlinkedTasks     = 'Task not linked';
 $lang->mr->confirmUnlinkTask = "Are you sure to remove this task?";
 $lang->mr->taskSummary       = "There are <strong>%s</strong> tasks on this page";
 $lang->mr->notDelbranch      = "The source branch cannot be deleted when it is a protected branch";
+$lang->mr->addForApp         = "There are no projects under this server, do you want to go to add?";
diff --git a/module/mr/lang/en.php b/module/mr/lang/en.php
index dde731f59d..75fd977b34 100644
--- a/module/mr/lang/en.php
+++ b/module/mr/lang/en.php
@@ -199,3 +199,4 @@ $lang->mr->unlinkedTasks     = 'Task not linked';
 $lang->mr->confirmUnlinkTask = "Are you sure to remove this task?";
 $lang->mr->taskSummary       = "There are <strong>%s</strong> tasks on this page";
 $lang->mr->notDelbranch      = "The source branch cannot be deleted when it is a protected branch";
+$lang->mr->addForApp         = "There are no projects under this server, do you want to go to add?";
diff --git a/module/mr/lang/fr.php b/module/mr/lang/fr.php
index dde731f59d..75fd977b34 100644
--- a/module/mr/lang/fr.php
+++ b/module/mr/lang/fr.php
@@ -199,3 +199,4 @@ $lang->mr->unlinkedTasks     = 'Task not linked';
 $lang->mr->confirmUnlinkTask = "Are you sure to remove this task?";
 $lang->mr->taskSummary       = "There are <strong>%s</strong> tasks on this page";
 $lang->mr->notDelbranch      = "The source branch cannot be deleted when it is a protected branch";
+$lang->mr->addForApp         = "There are no projects under this server, do you want to go to add?";
diff --git a/module/mr/lang/vi.php b/module/mr/lang/vi.php
index dde731f59d..75fd977b34 100644
--- a/module/mr/lang/vi.php
+++ b/module/mr/lang/vi.php
@@ -199,3 +199,4 @@ $lang->mr->unlinkedTasks     = 'Task not linked';
 $lang->mr->confirmUnlinkTask = "Are you sure to remove this task?";
 $lang->mr->taskSummary       = "There are <strong>%s</strong> tasks on this page";
 $lang->mr->notDelbranch      = "The source branch cannot be deleted when it is a protected branch";
+$lang->mr->addForApp         = "There are no projects under this server, do you want to go to add?";
diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php
index 4dbcbb1fca..4e4ed474e4 100644
--- a/module/mr/lang/zh-cn.php
+++ b/module/mr/lang/zh-cn.php
@@ -199,3 +199,4 @@ $lang->mr->unlinkedTasks     = '未关联任务';
 $lang->mr->confirmUnlinkTask = "您确认移除该任务吗？";
 $lang->mr->taskSummary       = "本页共 <strong>%s</strong> 个任务";
 $lang->mr->notDelbranch      = "源分支为受保护分支时不可删除";
+$lang->mr->addForApp         = "该服务器下没有项目，是否前往添加？";
diff --git a/module/mr/view/create.html.php b/module/mr/view/create.html.php
index d963aedb09..95d794eafb 100644
--- a/module/mr/view/create.html.php
+++ b/module/mr/view/create.html.php
@@ -13,6 +13,7 @@
 <?php js::import($jsRoot . 'misc/base64.js');?>
 <?php js::set('hosts', $hosts);?>
 <?php js::set('repo', $repo);?>
+<?php js::set('mrLang', $lang->mr);?>
 <?php js::set('branchPrivs', array());?>
 <div id='mainContent' class='main-row'>
   <div class='main-col main-content'>
diff --git a/module/repo/css/diff.css b/module/repo/css/diff.css
index 42127daf7d..57db0e5265 100644
--- a/module/repo/css/diff.css
+++ b/module/repo/css/diff.css
@@ -9,7 +9,7 @@ table.diff {margin-bottom: 0px;}
 .diff .line-new, .diff .line-new {background: #CFC;}
 .diff .line-old, .diff .line-old {background: #FCC;}
 .diff .line-all, .diff .line-all {background: #FFF;}
-.diff .w-num {width: 25px; border-right: 1px solid #E4E4E4; color: #999; border-left: 1px solid #E4E4E4; color: #999; font-weight: normal; line-height: 2.5;}
+.diff .w-num {width: 25px; border-right: 1px solid #E4E4E4; color: #999; border-left: 1px solid #E4E4E4; color: #999; font-weight: normal;}
 
 .repoCode .diff tr .comment-btn .icon-wrapper {left: -23px;}
 .repoCode .diff tr.over td.line-all, .repoCode .diff tr.over td.line-all {background: #f8eec7;}

From 37bb83338a640dfc92c1e9f0980c7cb0e15cb9c2 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 22 Jul 2022 15:29:42 +0800
Subject: [PATCH 07/10] * Modify merge resule update.

---
 module/mr/model.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/module/mr/model.php b/module/mr/model.php
index e0105fe73e..204aebec00 100644
--- a/module/mr/model.php
+++ b/module/mr/model.php
@@ -996,15 +996,8 @@ class mrModel extends model
             if($MR and $MR->removeSourceBranch == '1') $data['delete_branch_after_merge'] = true;
 
             $rowMR = json_decode(commonModel::http($url, $data, array(), array(), 'json', 'POST'));
-            if(!isset($rowMR->massage))
-            {
-                $rowMR = $this->apiGetSingleMR($hostID, $projectID, $MRID);
+            if(!isset($rowMR->massage)) $rowMR = $this->apiGetSingleMR($hostID, $projectID, $MRID);
 
-                $this->dao->update(TABLE_MR)->data(array('status' => 'merged'))
-                    ->where('id')->eq($MRID)
-                    ->autoCheck()
-                    ->exec();
-            }
             return $rowMR;
         }
     }
@@ -1892,6 +1885,11 @@ class mrModel extends model
         {
             $this->action->create('task', $task->id, 'mergedmr', '', helper::createLink('mr', 'view', "mr={$MR->id}"));
         }
+
+        return $this->dao->update(TABLE_MR)->data(array('status' => 'merged'))
+                    ->where('id')->eq($MR->id)
+                    ->autoCheck()
+                    ->exec();
     }
 
     /**

From 737799378de4a19a39b5ff0527deda07a27c213d Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 22 Jul 2022 15:49:22 +0800
Subject: [PATCH 08/10] * Fix bug #24702.

---
 module/testcase/js/batchedit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/testcase/js/batchedit.js b/module/testcase/js/batchedit.js
index 23aa5d369e..560ca72326 100644
--- a/module/testcase/js/batchedit.js
+++ b/module/testcase/js/batchedit.js
@@ -108,7 +108,7 @@ $(function()
                 $('#story' + num).replaceWith(stories);
                 $('#story' + num + "_chosen").remove();
                 $('#story' + num).next('.picker').remove();
-                $('#story' + num).attr('name', 'story[' + num + ']').pricker();
+                $('#story' + num).attr('name', 'story[' + num + ']').picker();
             });
         });
     }

From 714787d10862735947cb80be46f6531174908963 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 22 Jul 2022 15:50:37 +0800
Subject: [PATCH 09/10] * Fix bug #22507.

---
 module/story/view/track.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/story/view/track.html.php b/module/story/view/track.html.php
index 7522484fd5..b4f94b1a4c 100644
--- a/module/story/view/track.html.php
+++ b/module/story/view/track.html.php
@@ -17,7 +17,7 @@
       </p>
     </div>
     <?php else:?>
-    <?php $style  = $this->app->rawModule == 'projectstory' ? "style='overflow: unset; text-align: left'" : '';?>
+    <?php $style  = $this->app->rawModule == 'projectstory' ? "style='overflow: overflow; text-align: left'" : '';?>
     <?php $tab    = $this->app->rawModule == 'projectstory' ? 'project' : 'product';?>
     <?php $module = $this->app->rawModule == 'projectstory' ? 'projectstory' : 'story';?>
     <div class='main-table' data-ride="table">

From 9de38d0fe847a49976c3df05f3ad6204fc9faf38 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 22 Jul 2022 15:59:40 +0800
Subject: [PATCH 10/10] * Adjust code.

---
 module/mr/model.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/module/mr/model.php b/module/mr/model.php
index 204aebec00..66d7129e2c 100644
--- a/module/mr/model.php
+++ b/module/mr/model.php
@@ -1886,10 +1886,7 @@ class mrModel extends model
             $this->action->create('task', $task->id, 'mergedmr', '', helper::createLink('mr', 'view', "mr={$MR->id}"));
         }
 
-        return $this->dao->update(TABLE_MR)->data(array('status' => 'merged'))
-                    ->where('id')->eq($MR->id)
-                    ->autoCheck()
-                    ->exec();
+        return $this->dao->update(TABLE_MR)->data(array('status' => 'merged'))->where('id')->eq($MR->id)->exec();
     }
 
     /**