diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/footer.php | 14 | ||||
| -rw-r--r-- | includes/header.php | 25 |
2 files changed, 16 insertions, 23 deletions
diff --git a/includes/footer.php b/includes/footer.php index 489ca3a..d6444c2 100644 --- a/includes/footer.php +++ b/includes/footer.php @@ -34,14 +34,12 @@ <script src="<?php Utils::indexTheme('assets/js/pangu.js'); ?>"></script> <script src="<?php Utils::indexTheme('assets/js/l2dwidget.min.js'); ?>"></script> <?php endif; ?> - <script>var siteurl = '<?php $this->options->SiteUrl() ;?>';var owoJson = '<?php Utils::indexTheme('assets/OwO.json'); ?>'; - <?php if($this->options->customModel!=''): ?>var modelJson = "<?php echo $this->options->customModel(); ?>";<?php else: ?>var modelJson = '<?php if($this->options->cat && $this->options->cat==1){Utils::indexTheme('assets/model/hijiki/assets/hijiki.model.json');}elseif($this->options->cat && $this->options->cat==2){Utils::indexTheme('assets/model/tororo/assets/tororo.model.json');}?>';<?php endif; ?> - var modelHeight = <?php echo $this->options->ModelHeight(); ?>;var modelWidth = <?php echo $this->options->ModelWidth(); ?>; - <?php if($this->options->pjax && $this->options->pjax!=0) :?> - var loadPjax = true; - beforePjax = function() {NProgress.start();} - afterPjax = function() {<?php if($this->is('post') || $this->is('page')): ?>owoLoad();<?php endif; ?><?php $this->options->pjax_complete(); ?>} - <?php endif; ?></script> + <script>var siteurl = '<?php $this->options->SiteUrl() ;?>';var owoJson = '<?php Utils::indexTheme('assets/OwO.json'); ?>';<?php if($this->options->customModel!=''): ?>var modelJson = "<?php echo $this->options->customModel(); ?>";<?php else: ?>var modelJson = '<?php if($this->options->cat && $this->options->cat==1){Utils::indexTheme('assets/model/hijiki/assets/hijiki.model.json');}elseif($this->options->cat && $this->options->cat==2){Utils::indexTheme('assets/model/tororo/assets/tororo.model.json');}?>';<?php endif; ?> + <?php if($this->options->ModelHeight!=NULL): ?>var modelHeight = <?php echo $this->options->ModelHeight(); ?>;<?php endif; ?> + <?php if($this->options->ModelWidth!=NULL): ?>var modelWidth = <?php echo $this->options->ModelWidth(); ?>;<?php endif; ?> + <?php if($this->options->pjax && $this->options->pjax!=0) :?>var loadPjax = true; + beforePjax = function() {NProgress.start();} + afterPjax = function() {<?php if($this->is('post') || $this->is('page')): ?>owoLoad();<?php endif; ?><?php $this->options->pjax_complete(); ?>}<?php endif; ?></script> <script src="<?php Utils::indexTheme('assets/js/miracles.min.js'); ?>"></script> <script><?php if($this->options->news==!''): ?>alertSend('公告：<?php echo $this->options->news(); ?>');<?php endif; ?>LazyLoad();PrismLoad();<?php if($this->is('post') || $this->is('page')): ?>owoLoad();<?php endif; ?>panguLoad();<?php $this->options->jsEcho(); ?></script> <?php $this->footer(); ?> diff --git a/includes/header.php b/includes/header.php index e503537..724c780 100644 --- a/includes/header.php +++ b/includes/header.php @@ -1,5 +1,5 @@ <?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?> - <div class="mask"></div> + <div class="mask" onclick="toggleDrawer()"></div> <div class="alert ready"><p class="alert-content">错误！未定义的 alert 信息</p><button onclick="alertClose()" class="alert-close"><i class="iconfont icon-x"></i></button></div> <!-- 搜索 --> <div class="search ready"> @@ -43,7 +43,7 @@ </div> </div> <!-- 前台设置 --> - <div class="options ready<?php if($this->options->navStyle==1): ?> options-with-drawer<?php endif; ?>"<?php if($this->options->navStyle==1): ?> onclick="toggleOptions()"<?php endif; ?>> + <div class="options ready<?php if($this->options->navStyle==1): ?> options-with-drawer<?php endif; ?>"> <!-- 字体设置 --> <div class="options-content"> <div class="options-family container-fluid"> @@ -126,20 +126,14 @@ </nav> <?php elseif($this->options->navStyle==1): ?> <!-- 抽屉栏 --> - <nav class="drawer"> + <nav class="drawer"><div class="drawer-relative"> <div class="drawer-main"> <button class="drawer-button" onclick="toggleDrawer()"><i class="iconfont icon-list"></i></button> - <div class="drawer-avatar"> - <?php echo $this->author->gravatar(500); ?> - </div> - <div class="drawer-search"> - <form method="post" action=""> - <div class="drawer-search-form"> - <input type="text" name="s" class="text" size="32" /> - <button type="submit" class="submit">搜索</button> - </div> - </form> - </div> + <div class="drawer-header"> + <div class="drawer-avatar"> + <?php echo $this->author->gravatar(500); ?> + </div> + </div> <div class="drawer-content"> <a href="<?php $this->options->SiteUrl(); ?>" onclick="toggleDrawer()">首页</a> <?php $this->widget('Widget_Contents_Page_List') @@ -147,10 +141,11 @@ </div> </div> <div class="drawer-footer"> + <button class="drawer-icon" onclick="Search();toggleDrawer()"><i class="iconfont icon-chaxun"></i></button> <button class="drawer-icon" onclick="Login();toggleDrawer()"><i class="iconfont icon-user"></i></button> <button class="drawer-icon" onclick="toggleOptions()"><i class="iconfont icon-settings"></i></button> </div> - </nav> + </div></nav> <?php endif; ?> <div id="pjax-container"><!-- 开始 pjax-container --> <header> |