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

* Finish task #9023.

Browse Source
This commit is contained in:
Yagami
2021-01-19 10:10:47 +08:00
parent dd9b052b24
commit 2db4bb2c4a
3 changed files with 55 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+6 -2
View File
@@ -276,7 +276,9 @@ class commonModel extends model
$isGuest = $app->user->account == 'guest';
echo "<a class='dropdown-toggle' data-toggle='dropdown'>";
echo "<div class='avatar avatar bg-secondary avatar-circle'>" . strtoupper($app->user->account[0]) . "</div>\n";
echo "<div class='avatar avatar bg-secondary avatar-circle'>";
echo $app->user->avatar ? html::image($app->user->avatar) : strtoupper($app->user->account[0]);
echo "</div>\n";
echo '</a>';
echo "<ul class='dropdown-menu pull-right'>";
if(!$isGuest)
@@ -284,7 +286,9 @@ class commonModel extends model
$noRole = (!empty($app->user->role) && isset($lang->user->roleList[$app->user->role])) ? '' : ' no-role';
echo '<li class="user-profile-item">';
echo "<a href='" . helper::createLink('my', 'profile', '', '', true) . "' data-width='600' class='iframe $noRole'" . '>';
echo "<div class='avatar avatar bg-secondary avatar-circle'>" . strtoupper($app->user->account[0]) . "</div>\n";
echo "<div class='avatar avatar bg-secondary avatar-circle'>";
echo $app->user->avatar ? html::image($app->user->avatar) : strtoupper($app->user->account[0]);
echo "</div>\n";
echo '<div class="user-profile-name">' . (empty($app->user->realname) ? $app->user->account : $app->user->realname) . '</div>';
if(isset($lang->user->roleList[$app->user->role])) echo '<div class="user-profile-role">' . $lang->user->roleList[$app->user->role] . '</div>';
echo '</a></li><li class="divider"></li>';
module/my/view/profile.html.php
+12 -1
View File
@@ -14,7 +14,18 @@
<div id='mainContent'>
<div class='cell'>
<div class='main-header text-center'>
<span class="avatar avatar bg-secondary avatar-circle">A</span>
<span class="avatar avatar bg-secondary avatar-circle">
<?php
if($user->avatar)
{
echo html::image($app->user->avatar);
}
else
{
echo strtoupper($app->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>
<form method='post' action=<?php echo inlink('uploadAvatar');?> id='avatarForm' enctype='multipart/form-data'>
module/user/view/cropavatar.html.php
+37 -27
View File
@@ -11,31 +11,41 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<table class='table table-form'>
<tr>
<td>
<div class="img-cutter fixed-ratio" id="imgCutter" style="max-width: 100%">
<div class="canvas">
<?php
if(empty($user->avatar))
{
echo html::image($image->webPath);
}
else
{
echo html::image($user->avatar);
}
?>
</div>
<div class="form-actions">
<h5 id='avatarCropTip'><?php echo $lang->user->cropAvatarTip;?></h5>
<div class="img-cutter-preview"></div>
<button type="button" class="btn btn-primary img-cutter-submit"><?php echo $lang->save;?></button> <?php echo html::a(inlink('profile'), $lang->goback, "class='btn loadInModal'");?>
</div>
</div>
</td>
</tr>
</table>
<script> /*! TangBin: image.ready.js http://www.planeart.cn/?p=1121 */ !function(n){"use strict";n.zui.imgReady=function(){var n=[],l=null,e=function(){for(var l=0;l<n.length;l++)n[l].end?n.splice(l--,1):n[l]();!n.length&&o()},o=function(){clearInterval(l),l=null};return function(o,r,t,u){var c,i,a,d,f,h=new Image;return h.src=o,h.complete?(r.call(h),void(t&&t.call(h))):(i=h.width,a=h.height,h.onerror=function(){u&&u.call(h),c.end=!0,h=h.onload=h.onerror=null},c=function(){d=h.width,f=h.height,(d!==i||f!==a||d*f>1024)&&(r.call(h),c.end=!0)},c(),h.onload=function(){!c.end&&c(),t&&t.call(h),h=h.onload=h.onerror=null},void(c.end||(n.push(c),null===l&&(l=setInterval(e,40)))))}}()}(jQuery); </script>
<?php js::import($this->app->getWebRoot() . 'js/zui/imgcutter/min.js');?>
<?php css::import($this->app->getWebRoot() . 'js/zui/imgcutter/min.css');?>
<div id='mainContent' class='main-content'>
<div class='center-block'>
<div class='main-header'>
<h2><?php echo $lang->user->cropAvatar;?></h2>
</div>
<table class='table table-form'>
<tr>
<td>
<div class="img-cutter fixed-ratio" id="imgCutter" style="max-width: 100%">
<div class="canvas">
<?php
if(empty($user->avatar))
{
echo html::image($image->webPath);
}
else
{
echo html::image($user->avatar);
}
?>
</div>
<div class="form-actions">
<h5 id='avatarCropTip'><?php echo $lang->user->cropAvatarTip;?></h5>
<div class="img-cutter-preview"></div>
<button type="button" class="btn btn-primary img-cutter-submit"><?php echo $lang->save;?></button>
</div>
</div>
</td>
</tr>
</table>
</div>
</div>
<script>
var $imgCutter = $("#imgCutter");
$imgCutter.imgCutter(
@@ -44,12 +54,12 @@ $imgCutter.imgCutter(
minWidth: 48,
minHeight: 48,
post: '<?php echo inlink('cropavatar', "image={$image->id}")?>',
ready: function() {$.zui.ajustModalPosition(); $imgCutter.css('width', $imgCutter.closest('.modal-dialog').width() - 50);},
ready: function() {$.zui.ajustModalPosition(); $imgCutter.css('width', $imgCutter.closest('#mainContent').width());},
done: function(response)
{
$('#start .avatar, #startMenu .avatar').html('<img src="<?php echo $user->avatar?>?v=' + $.zui.uuid() + '" />');
if($('#start .avatar, #startMenu .avatar').hasClass('with-text')) $('#start .avatar, #startMenu .avatar').toggleClass('with-text').css('background', 'none');
$('#ajaxModal').load(createLink('user', 'profile'), function(){$.zui.ajustModalPosition()});
location.href = createLink('my', 'profile');
},
onSizeError: function(size)
{