From ab05cdc588c7b1f91e96bb5487a1b8b6616d584d Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Tue, 29 Dec 2020 13:34:29 +0800 Subject: [PATCH] * Finish task#8746. --- module/common/lang/de.php | 3 ++- module/common/lang/en.php | 3 ++- module/common/lang/fr.php | 3 ++- module/common/lang/vi.php | 3 ++- module/common/lang/zh-cn.php | 3 ++- module/common/model.php | 3 ++- module/index/css/index.css | 12 ++++++++++++ module/index/lang/de.php | 6 ++++++ module/index/lang/en.php | 6 +++--- module/index/lang/fr.php | 6 ++++++ module/index/lang/vi.php | 6 ++++++ module/index/lang/zh-cn.php | 7 ++++--- module/index/lang/zh-tw.php | 6 ++++++ module/index/view/index.html.php | 22 +++++++++++++++++----- 14 files changed, 72 insertions(+), 17 deletions(-) diff --git a/module/common/lang/de.php b/module/common/lang/de.php index b06aadcb31..ad7b0b2c4c 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -734,7 +734,8 @@ $lang->pager->pageOfTotal = "Page {page} of {totalPage $lang->colorPicker = new stdclass(); $lang->colorPicker->errorTip = 'Not a valid color value'; -$lang->proVersion = "ZenTao Pro   "; +$lang->proVersion = "Upgrade"; +$lang->globalLogo = ""; $lang->downNotify = "Download Desktop Notification"; $lang->downloadClient = "Download ZenTao Desktop"; $lang->clientHelp = "Client Help"; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 6cd847c9d8..96064daa25 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -734,7 +734,8 @@ $lang->pager->pageOfTotal = "Page {page} of {totalPage $lang->colorPicker = new stdclass(); $lang->colorPicker->errorTip = 'Not a valid color value'; -$lang->proVersion = "ZenTao Pro   "; +$lang->proVersion = "Upgrade"; +$lang->globalLogo = ""; $lang->downNotify = "Download Desktop Notification"; $lang->downloadClient = "Download ZenTao Desktop"; $lang->clientHelp = "Client Help"; diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index fe91092e33..8c8ce486e9 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -734,7 +734,8 @@ $lang->pager->pageOfTotal = "Page {page} sur {totalPag $lang->colorPicker = new stdclass(); $lang->colorPicker->errorTip = "Ce n'est pas une valeur de couleur valide"; -$lang->proVersion = "ZenTao Pro   "; +$lang->proVersion = "Upgrade"; +$lang->globalLogo = ""; $lang->downNotify = "Télécharger la notification sur le bureau"; $lang->downloadClient = "Télécharger ZenTao Desktop"; $lang->clientHelp = "Aide Client"; diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php index 8e39e493d1..ff8c1be103 100644 --- a/module/common/lang/vi.php +++ b/module/common/lang/vi.php @@ -734,7 +734,8 @@ $lang->pager->pageOfTotal = "Page {page} of {totalPage $lang->colorPicker = new stdclass(); $lang->colorPicker->errorTip = 'Not a valid color value'; -$lang->proVersion = "ZenTao Pro   "; +$lang->proVersion = "Upgrade"; +$lang->globalLogo = ""; $lang->downNotify = "Download Desktop Notification"; $lang->downloadClient = "Download ZenTao Desktop"; $lang->clientHelp = "Client Help"; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index faef785c05..7b1f30a109 100755 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -735,7 +735,8 @@ $lang->pager->pageOfTotal = '第 {page}/{totalPage}colorPicker = new stdclass(); $lang->colorPicker->errorTip = '不是有效的颜色值'; -$lang->proVersion = "专业版   "; +$lang->proVersion = "升级"; +$lang->globalLogo = ""; $lang->downNotify = "下载桌面提醒"; $lang->downloadClient = "下载客户端"; $lang->clientHelp = "客户端使用说明"; diff --git a/module/common/model.php b/module/common/model.php index 77b1ff474b..1cd9de0f92 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -977,7 +977,8 @@ class commonModel extends model public static function printClientLink() { global $lang; - echo html::a(helper::createLink('misc', 'downloadClient', '', '', true), $lang->downloadClient, '', "title='$lang->downloadClient' class='text-primary iframe' data-width='600'") . html::a($lang->clientHelpLink, "", '', "title='$lang->clientHelp' target='_blank'") . '   '; + echo html::a(helper::createLink('misc', 'downloadClient', '', '', true), $lang->downloadClient, '', "title='$lang->downloadClient' class='btn btn-link iframe' data-width='600'"); + echo html::a($lang->clientHelpLink, "", '', "title='$lang->clientHelp' class='btn btn-link' target='_blank'"); } /** diff --git a/module/index/css/index.css b/module/index/css/index.css index 8b9061c484..ab85f6dd90 100644 --- a/module/index/css/index.css +++ b/module/index/css/index.css @@ -24,3 +24,15 @@ #userNav>li .lang .dropdown-menu, #userNav>li .theme .dropdown-menu{top: -60px} #userNav .dropdown-menu>li>a>.icon { position: initial; display: inline;} #userNav li.open>a{background:#0c64eb} +#poweredBy{width: 55%; position: absolute; top: 4px; right: 0; padding: 0px 40px 0px 0px;} + +#globalSearchDiv{width:50%; float: right;} +#globalSearchDiv .input-group{width: 70%; float: right; margin-top: 2px;} +#globalSearchInput {height: 28px; padding-left: 10px;} +#globalSearchButton {height: 28px;} + +#globalBarLogo {width: 100%; float: right;} +#globalBarLogo a {float: right; margin: 0px 5px;} +#globalBarLogo img{width: 72px; float: left; margin-top: 2px;} + +#globalMessages .icon{font-size: 24px; color: #16a8f8;} diff --git a/module/index/lang/de.php b/module/index/lang/de.php index acdccd57de..f425b4e96a 100644 --- a/module/index/lang/de.php +++ b/module/index/lang/de.php @@ -1,3 +1,9 @@ index->common = 'Home'; $lang->index->index = 'Home'; +$lang->index->search = 'Please input'; + +$lang->index->tab = new stdClass(); +$lang->index->tab->open = 'Open'; +$lang->index->tab->reload = 'Reload'; +$lang->index->tab->close = 'Close'; diff --git a/module/index/lang/en.php b/module/index/lang/en.php index 6cd3b879e1..faec55fd93 100644 --- a/module/index/lang/en.php +++ b/module/index/lang/en.php @@ -3,6 +3,6 @@ $lang->index->common = 'Home'; $lang->index->index = 'Home'; $lang->index->tab = new stdClass(); -$lang->index->tab->open = 'Open'; -$lang->index->tab->reload = 'Reload'; -$lang->index->tab->close = 'Close'; +$lang->index->tab->open = 'Open'; +$lang->index->tab->reload = 'Reload'; +$lang->index->tab->close = 'Close'; diff --git a/module/index/lang/fr.php b/module/index/lang/fr.php index 12a473a936..4c0a4078a0 100644 --- a/module/index/lang/fr.php +++ b/module/index/lang/fr.php @@ -1,3 +1,9 @@ index->common = 'Accueil'; $lang->index->index = 'Accueil'; +$lang->index->search = 'Please input'; + +$lang->index->tab = new stdClass(); +$lang->index->tab->open = 'Open'; +$lang->index->tab->reload = 'Reload'; +$lang->index->tab->close = 'Close'; diff --git a/module/index/lang/vi.php b/module/index/lang/vi.php index 546130d671..5b79fc86db 100644 --- a/module/index/lang/vi.php +++ b/module/index/lang/vi.php @@ -1,3 +1,9 @@ index->common = 'Trang chủ'; $lang->index->index = 'Trang chủ'; +$lang->index->search = 'Please input'; + +$lang->index->tab = new stdClass(); +$lang->index->tab->open = 'Open'; +$lang->index->tab->reload = 'Reload'; +$lang->index->tab->close = 'Close'; diff --git a/module/index/lang/zh-cn.php b/module/index/lang/zh-cn.php index 8c2fdf3696..eaa696200b 100644 --- a/module/index/lang/zh-cn.php +++ b/module/index/lang/zh-cn.php @@ -1,8 +1,9 @@ index->common = '首页'; $lang->index->index = '首页'; +$lang->index->search = '请输入'; $lang->index->tab = new stdClass(); -$lang->index->tab->open = '打开'; -$lang->index->tab->reload = '刷新'; -$lang->index->tab->close = '关闭'; +$lang->index->tab->open = '打开'; +$lang->index->tab->reload = '刷新'; +$lang->index->tab->close = '关闭'; diff --git a/module/index/lang/zh-tw.php b/module/index/lang/zh-tw.php index acd3f835f4..8f725721d9 100644 --- a/module/index/lang/zh-tw.php +++ b/module/index/lang/zh-tw.php @@ -1,3 +1,9 @@ index->common = '首頁'; $lang->index->index = '首頁'; +$lang->index->search = '請輸入'; + +$lang->index->tab = new stdClass(); +$lang->index->tab->open = '打開'; +$lang->index->tab->reload = '刷新'; +$lang->index->tab->close = '關閉'; diff --git a/module/index/view/index.html.php b/module/index/view/index.html.php index 709f37aecb..c77489af42 100644 --- a/module/index/view/index.html.php +++ b/module/index/view/index.html.php @@ -44,12 +44,24 @@ js::set('defaultOpen', $open);
- -
- zentaoPMS . $config->version;?>   - proVersion;?> + +
+ +
-