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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
reneeteng
2019-05-30 07:58:29 +08:00
parent cc4d468c15 bbfe47008c
commit 441135cdab
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/css/profile.css
+4 -3
View File
@@ -1,8 +1,9 @@
.col-6{width:50% !important;}
.cell{height:450px;}
.cell{height:430px;}
.main-header{margin-bottom:20px;}
.dl-horizontal dt{color:#999; font-weight:normal; padding:5px 0px;}
.dl-horizontal dd{padding:5px 0px;}
.dl-horizontal{margin:0px;}
.dl-horizontal dt{color:#999; font-weight:normal; padding:5px 0px; width:120px;height:30px;}
.dl-horizontal dd{padding:5px 0px; margin-left:140px;overflow: hidden;text-overflow: ellipsis;height:30px; white-space: nowrap;}
.divider{border-left:1px solid #e5e5e5;}
.tiles{padding-top:15px;}
module/my/view/profile.html.php
+3 -3
View File
@@ -48,6 +48,8 @@
<dd><?php echo $lang->user->roleList[$user->role];?></dd>
<dt><?php echo $lang->group->priv;?></dt>
<dd><?php foreach($groups as $group) echo $group->name . ' '; ?></dd>
<dt><?php echo $lang->user->commiter;?></dt>
<dd><?php echo $user->commiter;?></dd>
<dt><?php echo $lang->user->join;?></dt>
<dd><?php echo formatTime($user->join);?></dd>
<dt><?php echo $lang->user->visits;?></dt>
@@ -67,10 +69,8 @@
</div>
<div class='col-md-6 divider'>
<dl class='dl-horizontal'>
<dt><?php echo $lang->user->commiter;?></dt>
<dd><?php echo $user->commiter;?></dd>
<dt><?php echo $lang->user->email;?></dt>
<dd><?php echo $user->email;?></dd>
<dd title='<?php echo $user->email;?>'><?php echo $user->email;?></dd>
<?php foreach(explode(',', $config->user->contactField) as $field):?>
<dt><?php echo $lang->user->$field;?></dt>
<dd>
module/user/css/profile.css
+4 -3
View File
@@ -1,8 +1,9 @@
.col-6{width:50% !important;}
.cell{height:450px;}
.cell{height:430px;}
.main-header{margin-bottom:20px;}
.dl-horizontal dt{color:#999; font-weight:normal; padding:5px 0px;}
.dl-horizontal dd{padding:5px 0px;}
.dl-horizontal{margin:0px;}
.dl-horizontal dt{color:#999; font-weight:normal; padding:5px 0px; width:120px;height:30px;}
.dl-horizontal dd{padding:5px 0px; margin-left:140px;overflow: hidden;text-overflow: ellipsis;height:30px; white-space: nowrap;}
.divider{border-left:1px solid #e5e5e5;}
.tiles{padding-top:15px;}
module/user/view/profile.html.php
+3 -3
View File
@@ -50,6 +50,8 @@
<dd><?php echo $lang->user->roleList[$user->role];?></dd>
<dt><?php echo $lang->group->priv;?></dt>
<dd><?php foreach($groups as $group) echo $group->name . ' '; ?></dd>
<dt><?php echo $lang->user->commiter;?></dt>
<dd><?php echo $user->commiter;?></dd>
<dt><?php echo $lang->user->join;?></dt>
<dd><?php echo formatTime($user->join);?></dd>
<dt><?php echo $lang->user->visits;?></dt>
@@ -69,10 +71,8 @@
</div>
<div class='col-md-6 divider'>
<dl class='dl-horizontal'>
<dt><?php echo $lang->user->commiter;?></dt>
<dd><?php echo $user->commiter;?></dd>
<dt><?php echo $lang->user->email;?></dt>
<dd><?php echo $user->email;?></dd>
<dd title='<?php echo $user->email;?>'><?php echo $user->email;?></dd>
<?php foreach(explode(',', $config->user->contactField) as $field):?>
<dt><?php echo $lang->user->$field;?></dt>
<dd>