From be04d6e492955e38f9ee1dfb45c6fed1cdb33129 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 21 Jul 2022 17:09:26 +0800
Subject: [PATCH] * Adjust codes.

---
 module/gitea/view/binduser.html.php  |  8 ++++----
 module/gitlab/lang/de.php            |  2 ++
 module/gitlab/lang/en.php            |  2 ++
 module/gitlab/lang/fr.php            |  2 ++
 module/gitlab/lang/vi.php            |  2 ++
 module/gitlab/lang/zh-cn.php         |  2 ++
 module/gitlab/view/binduser.html.php | 16 +++++++++-------
 7 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/module/gitea/view/binduser.html.php b/module/gitea/view/binduser.html.php
index 8d6b142ba1..554c875fd8 100644
--- a/module/gitea/view/binduser.html.php
+++ b/module/gitea/view/binduser.html.php
@@ -17,10 +17,10 @@
   </div>
   <form method='post' class='load-indicator main-form form-ajax' enctype='multipart/form-data'>
     <div class="table-responsive">
-      <table class="table table-borderless w-600px">
+      <table class="table table-borderless w-800px">
         <thead>
           <tr>
-            <th><?php echo $lang->gitea->giteaAvatar;?></th>
+            <th class='w-60px'><?php echo $lang->gitea->giteaAvatar;?></th>
             <th><?php echo $lang->gitea->giteaAccount;?></th>
             <th><?php echo $lang->gitea->giteaEmail;?></th>
             <th class='w-150px'><?php echo $lang->gitea->zentaoAccount;?></th>
@@ -32,7 +32,7 @@
           <?php if(isset($giteaUser->zentaoAccount)) continue;?>
           <?php echo html::hidden("giteaUserNames[$giteaUser->account]", $giteaUser->realname);?>
           <tr>
-            <td class='w-60px'><?php echo html::image($giteaUser->avatar, "height=40");?></td>
+            <td><?php echo html::image($giteaUser->avatar, "height=40");?></td>
             <td class='text-left'>
               <strong><?php echo $giteaUser->realname;?></strong>
               <br>
@@ -47,7 +47,7 @@
           <?php if(!isset($giteaUser->zentaoAccount)) continue;?>
           <?php echo html::hidden("giteaUserNames[$giteaUser->account]", $giteaUser->realname);?>
           <tr>
-            <td class='w-60px'><?php echo html::image($giteaUser->avatar, "height=40");?></td>
+            <td><?php echo html::image($giteaUser->avatar, "height=40");?></td>
             <td>
               <strong><?php echo $giteaUser->realname;?></strong>
               <br>
diff --git a/module/gitlab/lang/de.php b/module/gitlab/lang/de.php
index 41d82d8582..ef5d63cc87 100644
--- a/module/gitlab/lang/de.php
+++ b/module/gitlab/lang/de.php
@@ -12,7 +12,9 @@ $lang->gitlab->bindProduct       = 'Import Product';
 $lang->gitlab->importIssue       = 'Import Issue';
 $lang->gitlab->delete            = 'Delete GitLab';
 $lang->gitlab->confirmDelete     = 'Do you want to delete this GitLab server?';
+$lang->gitlab->gitlabAvatar      = 'Avatar';
 $lang->gitlab->gitlabAccount     = 'GitLab Account';
+$lang->gitlab->gitlabEmail       = 'Email';
 $lang->gitlab->zentaoAccount     = 'Zentao Account';
 $lang->gitlab->bindingStatus     = 'Binding Status';
 $lang->gitlab->notBind           = 'Not bind';
diff --git a/module/gitlab/lang/en.php b/module/gitlab/lang/en.php
index 41d82d8582..ef5d63cc87 100644
--- a/module/gitlab/lang/en.php
+++ b/module/gitlab/lang/en.php
@@ -12,7 +12,9 @@ $lang->gitlab->bindProduct       = 'Import Product';
 $lang->gitlab->importIssue       = 'Import Issue';
 $lang->gitlab->delete            = 'Delete GitLab';
 $lang->gitlab->confirmDelete     = 'Do you want to delete this GitLab server?';
+$lang->gitlab->gitlabAvatar      = 'Avatar';
 $lang->gitlab->gitlabAccount     = 'GitLab Account';
+$lang->gitlab->gitlabEmail       = 'Email';
 $lang->gitlab->zentaoAccount     = 'Zentao Account';
 $lang->gitlab->bindingStatus     = 'Binding Status';
 $lang->gitlab->notBind           = 'Not bind';
diff --git a/module/gitlab/lang/fr.php b/module/gitlab/lang/fr.php
index 41d82d8582..ef5d63cc87 100644
--- a/module/gitlab/lang/fr.php
+++ b/module/gitlab/lang/fr.php
@@ -12,7 +12,9 @@ $lang->gitlab->bindProduct       = 'Import Product';
 $lang->gitlab->importIssue       = 'Import Issue';
 $lang->gitlab->delete            = 'Delete GitLab';
 $lang->gitlab->confirmDelete     = 'Do you want to delete this GitLab server?';
+$lang->gitlab->gitlabAvatar      = 'Avatar';
 $lang->gitlab->gitlabAccount     = 'GitLab Account';
+$lang->gitlab->gitlabEmail       = 'Email';
 $lang->gitlab->zentaoAccount     = 'Zentao Account';
 $lang->gitlab->bindingStatus     = 'Binding Status';
 $lang->gitlab->notBind           = 'Not bind';
diff --git a/module/gitlab/lang/vi.php b/module/gitlab/lang/vi.php
index 41d82d8582..ef5d63cc87 100644
--- a/module/gitlab/lang/vi.php
+++ b/module/gitlab/lang/vi.php
@@ -12,7 +12,9 @@ $lang->gitlab->bindProduct       = 'Import Product';
 $lang->gitlab->importIssue       = 'Import Issue';
 $lang->gitlab->delete            = 'Delete GitLab';
 $lang->gitlab->confirmDelete     = 'Do you want to delete this GitLab server?';
+$lang->gitlab->gitlabAvatar      = 'Avatar';
 $lang->gitlab->gitlabAccount     = 'GitLab Account';
+$lang->gitlab->gitlabEmail       = 'Email';
 $lang->gitlab->zentaoAccount     = 'Zentao Account';
 $lang->gitlab->bindingStatus     = 'Binding Status';
 $lang->gitlab->notBind           = 'Not bind';
diff --git a/module/gitlab/lang/zh-cn.php b/module/gitlab/lang/zh-cn.php
index 7273c0c8ef..ef8637489c 100644
--- a/module/gitlab/lang/zh-cn.php
+++ b/module/gitlab/lang/zh-cn.php
@@ -12,7 +12,9 @@ $lang->gitlab->bindProduct       = '关联产品';
 $lang->gitlab->importIssue       = '关联issue';
 $lang->gitlab->delete            = '删除GitLab';
 $lang->gitlab->confirmDelete     = '确认删除该GitLab吗？';
+$lang->gitlab->gitlabAvatar      = '头像';
 $lang->gitlab->gitlabAccount     = 'GitLab用户';
+$lang->gitlab->gitlabEmail       = '邮箱';
 $lang->gitlab->zentaoAccount     = '禅道用户';
 $lang->gitlab->bindingStatus     = '绑定状态';
 $lang->gitlab->notBind           = '未绑定';
diff --git a/module/gitlab/view/binduser.html.php b/module/gitlab/view/binduser.html.php
index 8827890737..836fe3856e 100644
--- a/module/gitlab/view/binduser.html.php
+++ b/module/gitlab/view/binduser.html.php
@@ -17,12 +17,14 @@
   </div>
   <form method='post' class='load-indicator main-form form-ajax' enctype='multipart/form-data'>
     <div class="table-responsive">
-      <table class="table table-borderless w-600px">
+      <table class="table table-borderless w-800px">
         <thead>
           <tr>
-            <th colspan='2'><?php echo $lang->gitlab->gitlabAccount;?></th>
+            <th class='w-60px'><?php echo $lang->gitlab->gitlabAvatar;?></th>
+            <th><?php echo $lang->gitlab->gitlabAccount;?></th>
+            <th><?php echo $lang->gitlab->gitlabEmail;?></th>
             <th class='w-150px'><?php echo $lang->gitlab->zentaoAccount;?></th>
-            <th class='w-150px'><?php echo $lang->gitlab->bindingStatus;?></th>
+            <th><?php echo $lang->gitlab->bindingStatus;?></th>
           </tr>
         </thead>
         <tbody>
@@ -30,13 +32,13 @@
           <?php if(isset($gitlabUser->zentaoAccount)) continue;?>
           <?php echo html::hidden("gitlabUserNames[$gitlabUser->id]", $gitlabUser->realname);?>
           <tr>
-            <td class='w-60px'><?php echo html::image($gitlabUser->avatar, "height=40");?></td>
+            <td><?php echo html::image($gitlabUser->avatar, "height=40");?></td>
             <td class='text-left'>
               <strong><?php echo $gitlabUser->realname;?></strong>
               <br>
               <?php echo $gitlabUser->account;?>
-              <?php if($gitlabUser->email) echo " &lt;" . $gitlabUser->email . "&gt;";?>
             </td>
+            <td><?php echo $gitlabUser->email;?></td>
             <td><?php echo html::select("zentaoUsers[$gitlabUser->id]", $userPairs, '', "class='form-control select chosen'" );?></td>
             <td><?php echo $lang->gitlab->notBind;?></td>
           </tr>
@@ -45,13 +47,13 @@
           <?php if(!isset($gitlabUser->zentaoAccount)) continue;?>
           <?php echo html::hidden("gitlabUserNames[$gitlabUser->id]", $gitlabUser->realname);?>
           <tr>
-            <td class='w-60px'><?php echo html::image($gitlabUser->avatar, "height=40");?></td>
+            <td><?php echo html::image($gitlabUser->avatar, "height=40");?></td>
             <td>
               <strong><?php echo $gitlabUser->realname;?></strong>
               <br>
               <?php echo $gitlabUser->account;?>
-              <?php if($gitlabUser->email) echo " &lt;" . $gitlabUser->email . "&gt;";?>
             </td>
+            <td><?php echo $gitlabUser->email;?></td>
             <td><?php echo html::select("zentaoUsers[$gitlabUser->id]", $userPairs, $gitlabUser->zentaoAccount, "class='form-control select chosen'" );?></td>
             <td>
               <?php if(isset($bindedUsers[$gitlabUser->zentaoAccount])):?>