From 9ae13dfa011baab12843b6855c2e9a4d6ca92075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=94=E8=90=BD?=
 <45323514+BigCoke233@users.noreply.github.com>
Date: Sat, 30 Mar 2019 15:30:52 +0800
Subject: Add files via upload

---
 cross.php                 | 146 ++++++++++++++++++++++++++++++++++++++++++++++
 file.php                  |  12 ++--
 functions.php             |  10 ++--
 includes/comments.php     |  63 ++++++++++++++++++++
 includes/head.php         |   5 +-
 includes/header.php       |  11 ++++
 includes/post-content.php |  47 +++++++++++++++
 includes/post-item.php    |  56 +++++++++++-------
 includes/toolbar.php      |   5 +-
 links.php                 |  17 +++---
 page.php                  |  17 +++---
 post.php                  |  16 +++--
 12 files changed, 344 insertions(+), 61 deletions(-)
 create mode 100644 cross.php
 create mode 100644 includes/post-content.php

diff --git a/cross.php b/cross.php
new file mode 100644
index 0000000..8c33406
--- /dev/null
+++ b/cross.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * 闲言碎语
+ *
+ * @package custom
+ */
+ ?>
+<?php $this->need('includes/head.php'); ?>
+<?php $this->need('includes/header.php'); ?>
+
+  <main class="container" id="pjax-container"><div class="row">
+
+	<!-- 主体 -->
+	<div class="col-md-8">
+	  <!-- 面包屑 -->
+	  <div class="item post-bread">
+	    <i class="glyphicon glyphicon-folder-close"></i> <a href="<?php $this->options->siteUrl(); ?>"><?php $this->options->title(); ?></a> / <?php $this->title() ?>
+	  </div>
+	  <br />
+	  <!-- 文章内容 -->
+      
+	  <article class="item">
+	    <?php if($this->fields->banner && $this->fields->banner!='') :?>
+		<div class="post-banner">
+	      <div class="media-banner" style="background-position:center center;background:url(<?php $this->fields->banner(); ?>);background-repeat:no-repeat;background-size:cover;"></div>
+		</div>
+		<?php endif; ?>
+		
+		  <div class="post-header">
+		    <h2><?php $this->title() ?></h4>
+			<span>
+			  <i class="glyphicon glyphicon-time"></i> <?php $this->date('Y-m-d'); ?>&nbsp;&nbsp;/&nbsp;&nbsp;
+			  <i class="glyphicon glyphicon-bookmark"></i> <?php $this->category(',', true, '木有分类'); ?>&nbsp;&nbsp;/&nbsp;&nbsp;
+			  <i class="glyphicon glyphicon-comment"></i> <?php $this->commentsNum('%d'); ?>
+			</span>
+          </div>
+		
+		<hr />
+<br />
+
+<!-- 重新获取respondId -->
+<script>
+(function () {
+    window.TypechoComment = {
+        dom : function (id) {
+            return document.getElementById(id);
+        },
+    
+        create : function (tag, attr) {
+            var el = document.createElement(tag);
+        
+            for (var key in attr) {
+                el.setAttribute(key, attr[key]);
+            }
+        
+            return el;
+        },
+        reply : function (cid, coid) {
+            var comment = this.dom(cid), parent = comment.parentNode,
+                response = this.dom('" . $this->respondId . "'), input = this.dom('comment-parent'),
+                form = 'form' == response.tagName ? response : response.getElementsByTagName('form')[0],
+                textarea = response.getElementsByTagName('textarea')[0];
+            if (null == input) {
+                input = this.create('input', {
+                    'type' : 'hidden',
+                    'name' : 'parent',
+                    'id'   : 'comment-parent'
+                });
+                form.appendChild(input);
+            }
+            input.setAttribute('value', coid);
+            if (null == this.dom('comment-form-place-holder')) {
+                var holder = this.create('div', {
+                    'id' : 'comment-form-place-holder'
+                });
+                response.parentNode.insertBefore(holder, response);
+            }
+            comment.appendChild(response);
+            this.dom('cancel-comment-reply-link').style.display = '';
+            if (null != textarea && 'text' == textarea.name) {
+                textarea.focus();
+            }
+            return false;
+        },
+        cancelReply : function () {
+            var response = this.dom('{$this->respondId}'),
+            holder = this.dom('comment-form-place-holder'), input = this.dom('comment-parent');
+            if (null != input) {
+                input.parentNode.removeChild(input);
+            }
+            if (null == holder) {
+                return true;
+            }
+            this.dom('cancel-comment-reply-link').style.display = 'none';
+            holder.parentNode.insertBefore(response, holder);
+            return false;
+        }
+    };
+})();
+</script>
+
+<!-- 输入表单 -->
+<?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
+<?php if($this->user->hasLogin()): ?>
+<div id="comments" class="responsesWrapper">
+   <?php if($this->allow('comment')): ?>
+    <div id="<?php $this->respondId(); ?>" class="respond item">
+	<br />
+      <form method="post" action="<?php $this->commentUrl() ?>" id="comment-form" class="comment-form row" role="form">
+    	<p class="comment-form-comment col-md-12">
+          <textarea rows="8" cols="50" name="text" id="owo-textarea" class="textarea" required ><?php $this->remember('text'); ?></textarea>
+        </p>
+			
+		<?php $this->need('includes/owo.php'); ?>
+		<p class="form-submit col-md-12">
+          <button type="submit" class="submit btn btn-info " style="float:right;transition:all 0.5s;"><?php _e('提交评论'); ?></button>
+        </p>
+      </form>
+    </div>
+    <?php else: ?>
+    <h3><?php _e('评论已关闭'); ?></h3>
+    <?php endif; ?>
+<?php endif; ?>
+
+    <?php $this->comments()->to($comments); ?>
+    <?php if ($comments->have()): ?>
+    <div class="comment-list-wrap page-diary">
+    <?php $comments->listComments(); ?>
+    </div>
+    <?php $comments->pageNav('&laquo; 前一页', '后一页 &raquo;'); ?>
+    <?php else: ?>
+	<h3 style="text-algin:center;">这孩子连一篇动态都没有写哦~</h3>
+    <?php endif; ?>
+	  </article>
+
+	</div>
+	
+	<!-- 侧边栏 -->
+	<div class="col-md-4">
+	  <?php $this->need('includes/sidebar.php'); ?>
+	</div>
+	<?php $this->need('includes/toolbar.php'); ?>
+  </div></main>
+
+
+<?php $this->need('includes/footer.php'); ?>
\ No newline at end of file
diff --git a/file.php b/file.php
index 0bf18ee..5315316 100644
--- a/file.php
+++ b/file.php
@@ -20,20 +20,22 @@
 	  <!-- 文章内容 -->
       
 	  <article class="item">
+	    <?php if($this->fields->banner && $this->fields->banner!='') :?>
 		<div class="post-banner">
-          <?php if($this->fields->banner && $this->fields->banner!='') :?>
 	      <div class="media-banner" style="background-position:center center;background:url(<?php $this->fields->banner(); ?>);background-repeat:no-repeat;background-size:cover;"></div>
-		  <?php else: ?>
-		  <div class="media-banner" style="background-position:center center;background:url(<?php $this->fields->default_banner(); ?>);background-repeat:no-repeat;background-size:cover;"></div>
-          <?php endif; ?>
+		</div>
+		<?php endif; ?>
+		
 		  <div class="post-header">
 		    <h2><?php $this->title() ?></h4>
 			<span>
 			  <i class="glyphicon glyphicon-time"></i> <?php $this->date('Y-m-d'); ?>&nbsp;&nbsp;/&nbsp;&nbsp;
+			  <i class="glyphicon glyphicon-bookmark"></i> <?php $this->category(',', true, '木有分类'); ?>&nbsp;&nbsp;/&nbsp;&nbsp;
 			  <i class="glyphicon glyphicon-comment"></i> <?php $this->commentsNum('%d'); ?>
 			</span>
           </div>
-		</div>
+		
+		<hr />
 		
 		<div class="archive-list">
           <ul class="post-ul">
diff --git a/functions.php b/functions.php
index 301b65a..902d8af 100644
--- a/functions.php
+++ b/functions.php
@@ -7,7 +7,7 @@ function themeFields($layout) {
     $banner = new Typecho_Widget_Helper_Form_Element_Text('banner', NULL, NULL, _t('文章缩略图'), _t('填入一个图片url作为缩略图，显示在文章列表和文章页面顶部，不填写则没有缩略图'));
     $layout->addItem($banner);
 	
-	$type=new Typecho_Widget_Helper_Form_Element_Select('type',array('0'=>'一般文章','1'=>'说说'),'0','文章类型');
+	$type=new Typecho_Widget_Helper_Form_Element_Select('type',array('0'=>'一般文章','1'=>'说说','2'=>'小板式文章(New)'),'0','文章类型');
     $layout->addItem($type);
 }
 
@@ -39,9 +39,6 @@ function themeConfig($form) {
 	$site_create_time = new Typecho_Widget_Helper_Form_Element_Text('site_create_time', NULL, NULL, _t('网站建立时间'), _t('格式为 2010-09-10 00:00:00 即 年-月-日 时:分:秒'));
     $form->addInput($site_create_time);
 	
-	$default_banner = new Typecho_Widget_Helper_Form_Element_Text('default_banner', NULL, NULL, _t('默认头图'), _t('并非文章列表的默认缩略图，而是显示在文章内页的头图。'));
-    $form->addInput($default_banner);
-	
 	//侧边栏社交按钮配置
     $github = new Typecho_Widget_Helper_Form_Element_Text('github', NULL, NULL, _t('github主页地址'), _t('输入你的github主页地址，显示在侧边栏，不填写则不显示'));
     $form->addInput($github);
@@ -59,6 +56,9 @@ function themeConfig($form) {
     $bg_url = new Typecho_Widget_Helper_Form_Element_Text('bg_url', NULL, NULL, _t('背景图url'), _t('填入一个图片url作为背景图，填入背景图后自动设置透明度。'));
     $form->addInput($bg_url);
 	
+	$lgimg_url = new Typecho_Widget_Helper_Form_Element_Text('lgimg_url', NULL, NULL, _t('首页大图url'), _t('填入一个图片url作为首页大图，不填则不显示，填写后背景图失效。'));
+    $form->addInput($lgimg_url);
+	
     $custom_nav = new Typecho_Widget_Helper_Form_Element_Textarea('custom_nav', NULL, NULL, _t('自定义导航'), _t('用li标签结合a标签书写，若不清楚可以查看主题wiki，设置之后会直接覆盖默认的导航。'));
     $form->addInput($custom_nav);
 	
@@ -72,5 +72,5 @@ function themeConfig($form) {
     $pjax_reload = new Typecho_Widget_Helper_Form_Element_Textarea('pjax_reload', NULL, NULL, _t('Pjax重载函数'), _t('填入Pjax重载函数，不懂或者没有打开pjax请留空。'));
     $form->addInput($pjax_reload);
 }
-
+?>
 
diff --git a/includes/comments.php b/includes/comments.php
index 3facb2a..ee6e771 100644
--- a/includes/comments.php
+++ b/includes/comments.php
@@ -1,4 +1,67 @@
 <br />
+
+<!-- 重新获取respondId -->
+<script>
+(function () {
+    window.TypechoComment = {
+        dom : function (id) {
+            return document.getElementById(id);
+        },
+    
+        create : function (tag, attr) {
+            var el = document.createElement(tag);
+        
+            for (var key in attr) {
+                el.setAttribute(key, attr[key]);
+            }
+        
+            return el;
+        },
+        reply : function (cid, coid) {
+            var comment = this.dom(cid), parent = comment.parentNode,
+                response = this.dom('" . $this->respondId . "'), input = this.dom('comment-parent'),
+                form = 'form' == response.tagName ? response : response.getElementsByTagName('form')[0],
+                textarea = response.getElementsByTagName('textarea')[0];
+            if (null == input) {
+                input = this.create('input', {
+                    'type' : 'hidden',
+                    'name' : 'parent',
+                    'id'   : 'comment-parent'
+                });
+                form.appendChild(input);
+            }
+            input.setAttribute('value', coid);
+            if (null == this.dom('comment-form-place-holder')) {
+                var holder = this.create('div', {
+                    'id' : 'comment-form-place-holder'
+                });
+                response.parentNode.insertBefore(holder, response);
+            }
+            comment.appendChild(response);
+            this.dom('cancel-comment-reply-link').style.display = '';
+            if (null != textarea && 'text' == textarea.name) {
+                textarea.focus();
+            }
+            return false;
+        },
+        cancelReply : function () {
+            var response = this.dom('{$this->respondId}'),
+            holder = this.dom('comment-form-place-holder'), input = this.dom('comment-parent');
+            if (null != input) {
+                input.parentNode.removeChild(input);
+            }
+            if (null == holder) {
+                return true;
+            }
+            this.dom('cancel-comment-reply-link').style.display = 'none';
+            holder.parentNode.insertBefore(response, holder);
+            return false;
+        }
+    };
+})();
+</script>
+
+<!-- 评论开始 -->
 <?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
 <div id="comments" class="responsesWrapper">
 
diff --git a/includes/head.php b/includes/head.php
index c0e4b9e..2d1e4ac 100644
--- a/includes/head.php
+++ b/includes/head.php
@@ -84,7 +84,7 @@
 		background-repeat:no-repeat;
 		background-attachment:fixed;
 	}
-	.item,#nav,.list-group,.list-group li,.pagenav li,.page-navigator li,.comment-body{
+	.item,#nav,.pagenav li,.page-navigator li,.comment-body{
 		background:rgba(255,255,255,0.9)!important;
 	}
 	.footer-info{
@@ -94,6 +94,9 @@
     	box-shadow:0 0 8px #808080;
 	    -webkit-box-shadow:0 0 8px #808080;
 	}
+	.list-group,.list-group li{
+		background:rgba(255,255,255,0)
+	}
 	<?php endif; ?>
 	</style>
 
diff --git a/includes/header.php b/includes/header.php
index f9a06d0..f5c530c 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -26,10 +26,21 @@
 	</div>
   </nav>
   
+  <!-- 首页大图 -->
+  <?php if($this->options->lgimg_url && $this->options->lgimg_url!='') :?>
+  <div class="jumbotron" style="background:url('<?php $this->options->lgimg_url(); ?>');background-size:cover;background-repeat:no-repeat;">
+    <h1><?php $this->options->IndexName(); ?></h1>
+	<p><?php $this->options->IndexDecoration(); ?></p>
+  </div>
+  <?php endif; ?>
+  
+  <?php if($this->options->lgimg_url && $this->options->lgimg_url='') :?>
   <br />
   <br />
   <br />
   <br />
+  <?php endif; ?>
   <br />
+  
   <!-- 能偷懒不写样式为什么不用br? -->
 </header>
\ No newline at end of file
diff --git a/includes/post-content.php b/includes/post-content.php
new file mode 100644
index 0000000..c2f1a12
--- /dev/null
+++ b/includes/post-content.php
@@ -0,0 +1,47 @@
+<?php 
+    //解析灯箱及图片描述
+	$content = preg_replace('/<img(.*?)src="(.*?)" alt="(.*?)" title="(.*?)"(.*?)>/s','<a data-fancybox="gallery" href="${2}"><img${1}src="${2}"${5}></a><span class="post-img-alt">${4}</span>',$this->content); 
+	
+	//短代码（无参数）
+	$reg = '/\[scode\](.*?)\[\/scode\]/s';
+    $rp = '<div class="tip">${1}</div>';
+    $content = preg_replace($reg,$rp,$content);
+	
+    //短代码（有参数）
+	$reg = '/\[scode.*?type="(.*?)"\](.*?)\[\/scode\]/s';
+    $rp = '<div class="tip ${1}">${2}</div>';
+    $content = preg_replace($reg,$rp,$content);
+		
+	//font文字排版
+	  //无参数时，自动解析为红色
+	  $reg = '/\[font\](.*?)\[\/font\]/s';
+      $rg = '<span style="color:red;">${1}</span>';
+      $content = preg_replace($reg,$rp,$content);
+	  
+	  //解析只有color参数的font
+	  $reg = '/\[font color="(.*?)"\](.*?)\[\/font\]/s';
+      $rp = '<span style="color:${1}">${2}</span>';
+      $content = preg_replace($reg,$rp,$content);
+	  
+	  //解析只有bg参数的font
+	  $reg = '/\[font bg="(.*?)"\](.*?)\[\/font\]/s';
+      $rp = '<span style="background-color:${1}">${2}</span>';
+      $content = preg_replace($reg,$rp,$content);
+	
+	  //解析只有size参数的font
+	  $reg = '/\[font size="(.*?)"\](.*?)\[\/font\]/s';
+      $rp = '<span style="font-size:${1}">${2}</span>';
+      $content = preg_replace($reg,$rp,$content);
+	
+	  //解析只有style参数的font
+	  $reg = '/\[font style="(.*?)"\](.*?)\[\/font\]/s';
+      $rp = '<span style="${1}">${2}</span>';
+      $content = preg_replace($reg,$rp,$content);
+	  
+	//滚动文本区域
+	$reg = '/\[stext\](.*?)\[\/stext\]/s';
+    $rp = '<div class="post-stext">${1}</div>';
+    $content = preg_replace($reg,$rp,$content);
+	
+	echo $content 
+?>
\ No newline at end of file
diff --git a/includes/post-item.php b/includes/post-item.php
index 60ad412..f43e58c 100644
--- a/includes/post-item.php
+++ b/includes/post-item.php
@@ -1,36 +1,48 @@
 <?php if($this->is('post') || $this->fields->type=='1' ): ?>
 <!-- 说说 -->
-<?php if ($this->is('index')): ?>
+  <?php if ($this->is('index')): ?>
 	<div class="post-item item">
-	  
-	  <div class="row">
-	      <div class="saying-info">
+	    <div class="post-content saying-content">
+		<h3><?php $this->author() ?>说：</h3>
+          <?php $this->need('includes/post-content.php'); ?>
+		</div>
+		  <hr />
+		  <div class="row saying-info">
 		    <div class="col-md-1 col-xs-2 saying-avatar">
-	          <?php $this->author->gravatar(50); ?>
+			  <?php $this->author->gravatar(50) ?>
 			</div>
-			<div class="col-md-11 col-xs-10 saying-title-info">
-		      <h4 class="saying-title"><a href="<?php $this->permalink() ?>" class="post-link"><?php $this->sticky(); $this->title() ?></a></h4>
-		      <span><br /><i class="glyphicon glyphicon-send"></i> <?php $this->author() ?> 发布了一条说说：</span>
+		    <div class="col-md-11 col-xs-10">
+			  <h4 class="saying-title"><a href="<?php $this->permalink() ?>"><?php $this->title(); ?></a></h4>
+	          <div class="saying-info"><?php $this->date('F j, Y'); ?></div>
+			  
+			  <a href="<?php $this->permalink() ?>" class="read-more pull-right btn btn-default">前往吐槽</a>
 			</div>
 		  </div>
 	  </div>
-	    <hr />
-	    <div class="post-content saying-content">
-	      <?php 
-		  $content = preg_replace('/<img(.*?)src="(.*?)"(.*?)>/s','<a data-fancybox="gallery" href="${2}"><img${1}src="${2}"${3}></a>',$this->content); 
-		  echo $content 
-		  ?>
-		</div>
-		<a href="<?php $this->permalink() ?>" class="post-link">
+
+	  <br />
+  <?php endif; ?>
+<!-- 小板式文章 -->
+<?php elseif($this->fields->type=='2'): ?>
+  <a href="<?php $this->permalink() ?>" class="post-link">
+    <div class="item post-item">
+	  <div class="row">
+	    <div style="height:160px;background:url('<?php $this->fields->banner(); ?>');background-repeat:no-repeat;background-size:cover" class="col-md-3 col-xs-3 post-banner-sm"></div>
+		<div class="cold-md-9 col-xs-9" style="margin-top:-20px;">
+		  <h3><?php $this->sticky(); $this->title() ?></h3>
+		  <p class="excerpt">
+	       <?php $this->excerpt(66); ?>
+	      </p>
 		  <hr />
-	      <div class="post-info"><span class="glyphicon glyphicon-th-large"></span> <?php $this->category(',', true, '木有分类'); ?> &nbsp;| &nbsp;<span class="glyphicon glyphicon-calendar"></span> <?php $this->date('F j, Y'); ?> &nbsp;| &nbsp;<Span class="glyphicon glyphicon-comment"></span> <?php $this->commentsNum('%d Comments'); ?></div>
-	      <br />
-		</a>
+		  <div class="post-info"><span class="glyphicon glyphicon-th-large"></span> <?php $this->category(',', true, '木有分类'); ?> &nbsp;| &nbsp;<span class="glyphicon glyphicon-calendar"></span> <?php $this->date('F j, Y'); ?> &nbsp;| &nbsp;<Span class="glyphicon glyphicon-comment"></span> <?php $this->commentsNum('%d Comments'); ?></div>
+
+		</div>
 	  </div>
-	  <br />
-<?php endif; ?>
+	</div>
+  </a>
+  <br />
 <?php else: ?>
-<!-- 文章 -->
+<!-- 普通文章 -->
   <a href="<?php $this->permalink() ?>" class="post-link">
     <div class="item post-item">
 	  <?php if ($this->is('index')): ?>
diff --git a/includes/toolbar.php b/includes/toolbar.php
index 1f52a4f..91bddf4 100644
--- a/includes/toolbar.php
+++ b/includes/toolbar.php
@@ -7,4 +7,7 @@
 	<a href="#comments"><i class="fa fa-comments"></i></a>
 	<?php endif; ?>
     <a href="#top"><i class="fa fa-arrow-up"></i></a>
-  </div>
\ No newline at end of file
+  </div>
+  
+  <!-- 部分js -->
+  <script type="text/javascript" src="<?php $this->options->themeUrl('assets/js/id-transition.js'); ?>"></script>
\ No newline at end of file
diff --git a/links.php b/links.php
index b0975cd..0628f79 100644
--- a/links.php
+++ b/links.php
@@ -17,20 +17,22 @@ $this->need('includes/header.php'); ?>
 	  <br />
 	  
 	  <article class="item">
+	    <?php if($this->fields->banner && $this->fields->banner!='') :?>
 		<div class="post-banner">
-          <?php if($this->fields->banner && $this->fields->banner!='') :?>
 	      <div class="media-banner" style="background-position:center center;background:url(<?php $this->fields->banner(); ?>);background-repeat:no-repeat;background-size:cover;"></div>
-		  <?php else: ?>
-		  <div class="media-banner" style="background-position:center center;background:url(<?php $this->fields->default_banner(); ?>);background-repeat:no-repeat;background-size:cover;"></div>
-          <?php endif; ?>
+		</div>
+		<?php endif; ?>
+		
 		  <div class="post-header">
 		    <h2><?php $this->title() ?></h4>
 			<span>
 			  <i class="glyphicon glyphicon-time"></i> <?php $this->date('Y-m-d'); ?>&nbsp;&nbsp;/&nbsp;&nbsp;
+			  <i class="glyphicon glyphicon-bookmark"></i> <?php $this->category(',', true, '木有分类'); ?>&nbsp;&nbsp;/&nbsp;&nbsp;
 			  <i class="glyphicon glyphicon-comment"></i> <?php $this->commentsNum('%d'); ?>
 			</span>
           </div>
-        </div>
+		
+		<hr />
 		  
 		<div class="links-box">
 		  <h2>友链墙</h2>
@@ -42,10 +44,7 @@ $this->need('includes/header.php'); ?>
 		<hr />
 		
 		<div class="post-content">
-	      <?php 
-		  $content = preg_replace('/<img(.*?)src="(.*?)"(.*?)>/s','<a data-fancybox="gallery" href="${2}"><img${1}src="${2}"${3}></a>',$this->content); 
-		  echo $content 
-		  ?>
+          <?php $this->need('includes/post-content.php'); ?>
 		</div>
 	  </article>
 	  
diff --git a/page.php b/page.php
index 3dcd3a9..eb776c7 100644
--- a/page.php
+++ b/page.php
@@ -13,26 +13,25 @@
 	  <!-- 文章内容 -->
       
 	  <article class="item">
+	    <?php if($this->fields->banner && $this->fields->banner!='') :?>
 		<div class="post-banner">
-          <?php if($this->fields->banner && $this->fields->banner!='') :?>
 	      <div class="media-banner" style="background-position:center center;background:url(<?php $this->fields->banner(); ?>);background-repeat:no-repeat;background-size:cover;"></div>
-		  <?php else: ?>
-		  <div class="media-banner" style="background-position:center center;background:url(<?php $this->fields->default_banner(); ?>);background-repeat:no-repeat;background-size:cover;"></div>
-          <?php endif; ?>
+		</div>
+		<?php endif; ?>
+		
 		  <div class="post-header">
 		    <h2><?php $this->title() ?></h4>
 			<span>
 			  <i class="glyphicon glyphicon-time"></i> <?php $this->date('Y-m-d'); ?>&nbsp;&nbsp;/&nbsp;&nbsp;
+			  <i class="glyphicon glyphicon-bookmark"></i> <?php $this->category(',', true, '木有分类'); ?>&nbsp;&nbsp;/&nbsp;&nbsp;
 			  <i class="glyphicon glyphicon-comment"></i> <?php $this->commentsNum('%d'); ?>
 			</span>
           </div>
-		</div>
+		
+		<hr />
 		
 		<div class="post-content page-content">
-	      <?php 
-		  $content = preg_replace('/<img(.*?)src="(.*?)"(.*?)>/s','<a data-fancybox="gallery" href="${2}"><img${1}src="${2}"${3}></a>',$this->content); 
-		  echo $content 
-		  ?>
+          <?php $this->need('includes/post-content.php'); ?>
 		</div>
 
 	  </article>
diff --git a/post.php b/post.php
index af88a3d..239ff9e 100644
--- a/post.php
+++ b/post.php
@@ -13,12 +13,12 @@
 	  <!-- 文章内容 -->
       
 	  <article class="item">
+	    <?php if($this->fields->banner && $this->fields->banner!='') :?>
 		<div class="post-banner">
-          <?php if($this->fields->banner && $this->fields->banner!='') :?>
 	      <div class="media-banner" style="background-position:center center;background:url(<?php $this->fields->banner(); ?>);background-repeat:no-repeat;background-size:cover;"></div>
-		  <?php else: ?>
-		  <div class="media-banner" style="background-position:center center;background:url(<?php $this->fields->default_banner(); ?>);background-repeat:no-repeat;background-size:cover;"></div>
-          <?php endif; ?>
+		</div>
+		<?php endif; ?>
+		
 		  <div class="post-header">
 		    <h2><?php $this->title() ?></h4>
 			<span>
@@ -27,13 +27,11 @@
 			  <i class="glyphicon glyphicon-comment"></i> <?php $this->commentsNum('%d'); ?>
 			</span>
           </div>
-		</div>
+		
+		<hr />
 		
 		<div class="post-content">
-	      <?php 
-		  $content = preg_replace('/<img(.*?)src="(.*?)"(.*?)>/s','<a data-fancybox="gallery" href="${2}"><img${1}src="${2}"${3}></a>',$this->content); 
-		  echo $content 
-		  ?>
+          <?php $this->need('includes/post-content.php'); ?>
 		</div>
 
 		<div class="post-footer">
-- 
cgit v1.2.3