From 920490847ed7d5910b321fe409724ca50b3f6eca Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 20 Dec 2018 17:18:01 +0800 Subject: [PATCH] * adjust for xuanxuan. --- www/theme/default/x.style.css | 6 +++--- xuanxuan/module/entry/ext/control/visit.php | 1 + xuanxuan/module/message/ext/lang/en/xuanxuan.php | 2 +- xuanxuan/module/message/ext/lang/zh-cn/xuanxuan.php | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/www/theme/default/x.style.css b/www/theme/default/x.style.css index f9df141c7a..cc2bbff026 100644 --- a/www/theme/default/x.style.css +++ b/www/theme/default/x.style.css @@ -1,12 +1,12 @@ -body{padding:0px; margin: 0px} +body{padding:0px; margin: 0px;background-color: #fff;} #header{display: none} #footer{display: none} #header+#main{min-width:auto} #main{padding: 0px;} #main .container{padding: 0px;} -#mainMenu{margin-top:0px;} +#mainMenu{margin-top:0px;background-color: #efefef;} +#mainContent .cell{box-shadow:none; -webkit-box-shadow: none;} .xuanxuan-card{padding-bottom:55px;} .xuancard-actions{width: 100%;text-align: center; padding: 10px 0;} .xuancard-actions.fixed{position: fixed; background: #fff; border-top: 1px solid #ddd; bottom: 0; margin-bottom: 0; z-index: 999; box-shadow: 0 -2px 10px rgba(0,0,0,0.15);} -.cell .histories{min-height:350px} diff --git a/xuanxuan/module/entry/ext/control/visit.php b/xuanxuan/module/entry/ext/control/visit.php index 16be2d2127..f8a69b3a7b 100644 --- a/xuanxuan/module/entry/ext/control/visit.php +++ b/xuanxuan/module/entry/ext/control/visit.php @@ -59,6 +59,7 @@ class entry extends control $xxInstalled = $user->account . 'installed'; if(!isset($this->config->xxclient->$xxInstalled)) $this->loadModel('setting')->setItem("system.common.xxclient.{$user->account}installed", '1'); + if(!isset($this->config->xxserver->installed)) $this->loadModel('setting')->setItem("system.common.xxserver.installed", '1'); $this->session->set('user', $user); $this->app->user = $this->session->user; diff --git a/xuanxuan/module/message/ext/lang/en/xuanxuan.php b/xuanxuan/module/message/ext/lang/en/xuanxuan.php index 5f17d9ff8d..a75df906c9 100644 --- a/xuanxuan/module/message/ext/lang/en/xuanxuan.php +++ b/xuanxuan/module/message/ext/lang/en/xuanxuan.php @@ -1,5 +1,5 @@ message->typeList['xuanxuan'] = 'Xuanxuan'; +$lang->message->typeList['xuanxuan'] = 'Client'; $lang->message->sender = 'ZentaoPMS'; diff --git a/xuanxuan/module/message/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/module/message/ext/lang/zh-cn/xuanxuan.php index 4176c92aa4..5044f0980d 100644 --- a/xuanxuan/module/message/ext/lang/zh-cn/xuanxuan.php +++ b/xuanxuan/module/message/ext/lang/zh-cn/xuanxuan.php @@ -1,5 +1,5 @@ message->typeList['xuanxuan'] = '喧喧'; +$lang->message->typeList['xuanxuan'] = '客户端'; $lang->message->sender = '禅道项目管理';