From 4db7e135a0fb911027a7ae4d21eada7cc622f88e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?= <i@haozi.net>
Date: Thu, 16 Nov 2023 00:58:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20Pjax=20=E5=AE=B9=E5=99=A8=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 404.php       |   2 +-
 footer.php    | 114 +++++++++++++++++++++++++-------------------------
 header.php    |  93 ++++++++++++++++++++--------------------
 index.php     |   2 +-
 page-full.php |   2 +-
 page.php      |   2 +-
 single.php    |   2 +-
 7 files changed, 110 insertions(+), 107 deletions(-)

diff --git a/404.php b/404.php
index e786e83..75e9215 100644
--- a/404.php
+++ b/404.php
@@ -9,7 +9,7 @@
 
 get_header(); ?>
 <div class="k-main <?php echo kratos_option('top_img_switch', true) ? 'banner' : 'color' ?>" style="background:#ffffff">
-    <div id="pjax" class="container">
+    <div class="container">
         <div class="row">
             <div class="col-12 page404">
                 <div class="thumbnail" style="background-image: url(<?php echo kratos_option('g_404', ASSET_PATH . '/assets/img/404.jpg'); ?>">
diff --git a/footer.php b/footer.php
index d3ce35d..a4c06f6 100644
--- a/footer.php
+++ b/footer.php
@@ -7,65 +7,67 @@
  * @version 2022.05.27
  */
 ?>
-<div class="k-footer">
-    <div class="f-toolbox">
-        <div class="gotop <?php echo kratos_option('g_wechat_fieldset')['g_wechat'] ? 'gotop-haswechat' : ''; ?>">
-            <div class="gotop-btn">
-                <span class="kicon i-up"></span>
-            </div>
-        </div>
-		<?php if (!empty(kratos_option('g_wechat_fieldset')['g_wechat'])) { ?>
-            <div class="wechat">
-                <span class="kicon i-wechat"></span>
-                <div class="wechat-pic">
-                    <img src="<?php echo kratos_option('g_wechat_fieldset')['g_wechat_img']; ?>">
+    <div class="k-footer">
+        <div class="f-toolbox">
+            <div class="gotop <?php echo kratos_option('g_wechat_fieldset')['g_wechat'] ? 'gotop-haswechat' : ''; ?>">
+                <div class="gotop-btn">
+                    <span class="kicon i-up"></span>
                 </div>
             </div>
-		<?php } ?>
-        <div class="search">
-            <span class="kicon i-find"></span>
-            <form class="search-form" role="search" method="get" action="<?php echo home_url('/'); ?>">
-                <input type="text" name="s" id="search-footer" placeholder="<?php _e('搜点什么呢?', 'kratos'); ?>" style="display:none" />
-            </form>
+            <?php if (!empty(kratos_option('g_wechat_fieldset')['g_wechat'])) { ?>
+                <div class="wechat">
+                    <span class="kicon i-wechat"></span>
+                    <div class="wechat-pic">
+                        <img src="<?php echo kratos_option('g_wechat_fieldset')['g_wechat_img']; ?>">
+                    </div>
+                </div>
+            <?php } ?>
+            <div class="search">
+                <span class="kicon i-find"></span>
+                <form class="search-form" role="search" method="get" action="<?php echo home_url('/'); ?>">
+                    <input type="text" name="s" id="search-footer" placeholder="<?php _e('搜点什么呢?', 'kratos'); ?>" style="display:none" />
+                </form>
+            </div>
         </div>
-    </div>
-    <div class="container">
-        <div class="row">
-            <div class="col-12 text-center">
-                <p class="social">
-					<?php
-					if (!empty(kratos_option('s_social_fieldset'))) {
-						foreach (kratos_option('s_social_fieldset') as $key => $value) {
-							if (kratos_option('s_social_fieldset')[$key]) {
-								echo '<a target="_blank" rel="nofollow" href="' . kratos_option('s_social_fieldset')[$key] . '"><i class="kicon i-' . str_replace(array("s_", "_url"), array('', ''), $key) . '"></i></a>';
-							}
-						}
-					}
-					?>
-                </p>
-                <p class="social">
-					<?php
-					$bookmarks = get_bookmarks([
-						'orderby' => 'name',
-						'order' => 'ASC'
-					]);
-					foreach ($bookmarks as $bookmark) {
-						echo '<a href="' . esc_url($bookmark->link_url) . '">' . esc_html($bookmark->link_name) . '</a>';
-					}
-					?>
-                </p>
-				<?php
-				if (kratos_option('g_performance')) {
-					echo '<p>'. sprintf( '请求次数：%d 次，加载用时：%.3f 秒，内存占用：%.2f MB', get_num_queries(), timer_stop(), memory_get_peak_usage() / 1024 / 1024 ) . '</p>';
-				}
-				echo '<p>' . kratos_option('s_copyright', 'COPYRIGHT © ' . wp_date('Y') . ' ' . get_bloginfo('name') . '. ALL RIGHTS RESERVED.') . '</p>';
-				if (kratos_option('s_icp')) {
-					echo '<p><a href="https://beian.miit.gov.cn/" target="_blank" rel="nofollow">' . kratos_option('s_icp') . '</a></p>';
-				}
-				if (kratos_option('s_gov')) {
-					echo '<p><a href="' . kratos_option('s_gov_link') . '" target="_blank" rel="nofollow" ><i class="police-ico"></i>' . kratos_option('s_gov') . '</a></p>';
-				}
-				?>
+        <div class="container">
+            <div class="row">
+                <div class="col-12 text-center">
+                    <p class="social">
+                        <?php
+                        if (!empty(kratos_option('s_social_fieldset'))) {
+                            foreach (kratos_option('s_social_fieldset') as $key => $value) {
+                                if (kratos_option('s_social_fieldset')[$key]) {
+                                    echo '<a target="_blank" rel="nofollow" href="' . kratos_option('s_social_fieldset')[$key] . '"><i class="kicon i-' . str_replace(array("s_", "_url"), array('', ''), $key) . '"></i></a>';
+                                }
+                            }
+                        }
+                        ?>
+                    </p>
+                    <p>
+                        <b>邻居</b>
+                        <?php
+                        $bookmarks = get_bookmarks([
+                            'orderby' => 'name',
+                            'order' => 'ASC'
+                        ]);
+                        foreach ($bookmarks as $bookmark) {
+                            echo '<a class="p-1" href="' . esc_url($bookmark->link_url) . '">' . esc_html($bookmark->link_name) . '</a>';
+                        }
+                        ?>
+                    </p>
+                    <?php
+                    if (kratos_option('g_performance')) {
+                        echo '<p>'. sprintf( '请求次数：%d 次，加载用时：%.3f 秒，内存占用：%.2f MB', get_num_queries(), timer_stop(), memory_get_peak_usage() / 1024 / 1024 ) . '</p>';
+                    }
+                    echo '<p>' . kratos_option('s_copyright', 'COPYRIGHT © ' . wp_date('Y') . ' ' . get_bloginfo('name') . '. ALL RIGHTS RESERVED.') . '</p>';
+                    if (kratos_option('s_icp')) {
+                        echo '<p><a href="https://beian.miit.gov.cn/" target="_blank" rel="nofollow">' . kratos_option('s_icp') . '</a></p>';
+                    }
+                    if (kratos_option('s_gov')) {
+                        echo '<p><a href="' . kratos_option('s_gov_link') . '" target="_blank" rel="nofollow" ><i class="police-ico"></i>' . kratos_option('s_gov') . '</a></p>';
+                    }
+                    ?>
+                </div>
             </div>
         </div>
     </div>
diff --git a/header.php b/header.php
index 22eac3f..a3d6d31 100644
--- a/header.php
+++ b/header.php
@@ -55,55 +55,56 @@
 <?php flush(); ?>
 
 <body>
-    <div class="k-header">
-        <nav class="k-nav navbar navbar-expand-lg navbar-light fixed-top" <?php echo kratos_option('top_img_switch', true) ? '' : 'style="background:' . kratos_option('top_color', '#24292e') . '"'; ?>>
-            <div class="container">
-                <a class="navbar-brand" href="<?php echo get_option('home'); ?>">
-                    <?php
-                    if (kratos_option('g_logo')) {
-                        echo '<img src="' . kratos_option('g_logo') . '"><h1 style="display:none">' . get_bloginfo('name') . '</h1>';
-                    } else {
-                        echo '<h1>' . get_bloginfo('name') . '</h1>';
-                    }
-                    ?>
-                </a>
-                <?php if (has_nav_menu('header_menu')) { ?>
-                    <button class="navbar-toggler navbar-toggler-right" id="navbutton" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
-                        <span class="line first-line"></span>
-                        <span class="line second-line"></span>
-                        <span class="line third-line"></span>
-                    </button>
-                <?php }
-                if (has_nav_menu('header_menu')) {
-                    wp_nav_menu(array(
-                        'theme_location'  => 'header_menu',
-                        'depth'           => 2,
-                        'container'       => 'div',
-                        'container_class' => 'collapse navbar-collapse',
-                        'container_id'    => 'navbarResponsive',
-                        'menu_class'      => 'navbar-nav ml-auto',
-                        'walker'          => new WP_Bootstrap_Navwalker(),
-                    ));
-                }
-                ?>
-            </div>
-        </nav>
-        <?php if (kratos_option('top_img_switch', true)) { ?>
-            <div class="banner">
-                <div class="overlay"></div>
-                <div class="content text-center" style="background-image: url(<?php echo kratos_option('top_img', ASSET_PATH . '/assets/img/background.jpg'); ?>);">
-                    <div class="introduce animate__animated animate__fadeInUp">
+    <div id="pjax">
+        <div class="k-header">
+            <nav class="k-nav navbar navbar-expand-lg navbar-light fixed-top" <?php echo kratos_option('top_img_switch', true) ? '' : 'style="background:' . kratos_option('top_color', '#24292e') . '"'; ?>>
+                <div class="container">
+                    <a class="navbar-brand" href="<?php echo get_option('home'); ?>">
                         <?php
-                        if (is_category() || is_tag()) {
-                            echo '<div class="title">' . single_cat_title('', false) . '</div>';
-                            echo '<div class="mate">' . strip_tags(category_description()) . '</div>';
+                        if (kratos_option('g_logo')) {
+                            echo '<img src="' . kratos_option('g_logo') . '"><h1 style="display:none">' . get_bloginfo('name') . '</h1>';
                         } else {
-                            echo '<div class="title">' . kratos_option('top_title', 'Kratos') . '</div>';
-                            echo '<div class="mate">' . kratos_option('top_describe', __('专注于用户阅读体验的响应式博客主题', 'kratos')) . '</div>';
+                            echo '<h1>' . get_bloginfo('name') . '</h1>';
                         }
                         ?>
+                    </a>
+                    <?php if (has_nav_menu('header_menu')) { ?>
+                        <button class="navbar-toggler navbar-toggler-right" id="navbutton" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
+                            <span class="line first-line"></span>
+                            <span class="line second-line"></span>
+                            <span class="line third-line"></span>
+                        </button>
+                    <?php }
+                    if (has_nav_menu('header_menu')) {
+                        wp_nav_menu(array(
+                            'theme_location'  => 'header_menu',
+                            'depth'           => 2,
+                            'container'       => 'div',
+                            'container_class' => 'collapse navbar-collapse',
+                            'container_id'    => 'navbarResponsive',
+                            'menu_class'      => 'navbar-nav ml-auto',
+                            'walker'          => new WP_Bootstrap_Navwalker(),
+                        ));
+                    }
+                    ?>
+                </div>
+            </nav>
+            <?php if (kratos_option('top_img_switch', true)) { ?>
+                <div class="banner">
+                    <div class="overlay"></div>
+                    <div class="content text-center" style="background-image: url(<?php echo kratos_option('top_img', ASSET_PATH . '/assets/img/background.jpg'); ?>);">
+                        <div class="introduce animate__animated animate__fadeInUp">
+                            <?php
+                            if (is_category() || is_tag()) {
+                                echo '<div class="title">' . single_cat_title('', false) . '</div>';
+                                echo '<div class="mate">' . strip_tags(category_description()) . '</div>';
+                            } else {
+                                echo '<div class="title">' . kratos_option('top_title', 'Kratos') . '</div>';
+                                echo '<div class="mate">' . kratos_option('top_describe', __('专注于用户阅读体验的响应式博客主题', 'kratos')) . '</div>';
+                            }
+                            ?>
+                        </div>
                     </div>
                 </div>
-            </div>
-        <?php } ?>
-    </div>
\ No newline at end of file
+            <?php } ?>
+        </div>
\ No newline at end of file
diff --git a/index.php b/index.php
index f547835..5d384bf 100644
--- a/index.php
+++ b/index.php
@@ -8,7 +8,7 @@
  */
 get_header(); ?>
 <div class="k-main <?php echo kratos_option('top_img_switch', true) ? 'banner' : 'color' ?>" style="background:<?php echo kratos_option('g_background', '#f5f5f5'); ?>">
-    <div id="pjax" class="container">
+    <div class="container">
         <div class="row">
             <div class="col-lg-8 board">
                 <?php if (is_home() && kratos_option('g_carousel', false)) {
diff --git a/page-full.php b/page-full.php
index d1f3a8d..3d14634 100644
--- a/page-full.php
+++ b/page-full.php
@@ -9,7 +9,7 @@
 
 get_header(); ?>
 <div class="k-main <?php echo kratos_option('top_img_switch', true) ? 'banner' : 'color' ?>" style="background:<?php echo kratos_option('g_background', '#f5f5f5'); ?>">
-    <div id="pjax" class="container">
+    <div class="container">
         <div class="row">
             <div class="col-lg-12 details">
                 <?php if (have_posts()) : the_post();
diff --git a/page.php b/page.php
index 064d42a..ef65b97 100644
--- a/page.php
+++ b/page.php
@@ -9,7 +9,7 @@
 
 get_header(); ?>
 <div class="k-main <?php echo kratos_option('top_img_switch', true) ? 'banner' : 'color' ?>" style="background:<?php echo kratos_option('g_background', '#f5f5f5'); ?>">
-    <div id="pjax" class="container">
+    <div class="container">
         <div class="row">
             <div class="col-lg-8 details">
                 <?php if (have_posts()) : the_post();
diff --git a/single.php b/single.php
index 9442a3c..4a7c076 100644
--- a/single.php
+++ b/single.php
@@ -14,7 +14,7 @@ $col_array = array(
 );
 ?>
 <div class="k-main <?php echo kratos_option('top_img_switch', true) ? 'banner' : 'color' ?>" style="background:<?php echo kratos_option('g_background', '#f5f5f5'); ?>">
-    <div id="pjax" class="container">
+    <div class="container">
         <div class="row">
             <div class="<?php echo $col_array[kratos_option('g_article_widgets', 'two_side')] ?> details">
                 <?php if (have_posts()) : the_post();