Merge branch 'sprint/scx_header' into 'master'
* SupportLang. See merge request easycorp/zentaopms!3763
This commit is contained in:
@@ -8,6 +8,7 @@ $defaultTheme = $webRoot . 'theme/default/';
|
|||||||
$langTheme = $themeRoot . 'lang/' . $clientLang . '.css';
|
$langTheme = $themeRoot . 'lang/' . $clientLang . '.css';
|
||||||
$clientTheme = $this->app->getClientTheme();
|
$clientTheme = $this->app->getClientTheme();
|
||||||
$onlybody = zget($_GET, 'onlybody', 'no');
|
$onlybody = zget($_GET, 'onlybody', 'no');
|
||||||
|
$defaultLang = array('zh-cn', 'zh-tw', 'en');
|
||||||
?>
|
?>
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang='<?php echo $clientLang;?>'>
|
<html lang='<?php echo $clientLang;?>'>
|
||||||
@@ -31,7 +32,7 @@ $onlybody = zget($_GET, 'onlybody', 'no');
|
|||||||
|
|
||||||
js::import($jsRoot . 'jquery/lib.js');
|
js::import($jsRoot . 'jquery/lib.js');
|
||||||
js::import($jsRoot . 'zui/min.js?t=' . $timestamp);
|
js::import($jsRoot . 'zui/min.js?t=' . $timestamp);
|
||||||
if($clientLang === 'ja') js::import($jsRoot . 'zui/lang.' . $clientLang . '.min.js?t=' . $timestamp);
|
if(!in_array($clientLang, $defaultLang)) js::import($jsRoot . 'zui/lang.' . $clientLang . '.min.js?t=' . $timestamp);
|
||||||
js::import($jsRoot . 'my.full.js?t=' . $timestamp);
|
js::import($jsRoot . 'my.full.js?t=' . $timestamp);
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -41,7 +42,7 @@ $onlybody = zget($_GET, 'onlybody', 'no');
|
|||||||
if(!file_exists($this->app->getThemeRoot() . 'default/' . $this->cookie->lang . '.' . $this->cookie->theme . '.css')) $minCssFile = $defaultTheme . 'en.' . $this->cookie->theme . '.css';
|
if(!file_exists($this->app->getThemeRoot() . 'default/' . $this->cookie->lang . '.' . $this->cookie->theme . '.css')) $minCssFile = $defaultTheme . 'en.' . $this->cookie->theme . '.css';
|
||||||
css::import($minCssFile);
|
css::import($minCssFile);
|
||||||
js::import($jsRoot . 'all.js');
|
js::import($jsRoot . 'all.js');
|
||||||
if($clientLang === 'ja') js::import($jsRoot . 'zui/lang.' . $clientLang . '.min.js');
|
if(!in_array($clientLang, $defaultLang)) js::import($jsRoot . 'zui/lang.' . $clientLang . '.min.js');
|
||||||
}
|
}
|
||||||
if($this->app->getViewType() == 'xhtml') css::import($defaultTheme . 'x.style.css');
|
if($this->app->getViewType() == 'xhtml') css::import($defaultTheme . 'x.style.css');
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user