diff --git a/module/block/js/dashboard.ui.js b/module/block/js/dashboard.ui.js index a10c03f09b..314d44edf2 100644 --- a/module/block/js/dashboard.ui.js +++ b/module/block/js/dashboard.ui.js @@ -1,8 +1,8 @@ $(function() { - if($('#expiredModal').length) zui.Modal.open({id: 'expiredModal'}); - if($('#metriclibModal').length) zui.Modal.open({id: 'metriclibModal'}); - if($('#upgradeModal').length) zui.Modal.open({id: 'upgradeModal'}); + if($('#upgradeModal').length) zui.Modal.open({id: 'upgradeModal'}); + else if($('#expiredModal').length) zui.Modal.open({id: 'expiredModal'}); + else if($('#metriclibModal').length) zui.Modal.open({id: 'metriclibModal'}); }); function deleteBlock(dashboard, data, block) diff --git a/module/block/ui/dashboard.html.php b/module/block/ui/dashboard.html.php index d67df062d5..5b6867e974 100644 --- a/module/block/ui/dashboard.html.php +++ b/module/block/ui/dashboard.html.php @@ -42,116 +42,126 @@ dashboard set::onLayoutChange(jsRaw('handleLayoutChange')) ); -$remind = $this->loadModel('misc')->getPluginRemind(); -$remind ? modal -( - setID('expiredModal'), - set::title($lang->misc->expiredTipsTitle), - html($remind) -) : null; - -$metriclibRemind = $this->misc->getMetriclibRemind(); -$metriclibRemind ? modal -( - setID('metriclibModal'), - html($metriclibRemind) -) : null; - -$upgradeRemind = $this->misc->getUpgradeRemind(); +$upgradeRemind = $this->loadModel('misc')->getUpgradeRemind(); if($upgradeRemind) { - $guideInfo = $this->config->upgradeGuide[$config->edition]; - $clientLang = common::checkNotCN() ? 'en' : 'cn'; + $guideInfo = $this->config->upgradeGuide[$config->edition]; $version = $guideInfo['version']; $imagePath = $guideInfo['imagePath']; $moreLink = 'https://api.zentao.net/goto.php?item=' . $guideInfo['linkItem']; + + modal + ( + setID('upgradeModal'), + div + ( + setClass('page-block pageOne'), + img(set::src("{$imagePath}{$clientLang}_upgrade_guide1_{$version}.svg")), + div(setClass('learn-more-link flex justify-end text-root text-primary-600'), a(set::href($moreLink), set::target('_blank'), $lang->block->learnMore . ' >')), + div + ( + setClass('my-6 text-center'), + btn + ( + setClass('primary'), + on::click("togglePage('pageTwo')"), + $lang->block->nextPage + ) + ) + ), + div + ( + setClass('page-block pageTwo hidden'), + img(set::src("{$imagePath}{$clientLang}_upgrade_guide2_{$version}.svg")), + div(setClass('learn-more-link flex justify-end text-root text-primary-600'), a(set::href($moreLink), set::target('_blank'), $lang->block->learnMore . ' >')), + div + ( + setClass('my-6 text-center'), + btn + ( + setClass('mr-4'), + on::click("togglePage('pageOne')"), + $lang->block->prevPage + ), + btn + ( + setClass('primary'), + on::click("togglePage('pageThree')"), + $lang->block->nextPage + ) + ) + ), + div + ( + setClass('page-block pageThree hidden'), + img(set::src("{$imagePath}{$clientLang}_upgrade_guide3_{$version}.svg")), + div(setClass('learn-more-link flex justify-end text-root text-primary-600'), a(set::href($moreLink), set::target('_blank'), $lang->block->learnMore . ' >')), + div + ( + setClass('my-6 text-center'), + btn + ( + setClass('mr-4'), + on::click("togglePage('pageTwo')"), + $lang->block->prevPage + ), + btn + ( + setClass('primary'), + on::click("togglePage('pageFour')"), + $lang->block->nextPage + ) + ) + ), + div + ( + setClass('page-block pageFour hidden'), + img(set::src("{$imagePath}{$clientLang}_upgrade_guide4_{$version}.svg")), + div(setClass('learn-more-link flex justify-end text-root text-primary-600'), a(set::href($moreLink), set::target('_blank'), $lang->block->learnMore . ' >')), + div + ( + setClass('my-6 text-center'), + btn + ( + setClass('mr-4'), + on::click("togglePage('pageThree')"), + $lang->block->prevPage + ), + btn + ( + setClass('primary'), + setData('dismiss', 'modal'), + $lang->block->experience + ) + ) + ) + ); } -$upgradeRemind ? modal -( - setID('upgradeModal'), - div - ( - setClass('page-block pageOne'), - img(set::src("{$imagePath}{$clientLang}_upgrade_guide1_{$version}.svg")), - div(setClass('learn-more-link flex justify-end text-root text-primary-600'), a(set::href($moreLink), set::target('_blank'), $lang->block->learnMore . ' >')), - div +else +{ + $pluginRemind = $this->misc->getPluginRemind(); + if($pluginRemind) + { + modal ( - setClass('my-6 text-center'), - btn + setID('expiredModal'), + set::title($lang->misc->expiredTipsTitle), + html($pluginRemind) + ); + } + else + { + $metriclibRemind = $this->misc->getMetriclibRemind(); + if($metriclibRemind) + { + modal ( - setClass('primary'), - on::click("togglePage('pageTwo')"), - $lang->block->nextPage - ) - ) - ), - div - ( - setClass('page-block pageTwo hidden'), - img(set::src("{$imagePath}{$clientLang}_upgrade_guide2_{$version}.svg")), - div(setClass('learn-more-link flex justify-end text-root text-primary-600'), a(set::href($moreLink), set::target('_blank'), $lang->block->learnMore . ' >')), - div - ( - setClass('my-6 text-center'), - btn - ( - setClass('mr-4'), - on::click("togglePage('pageOne')"), - $lang->block->prevPage - ), - btn - ( - setClass('primary'), - on::click("togglePage('pageThree')"), - $lang->block->nextPage - ) - ) - ), - div - ( - setClass('page-block pageThree hidden'), - img(set::src("{$imagePath}{$clientLang}_upgrade_guide3_{$version}.svg")), - div(setClass('learn-more-link flex justify-end text-root text-primary-600'), a(set::href($moreLink), set::target('_blank'), $lang->block->learnMore . ' >')), - div - ( - setClass('my-6 text-center'), - btn - ( - setClass('mr-4'), - on::click("togglePage('pageTwo')"), - $lang->block->prevPage - ), - btn - ( - setClass('primary'), - on::click("togglePage('pageFour')"), - $lang->block->nextPage - ) - ) - ), - div - ( - setClass('page-block pageFour hidden'), - img(set::src("{$imagePath}{$clientLang}_upgrade_guide4_{$version}.svg")), - div(setClass('learn-more-link flex justify-end text-root text-primary-600'), a(set::href($moreLink), set::target('_blank'), $lang->block->learnMore . ' >')), - div - ( - setClass('my-6 text-center'), - btn - ( - setClass('mr-4'), - on::click("togglePage('pageThree')"), - $lang->block->prevPage - ), - btn - ( - setClass('primary'), - setData('dismiss', 'modal'), - $lang->block->experience - ) - ) - ) -) : null; + setID('metriclibModal'), + html($metriclibRemind) + ); + }; + } +} render(); diff --git a/module/misc/model.php b/module/misc/model.php index ed61b378ab..c53949147c 100644 --- a/module/misc/model.php +++ b/module/misc/model.php @@ -95,6 +95,7 @@ class miscModel extends model { if(!$this->app->user->admin) return ''; if($this->config->edition == 'open') return ''; + if($this->config->vision != 'rnd') return ''; $remind = ''; if(empty($this->config->global->metriclibShowed))