优化

5 files changed, 34 insertions, 26 deletions

diff --git a/includes/comments.php b/includes/comments.php
index ee6e771..39d1a3f 100644
--- a/includes/comments.php
+++ b/includes/comments.php
@@ -64,7 +64,15 @@
 <!-- 评论开始 -->

 <?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>

 <div id="comments" class="responsesWrapper">

-

+    <?php

+    $parameter = array(

+        'parentId'      => $this->hidden ? 0 : $this->cid,

+        'parentContent' => $this->row,

+        'respondId'     => $this->respondId,

+        'commentPage'   => $this->request->filter('int')->commentPage,

+        'allowComment'  => $this->allow('comment')

+    );

+    ?>

     <?php if($this->allow('comment')): ?>

     <div id="<?php $this->respondId(); ?>" class="respond item">

 	<br />

@@ -93,15 +101,26 @@
     	</form>

     </div>

     <?php else: ?>

-    <h3><?php _e('评论已关闭'); ?></h3>

+    <div class="item"><h3><?php _e('评论已关闭'); ?></h3></div>

     <?php endif; ?>

 	

     <?php $this->comments()->to($comments); ?>

     <?php if ($comments->have()): ?>

-    <div class="comment-list-wrap">

-    <?php $comments->listComments(); ?>

+	<!-- 解析评论内容 -->

+	<?php

+	  

+	?>

+	

+	<br />

+    <div class="item">

+	  <h3 style="margin-top:-4px;text-align:center;">- <?php $this->commentsNum('评论列表', '已有 1 条评论', '已有 <span class="num">%d</span> 条评论'); ?> -</h3>

+	  <hr style="margin:-10px;margin-top:0;" />

+	  <div class="comment-list-wrap">

+      <?php $comments->listComments(); ?>

+	  </div>

     </div>

-    <?php $comments->pageNav('&laquo; 前一页', '后一页 &raquo;'); ?>

+	<br />

+    <?php $comments->pageNav('&laquo;', '&raquo;'); ?>

     

     <?php endif; ?>

 </div>
\ No newline at end of file
diff --git a/includes/footer.php b/includes/footer.php
index 9c58b2e..2519bbe 100644
--- a/includes/footer.php
+++ b/includes/footer.php
@@ -1,3 +1,4 @@
+

   <!-- 页脚信息 -->

   <footer class="footer-info">

     <div class="container">

@@ -25,28 +26,20 @@
 	</div>

   </footer>

 

-

+  

   

   <!-- js -->

-  <script type="text/javascript" src="<?php $this->options->themeUrl('assets/js/bootstrap.min.js'); ?>"></script>

   <script type="text/javascript" src="<?php $this->options->themeUrl('assets/js/nav.js'); ?>"></script>

   <script type="text/javascript" src="<?php $this->options->themeUrl('assets/js/jquery.fancybox.min.js'); ?>"></script>

   <script type="text/javascript" src="<?php $this->options->themeUrl('assets/js/owo.js'); ?>"></script>

   <script type="text/javascript" src="<?php $this->options->themeUrl('assets/js/prism.js'); ?>" data-no-instant></script>

+  <script type="text/javascript" src="<?php $this->options->themeUrl('assets/pjax/jquery.pjax.js'); ?>"></script>

+  <script type="text/javascript" src="<?php $this->options->themeUrl('assets/js/nprogress.js'); ?>"></script>

   

   <script src="https://v1.hitokoto.cn/?encode=js&select=%23hitokoto" defer></script>

   

-  <!-- pjax 动画 -->

-<div class="spinner unvisible">

-  <div class="rect1"></div>

-  <div class="rect2"></div>

-  <div class="rect3"></div>

-  <div class="rect4"></div>

-  <div class="rect5"></div>

-</div>

-<div class="viewport-cover unvisible-cover"></div>

-  

   <?php if($this->options->pjax && $this->options->pjax!=0) :?>

+

   <!-- pjax -->

   <script>

   //pjax load

@@ -62,14 +55,12 @@
   $(document).on('pjax:send',

   function() {

       $('#pjax-container').addClass("pjax-loading");

-	  $('.spinner').removeClass("unvisible");

-	  $('.viewport-cover').removeClass("unvisible-cover");

+	  NProgress.start();

   })

   $(document).on('pjax:complete',

   function() {

       $('#pjax-container').removeClass("pjax-loading");

-	  $('.spinner').addClass("unvisible");

-	  $('.viewport-cover').addClass("unvisible-cover");

+	  NProgress.done();

 	   if (typeof Prism !== 'undefined') {

        Prism.highlightAll(true,null);}

 	   <?php $this->options->pjax_reload(); ?>

diff --git a/includes/head.php b/includes/head.php
index 9e5fce7..c99961e 100644
--- a/includes/head.php
+++ b/includes/head.php
@@ -44,10 +44,11 @@
     <link rel="stylesheet" type="text/css" href="<?php $this->options->themeUrl('assets/css/button.css'); ?>" />

 	<link rel="stylesheet" type="text/css" href="<?php $this->options->themeUrl('assets/css/prism.css'); ?>" />

 	<link rel="stylesheet" type="text/css" href="<?php $this->options->themeUrl('assets/css/owo.min.css'); ?>" />

+    <link rel="stylesheet" type="text/css" href="<?php $this->options->themeUrl('assets/css/nprogress.css'); ?>" />

   

     <!-- 部分js -->

 	<script type="text/javascript" src="<?php $this->options->themeUrl('assets/js/jquery.min.js'); ?>"></script>

-	<script type="text/javascript" src="<?php $this->options->themeUrl('assets/pjax/jquery.pjax.js'); ?>"></script>

+	<script type="text/javascript" src="<?php $this->options->themeUrl('assets/js/bootstrap.min.js'); ?>"></script>

   

     <!-- 部分css -->

 	<style>

diff --git a/includes/sidebar.php b/includes/sidebar.php
index 5e4f0f2..0c07b6f 100644
--- a/includes/sidebar.php
+++ b/includes/sidebar.php
@@ -89,7 +89,7 @@
       <?php $this->widget('Widget_Metas_Tag_Cloud', 'sort=mid&ignoreZeroCount=1&desc=0&limit=30')->to($tags); ?>

       <?php if($tags->have()): ?>

       <?php while ($tags->next()): ?>

-      <a href="<?php $tags->permalink(); ?>" rel="tag" title="该标签下有 <?php $tags->count(); ?> 篇文章"><?php $tags->name(); ?></a>

+      <a href="<?php $tags->permalink(); ?>" title="该标签下有 <?php $tags->count(); ?> 篇文章"><?php $tags->name(); ?></a>

       <?php endwhile; ?>

       <?php else: ?>

       还没有任何标签哦~

diff --git a/includes/toolbar.php b/includes/toolbar.php
index 91bddf4..3374e8f 100644
--- a/includes/toolbar.php
+++ b/includes/toolbar.php
@@ -1,8 +1,5 @@
   <!-- 右侧工具栏 -->

   <Div class="footer-tools mobile-none">

-    <?php if (!$this->is('index')): ?>

-	<a href="<?php $this->options->SiteUrl(); ?>"><i class="fa fa-home"></i></a>

-	<?php endif; ?>

 	<?php if ($this->is('post') || $this->is('page')): ?>

 	<a href="#comments"><i class="fa fa-comments"></i></a>

 	<?php endif; ?>