From 88bd2a9e9111b7c65dac76c3d23870d2540334a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <memory@lvtao.net>
Date: Thu, 7 Dec 2017 16:37:45 +0800
Subject: [PATCH] * Task#3437

---
 module/company/view/browse.html.php | 4 +---
 module/user/view/create.html.php    | 2 ++
 module/user/view/edit.html.php      | 4 +++-
 module/user/view/profile.html.php   | 2 ++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/module/company/view/browse.html.php b/module/company/view/browse.html.php
index c5ad8c36b3..bf046fbd46 100644
--- a/module/company/view/browse.html.php
+++ b/module/company/view/browse.html.php
@@ -46,7 +46,6 @@ js::set('confirmDelete', $lang->user->confirmDelete);
         <th><?php common::printOrderLink('gender',   $orderBy, $vars, $lang->user->gender);?></th>
         <th><?php common::printOrderLink('phone',    $orderBy, $vars, $lang->user->phone);?></th>
         <th><?php common::printOrderLink('qq',       $orderBy, $vars, $lang->user->qq);?></th>
-        <th><?php common::printOrderLink('join',     $orderBy, $vars, $lang->user->join);?></th>
         <th><?php common::printOrderLink('last',     $orderBy, $vars, $lang->user->last);?></th>
         <th><?php common::printOrderLink('visits',   $orderBy, $vars, $lang->user->visits);?></th>
         <th class='w-90px'><?php echo $lang->actions;?></th>
@@ -72,7 +71,6 @@ js::set('confirmDelete', $lang->user->confirmDelete);
         <td><?php if(isset($lang->user->genderList[$user->gender])) echo $lang->user->genderList[$user->gender];?></td>
         <td><?php echo $user->phone;?></td>
         <td><?php if($user->qq) echo html::a("tencent://message/?uin=$user->qq", $user->qq);?></td>
-        <td><?php echo $user->join;?></td>
         <td><?php if($user->last) echo date('Y-m-d', $user->last);?></td>
         <td><?php echo $user->visits;?></td>
         <td class='text-left'>
@@ -94,7 +92,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
       </tbody>
       <tfoot>
       <tr>
-        <td colspan='12'>
+        <td colspan='11'>
         <div class='table-actions clearfix'>
         <?php
         if($canBatchEdit) echo html::selectButton();
diff --git a/module/user/view/create.html.php b/module/user/view/create.html.php
index 95d34dd32f..01bae78aa6 100644
--- a/module/user/view/create.html.php
+++ b/module/user/view/create.html.php
@@ -69,10 +69,12 @@
         <th><?php echo $lang->user->commiter;?></th>
         <td><?php echo html::input('commiter', '', "class='form-control' autocomplete='off'");?></td>
       </tr>
+      <!--
       <tr>
         <th><?php echo $lang->user->join;?></th>
         <td><?php echo html::input('join', '', "class='form-control form-date'");?></td>
       </tr>
+      -->
       <tr>
         <th><?php echo $lang->user->gender;?></th>
         <td><?php echo html::radio('gender', (array)$lang->user->genderList, 'm');?></td>
diff --git a/module/user/view/edit.html.php b/module/user/view/edit.html.php
index 17d2d1a414..5b6a859e33 100644
--- a/module/user/view/edit.html.php
+++ b/module/user/view/edit.html.php
@@ -39,10 +39,12 @@
         <td colspan='3'><?php echo html::select('groups[]', $groups, $userGroups, 'size=3 multiple=multiple class="form-control chosen"');?></td>
       </tr>
       <tr>
+        <!--
         <th><?php echo $lang->user->join;?></th>
         <td><?php echo html::input('join', $user->join, "class='form-control form-date'");?></td>
+        -->
         <th><?php echo $lang->user->gender;?></th>
-        <td><?php echo html::radio('gender', (array)$lang->user->genderList, $user->gender);?></td>
+        <td colspan="3"><?php echo html::radio('gender', (array)$lang->user->genderList, $user->gender);?></td>
       </tr>
     </table>
     <table align='center' class='table table-form'>
diff --git a/module/user/view/profile.html.php b/module/user/view/profile.html.php
index df03bc6926..64e3f40f07 100644
--- a/module/user/view/profile.html.php
+++ b/module/user/view/profile.html.php
@@ -74,10 +74,12 @@
       <th><?php echo $lang->user->email;?></th>
       <td><?php echo $user->email;?></td>
     </tr>
+    <!--
     <tr>
       <th><?php echo $lang->user->join;?></th>
       <td><?php echo $user->join;?></td>
     </tr>
+    -->
     <tr>
       <th><?php echo $lang->user->visits;?></th>
       <td><?php echo $user->visits;?></td>