diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 1c6a3786c2..9cd57439b5 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -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"; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 44cd85fe22..e8022f9f17 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -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"; diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 35aef6f5fc..d291be8c95 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -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"; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index b56b7e3fea..eb4cc5bf63 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -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"; diff --git a/module/common/model.php b/module/common/model.php index 06c0df19fe..608e445239 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -1423,6 +1423,9 @@ class commonModel extends model echo "
  • "; echo "" . " " . $lang->clientName . "
    • '; } diff --git a/module/doc/css/createbasicinfo.css b/module/doc/css/createbasicinfo.css new file mode 100644 index 0000000000..a6a00155ce --- /dev/null +++ b/module/doc/css/createbasicinfo.css @@ -0,0 +1 @@ +#whiteListBox .input-group:last-child {margin-top: 10px;} diff --git a/module/doc/js/create.js b/module/doc/js/create.js index c3d6455f72..7c70650790 100644 --- a/module/doc/js/create.js +++ b/module/doc/js/create.js @@ -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')); diff --git a/module/doc/js/selectlibtype.js b/module/doc/js/selectlibtype.js index 14a81d6197..719e0e85bc 100644 --- a/module/doc/js/selectlibtype.js +++ b/module/doc/js/selectlibtype.js @@ -1,6 +1,6 @@ $(function() { - $("input[name=objectType]").trigger('change'); + loadDocLibs('product'); }) /** diff --git a/module/doc/view/create.html.php b/module/doc/view/create.html.php index a4c9920f9e..5ce268c485 100644 --- a/module/doc/view/create.html.php +++ b/module/doc/view/create.html.php @@ -143,6 +143,7 @@ $("a[href^='###']").click(function() +doc->textTypes);?> doc->noticeAcl['doc']);?> diff --git a/module/doc/view/createtexttype.html.php b/module/doc/view/createtexttype.html.php index 9d2b499d3b..b6d140b42d 100644 --- a/module/doc/view/createtexttype.html.php +++ b/module/doc/view/createtexttype.html.php @@ -176,6 +176,7 @@ $(function() $('iframe.ke-edit-iframe').contents().find('.article-content').css('padding', '20px 20px 0 20px'); }) +doc->textTypes);?> doc->noticeAcl['doc']);?> diff --git a/module/doc/view/tablecontents.html.php b/module/doc/view/tablecontents.html.php index d28a2e42ff..6442f4f00a 100644 --- a/module/doc/view/tablecontents.html.php +++ b/module/doc/view/tablecontents.html.php @@ -93,11 +93,12 @@ if(empty($type)) $type = 'product'; $html .= ""; diff --git a/www/theme/default/images/main/mobile_qrcode.png b/www/theme/default/images/main/mobile_qrcode.png new file mode 100644 index 0000000000..f73949afbe Binary files /dev/null and b/www/theme/default/images/main/mobile_qrcode.png differ diff --git a/www/theme/default/style.css b/www/theme/default/style.css index abe34e216e..da3819ad5f 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -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;}