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

Merge branch 'sprint/hufangzhou_62965' into 'master'

Browse Source 
* Finish task #62965. Fix bug #26130, #26129, #26120.

See merge request easycorp/zentaopms!4843
This commit is contained in:
王怡栋
2022-08-08 08:47:08 +00:00
parent ac968a603a 96506b7125
commit 22bf2d8058
13 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/de.php
+1
View File
@@ -431,6 +431,7 @@ $lang->colorPicker->errorTip = 'Not a valid color value';
$lang->downNotify = "Download Desktop Notification";
$lang->clientName = "Desktop";
$lang->downloadClient = "Download ZenTao Desktop";
$lang->downloadMobile = "Download Mobile Terminal";
$lang->clientHelp = "Client Help";
$lang->clientHelpLink = "https://www.zentao.pm/book/zentaomanual/scrum-tool-im-integration-206.html";
$lang->website = "http://www.zentao.net";
module/common/lang/en.php
+1
View File
@@ -431,6 +431,7 @@ $lang->colorPicker->errorTip = 'Not a valid color value';
$lang->downNotify = "Download Desktop Notification";
$lang->clientName = "Desktop";
$lang->downloadClient = "Download ZenTao Desktop";
$lang->downloadMobile = "Download Mobile Terminal";
$lang->clientHelp = "Client Help";
$lang->clientHelpLink = "https://www.zentao.pm/book/zentaomanual/scrum-tool-im-integration-206.html";
$lang->website = "https://www.zentao.pm";
module/common/lang/fr.php
+1
View File
@@ -431,6 +431,7 @@ $lang->colorPicker->errorTip = "Ce n'est pas une valeur de couleur valide";
$lang->downNotify = "Télécharger la notification sur le bureau";
$lang->clientName = "Desktop";
$lang->downloadClient = "Télécharger ZenTao Desktop";
$lang->downloadMobile = "Download Mobile Terminal";
$lang->clientHelp = "Aide Client";
$lang->clientHelpLink = "https://www.zentao.pm/book/zentaomanual/scrum-tool-im-integration-206.html";
$lang->website = "https://www.zentao.pm";
module/common/lang/zh-cn.php
+1
View File
@@ -431,6 +431,7 @@ $lang->colorPicker->errorTip = '不是有效的颜色值';
$lang->downNotify = "下载桌面提醒";
$lang->clientName = "客户端";
$lang->downloadClient = "下载客户端";
$lang->downloadMobile = "下载移动端";
$lang->clientHelp = "客户端使用说明";
$lang->clientHelpLink = "http://www.zentao.net/book/zentaopmshelp/302.html#2";
$lang->website = "https://www.zentao.net";
module/common/model.php
+3
View File
@@ -1423,6 +1423,9 @@ class commonModel extends model
echo "<li class='dropdown-submenu'>";
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 class='dropdown-submenu' id='downloadMobile'><a href='javascript:;'>" . $lang->downloadMobile . "</a><ul class='dropdown-menu pull-left''>";
echo "<li><div class='mobile-qrcode'><img src='{$config->webRoot}theme/default/images/main/mobile_qrcode.png' /><div class='mobile-version'><span>v1.2</span></div></div></li>";
echo "</ul></li>";
echo '<li>' . html::a($lang->clientHelpLink, $lang->clientHelp, '', "title='$lang->clientHelp' target='_blank'") . '</li>';
echo '</ul></li>';
}
module/doc/css/createbasicinfo.css
+1
View File
@@ -0,0 +1 @@
#whiteListBox .input-group:last-child {margin-top: 10px;}
module/doc/js/create.js
+1 -1
View File
@@ -62,7 +62,7 @@ $(function()
if($(".createCustomLib").length == 1) $(".createCustomLib").click(); // Fix bug #15139.
if(!fromGlobal)
if(!fromGlobal && textType.indexOf(docType) != -1)
{
var basicInfo = JSON.parse(sessionStorage.getItem('docBasicInfo'));
module/doc/js/selectlibtype.js
+1 -1
View File
@@ -1,6 +1,6 @@
$(function()
{
$("input[name=objectType]").trigger('change');
loadDocLibs('product');
})
/**
module/doc/view/create.html.php
+1
View File
@@ -143,6 +143,7 @@ $("a[href^='###']").click(function()
</form>
</div>
</div>
<?php js::set('textType', $config->doc->textTypes);?>
<?php js::set('docType', $docType);?>
<?php js::set('fromGlobal', $fromGlobal);?>
<?php js::set('noticeAcl', $lang->doc->noticeAcl['doc']);?>
module/doc/view/createtexttype.html.php
+1
View File
@@ -176,6 +176,7 @@ $(function()
$('iframe.ke-edit-iframe').contents().find('.article-content').css('padding', '20px 20px 0 20px');
})
</script>
<?php js::set('textType', $config->doc->textTypes);?>
<?php js::set('docType', $docType);?>
<?php js::set('fromGlobal', $fromGlobal);?>
<?php js::set('noticeAcl', $lang->doc->noticeAcl['doc']);?>
module/doc/view/tablecontents.html.php
+6 -5
View File
@@ -93,11 +93,12 @@ if(empty($type)) $type = 'product';
$html .= "<ul class='dropdown-menu' style='left:0px'>";
foreach($this->lang->doc->typeList as $typeKey => $typeName)
{
$icon = zget($this->config->doc->iconList, $typeKey);
$class = (strpos($this->config->doc->officeTypes, $typeKey) !== false or strpos($this->config->doc->textTypes, $typeKey) !== false) ? 'iframe' : '';
$html .= "<li>";
$html .= html::a(helper::createLink('doc', 'create', "objectType=$type&objectID=$objectID&libID=$libID&moduleID=0&type=$typeKey", '', $class ? true : false), "<i class='icon-$icon text-muted'></i> " . $typeName, '', "class='$class' data-app='{$this->app->tab}'");
$html .= "</li>";
$icon = zget($this->config->doc->iconList, $typeKey);
$class = (strpos($this->config->doc->officeTypes, $typeKey) !== false or strpos($this->config->doc->textTypes, $typeKey) !== false) ? 'iframe' : '';
$method = strpos($this->config->doc->textTypes, $typeKey) !== false ? 'createBasicInfo' : 'create';
$html .= "<li>";
$html .= html::a(helper::createLink('doc', $method, "objectType=$type&objectID=$objectID&libID=$libID&moduleID=0&type=$typeKey", '', $class ? true : false), "<i class='icon-$icon text-muted'></i> " . $typeName, '', "class='$class' data-app='{$this->app->tab}'");
$html .= "</li>";
if($typeKey == 'url') $html .= '<li class="divider"></li>';
}
$html .= "</ul></div>";
www/theme/default/images/main/mobile_qrcode.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

www/theme/default/style.css
+5
View File
@@ -104,3 +104,8 @@ body.xxc-embed.m-productplan-view,body.xxc-embed.m-bug-browse,body.xxc-embed.m-p
.xxc-embed #headerActions {right: 310px!important;}
.xxc-embed.body-modal #mainContent {padding-top: 13px !important;}
.xxc-embed .modal-iframe .modal-header .close {font-size: 28px !important;}
#downloadMobile .dropdown-menu {top: -31px !important; min-width: 130px; padding: 0;}
#downloadMobile .dropdown-menu .mobile-qrcode {padding: 15px 5px 0 5px;}
#downloadMobile .dropdown-menu .mobile-version {text-align: center;}
#downloadMobile .dropdown-menu .mobile-version span {color: #0c64eb; font-size: 12px; font-weight: 700;}