0.6.0

静态资源本地化

dist/js/bundle.js

@@ -17,7 +17,7 @@
       is_single = false;
       post_id = 0;
       is_archive = false;
-      VERSION = "0.5.8";
+      VERSION = "0.6.0";
       constructor() {
         super();
         this.initCopyright();
@@ -45,8 +45,8 @@
         }
       }
       initCopyright() {
-        const copyright = `<div class="site--footer__info">
-          Theme <a href="https://fatesinger.com/101971" target="_blank">farallon</a> by bigfa <a href="https://www.imsun.org" target="_blank">&nbsp;Made with Sun</a> / version ${this.VERSION}
+        const copyright = `<div class="site--footer__info">由<a href="https://www.typecho.org" target="_blank">Typecho</a> 驱动 <br>
+          Theme <a href="https://fatesinger.com/101971" target="_blank">farallon</a> by bigfa &nbsp;<br>Made with<a href="https://www.imsun.org" target="_blank"> Sun</a> / version ${this.VERSION}
       </div>`;
         document.querySelector(".site--footer__content").insertAdjacentHTML("afterend", copyright);
         document.querySelector(".icon--copryrights").addEventListener("click", () => {

footer.php

@@ -3,17 +3,18 @@
     <div class="site--footer__content">
         <div class=site--footer__sns>
            <?php $this->need('sns.php'); ?>
-        </div>
             <?php //sitemap填入
             if($this->options->sitemapurl): ?>
             <a href="<?php $this->options->sitemapurl() ?>" target="_blank">💗</a>
             <?php endif; ?>    
+        </div>      
             <?php //添加加载时间控制
             if ($this->options->showtime): ?>
             &nbsp;页面加载耗时<?php echo timer_stop();?> 
-            <?php endif; ?>    
+            <?php endif; ?> 
+            <?php $this->options->tongji(); ?>      
          <div class="copyright"> © <?php echo date('Y'); ?> 
-         <?php $this->options->title(); ?>由<a href="https://www.typecho.org" target="_blank">Typecho</a> 驱动
+         <?php $this->options->title(); ?>
             <svg class="icon icon--copryrights" viewBox="0 0 1040 1024" width="16" height="16">
                 <path
                     d="M717.056236 383.936299l-51.226708 0c-28.2893 0-51.226708 22.936385-51.226708 51.225685l0 128.062678c0 28.2893 22.937408 51.225685 51.226708 51.225685l51.226708 0c28.2893 0 51.225685-22.936385 51.225685-51.225685L768.281921 435.161984C768.281921 406.872684 745.345536 383.936299 717.056236 383.936299zM717.056236 537.611308c0 14.158465-11.480472 25.612331-25.613354 25.612331-14.132882 0-25.612331-11.453866-25.612331-25.612331l0-76.835969c0-14.158465 11.480472-25.613354 25.612331-25.613354 14.133905 0 25.613354 11.453866 25.613354 25.613354L717.056236 537.611308zM1013.977739 426.580538 859.776751 165.30079c-8.888438-15.063067-22.294772-25.975605-37.57171-32.080649-32.708959-34.856879-79.187527-56.638975-130.762159-56.638975L332.862064 76.581166c-51.575656 0-98.0532 21.782096-130.761136 56.639998-15.276938 6.105045-28.683273 17.017582-37.572734 32.079626L10.327206 426.580538c-21.26021 36.069497-8.655124 82.217537 28.239158 103.028515l115.00836 64.967664 0 199.163015c0 99.024318 80.264045 153.678078 179.287339 153.678078l358.580818 0c99.024318 0 179.290409-80.266092 179.290409-179.290409L870.733291 594.575694l115.00836-64.966641C1022.63184 508.798075 1035.238972 462.650035 1013.977739 426.580538zM153.574724 536.518417l-67.058278-37.875632c-24.589025-13.907755-33.019021-44.647873-18.809391-68.684312l85.86767-145.555074L153.574724 536.518417zM646.620024 127.807874c0 56.5786-60.205197 102.45137-134.467551 102.45137-74.261331 0-134.466528-45.873794-134.466528-102.45137L646.620024 127.807874zM819.507606 742.515071c0 84.893482-68.810179 153.677055-153.678078 153.677055L358.475418 896.192126c-84.8679 0-153.675008-68.783573-153.675008-153.677055l0-461.030142c0-76.150354 55.402821-139.361001 128.093377-151.545508 1.332345 83.883479 81.06734 151.545508 179.258687 151.545508 98.19237 0 177.926342-67.662029 179.25971-151.545508 72.690556 12.183484 128.096447 75.394131 128.096447 151.545508L819.508629 742.515071zM937.791569 498.642784l-67.058278 37.875632 0-252.111948 85.86767 145.552004C970.807521 453.995935 962.377524 484.736053 937.791569 498.642784z"
@@ -21,7 +22,6 @@
             </svg>
         </div>
     </div>
-    <?php $this->options->tongji(); ?>   
 </footer>
 <div class="backToTop">
     <svg xmlns="http://www.w3.org/2000/svg" class="svgIcon" viewBox="0 0 14 14" fill="currentColor" aria-hidden="true">

index.php

@@ -3,7 +3,7 @@
  * 移植自HUGO主题 farallon 原作者 bigfa  
  * @package Farallon
  * @author  老孙 
- * @version 0.5.8
+ * @version 0.6.0
  * @link https://www.imsun.org
  */
 if (!defined('__TYPECHO_ROOT_DIR__')) exit;

page-data.php

@@ -79,8 +79,8 @@ $this->need('header.php');
         category: <?php echo json_encode(categoryPostCount()); ?>
       };
     </script>
-    <script type="text/javascript" src="https://cdn.jsdelivr.net/gh/jkjoy/typecho-theme-farallon@0.5.0/dist/js/chart.js"></script>
-    <script id="MathJax-script" async src="https://jsd.onmicrosoft.cn/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
+    <script type="text/javascript" src="<?php $this->options->themeUrl('/dist/js/chart.js'); ?>"></script>
+    <script id="MathJax-script" async src="<?php $this->options->themeUrl('/dist/js/tex-mml-chtml.js'); ?>"></script>
             <script>
                 // 配置 MathJax
                 MathJax = {

page-mastodon.php

@@ -13,9 +13,9 @@ if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
     </header>
     <article class="post--single">
     <?php $tooot = $this->fields->tooot ? $this->fields->tooot : 'https://bbapi.ima.cm'; ?>
-    <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/@fancyapps/ui@5.0/dist/fancybox/fancybox.umd.js"></script>
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fancyapps/ui@5.0/dist/fancybox/fancybox.css" />    
+    <script src="<?php $this->options->themeUrl('/dist/js/marked.min.js'); ?>"></script>
+    <script src="<?php $this->options->themeUrl('/dist/js/fancybox.umd.js'); ?>"></script>
+    <link rel="stylesheet" href="<?php $this->options->themeUrl('/dist/css/fancybox.css'); ?>" />    
     <div id="tooot"></div>
     <div class="nav-links" id="loadmore">
         <span class="loadmore">加载更多</span>

page-memos.php

@@ -18,9 +18,9 @@ if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
         $memosnum = $this->fields->memosnum ? $this->fields->memosnum : '20';
         ?>
     <article class="post--single">
-    <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/@fancyapps/ui@5.0/dist/fancybox/fancybox.umd.js"></script>
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fancyapps/ui@5.0/dist/fancybox/fancybox.css" />    
+    <script src="<?php $this->options->themeUrl('/dist/js/marked.min.js'); ?>"></script>
+    <script src="<?php $this->options->themeUrl('/dist/js/fancybox.umd.js'); ?>"></script>
+    <link rel="stylesheet" href="<?php $this->options->themeUrl('/dist/css/fancybox.css'); ?>" />      
     <div id="talk"></div>
     </article> 
 <script>

postlist.php

@@ -4,101 +4,98 @@ if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 
 /** 文章置顶 */
 $sticky = $this->options->sticky; // 置顶的文章id，多个用|隔开
+$db = Typecho_Db::get();
+$pageSize = $this->options->pageSize;
 
-if ($sticky) {
+if ($sticky && !empty(trim($sticky))) {
     $sticky_cids = array_filter(explode('|', $sticky)); // 分割文本并过滤空值
-    $sticky_html = " <span class='sticky--post'> 置顶 </span> "; // 置顶标题的 html
-    $db = Typecho_Db::get();
-    $pageSize = $this->options->pageSize;
+    if (!empty($sticky_cids)) {
+        $sticky_html = " <span class='sticky--post'> 置顶 </span> "; // 置顶标题的 html
 
-    // 清空原有文章的队列
-    $this->row = [];
-    $this->stack = [];
-    $this->length = 0;
+        // 清空原有文章的队列
+        $this->row = [];
+        $this->stack = [];
+        $this->length = 0;
 
-    // 获取总数，并排除置顶文章数量
-    if (isset($this->currentPage) && $this->currentPage == 1) {
-        $totalOriginal = $this->getTotal();
-        $stickyCount = count($sticky_cids);
-        $this->setTotal(max($totalOriginal - $stickyCount, 0));
+        // 获取总数，并排除置顶文章数量
+        if (isset($this->currentPage) && $this->currentPage == 1) {
+            $totalOriginal = $this->getTotal();
+            $stickyCount = count($sticky_cids);
+            $this->setTotal(max($totalOriginal - $stickyCount, 0));
 
-        // 构建置顶文章的查询
-        $selectSticky = $this->select()->where('type = ?', 'post');
-        foreach ($sticky_cids as $i => $cid) {
-            if ($i == 0) 
-                $selectSticky->where('cid = ?', $cid);
-            else 
-                $selectSticky->orWhere('cid = ?', $cid);
+            // 构建置顶文章的查询
+            $selectSticky = $this->select()->where('type = ?', 'post');
+            foreach ($sticky_cids as $i => $cid) {
+                if ($i == 0) 
+                    $selectSticky->where('cid = ?', $cid);
+                else 
+                    $selectSticky->orWhere('cid = ?', $cid);
+            }
+
+            // 获取置顶文章
+            $stickyPosts = $db->fetchAll($selectSticky);
+
+            // 压入置顶文章到文章队列
+            foreach ($stickyPosts as &$stickyPost) {
+                $stickyPost['title'] .= $sticky_html;
+                $this->push($stickyPost);
+            }
+
+            $standardPageSize = $pageSize - count($stickyPosts);
+        } else {
+            $standardPageSize = $pageSize;
         }
 
-        // 获取置顶文章
-        $stickyPosts = $db->fetchAll($selectSticky);
-        
-        // 压入置顶文章到文章队列
-        foreach ($stickyPosts as &$stickyPost) {
-            $stickyPost['title'] .= $sticky_html;
-            $this->push($stickyPost);
-        }
+        // 构建正常文章查询，排除置顶文章
+        $selectNormal = $this->select()
+            ->where('type = ?', 'post')
+            ->where('status = ?', 'publish')
+            ->where('created < ?', time())
+            ->order('created', Typecho_Db::SORT_DESC)
+            ->page(isset($this->currentPage) ? $this->currentPage : 1, $standardPageSize);
 
-        $standardPageSize = $pageSize - count($stickyPosts);
+        foreach ($sticky_cids as $cid) {
+            $selectNormal->where('table.contents.cid != ?', $cid);
+        }
     } else {
-        $standardPageSize = $pageSize;
-    }
-
-    // 构建正常文章查询，排除置顶文章
-    $selectNormal = $this->select()
-        ->where('type = ?', 'post')
-        ->where('status = ?', 'publish')
-        ->where('created < ?', time())
-        ->order('created', Typecho_Db::SORT_DESC)
-        ->page(isset($this->currentPage) ? $this->currentPage : 1, $standardPageSize);
-
-    foreach ($sticky_cids as $cid) {
-        $selectNormal->where('table.contents.cid != ?', $cid);
-    }
-
-    // 登录用户显示私密文章
-    if ($this->user->hasLogin()) {
-        $uid = $this->user->uid;
-        if ($uid) {
-            $selectNormal->orWhere('authorId = ? AND status = ?', $uid, 'private');
-        }
-    }
-
-    $normalPosts = $db->fetchAll($selectNormal);
-    
-    // 压入正常文章到文章队列
-    foreach ($normalPosts as $normalPost) {
-        $this->push($normalPost);
+        // 如果sticky_cids为空，使用默认查询
+        $selectNormal = $this->select()
+            ->where('type = ?', 'post')
+            ->where('status = ?', 'publish')
+            ->where('created < ?', time())
+            ->order('created', Typecho_Db::SORT_DESC)
+            ->page(isset($this->currentPage) ? $this->currentPage : 1, $pageSize);
     }
 } else {
-    // 如果没有置顶文章，正常分页
+    // 如果没有置顶文章，使用默认查询
     $selectNormal = $this->select()
         ->where('type = ?', 'post')
         ->where('status = ?', 'publish')
         ->where('created < ?', time())
         ->order('created', Typecho_Db::SORT_DESC)
-        ->page(isset($this->currentPage) ? $this->currentPage : 1, $this->options->pageSize);
+        ->page(isset($this->currentPage) ? $this->currentPage : 1, $pageSize);
+}
 
-    // 登录用户显示私密文章
-    if ($this->user->hasLogin()) {
-        $uid = $this->user->uid;
-        if ($uid) {
-            $selectNormal->orWhere('authorId = ? AND status = ?', $uid, 'private');
-        }
+// 登录用户显示私密文章
+if ($this->user->hasLogin()) {
+    $uid = $this->user->uid;
+    if ($uid) {
+        $selectNormal->orWhere('authorId = ? AND status = ?', $uid, 'private');
     }
+}
 
-    $normalPosts = $db->fetchAll($selectNormal);
-    
-    // 清空原有文章的队列
+$normalPosts = $db->fetchAll($selectNormal);
+
+// 如果之前没有清空队列（没有置顶文章的情况），现在清空
+if (empty($sticky) || empty(trim($sticky)) || empty($sticky_cids)) {
     $this->row = [];
     $this->stack = [];
     $this->length = 0;
+}
 
-    // 压入正常文章到文章队列
-    foreach ($normalPosts as $normalPost) {
-        $this->push($normalPost);
-    }
+// 压入正常文章到文章队列
+foreach ($normalPosts as $normalPost) {
+    $this->push($normalPost);
 }
 ?>
 <?php while($this->next()): ?>