Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* my-todo Priority and name plus title;

Browse Source 
* user-edit     Adjust the location of the entry date
* user-profile  If the entry date is empty, do not display.
This commit is contained in:
JackWuLieHao
2018-04-03 15:05:20 +08:00
parent 88a06cc0e0
commit 6dcfb832f0
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/view/profile.html.php
+2 -1
View File
@@ -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>
module/my/view/todo.html.php
+2 -2
View File
@@ -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>
module/user/view/edit.html.php
+3 -5
View File
@@ -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>
module/user/view/profile.html.php
+4 -2
View File
@@ -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>