* Finish task #9091.
This commit is contained in:
holan20180123
@@ -1,4 +1,5 @@
|
||||
.body-modal .main-header{padding: 13px 0px 0px 0;}
|
||||
.row{height: 340px;}
|
||||
.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;}
|
||||
|
||||
@@ -63,7 +63,7 @@
|
||||
<td class='text-left'><?php echo $project->budget != 0 ? zget($lang->program->currencySymbol, $project->budgetUnit) . number_format($project->budget, 2) : $lang->program->future;?></td>
|
||||
<td>
|
||||
<?php $userID = isset($PMList[$project->PM]) ? $PMList[$project->PM]->id : ''?>
|
||||
<?php if(!empty($project->PM)) echo html::a($this->createLink('user', 'profile', "userID=$userID", '', true), zget($users, $project->PM), '', "data-toggle='modal' data-type='iframe' data-width='800'");?>
|
||||
<?php if(!empty($project->PM)) echo html::a($this->createLink('user', 'profile', "userID=$userID", '', true), zget($users, $project->PM), '', "data-toggle='modal' data-type='iframe' data-width='600'");?>
|
||||
</td>
|
||||
<td class='c-actions'>
|
||||
<?php if($project->status == 'wait' || $project->status == 'suspended') common::printIcon('program', 'PRJStart', "projectID=$project->id", $project, 'list', 'play', '', 'iframe', true);?>
|
||||
|
||||
@@ -520,8 +520,7 @@ class user extends control
|
||||
$this->view->personalData = $this->user->getPersonalData($user->account);
|
||||
$this->view->userList = $this->user->setUserList($users, $userID, $fromModule);
|
||||
|
||||
if(isonlybody()) $this->display('my', 'profile');
|
||||
if(!isonlybody()) $this->display();
|
||||
$this->display();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+11
-13
@@ -1,13 +1,11 @@
|
||||
.col-6{width:50% !important;}
|
||||
.col-md-6{width:49% !important;}
|
||||
.cell{height:520px;}
|
||||
.cell .divider{ display: block; width: 1px; height: 340px; background-color: rgba(0,0,0,.05); float: left;}
|
||||
.main-header{margin-bottom:20px;}
|
||||
.info-title{margin: 5px 10px; font-size: 14px; font-weight: bold; padding-left: 10px;}
|
||||
.right-info{padding-top: 30px;}
|
||||
.dl-horizontal{margin:0px;}
|
||||
.divider{border-left:1px solid #e5e5e5;}
|
||||
|
||||
.tiles{padding-top:15px;}
|
||||
.tile{text-align:left !important; padding-left:60px;}
|
||||
.tile-title{color:#999; padding-bottom:5px !important;}
|
||||
.row table{width: 94%; margin-top: 15px; margin-left: 3%}
|
||||
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;}
|
||||
.user-name{margin-left: 15px}
|
||||
.user-name, .user-role{font-size: 16px; vertical-align: top;}
|
||||
#avatarUploadBtn{padding: 4px 12px; position: relative; left: 32px; bottom: 30px;}
|
||||
#avatarForm{height: 10px}
|
||||
|
||||
@@ -13,95 +13,117 @@
|
||||
<?php include '../../common/view/header.html.php';?>
|
||||
<?php include '../../common/view/tablesorter.html.php';?>
|
||||
<?php include './featurebar.html.php';?>
|
||||
<div id='mainContent' class='main-row'>
|
||||
<div class='main-col col-6'>
|
||||
<div class='cell'>
|
||||
<div class='main-header'>
|
||||
<h2><?php echo $lang->user->profile;?></h2>
|
||||
<div class='actions pull-right'>
|
||||
<?php if($fromModule == 'user' and common::hasPriv('user', 'edit')) echo html::a($this->createLink('user', 'edit', "userID=$user->id"), html::icon('pencil') . ' ' . $lang->user->editProfile, '', "class='btn btn-primary'"); ?>
|
||||
</div>
|
||||
</div>
|
||||
<div class='row'>
|
||||
<div class='col-md-6'>
|
||||
<div class='info-title'><?php echo $lang->user->basicInfo;?></div>
|
||||
<dl class='dl-horizontal info'>
|
||||
<dt><?php echo $lang->user->realname;?></dt>
|
||||
<dd><?php echo $user->realname;?></dd>
|
||||
<dt><?php echo $lang->user->account;?></dt>
|
||||
<dd><?php echo $user->account;?></dd>
|
||||
<dt><?php echo $lang->user->dept;?></dt>
|
||||
<dd>
|
||||
<?php
|
||||
if(empty($deptPath))
|
||||
{
|
||||
echo "/";
|
||||
}
|
||||
else
|
||||
{
|
||||
foreach($deptPath as $key => $dept)
|
||||
{
|
||||
if($dept->name) echo $dept->name;
|
||||
if(isset($deptPath[$key + 1])) echo $lang->arrow;
|
||||
}
|
||||
}
|
||||
?>
|
||||
</dd>
|
||||
<dt><?php echo $lang->user->join;?></dt>
|
||||
<dd><?php echo formatTime($user->join);?></dd>
|
||||
</dl>
|
||||
<div class='info-title'><?php echo $lang->user->contactInfo;?></div>
|
||||
<dl class='dl-horizontal contact'>
|
||||
<dt><?php echo $lang->user->mobile;?></dt>
|
||||
<dd><?php echo $user->mobile;?></dd>
|
||||
<dt><?php echo $lang->user->phone;?></dt>
|
||||
<dd><?php echo $user->phone;?></dd>
|
||||
<dt><?php echo $lang->user->weixin;?></dt>
|
||||
<dd><?php echo $user->weixin;?></dd>
|
||||
<dt><?php echo $lang->user->qq;?></dt>
|
||||
<dd><?php echo $user->qq;?></dd>
|
||||
<dt><?php echo $lang->user->zipcode;?></dt>
|
||||
<dd><?php echo $user->zipcode;?></dd>
|
||||
</dl>
|
||||
<div class='info-title'><?php echo $lang->user->else;?></div>
|
||||
<dl class='dl-horizontal else'>
|
||||
<dt><?php echo $lang->user->commiter;?></dt>
|
||||
<dd><?php echo $user->commiter;?></dd>
|
||||
<dt><?php echo $lang->user->ip;?></dt>
|
||||
<dd><?php echo $user->ip;?></dd>
|
||||
</dl>
|
||||
</div>
|
||||
<div class='col-md-6'>
|
||||
<dl class='dl-horizontal right-info'>
|
||||
<dt><?php echo $lang->user->gender;?></dt>
|
||||
<dd><?php echo zget($lang->user->genderList, $user->gender);?></dd>
|
||||
<dt><?php echo $lang->user->email;?></dt>
|
||||
<dd title='<?php echo $user->email;?>'><?php echo $user->email;?></dd>
|
||||
<dt><?php echo $lang->user->role;?></dt>
|
||||
<dd><?php echo zget($lang->user->roleList, $user->role);?></dd>
|
||||
<dt><?php echo $lang->group->priv;?></dt>
|
||||
<dd><?php foreach($groups as $group) echo $group->name . ' '; ?></dd>
|
||||
</dl>
|
||||
<dl class='dl-horizontal right-info'>
|
||||
<dt><?php echo $lang->user->skype;?></dt>
|
||||
<dd><?php if($user->skype) echo html::a("callto://$user->skype", $user->skype);?></dd>
|
||||
<dt><?php echo $lang->user->whatsapp;?></dt>
|
||||
<dd><?php echo $user->whatsapp;?></dd>
|
||||
<dt><?php echo $lang->user->slack;?></dt>
|
||||
<dd><?php echo $user->slack;?></dd>
|
||||
<dt><?php echo $lang->user->dingding;?></dt>
|
||||
<dd><?php echo $user->dingding;?></dd>
|
||||
<dt><?php echo $lang->user->address;?></dt>
|
||||
<dd title='<?php echo $user->address;?>'><?php echo $user->address;?></dd>
|
||||
</dl>
|
||||
<dl class='dl-horizontal right-info'>
|
||||
<dt><?php echo $lang->user->visits;?></dt>
|
||||
<dd><?php echo $user->visits;?></dd>
|
||||
<dt><?php echo $lang->user->last;?></dt>
|
||||
<dd><?php echo $user->last;?></dd>
|
||||
</dl>
|
||||
</div>
|
||||
</div>
|
||||
<?php if(!isonlybody()):?>
|
||||
<style>#mainContent{width: 60%; margin-left: 20%;}</style>
|
||||
<?php endif;?>
|
||||
<div id='mainContent'>
|
||||
<div class='cell'>
|
||||
<div class='main-header text-center'>
|
||||
<span class="avatar avatar bg-secondary avatar-circle">
|
||||
<?php
|
||||
if($user->avatar)
|
||||
{
|
||||
echo html::image($user->avatar);
|
||||
}
|
||||
else
|
||||
{
|
||||
echo strtoupper($user->account[0]);
|
||||
}
|
||||
?>
|
||||
</span>
|
||||
<span class='user-name'><strong><?php echo $user->realname;?></strong></span>
|
||||
<span class='user-role'><?php echo zget($lang->user->roleList, $user->role);?></span>
|
||||
</div>
|
||||
<div class='row'>
|
||||
<table>
|
||||
<tr>
|
||||
<th><?php echo $lang->user->realname;?></th>
|
||||
<td><?php echo $user->realname;?></td>
|
||||
<th><?php echo $lang->user->gender;?></th>
|
||||
<td><?php echo zget($lang->user->genderList, $user->gender);?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->user->account;?></th>
|
||||
<td><?php echo $user->account;?></td>
|
||||
<th><?php echo $lang->user->email;?></th>
|
||||
<td title='<?php echo $user->email;?>'><?php echo $user->email;?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->user->dept;?></th>
|
||||
<td>
|
||||
<?php
|
||||
if(empty($deptPath))
|
||||
{
|
||||
echo "/";
|
||||
}
|
||||
else
|
||||
{
|
||||
foreach($deptPath as $key => $dept)
|
||||
{
|
||||
if($dept->name) echo $dept->name;
|
||||
if(isset($deptPath[$key + 1])) echo $lang->arrow;
|
||||
}
|
||||
}
|
||||
?>
|
||||
</td>
|
||||
<th><?php echo $lang->user->role;?></th>
|
||||
<td><?php echo zget($lang->user->roleList, $user->role);?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->user->join;?></th>
|
||||
<td><?php echo formatTime($user->join);?></td>
|
||||
<th><?php echo $lang->group->priv;?></th>
|
||||
<td><?php foreach($groups as $group) echo $group->name . ' ';?></td>
|
||||
</tr>
|
||||
</table>
|
||||
<table>
|
||||
<tr>
|
||||
<th><?php echo $lang->user->mobile;?></th>
|
||||
<td><?php echo $user->mobile;?></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->qq;?></th>
|
||||
<td><?php echo $user->qq;?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->user->zipcode;?></th>
|
||||
<td><?php echo $user->zipcode;?></td>
|
||||
<th><?php echo $lang->user->address;?></th>
|
||||
<td title='<?php echo $user->address;?>'><?php echo $user->address;?></td>
|
||||
</tr>
|
||||
</table>
|
||||
<?php if(!isonlybody()):?>
|
||||
<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->dingding;?></th>
|
||||
<td><?php echo $user->dingding;?></td>
|
||||
</tr>
|
||||
</table>
|
||||
<?php endif;?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user