diff --git a/module/common/model.php b/module/common/model.php index 6d7ef6cf9b..c937498a6f 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -283,12 +283,12 @@ class commonModel extends model { $noRole = (!empty($app->user->role) && isset($lang->user->roleList[$app->user->role])) ? '' : ' no-role'; echo '
  • '; - echo "'; + echo "'; echo "
    " . strtoupper($app->user->account[0]) . "
    \n"; echo ''; if(isset($lang->user->roleList[$app->user->role])) echo ''; echo '
  • '; - echo '
  • ' . html::a(helper::createLink('my', 'profile', '', '', true), " " . $lang->profile, '', "class='iframe'") . '
  • '; + echo '
  • ' . html::a(helper::createLink('my', 'profile', '', '', true), " " . $lang->profile, '', "class='iframe' data-width='500'") . '
  • '; echo '
  • ' . html::a(helper::createLink('my', 'changepassword', '', '', true), " " . $lang->changePassword, '', "class='iframe' data-width='500'") . '
  • '; echo "
  • "; diff --git a/module/my/css/profile.css b/module/my/css/profile.css index 5381d8a33f..d8b4e6ec8e 100644 --- a/module/my/css/profile.css +++ b/module/my/css/profile.css @@ -1,16 +1,6 @@ -.col-6{width:50% !important;} -.col-sm-6{width:49% !important;} -.cell{height:440px; width: 100%} -.cell .divider{ display: block; width: 1px; height: 340px; background-color: rgba(0,0,0,.05); float: left;} -.main-header{margin-bottom:20px;} -.main-header .user-name{margin: 0 10px 0 0; font-size: 14px; line-height: 34px; font-weight: bold;} -.main-header .user-role{margin: 0 10px 0 0; font-size: 12px; line-height: 34px;} +.cell{height:440px;} +.row table{width: 100%;} +.row th{width: 20%; line-height: 30px; padding-right: 20px; text-align: right; font-weight: 500;} +.row td{width: 30%; text-align: left; font-weight: 700;} .main-actions{margin: 20px 0 20px 0; text-align: center;} .user-title{margin: 5px 10px; font-size: 14px; font-weight: bold; border-left: 3px solid #006af1; 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;} diff --git a/module/my/view/profile.html.php b/module/my/view/profile.html.php index e732bc9e34..4334efdf57 100644 --- a/module/my/view/profile.html.php +++ b/module/my/view/profile.html.php @@ -18,15 +18,23 @@ user->roleList, $user->role);?>
    -
    -
    user->basicInfo;?>
    -
    -
    user->realname;?>
    -
    realname;?>
    -
    user->account;?>
    -
    account;?>
    -
    user->dept;?>
    -
    +
    user->basicInfo;?>
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    user->realname;?>realname;?>user->gender;?>user->genderList, $user->gender);?>
    user->account;?>account;?>user->email;?>email;?>
    user->dept;?> - -
    user->join;?>
    -
    join);?>
    - -
    user->contactInfo;?>
    -
    -
    user->mobile;?>
    -
    mobile;?>
    -
    user->phone;?>
    -
    phone;?>
    -
    user->weixin;?>
    -
    weixin;?>
    -
    user->qq;?>
    -
    qq;?>
    -
    user->zipcode;?>
    -
    zipcode;?>
    -
    -
    user->else;?>
    -
    -
    user->commiter;?>
    -
    commiter;?>
    -
    user->ip;?>
    -
    ip;?>
    -
    - -
    -
    -
    user->gender;?>
    -
    user->genderList, $user->gender);?>
    -
    user->email;?>
    -
    email;?>
    -
    user->role;?>
    -
    user->roleList, $user->role);?>
    -
    group->priv;?>
    -
    name . ' '; ?>
    -
    -
    -
    user->skype;?>
    -
    skype) echo html::a("callto://$user->skype", $user->skype);?>
    -
    user->whatsapp;?>
    -
    whatsapp;?>
    -
    user->slack;?>
    -
    slack;?>
    -
    user->dingding;?>
    -
    dingding;?>
    -
    user->address;?>
    -
    address;?>
    -
    -
    -
    user->visits;?>
    -
    visits;?>
    -
    user->last;?>
    -
    last;?>
    -
    -
    +
    user->role;?>user->roleList, $user->role);?>
    user->join;?>join);?>group->priv;?>name . ' ';?>
    +
    user->contactInfo;?>
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    user->mobile;?>mobile;?>user->skype;?>skype) echo html::a("callto://$user->skype", $user->skype);?>
    user->phone;?>phone;?>user->whatsapp;?>whatsapp;?>
    user->weixin;?>weixin;?>user->slack;?>slack;?>
    user->qq;?>qq;?>user->dingding;?>dingding;?>
    user->zipcode;?>zipcode;?>user->address;?>address;?>
    +
    user->else;?>
    + + + + + + + + + + + + + +
    user->commiter;?>commiter;?>user->visits;?>visits;?>
    user->ip;?>ip;?>user->last;?>last;?>