From 344fdf303d89f81c62aa86f31f8013af7eefc6cd Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Tue, 26 Jan 2021 10:41:07 +0800
Subject: [PATCH] * Adjust the style of profile.

---
 module/common/model.php         |  4 ++--
 module/my/css/profile.css       |  8 ++++----
 module/my/view/profile.html.php | 35 +++++++++++++++------------------
 3 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index 528e4ea6d9..254437c04b 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -286,14 +286,14 @@ class commonModel extends model
             {
                 $noRole = (!empty($app->user->role) && isset($lang->user->roleList[$app->user->role])) ? '' : ' no-role';
                 echo '<li class="user-profile-item">';
-                echo "<a href='" . helper::createLink('my', 'profile', '', '', true) . "' data-width='800' class='iframe $noRole'" . '>';
+                echo "<a href='" . helper::createLink('my', 'profile', '', '', true) . "' data-width='600' class='iframe $noRole'" . '>';
                 echo "<div class='avatar avatar bg-secondary avatar-circle'>";
                 echo $app->user->avatar ? html::image($app->user->avatar) : strtoupper($app->user->account[0]);
                 echo "</div>\n";
                 echo '<div class="user-profile-name">' . (empty($app->user->realname) ? $app->user->account : $app->user->realname) . '</div>';
                 if(isset($lang->user->roleList[$app->user->role])) echo '<div class="user-profile-role">' . $lang->user->roleList[$app->user->role] . '</div>';
                 echo '</a></li><li class="divider"></li>';
-                echo '<li>' . html::a(helper::createLink('my', 'profile', '', '', true), "<i class='icon icon-account'></i> " . $lang->profile, '', "class='iframe' data-width='800'") . '</li>';
+                echo '<li>' . html::a(helper::createLink('my', 'profile', '', '', true), "<i class='icon icon-account'></i> " . $lang->profile, '', "class='iframe' data-width='600'") . '</li>';
                 echo '<li>' . html::a(helper::createLink('my', 'preference', '', '', true), "<i class='icon icon-controls'></i> " . $lang->preference, '', "class='iframe' data-width='650'") . '</li>';
                 echo '<li>' . html::a(helper::createLink('my', 'changepassword', '', '', true), "<i class='icon icon-cog-outline'></i> " . $lang->changePassword, '', "class='iframe' data-width='600'") . '</li>';
                 echo "<li id='menuToggleItem'><a type='button' class='menu-toggle'><i class='icon icon-sm icon-menu-collapse'></i> <span class='is-unfold'>$lang->unfoldMenu</span><span class='is-collapse'>$lang->collapseMenu</span></a></li>";
diff --git a/module/my/css/profile.css b/module/my/css/profile.css
index 8d85d78be4..065aea3819 100644
--- a/module/my/css/profile.css
+++ b/module/my/css/profile.css
@@ -1,8 +1,8 @@
 .body-modal .main-header{padding: 13px 0px 0px 0;}
-.cell{height:420px;}
-.row table{width: 100%;}
-.row th{width: 20%; line-height: 30px; padding-right: 20px; text-align: right; font-weight: 500;}
-.row td{width: 30%; text-align: left; font-weight: 700;}
+.row table{width: 100%; margin-top: 5px;}
+table+table{border-top: 1px solid #eee;}
+.row th{width: 17%; line-height: 30px; padding-right: 20px; text-align: right; font-weight: 500;}
+.row td{width: 33%; text-align: left; font-weight: 700;}
 .main-actions{margin: 20px 0 20px 0; text-align: center;}
 .user-title{margin: 10px 10px -10px 10px; font-size: 14px; font-weight: bold; padding-left: 10px;}
 .avatar { display: inline-block; width: 50px; height: 50px; line-height: 50px;}
diff --git a/module/my/view/profile.html.php b/module/my/view/profile.html.php
index 702b712948..aeb97b7ba9 100644
--- a/module/my/view/profile.html.php
+++ b/module/my/view/profile.html.php
@@ -36,7 +36,6 @@
       <?php endif;?>
     </div>
     <div class='row'>
-      <div class='user-title'><?php echo $lang->user->basicInfo;?></div>
       <table>
         <tr>
           <th><?php echo $lang->user->realname;?></th>
@@ -78,31 +77,18 @@
           <td><?php foreach($groups as $group) echo $group->name . ' ';?></td>
         </tr>
       </table>
-      <div class='user-title'><?php echo $lang->user->contactInfo;?></div>
       <table>
         <tr>
           <th><?php echo $lang->user->mobile;?></th>
           <td><?php echo $user->mobile;?></td>
-          <th><?php echo $lang->user->skype;?></th>
-          <td><?php if($user->skype) echo html::a("callto://$user->skype", $user->skype);?></td>
+          <th><?php echo $lang->user->weixin;?></th>
+          <td><?php echo $user->weixin;?></td>
         </tr>
         <tr>
           <th><?php echo $lang->user->phone;?></th>
           <td><?php echo $user->phone;?></td>
-          <th><?php echo $lang->user->whatsapp;?></th>
-          <td><?php echo $user->whatsapp;?></td>
-        </tr>
-        <tr>
-          <th><?php echo $lang->user->weixin;?></th>
-          <td><?php echo $user->weixin;?></td>
-          <th><?php echo $lang->user->slack;?></th>
-          <td><?php echo $user->slack;?></td>
-        </tr>
-        <tr>
           <th><?php echo $lang->user->qq;?></th>
           <td><?php echo $user->qq;?></td>
-          <th><?php echo $lang->user->dingding;?></th>
-          <td><?php echo $user->dingding;?></td>
         </tr>
         <tr>
           <th><?php echo $lang->user->zipcode;?></th>
@@ -111,19 +97,30 @@
           <td title='<?php echo $user->address;?>'><?php echo $user->address;?></td>
         </tr>
       </table>
-      <div class='user-title'><?php echo $lang->user->else;?></div>
       <table>
         <tr>
           <th><?php echo $lang->user->commiter;?></th>
           <td><?php echo $user->commiter;?></td>
+          <th><?php echo $lang->user->skype;?></th>
+          <td><?php if($user->skype) echo html::a("callto://$user->skype", $user->skype);?></td>
+        </tr>
+        <tr>
           <th><?php echo $lang->user->visits;?></th>
           <td><?php echo $user->visits;?></td>
+          <th><?php echo $lang->user->whatsapp;?></th>
+          <td><?php echo $user->whatsapp;?></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->user->last;?></th>
+          <td><?php echo $user->last;?></td>
+          <th><?php echo $lang->user->slack;?></th>
+          <td><?php echo $user->slack;?></td>
         </tr>
         <tr>
           <th><?php echo $lang->user->ip;?></th>
           <td><?php echo $user->ip;?></td>
-          <th><?php echo $lang->user->last;?></th>
-          <td><?php echo $user->last;?></td>
+          <th><?php echo $lang->user->dingding;?></th>
+          <td><?php echo $user->dingding;?></td>
         </tr>
       </table>
     </div>