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

Merge branch 'master' of https://git.zcorp.cc/zentaopms

Browse Source
This commit is contained in:
tianshujie98
2021-01-28 11:45:43 +08:00
parent 32e89fc96d 47731bb3c9
commit d8ac5728d8
10 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/common/lang/de.php
View File

@@ -780,7 +780,7 @@ $lang->colorPicker = new stdclass();
$lang->colorPicker->errorTip = 'Not a valid color value';
$lang->downNotify = "Download Desktop Notification";
$lang->client = "Desktop";
$lang->clientName = "Desktop";
$lang->downloadClient = "Download ZenTao Desktop";
$lang->clientHelp = "Client Help";
$lang->clientHelpLink = "https://www.zentao.pm/book/zentaomanual/scrum-tool-im-integration-206.html";

2
module/common/lang/en.php
View File

@@ -780,7 +780,7 @@ $lang->colorPicker = new stdclass();
$lang->colorPicker->errorTip = 'Not a valid color value';
$lang->downNotify = "Download Desktop Notification";
$lang->client = "Desktop";
$lang->clientName = "Desktop";
$lang->downloadClient = "Download ZenTao Desktop";
$lang->clientHelp = "Client Help";
$lang->clientHelpLink = "https://www.zentao.pm/book/zentaomanual/scrum-tool-im-integration-206.html";

2
module/common/lang/fr.php
View File

@@ -780,7 +780,7 @@ $lang->colorPicker = new stdclass();
$lang->colorPicker->errorTip = "Ce n'est pas une valeur de couleur valide";
$lang->downNotify = "Télécharger la notification sur le bureau";
$lang->client = "Desktop";
$lang->clientName = "Desktop";
$lang->downloadClient = "Télécharger ZenTao Desktop";
$lang->clientHelp = "Aide Client";
$lang->clientHelpLink = "https://www.zentao.pm/book/zentaomanual/scrum-tool-im-integration-206.html";

2
module/common/lang/vi.php
View File

@@ -780,7 +780,7 @@ $lang->colorPicker = new stdclass();
$lang->colorPicker->errorTip = 'Not a valid color value';
$lang->downNotify = "Download Desktop Notification";
$lang->client = "Desktop";
$lang->clientName = "Desktop";
$lang->downloadClient = "Download ZenTao Desktop";
$lang->clientHelp = "Client Help";
$lang->clientHelpLink = "https://www.zentao.pm/book/zentaomanual/scrum-tool-im-integration-206.html";

2
module/common/lang/zh-cn.php
View File

@@ -780,7 +780,7 @@ $lang->colorPicker = new stdclass();
$lang->colorPicker->errorTip = '不是有效的颜色值';
$lang->downNotify = "下载桌面提醒";
$lang->client = "客户端";
$lang->clientName = "客户端";
$lang->downloadClient = "下载客户端";
$lang->clientHelp = "客户端使用说明";
$lang->clientHelpLink = "http://www.zentao.net/book/zentaopmshelp/302.html#2";

2
module/common/model.php
View File

@@ -950,7 +950,7 @@ class commonModel extends model
if(isset($config->xxserver->installed) and $config->xuanxuan->turnon)
{
echo "<li class='dropdown-submenu'>";
echo "<a href='javascript:;'>" . "<i class='icon icon-download'></i> " . $lang->client . "</a><ul class='dropdown-menu pull-left'>";
echo "<a href='javascript:;'>" . "<i class='icon icon-download'></i> " . $lang->clientName . "</a><ul class='dropdown-menu pull-left'>";
echo '<li>' . html::a(helper::createLink('misc', 'downloadClient', '', '', true), $lang->downloadClient, '', "title='$lang->downloadClient' class='iframe text-ellipsis' data-width='600'") . '</li>';
echo '<li>' . html::a($lang->clientHelpLink, $lang->clientHelp, '', "title='$lang->clientHelp' target='_blank'") . '</li>';
echo '</ul></li>';

4
module/my/css/profile.css
View File

@@ -7,6 +7,6 @@ table+table{border-top: 1px solid #eee;}
.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;}
.avatar .btn{padding: 0;vertical-align: revert; border: 0;}
.avatar .btn-avatar{padding: 0;vertical-align: revert; border: 0; background-color: auto; color: #fff; font-size: 20px;}
.user-name{margin-left: 15px}
.user-name, .user-role{font-size: 16px; vertical-align: top;}
.user-name, .user-role{line-height: 50px; font-size: 16px; vertical-align: top;}

2
module/my/view/profile.html.php
View File

@@ -18,7 +18,7 @@
<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 $avatar = $user->avatar ? html::image($user->avatar) : strtoupper($user->account[0]);?>
<?php echo html::a('javascript:void(0);', $avatar, '', "class='btn btn-avatar' id='avatarUploadBtn' data-placement='right'");?>
<?php echo html::a('javascript:void(0);', $avatar, '', "class='btn-avatar' id='avatarUploadBtn' data-placement='right'");?>
</form>
</span>
<span class='user-name'><strong><?php echo $user->realname;?></strong></span>

1
module/upgrade/lang/version.php
View File

@@ -134,3 +134,4 @@ $lang->upgrade->fromVersions['12_5_1'] = '12.5.1';
$lang->upgrade->fromVersions['20_0_alpha1'] = '20.0.alpha1';
$lang->upgrade->fromVersions['20_0_beta1'] = '20.0.beta1';
$lang->upgrade->fromVersions['20_0_beta2'] = '20.0.beta2';
$lang->upgrade->fromVersions['20_0_beta3'] = '20.0.beta3';

2
module/user/model.php
View File

@@ -1160,7 +1160,7 @@ class userModel extends model
$fileIdList = array_keys($uploadResult);
$file = $this->file->getByID($fileIdList[0]);
$this->dao->update(TABLE_USER)->set('avatar')->eq($file->webPath)->where('account')->eq($this->app->user->account)->exec();
return array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => helper::createLink('user', 'cropavatar', "image={$file->id}"));
return array('result' => 'success', 'message' => '', 'locate' => helper::createLink('user', 'cropavatar', "image={$file->id}"));
}
/**