diff --git a/module/screen/control.php b/module/screen/control.php index 4af160ea6b..84d6da7694 100644 --- a/module/screen/control.php +++ b/module/screen/control.php @@ -20,15 +20,24 @@ class screen extends control */ public function browse($dimensionID = 0) { + $this->app->loadLang('admin'); + $this->loadModel('setting'); + $dimensionID = $this->loadModel('dimension')->setSwitcherMenu($dimensionID); - $this->loadModel('setting'); + /* BI guide. */ + $lang = (strpos($this->app->getClientLang(), 'zh') !== false) ? 'zh' : 'en'; + $version = ($this->config->edition == 'biz' or $this->config->edition == 'max') ? 'biz' : 'pms'; + $imageURL = "static/images/bi_guide_{$version}_{$lang}.png"; + $currentUser = $this->app->user->account; - $firstGuide = $this->setting->getItem("owner={$currentUser}&module=bi&key=firstGuide"); - if(empty($firstGuide)) $this->setting->setItem("{$currentUser}.bi.firstGuide", 1); + $moduleKey = $version . 'firstGuide'; + $firstGuide = $this->setting->getItem("owner={$currentUser}&module=bi&key={$moduleKey}"); + if(empty($firstGuide)) $this->setting->setItem("{$currentUser}.bi.{$moduleKey}", 1); $this->view->firstGuide = !empty($firstGuide); - $this->view->langSuffix = (strpos($this->app->getClientLang(), 'zh') !== false) ? 'zh' : 'en'; + $this->view->imageURL = $imageURL; + $this->view->version = $version; $this->view->title = $this->lang->screen->common; $this->view->screens = $this->screen->getList($dimensionID); $this->view->dimension = $dimensionID; diff --git a/module/screen/css/browse.css b/module/screen/css/browse.css index 1a446de418..afd8665f3f 100644 --- a/module/screen/css/browse.css +++ b/module/screen/css/browse.css @@ -33,8 +33,9 @@ .main-col .row .col-md-3 {padding: 8px;} .main-col .row .col-md-3 a {min-width: 297px;} -#firstGuide .modal-dialog {width: 750px !important;} -#firstGuide .modal-body {padding: 0 !important;} -#firstGuide .background-img {height: 430px !important;} +#firstGuide .modal-dialog {width: 800px !important;} +#firstGuide .modal-body {padding: 0 !important; max-height: 465px !important;} +#firstGuide .background-img {height: 460px !important;} #firstGuide .modal-footer {text-align: center !important; border-top: none !important; padding: 24px 0px !important;} #firstGuide .btn-wide {min-width: 90px !important;} +#firstGuide .clickable-area {position: absolute; width: 50px; height: 20px; top: 235px; right: 117px;} diff --git a/module/screen/css/browse.en.css b/module/screen/css/browse.en.css new file mode 100644 index 0000000000..bef44bcbdd --- /dev/null +++ b/module/screen/css/browse.en.css @@ -0,0 +1 @@ +#firstGuide .clickable-area {position: absolute; width: 50px; height: 20px; top: 250px; right: 130px;} diff --git a/module/screen/view/browse.html.php b/module/screen/view/browse.html.php index 8722b05d35..5da35f5202 100644 --- a/module/screen/view/browse.html.php +++ b/module/screen/view/browse.html.php @@ -47,9 +47,11 @@