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

Merge branch 'master_xieqiyu_58567' into 'master'

Browse Source 
Master xieqiyu 58567

See merge request easycorp/zentaopms!4197
This commit is contained in:
王怡栋
2022-06-28 09:31:57 +00:00
parent 11e681d2f7 a757ea76c1
commit e05ac602cc
9 changed files with 56 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/css/profile.css
+7 -6
View File
@@ -1,14 +1,15 @@
.body-modal .main-header {padding: 13px 0px 0px 0;}
.row table {width: 100%; margin-top: 5px;}
.body-modal .main-header {padding: 20px 0px 24px 0; border-bottom: unset;}
.row table {width: 100%; margin-top: 5px; margin-left: 20px;}
table+table {border-top: 1px solid #eee;}
.row th {width: 17%; line-height: 30px; padding-right: 20px; text-align: right; font-weight: 500;}
.row th {width: 17%; line-height: 30px; padding-right: 20px; text-align: right; font-weight: unset;}
.row td {width: 33%; text-align: left; font-weight: 700;}
.main-actions {margin: 5px 0 10px 0; text-align: center;}
.user-title {margin: 10px 10px -10px 10px; font-size: 14px; font-weight: bold; padding-left: 10px;}
.user-name {margin-left: 15px; font-weight: bold;}
.user-name, .user-role {line-height: 50px; font-size: 16px; vertical-align: top;}
.user-name {font-weight: bold;}
.user-role {color: #5B606E;}
.user-name, .user-role {font-size: 14px; vertical-align: top; display: table; padding-left: 310px;}
#avatarUpload {display: inline-block; width: 50px; height: 50px; position: relative;}
#avatarUpload {display: inline-block; width: 40px; height: 40px; position: absolute; left: 265px}
#avatarForm {position: absolute; top: 0; left: 0; right: 0; bottom: 0;}
#avatarUploadBtn {display: block; position: absolute; top: 0; left: 0; right: 0; bottom: 0;}
#avatarUploadBtn {opacity: 0; color: #fff; border-radius: 50%; line-height: 50px;}
module/my/view/profile.html.php
+9 -6
View File
@@ -13,18 +13,21 @@
<?php include '../../common/view/header.html.php';?>
<?php js::set('avatar', $this->app->user->avatar);?>
<?php js::set('userID', $this->app->user->id);?>
<?php if(!zget($lang->user->roleList, $user->role, '')):?>
<style>.user-name {line-height: 40px;}</style>
<?php endif;?>
<div id='mainContent'>
<div class='cell'>
<div class='main-header text-center'>
<div id="avatarUpload">
<?php echo html::avatar($user, 50); ?>
<?php echo html::avatar($user, 40); ?>
<form method='post' class='form-ajax' action=<?php echo inlink('uploadAvatar');?> id='avatarForm' enctype='multipart/form-data'>
<input type="file" name="files" id="files" class="form-control hidden">
<?php if(common::hasPriv('my', 'uploadAvatar')) echo html::a('javascript:void(0);', '<i class="icon icon-pencil icon-2x"></i>', '', "class='btn-avatar' id='avatarUploadBtn' data-toggle='tooltip' data-container='body' data-placement='bottom' title='{$lang->my->uploadAvatar}'");?>
</form>
</div>
<span class='user-name'><?php echo $user->realname;?></span>
<span class='user-role'><?php echo zget($lang->user->roleList, $user->role, '');?></span>
<div class='user-name'><?php echo $user->realname;?></div>
<div class='user-role'><?php echo zget($lang->user->roleList, $user->role, '');?></div>
</div>
<div class='row'>
<table>
@@ -62,9 +65,9 @@
<td><?php echo zget($lang->user->roleList, $user->role, '');?></td>
</tr>
<tr>
<th><?php echo $lang->user->join;?></th>
<th><?php echo $lang->user->joinAB;?></th>
<td><?php echo formatTime($user->join);?></td>
<th><?php echo $lang->group->priv;?></th>
<th><?php echo $lang->user->priv;?></th>
<td><?php foreach($groups as $group) echo $group->name . ' ';?></td>
</tr>
</table>
@@ -84,7 +87,7 @@
<tr>
<th><?php echo $lang->user->zipcode;?></th>
<td><?php echo $user->zipcode;?></td>
<th><?php echo $lang->user->address;?></th>
<th><?php echo $lang->user->addressAB;?></th>
<td title='<?php echo $user->address;?>'><?php echo $user->address;?></td>
</tr>
</table>
module/user/css/profile.css
+6 -5
View File
@@ -1,12 +1,13 @@
.main-header {margin-bottom: 10px;}
.main-header {border-bottom: unset; padding-top: 20px !important; padding-bottom: 24px !important;}
.row table {width: 94%; margin-left: 3%;}
.row th {width: 17%; line-height: 30px; padding-right: 20px; text-align: right; font-weight: 500;}
.row th {width: 17%; line-height: 32px; padding-right: 20px; text-align: right; font-weight: unset;}
.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;}
.cell .avatar {display: inline-block; width: 50px; height: 50px; line-height: 50px;}
.user-name {margin-left: 15px; font-weight: bold;}
.user-name, .user-role {font-size: 16px; vertical-align: top; line-height: 50px;}
.cell .avatar {display: inline-block; width: 40px; height: 40px; line-height: 40px; position: absolute; left: 200px;}
.user-name {font-weight: bold;}
.user-role {color: #5B606E;}
.user-name, .user-role {font-size: 14px; vertical-align: top; display: table; padding-left: 250px;}
.line {border-top: 1px solid #eee; margin: 10px;}
#avatarUploadBtn {padding: 4px 12px; position: relative; left: 32px; bottom: 30px;}
#avatarForm {height: 10px;}
module/user/lang/de.php
+3
View File
@@ -40,8 +40,11 @@ $lang->user->dingding = 'DingDing';
$lang->user->slack = 'Slack';
$lang->user->whatsapp = 'WhatsApp';
$lang->user->address = 'Adresse';
$lang->user->addressAB = 'Adresse';
$lang->user->zipcode = 'PLZ';
$lang->user->join = 'Beigetreten am';
$lang->user->joinAB = 'Induktion';
$lang->user->priv = 'Gruppe';
$lang->user->visits = 'Besuche';
$lang->user->visions = 'Version Type';
$lang->user->ip = 'Letzte IP';
module/user/lang/en.php
+3
View File
@@ -40,8 +40,11 @@ $lang->user->dingding = 'DingDing';
$lang->user->slack = 'Slack';
$lang->user->whatsapp = 'WhatsApp';
$lang->user->address = 'Address';
$lang->user->addressAB = 'Address';
$lang->user->zipcode = 'ZipCode';
$lang->user->join = 'Joined';
$lang->user->joinAB = 'Joined';
$lang->user->priv = 'Privilege';
$lang->user->visits = 'Visits';
$lang->user->visions = 'Version Type';
$lang->user->ip = 'Last IP';
module/user/lang/fr.php
+3
View File
@@ -40,8 +40,11 @@ $lang->user->dingding = 'DingDing';
$lang->user->slack = 'Slack';
$lang->user->whatsapp = 'WhatsApp';
$lang->user->address = 'Adresse';
$lang->user->addressAB = 'Adresse';
$lang->user->zipcode = 'Code Postal';
$lang->user->join = 'Ajouté le';
$lang->user->joinAB = 'Ajouté le';
$lang->user->priv = 'Autorité';
$lang->user->visits = 'Nb Visites';
$lang->user->visions = 'Version Type';
$lang->user->ip = 'Dernière IP';
module/user/lang/vi.php
+3
View File
@@ -39,8 +39,11 @@ $lang->user->dingding = 'DingDing';
$lang->user->slack = 'Slack';
$lang->user->whatsapp = 'WhatsApp';
$lang->user->address = 'Địa chỉ';
$lang->user->addressAB = 'Địa chỉ';
$lang->user->zipcode = 'ZipCode';
$lang->user->join = 'Đã tham gia';
$lang->user->joinAB = 'Đã tham gia';
$lang->user->priv = 'Nhóm quyền';
$lang->user->visits = 'Visits';
$lang->user->ip = 'IP gần nhất';
$lang->user->last = 'Đăng nhập gần nhất';
module/user/lang/zh-cn.php
+3
View File
@@ -40,8 +40,11 @@ $lang->user->dingding = '钉钉';
$lang->user->slack = 'Slack';
$lang->user->whatsapp = 'WhatsApp';
$lang->user->address = '通讯地址';
$lang->user->addressAB = '地址';
$lang->user->zipcode = '邮编';
$lang->user->join = '入职日期';
$lang->user->joinAB = '入职';
$lang->user->priv = '权限';
$lang->user->visits = '访问次数';
$lang->user->visions = '界面类型';
$lang->user->ip = '最后IP';
module/user/view/profile.html.php
+19 -10
View File
@@ -12,18 +12,27 @@
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<?php include './featurebar.html.php';?>
<?php if(!isonlybody()):?>
<style>#mainContent{width: 60%; margin-left: 20%;}</style>
<?php include './featurebar.html.php';?>
<style>
#mainContent {width: 60%; margin-left: 20%;}
.cell .avatar {left: 45% !important;}
.user-name, .user-role {padding-left: 47% !important;}
</style>
<?php endif;?>
<?php if(!zget($lang->user->roleList, $user->role, '')):?>
<style>.user-name {line-height: 40px;}</style>
<?php endif;?>
<div id='mainContent'>
<div class='cell'>
<div class='main-header text-center'>
<span class="avatar avatar bg-secondary avatar-circle">
<?php echo $user->avatar ? html::image($user->avatar) : strtoupper($user->account[0]);?>
</span>
<span class='user-name'><?php echo $user->realname;?></span>
<span class='user-role'><?php echo zget($lang->user->roleList, $user->role, '');?></span>
<div class="avatar avatar bg-secondary avatar-circle">
<?php echo $user->avatar ? html::image($user->avatar) : strtoupper($user->account[0]);?>
</div>
<div class='user-name'><?php echo $user->realname;?></div>
<?php if(zget($lang->user->roleList, $user->role, '')):?>
<div class='user-role'><?php echo zget($lang->user->roleList, $user->role, '');?></div>
<?php endif;?>
</div>
<div class='row'>
<table>
@@ -61,9 +70,9 @@
<td><?php echo zget($lang->user->roleList, $user->role, '');?></td>
</tr>
<tr>
<th><?php echo $lang->user->join;?></th>
<th><?php echo $lang->user->joinAB;?></th>
<td><?php echo formatTime($user->join);?></td>
<th><?php echo $lang->group->priv;?></th>
<th><?php echo $lang->user->priv;?></th>
<td><?php foreach($groups as $group) echo $group->name . ' ';?></td>
</tr>
</table>
@@ -84,7 +93,7 @@
<tr>
<th><?php echo $lang->user->zipcode;?></th>
<td><?php echo $user->zipcode;?></td>
<th><?php echo $lang->user->address;?></th>
<th><?php echo $lang->user->addressAB;?></th>
<td title='<?php echo $user->address;?>'><?php echo $user->address;?></td>
</tr>
</table>