From 6dcfb832f028271fb71fabd6964a76eadb931e79 Mon Sep 17 00:00:00 2001
From: JackWuLieHao <wuliehao@cnezsoft.com>
Date: Tue, 3 Apr 2018 15:05:20 +0800
Subject: [PATCH] * my-todo       Priority and name plus title; * user-edit    
 Adjust the location of the entry date * user-profile  If the entry date is
 empty, do not display.

---
 module/my/view/profile.html.php   | 3 ++-
 module/my/view/todo.html.php      | 4 ++--
 module/user/view/edit.html.php    | 8 +++-----
 module/user/view/profile.html.php | 6 ++++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/module/my/view/profile.html.php b/module/my/view/profile.html.php
index 65d9a20ae0..016fef0557 100644
--- a/module/my/view/profile.html.php
+++ b/module/my/view/profile.html.php
@@ -62,7 +62,8 @@
       <th><?php echo $lang->user->email;?></th>
       <td><?php echo $user->email;?></td>
     </tr>
-    <tr>
+    <?php $style = $user->join == '0000-00-00' ? "style='display:none'" : '';?>
+    <tr <?php echo $style;?> >
       <th><?php echo $lang->user->join;?></th>
       <td><?php echo $user->join;?></td>
     </tr>
diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index 80fea7a34d..19c2d94ce1 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -72,8 +72,8 @@
       </td>
       <td><?php echo $todo->date == '2030-01-01' ? $lang->todo->periods['future'] : $todo->date;?></td>
       <td><?php echo $lang->todo->typeList[$todo->type];?></td>
-      <td><span class='<?php echo 'pri' . zget($lang->todo->priList, $todo->pri, $todo->pri);?>'><?php echo zget($lang->todo->priList, $todo->pri, $todo->pri)?></span></td>
-      <td class='text-left'><?php echo html::a($this->createLink('todo', 'view', "id=$todo->id&from=my", '', true), $todo->name, '', "data-toggle='modal' data-type='iframe' data-title='" . $lang->todo->view . "' data-icon='check'");?></td>
+      <td><span title="<?php echo zget($lang->todo->priList, $todo->pri,$todo->pri);?>" class='<?php echo 'pri' . zget($lang->todo->priList, $todo->pri, $todo->pri);?>'><?php echo zget($lang->todo->priList, $todo->pri, $todo->pri)?></span></td>
+      <td class='text-left' title="<?php echo $todo->name;?>"><?php echo html::a($this->createLink('todo', 'view', "id=$todo->id&from=my", '', true), $todo->name, '', "data-toggle='modal' data-type='iframe' data-title='" . $lang->todo->view . "' data-icon='check'");?></td>
       <td><?php echo $todo->begin;?></td>
       <td><?php echo $todo->end;?></td>
       <td class='<?php echo $todo->status;?>'><?php echo $lang->todo->statusList[$todo->status];?></td>
diff --git a/module/user/view/edit.html.php b/module/user/view/edit.html.php
index 8f9713f6b3..651dca4c96 100644
--- a/module/user/view/edit.html.php
+++ b/module/user/view/edit.html.php
@@ -26,7 +26,9 @@
       <caption class='text-left text-muted'><?php echo $lang->user->basicInfo;?></caption>
       <tr>
         <th class='w-90px'><?php echo $lang->user->realname;?></th>
-        <td class='w-p40'><?php echo html::input('realname', $user->realname, "class='form-control' autocomplete='off'");?></td><td></td><td></td>
+        <td class='w-p40'><?php echo html::input('realname', $user->realname, "class='form-control' autocomplete='off'");?></td>
+        <th class='w-90px'><?php echo $lang->user->join;?></th>
+        <td class='w-p40'><?php echo html::input('join', $user->join, "class='form-control form-date'");?></td>  
       </tr>
       <tr>
         <th class='w-90px'><?php echo $lang->user->dept;?></th>
@@ -34,10 +36,6 @@
         <th><?php echo $lang->user->role;?></th>
         <td><?php echo html::select('role', $lang->user->roleList, $user->role, "class='form-control'");?></td>
       </tr>
-      <tr>
-        <th><?php echo $lang->user->join;?></th>
-        <td><?php echo html::input('join', $user->join, "class='form-control form-date'");?></td>
-      </tr>
       <tr>
         <th><?php echo $lang->group->priv;?></th>
         <td colspan='3'><?php echo html::select('groups[]', $groups, $userGroups, 'size=3 multiple=multiple class="form-control chosen"');?></td>
diff --git a/module/user/view/profile.html.php b/module/user/view/profile.html.php
index 6701a83e30..83e3cc8d3e 100644
--- a/module/user/view/profile.html.php
+++ b/module/user/view/profile.html.php
@@ -60,10 +60,12 @@
       <th><?php echo $lang->user->role;?></th>
       <td><?php echo $lang->user->roleList[$user->role];?></td>
     </tr>
-    <tr>
+    <?php $style = $user->join == '0000-00-00' ? "style='display:none'" : '';?> 
+    <tr <?php echo $style;?>>
       <th><?php echo $lang->user->join;?></th>
       <td><?php echo $user->join;?></td>
-    </tr>
+    </tr> 
+    <?php;?>
     <tr>
       <th><?php echo $lang->user->commiter;?></th>
       <td><?php echo $user->commiter;?></td>