new version

Author: MuZhou233

_includes/footer.php

@@ -34,6 +34,7 @@
 
     <script src="<?php $this->options->themeUrl('asserts/lib/lazyload.min.js'); ?>"></script>
     <script src="<?php $this->options->themeUrl('asserts/js/article.js'); ?>"></script>
+    <link rel="stylesheet" href="<?php $this->options->themeUrl('asserts/lib/highlight/vscode.css'); ?>">
     <script src="<?php $this->options->themeUrl('script.js'); ?>"></script>
 
     <?php if (array_key_exists('is_archive', $GLOBALS) && $GLOBALS['is_archive']): ?>
@@ -48,6 +49,15 @@
     </script>
     <?php endif ?>
 
+    <?php if($this->options->blurCard === "true"): ?>
+    <style>
+    .card{
+        backdrop-filter: blur(10px) saturate(1.8);
+        background-color: rgba(255,255,255,.75);
+    }
+    </style>
+    <?php endif; ?>
+    <?php if($this->options->musicUrl): ?>
     <script src="<?php $this->options->themeUrl('asserts/lib/plyr/plyr.polyfilled.min.js'); ?>"></script>
     <script>
         const player = new Plyr('#player', { controls: '',loadSprite: false });
@@ -96,5 +106,6 @@
             }, 2000)
         })
     </script>
+    <?php endif; ?>
     <?php $this -> footer(); ?>
 </footer>

_includes/nav.php

@@ -36,12 +36,12 @@
 
     <div class="site-controls text-center align-middle">
         <div class="row">
-            <div class="col-4 active" data-tab="navigation"><a href="javascript:;"><i
-                        data-feather="compass"></i><br /><span>导航</span></a></div>
-            <div class="col-4" data-tab="folder"><a href="javascript:;"><i
-                        data-feather="folder"></i><br /><span>归档</span></a></div>
-            <div class="col-4" data-tab="setting"><a href="javascript:;"><i
-                        data-feather="settings"></i><br /><span>设置</span></a></div>
+            <div class="col-4 active" data-tab="navigation"><a href="javascript:;"><div><i
+                        data-feather="compass"></i><br /><span>导航</span></div></a></div>
+            <div class="col-4" data-tab="folder"><a href="javascript:;"><div><i
+                        data-feather="folder"></i><br /><span>归档</span></div></a></div>
+            <div class="col-4" data-tab="setting"><a href="javascript:;"><div><i
+                        data-feather="settings"></i><br /><span>设置</span></div></a></div>
         </div>
     </div>
 

_includes/sidebar.php

@@ -22,11 +22,11 @@
     <div class="title">作者信息</div>
     <div class="site-meta row text-center">
         <div class="col-4">
-            <div><?php echo get_PublishedPostsNum($this->_archiveSlug); ?></div>
+            <div><?php echo get_post_num($this->_archiveSlug); ?></div>
             <div>文章</div>
         </div>
         <div class="col-4">
-            <div><?php echo get_SpamCommentsNum($this->_archiveSlug); ?></div>
+            <div><?php echo get_comment_num($this->_archiveSlug); ?></div>
             <div>评论</div>
         </div>
         <div class="col-4">

_layouts/default-0.php

@@ -19,7 +19,6 @@
     <link rel="shortcut icon" href="<?php if($this->options->favicon)$this->options->favicon(); ?>">
     <link rel="stylesheet" href="<?php $this->options->themeUrl('asserts/lib/bootstrap/bootstrap.min.css'); ?>">
     <link rel="stylesheet" href="<?php $this->options->themeUrl('style.css'); ?>">
-    <link rel="stylesheet" href="<?php $this->options->themeUrl('asserts/lib/highlight/vscode.css'); ?>">
     <?php $this->header(); ?>
 </head>
 

asserts/css/morecho.css

@@ -298,37 +298,47 @@ button.bg-darker:focus {
 }
 /* from argon end */
 
-.nav-pills .nav-link {
+.flex-column.nav-pills .nav-link {
   font-weight: 600;
-  border-radius: 0.5rem;
   position: relative;
-  transition: all 0.1s ease 0s;
+  z-index: 0;
+  background-color: transparent !important;
+  transition: all 0.2s ease 0s;
 }
-.flex-column.nav-pills .nav-link {
+.flex-column.nav-pills .nav-link:after {
+  content: '';
   width: 100%;
+  height: 100%;
+  left: 0;
+  top: 0;
+  z-index: -1;
+  background-color: transparent;
+  border-radius: 0.5rem;
+  position: absolute;
+  transition: all 0.2s ease 0s;
 }
-.flex-column.nav-pills:hover .nav-link.active {
-  font-size: 1rem;
-  padding: 0.5rem 1rem;
+.flex-column.nav-pills .nav-link {
   width: 100%;
-  color: #007bff;
-  background-color: transparent;
-  transform: unset;
-  box-shadow: unset !important;
 }
 .flex-column.nav-pills .nav-link.active,
-.flex-column.nav-pills:hover .nav-link:hover {
-  transition: all 0.3s ease 0s;
-  transform: translateX(-2rem);
-  width: calc(100% + 3rem);
-  padding: 0.5rem 2.5rem;
-  box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15) !important;
-}
-.nav-pills .nav-link.active,
-.nav-pills:hover .nav-link:hover,
-.nav-pills:hover .nav-link.active:hover {
+.flex-column.nav-pills:hover .nav-link:hover,
+.flex-column.nav-pills:hover .nav-link.active:hover{
   color: #fff;
+  transform: translateX(-.7rem);
+}
+.flex-column.nav-pills .nav-link.active:after,
+.flex-column.nav-pills:hover .nav-link:hover:after,
+.flex-column.nav-pills:hover .nav-link.active:hover:after{
   background-color: #007bff;
+  transform: scaleX(1.2);
+}
+.flex-column.nav-pills:hover .nav-link.active {
+  color: #007bff;
+  transform: unset;
+}
+.flex-column.nav-pills:hover .nav-link.active:after {
+  background-color: transparent;
+  transform: unset;
 }
 /* timeline */
 .timeline {

functions.php

@@ -4,7 +4,7 @@
 function themeInit($data)
 {
     if($data->is('category')||$data->is('search')||$data->is('tag')||$data->is('author')||$data->parameter->type == 'Morecho_archive_page')
-        $data->parameter->pageSize = 2^32;
+        $data->parameter->pageSize = 2<<30;
 }
 
 function themeConfig($form)
@@ -48,6 +48,9 @@ function themeConfig($form)
     $backgroundsm = new Typecho_Widget_Helper_Form_Element_Text('backgroundsm', NULL, NULL, _t('移动端背景图片地址'), _t('在移动端使用长图替换宽图体验更好'));
     $form->addInput($backgroundsm->addRule('xssCheck', _t('请不要使用特殊字符')));
 
+    $blurCard = new Typecho_Widget_Helper_Form_Element_Radio('blurCard', array('false' => _t('不启用'), 'true' => _t('启用')), 'false', _t('是否启用半透明卡片效果（实验性）'), _t(''));
+    $form->addInput($blurCard);
+
     $title2 = new Typecho_Widget_Helper_Layout('div', array('class=' => 'typecho-page-title'));
     $title2->html('<h2>头衔</h2>
     <p>会在左侧栏和评论区显示</p>');
@@ -70,15 +73,15 @@ function themeFields($layout)
     if (preg_match("/write-page.php/", $_SERVER['REQUEST_URI'])) {
         $textIndent = new Typecho_Widget_Helper_Form_Element_Select('textIndent', array('false' => '不缩进', 'true' => '缩进'), 'false', '开启全文首行缩进');
         $layout->addItem($textIndent);
-        $headImage = new Typecho_Widget_Helper_Form_Element_Text('headImage', NULL, NULL, _t('头图'), _t(''));
+        $headImage = new Typecho_Widget_Helper_Form_Element_Text('headImage', NULL, NULL, _t('头图'), _t('输入图片链接'));
         $layout->addItem($headImage);
     }
     if (preg_match("/write-post.php/", $_SERVER['REQUEST_URI'])) {
         $textIndent = new Typecho_Widget_Helper_Form_Element_Select('textIndent', array('false' => '不缩进', 'true' => '缩进'), 'false', '开启全文首行缩进');
         $layout->addItem($textIndent);
         $foldInIndex = new Typecho_Widget_Helper_Form_Element_Select('foldInIndex', array('false' => '不折叠', 'true' => '折叠'), 'false', '在主页列表中折叠');
         $layout->addItem($foldInIndex);
-        $headImage = new Typecho_Widget_Helper_Form_Element_Text('headImage', NULL, NULL, _t('头图'), _t(''));
+        $headImage = new Typecho_Widget_Helper_Form_Element_Text('headImage', NULL, NULL, _t('头图'), _t('输入图片链接'));
         $layout->addItem($headImage);
         $subtitle = new Typecho_Widget_Helper_Form_Element_Text('subtitle', NULL, NULL, _t('副标题'), _t('首页模板功能'));
         $layout->addItem($subtitle);
@@ -95,18 +98,30 @@ function get_user($uid){
 
 function get_post_num($id = false){
     $db = Typecho_Db::get();
-    if($id == false) $postnum=$db->fetchRow($db->select(array('COUNT(authorId)'=>'allpostnum'))->from ('table.contents')->where('table.contents.type=?', 'post'));
-    else $postnum=$db->fetchRow($db->select(array('COUNT(authorId)'=>'allpostnum'))->from ('table.contents')->where ('table.contents.authorId=?',$id)->where('table.contents.type=?', 'post'));
-    $postnum = $postnum['allpostnum'];
-    return $postnum;
+    if($id == false) $postnum=$db->fetchRow($db
+        ->select(array('COUNT(authorId)'=>'allpostnum'))
+        ->from ('table.contents')
+        ->where('table.contents.type=?', 'post'));
+    else $postnum=$db->fetchRow($db
+        ->select(array('COUNT(authorId)'=>'allpostnum'))
+        ->from ('table.contents')
+        ->where ('table.contents.authorId=?',$id)
+        ->where('table.contents.type=?', 'post'));
+    return $postnum['allpostnum'];
 }
 
 function get_comment_num($id = false){
     $db = Typecho_Db::get();
-    if($id == false) $commentnum=$db->fetchRow($db->select(array('COUNT(authorId)'=>'commentnum'))->from ('table.comments')->where ('table.comments.authorId=?',$id)->where('table.comments.type=?', 'comment'));
-    else $commentnum=$db->fetchRow($db->select(array('COUNT(authorId)'=>'commentnum'))->from ('table.comments')->where('table.comments.type=?', 'comment'));
-    $commentnum = $commentnum['commentnum'];
-    return $commentnum;
+    if($id == false) $commentnum=$db->fetchRow($db
+        ->select(array('COUNT(authorId)'=>'commentnum'))
+        ->from ('table.comments')
+        ->where('table.comments.type=?', 'comment'));
+    else $commentnum=$db->fetchRow($db
+        ->select(array('COUNT(authorId)'=>'commentnum'))
+        ->from ('table.comments')
+        ->where ('table.comments.authorId=?',$id)
+        ->where('table.comments.type=?', 'comment'));
+    return $commentnum['commentnum'];
 }
 
 function get_last_update(){
@@ -123,23 +138,6 @@ function get_last_update(){
     }
 }
 
-function get_PublishedPostsNum($uid){
-    $db     = Typecho_Db::get();
-    return $db->fetchObject($db->select(array('COUNT(cid)' => 'num'))
-                ->from('table.contents')
-                ->where('table.contents.type = ?', 'post')
-                ->where('table.contents.status = ?', 'publish')
-                ->where('table.contents.authorId = ?', $uid))->num;
-}
-
-function get_SpamCommentsNum($uid){
-    $db     = Typecho_Db::get();
-    return $db->fetchObject($db->select(array('COUNT(coid)' => 'num'))
-                ->from('table.comments')
-                ->where('table.comments.status = ?', 'spam')
-                ->where('table.comments.ownerId = ?', $uid))->num;
-}
-
 function get_user_group($name = NULL){
     $options = Helper::options();
     $db = Typecho_Db::get();

index.php

@@ -4,7 +4,7 @@
  * 
  * @package Morecho Theme
  * @author MuZhou233
- * @version 0.4.4
+ * @version 0.5.1
  * @link https://typecho.mosar.in
  */
 

page.php

@@ -15,7 +15,7 @@
 <h1 class="title"><?php $this->title() ?></h1>
 
 <article class="card card-article">
-    <?php if($this->fields->headImage): ?><img class="headimg" href="<?php $this->fields->subtitle() ?>"></img><?php endif ?>
+    <?php if($this->fields->headImage): ?><img class="headimg" src="<?php $this->fields->headImage() ?>"></img><?php endif ?>
     <?php if($this->fields->subtitle): ?><h2 class="subtitle"><?php $this->fields->subtitle() ?></h2><?php endif ?>
     <?php $this->content(); ?>
 </article>

post.php

@@ -15,7 +15,7 @@
 <h1 class="title"><?php $this->title() ?></h1>
 
 <article class="card card-article">
-    <?php if($this->fields->headImage): ?><img class="headimg" href="<?php $this->fields->subtitle() ?>"></img><?php endif ?>
+    <?php if($this->fields->headImage): ?><img class="headimg" src="<?php $this->fields->headImage() ?>"></img><?php endif ?>
     <?php if($this->fields->subtitle): ?><h2 class="subtitle"><?php $this->fields->subtitle() ?></h2><?php endif ?>
     <?php $this->content(); ?>
 </article>