diff --git a/module/common/view/header.lite.html.php b/module/common/view/header.lite.html.php index c4981cfbae..685c876d23 100755 --- a/module/common/view/header.lite.html.php +++ b/module/common/view/header.lite.html.php @@ -1,5 +1,5 @@ -getExtViewFile(__FILE__)){include $extView; return helper::cd();}?> -getExtViewFile(__FILE__)){include $extView; return helper::cd();} $clientLang = $app->getClientLang(); $webRoot = $this->app->getWebRoot(); $jsRoot = $webRoot . "js/"; @@ -81,13 +81,13 @@ $xuanExtFile = $extensionRoot . 'xuan/common/ext/view/header.xuanxuan.html.hook. if(file_exists($xuanExtFile)) include $xuanExtFile; ?> -app->getViewType() == 'xhtml' ? 'allow-self-open' : '';?> - -moduleName == 'index' && $this->methodName == 'index'): ?> - '> - - - +app->getViewType() == 'xhtml' ? 'allow-self-open' : ''; +if(isset($pageBodyClass)) $bodyClass = $bodyClass . ' ' . $pageBodyClass; +if($this->moduleName == 'index' && $this->methodName == 'index') $bodyClass .= ' menu-' . ($this->cookie->hideMenu ? 'hide' : 'show'); +if(strpos($_SERVER['HTTP_USER_AGENT'], 'xuanxuan') !== false) $bodyClass .= ' xxc-embed'; +?> + app->getViewType() == 'xhtml'):?> + +
diff --git a/www/js/my.full.js b/www/js/my.full.js index 1a394c3c43..653d5b2285 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -210,7 +210,7 @@ function setImageSize(image, maxWidth, maxHeight) setTimeout(function() { maxHeightStyle = $image.height() > 0 ? 'max-height:' + maxHeight + 'px' : ''; - if($image.width() > 0 && $image.width() > maxWidth) $image.attr('width', maxWidth); + if(!document.getElementsByClassName('xxc-embed').length && $image.width() > 0 && $image.width() > maxWidth) $image.attr('width', maxWidth); $image.wrap(''); if($image.height() > 0 && $image.height() > maxHeight) $image.closest('a').append("" + lang.expand + " "); }, 50); diff --git a/www/theme/default/x.style.css b/www/theme/default/x.style.css index 24d222ce45..46064ecdfc 100644 --- a/www/theme/default/x.style.css +++ b/www/theme/default/x.style.css @@ -10,3 +10,8 @@ body{padding:0px; margin: 0px;background-color: #fff;} .xuanxuan-card{padding-bottom:55px;} .xuancard-actions{width: 100%;text-align: center; height: 35px; padding: 1px;} .xuancard-actions.fixed{position: fixed; background: #fff; border-top: 1px solid #eee; bottom: 0; margin-bottom: 0; z-index: 999;} +body.xxc-embed {overflow-x: auto; overflow-y: hidden;} +.xxc-embed #header {position: fixed;top: 0;width: 100%;z-index: 10;} +.xxc-embed #toolbar {position: fixed;right: 120px!important;} +.xxc-embed #main {position: absolute;top: 50px;bottom: 0;left: 0;right: 0;overflow: auto;} +.xxc-embed .fix-table-copy-wrapper {top: 50px!important;} diff --git a/xuanxuan/extension/xuan/index/ext/view/index.xuanxuan.html.hook.php b/xuanxuan/extension/xuan/index/ext/view/index.xuanxuan.html.hook.php index e056e5cd95..b9c0fb5e72 100644 --- a/xuanxuan/extension/xuan/index/ext/view/index.xuanxuan.html.hook.php +++ b/xuanxuan/extension/xuan/index/ext/view/index.xuanxuan.html.hook.php @@ -1,8 +1,6 @@