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

Merge branch 'master' into 20.x

Browse Source
This commit is contained in:
Yagami
2020-08-26 16:10:36 +08:00
parent 0f7a173c85 b3f9379148
commit b72a7dee43
701 changed files with 33172 additions and 3307 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/view/header.lite.html.php
+8 -1
View File
@@ -46,7 +46,7 @@ $onlybody = zget($_GET, 'onlybody', 'no');
}
if($this->app->getViewType() == 'xhtml') css::import($defaultTheme . 'x.style.css');
if(!defined('IN_INSTALL') and commonModel::isTutorialMode())
if(defined('IN_USE') and commonModel::isTutorialMode())
{
$wizardModule = defined('WIZARD_MODULE') ? WIZARD_MODULE : $this->moduleName;
$wizardMethod = defined('WIZARD_METHOD') ? WIZARD_METHOD : $this->methodName;
@@ -62,6 +62,13 @@ $onlybody = zget($_GET, 'onlybody', 'no');
<!--[if lt IE 10]>
<?php js::import($jsRoot . 'jquery/placeholder/min.js'); ?>
<![endif]-->
<?php
/* Load hook files for current page. */
$extPath = $this->app->getModuleRoot() . '/common/ext/view/';
$extHookRule = $extPath . 'header.*.hook.php';
$extHookFiles = glob($extHookRule);
if($extHookFiles) foreach($extHookFiles as $extHookFile) include $extHookFile;
?>
</head>
<?php if($this->cookie->hideMenu): ?>
<body class='menu-hide'>