From 42c7dbbe05bc6b8f4949bce909d38ae4a296b478 Mon Sep 17 00:00:00 2001
From: Patrick95 <lawcy@qq.com>
Date: Fri, 28 Jul 2017 09:52:42 +0800
Subject: [PATCH] v0.9.2

---
 comments.php      | 24 +++++++++++++-----------
 footer.php        |  2 +-
 functions.php     | 28 ++++++++++++++++++++++++++++
 header.php        | 10 +++++-----
 js/main.js        | 16 ++++++++++++++++
 page-archives.php | 39 +++++++++++++++++++++++++++++++++++++++
 page.php          |  1 -
 post.php          |  1 +
 style.css         | 12 ++++++++----
 9 files changed, 111 insertions(+), 22 deletions(-)
 create mode 100644 js/main.js
 create mode 100644 page-archives.php

diff --git a/comments.php b/comments.php
index 459dcd0..32dbc1e 100644
--- a/comments.php
+++ b/comments.php
@@ -1,3 +1,4 @@
+<?php if($this->allow('comment')): ?>
 <?php
 $GLOBALS['z']  = $this->options->CDNURL;
 function threadedComments($comments, $options) {
@@ -44,7 +45,7 @@ function threadedComments($comments, $options) {
             <div class="comment-meta">
                 <span class="comment-author"><?php echo $author; ?></span>
                 <time class="comment-time"><?php $comments->date('Y-m-d H:i:s'); ?></time>
-                <span class="comment-reply"><?php $comments->reply(); ?></span>
+                <span class="comment-reply"><?php $comments->reply('Reply'); ?></span>
             </div>
         </div>
     </div>
@@ -62,7 +63,7 @@ function threadedComments($comments, $options) {
 <div id="comments" class="cf">
     <?php $this->comments()->to($comments); ?>
     <?php if ($comments->have()): ?>
-    <span class="comment-num"><?php $this->commentsNum(_t('暂无评论'), _t('已有 1 条评论'), _t('已有 %d 条评论')); ?></span>
+    <span class="comment-num"><?php $this->commentsNum(_t('No comments'), _t('1 comment'), _t('%d comments')); ?></span>
 
     <?php $comments->listComments(); ?>
 
@@ -72,36 +73,36 @@ function threadedComments($comments, $options) {
 
     <?php if($this->allow('comment')): ?>
     <div id="<?php $this->respondId(); ?>" class="respond">
-        <div class="cancel-comment-reply"><span class="response"><?php _e('发表新评论'); ?></span><span class="cancel-reply"><?php $comments->cancelReply(); ?></span></div>
+        <div class="cancel-comment-reply"><span class="response"><?php _e('To fill this form if you wanna discuss'); ?></span><span class="cancel-reply"><?php $comments->cancelReply('Cancel reply'); ?></span></div>
         <form method="post" action="<?php $this->commentUrl() ?>" id="comment-form" role="form">
             <?php if($this->user->hasLogin()): ?>
-            <p style="padding-top:10px;"><?php _e('已登入: '); ?><a href="<?php $this->options->profileUrl(); ?>"><?php $this->user->screenName(); ?></a>. <a href="<?php $this->options->logoutUrl(); ?>" title="Logout"><?php _e('退出'); ?> &raquo;</a></p>
+            <p style="padding-top:10px;"><?php _e('Already login as: '); ?><a href="<?php $this->options->profileUrl(); ?>"><?php $this->user->screenName(); ?></a>. <a href="<?php $this->options->logoutUrl(); ?>" title="Logout"><?php _e('Logout'); ?> &raquo;</a></p>
             <?php else: ?>
                 <?php if($this->remember('author',true) != "" && $this->remember('mail',true) != "") : ?> 
                 
                 <p style="padding-top:10px;color:#aaa;">
-                    <span onClick='showhidediv("author_info")'; style="cursor:pointer;color:#2479cc;"><?php $this->remember('author'); ?></span>，<?php _e('欢迎回来'); ?> 
-                    <span id="cancel-comment-reply"><?php $comments->cancelReply(); ?></span>
+                    <span onClick='showhidediv("author_info")'; style="cursor:pointer;color:#2479cc;"><?php $this->remember('author'); ?></span>，<?php _e('Welcome back'); ?> 
+                    <span id="cancel-comment-reply"><?php $comments->cancelReply('Cancel reply'); ?></span>
                 </p>
                 <div id="author_info" style="display:none;">
                 <?php else : ?>
                 <div id="author_info">
                 <?php endif ; ?>
-            <input type="text" name="author" maxlength="12" id="author" class="form-control" placeholder="<?php _e('称呼 *'); ?>" value="<?php $this->remember('author'); ?>">
+            <input type="text" name="author" maxlength="12" id="author" class="form-control" placeholder="<?php _e('Name *'); ?>" value="<?php $this->remember('author'); ?>">
             <input type="email" name="mail" id="mail" class="form-control" placeholder="<?php _e('Email *'); ?>" value="<?php $this->remember('mail'); ?>">
-            <input type="url" name="url" id="url" class="form-control" placeholder="<?php _e('网站'); ?>" value="<?php $this->remember('url'); ?>">
+            <input type="url" name="url" id="url" class="form-control" placeholder="<?php _e('Website'); ?>" value="<?php $this->remember('url'); ?>">
                </div>
                 <?php endif; ?>
 				
-            <textarea name="text" id="textarea" class="form-control" onkeydown="if(event.ctrlKey&&event.keyCode==13){document.getElementById('misubmit').click();return false};" placeholder="<?php _e('Enter your comment here...'); ?>" required ><?php $this->remember('text',false); ?></textarea>
-            <button type="submit" class="submit" id="misubmit"><?php _e('提交评论'); ?></button>
+            <textarea name="text" id="textarea" class="form-control" onkeydown="if(event.ctrlKey&&event.keyCode==13){document.getElementById('misubmit').click();return false};" placeholder="<?php _e('Type your comment here...'); ?>" required ><?php $this->remember('text',false); ?></textarea>
+            <button type="submit" class="submit" id="misubmit"><?php _e('Submit'); ?></button>
             <?php $security = $this->widget('Widget_Security'); ?>
             <input type="hidden" name="_" value="<?php echo $security->getToken($this->request->getReferer())?>">
         </form>
     </div>   
 </div>
     <?php else: ?>
-    <h4 class="comment-close">此处评论已关闭</h4>
+    <h4 class="comment-close">Comment closed</h4>
     <?php endif; ?>  
 <script>
 function showhidediv(id){  
@@ -244,4 +245,5 @@ function showhidediv(id){
 })();
 </script>
 <?php else : ?>
+<?php endif; ?>
 <?php endif; ?>
\ No newline at end of file
diff --git a/footer.php b/footer.php
index 82e550b..d26c145 100644
--- a/footer.php
+++ b/footer.php
@@ -10,13 +10,13 @@
     </footer>
     </div>
      <?php $this->footer(); ?> 
+     <script src="<?php $this->options->themeUrl('js/main.js'); ?>"></script>
      <script src="//cdn.staticfile.org/instantclick/3.0.1/instantclick.min.js" data-no-instant></script>
      <script src="<?php $this->options->themeUrl('js/prism.js'); ?>" data-no-instant></script>
     <script data-no-instant>
 	InstantClick.on('change', function(isInitialLoad) {
 		if (isInitialLoad === false) {
 			if (typeof Prism !== 'undefined') Prism.highlightAll(true,null);
-			if (typeof ga !== 'undefined') ga('send', 'pageview', location.pathname + location.search);
 		}
 	});
 	InstantClick.init();
diff --git a/functions.php b/functions.php
index 527c2dd..7dfc483 100644
--- a/functions.php
+++ b/functions.php
@@ -116,4 +116,32 @@ function get_filtered_comment($coid){
 function print_summary($obj, $length){
     $str = preg_replace('/<script>.*?<\/script>/is', '', $obj->excerpt);
     echo Typecho_Common::subStr(strip_tags($str), 0, $length, '...');
+}
+
+function theNext($obj, $format = '%s', $default = NULL, $custom = array()) {
+    $content = $obj->db->fetchRow($obj->select()->where('table.contents.created > ? AND table.contents.created < ?',
+            $obj->created, $obj->options->gmtTime)
+            ->where('table.contents.status = ?', 'publish')
+            ->where('table.contents.type = ?', $obj->type)
+            ->where('table.contents.password IS NULL')
+            ->order('table.contents.created', Typecho_Db::SORT_ASC)
+            ->limit(1));
+
+        if ($content) {
+            $content = $obj->filter($content);
+            $default = array(
+                'title' => NULL,
+                'tagClass' => NULL
+            );
+            $custom = array_merge($default, $custom);
+            extract($custom);
+
+            $linkText = empty($title) ? $content['title'] : $title;
+            $linkClass = empty($tagClass) ? '' : 'class="' . $tagClass . '" ';
+            $link = '<a ' . $linkClass . 'href="' . $content['permalink'] . '" title="' . $content['title'] . '">' . $linkText . '</a>';
+
+            printf($format, $link);
+        } else {
+            echo $default;
+        }
 }
\ No newline at end of file
diff --git a/header.php b/header.php
index 769af59..82525fe 100644
--- a/header.php
+++ b/header.php
@@ -31,12 +31,12 @@
 <![endif]-->
 <div class="wrap">
 <header>
-    <a href="/" class="logo-link"><img src="<?php $this->options->themeUrl('img/logo.png'); ?>"></a>
+    <a href="<?php $this->options->siteUrl(); ?>" class="logo-link"><img src="<?php $this->options->themeUrl('img/logo.png'); ?>"></a>
             <ul class="nav nav-list">
-                <li class="nav-list-item"><a href="#" target="_self" class="nav-list-link <?php if($this->is('index')) echo 'active'; ?>">BLOG</a></li>
-                <li class="nav-list-item"><a href="#" target="_self" class="nav-list-link">ARCHIVES</a></li>
-                <li class="nav-list-item"><a href="#" target="_self" class="nav-list-link">ABOUT</a></li>
-                <li class="nav-list-item"><a href="#" target="_self" class="nav-list-link">GUESTBOOK</a></li>
+                <li class="nav-list-item"><a href="<?php $this->options->siteUrl(); ?>" class="nav-list-link <?php if($this->is('index')) echo 'active'; ?>">BLOG</a></li>
+                <li class="nav-list-item"><a href="<?php $this->options->siteUrl('index.php/archives.html'); ?>" class="nav-list-link <?php if($this->is('page', 'archives')) echo 'active'; ?>">ARCHIVES</a></li>
+                <li class="nav-list-item"><a href="<?php $this->options->siteUrl('about.html'); ?>" class="nav-list-link <?php if($this->is('page', 'about')) echo 'active'; ?>">ABOUT</a></li>
+                <li class="nav-list-item"><a href="<?php $this->options->siteUrl('guestbook.html'); ?>" class="nav-list-link <?php if($this->is('page', 'guestbook')) echo 'active'; ?>">GUESTBOOK</a></li>
             </ul>
 </header>
 <section class="container">
diff --git a/js/main.js b/js/main.js
new file mode 100644
index 0000000..7b653d2
--- /dev/null
+++ b/js/main.js
@@ -0,0 +1,16 @@
+
+/*!
+ * pangu.js
+ * --------
+ * @version: 3.2.1
+ * @homepage: https://github.com/vinta/pangu.js
+ * @license: MIT
+ * @author: Vinta Chen <vinta.chen@gmail.com> (https://github.com/vinta)
+ */
+!function(e,u){"object"==typeof exports&&"object"==typeof module?module.exports=u():"function"==typeof define&&define.amd?define("pangu",[],u):"object"==typeof exports?exports.pangu=u():e.pangu=u()}(this,function(){return function(e){function u(a){if(f[a])return f[a].exports;var t=f[a]={exports:{},id:a,loaded:!1};return e[a].call(t.exports,t,t.exports,u),t.loaded=!0,t.exports}var f={};return u.m=e,u.c=f,u.p="",u(0)}([function(e,u,f){"use strict";function a(e,u){if(!(e instanceof u))throw new TypeError("Cannot call a class as a function")}function t(e,u){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!u||"object"!=typeof u&&"function"!=typeof u?e:u}function n(e,u){if("function"!=typeof u&&null!==u)throw new TypeError("Super expression must either be null or a function, not "+typeof u);e.prototype=Object.create(u&&u.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),u&&(Object.setPrototypeOf?Object.setPrototypeOf(e,u):e.__proto__=u)}var i=function(){function e(e,u){for(var f=0;f<u.length;f++){var a=u[f];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}}return function(u,f,a){return f&&e(u.prototype,f),a&&e(u,a),u}}(),r=f(1).Pangu,o=8,s=function(e){function u(){a(this,u);var e=t(this,Object.getPrototypeOf(u).call(this));return e.topTags=/^(html|head|body|#document)$/i,e.ignoreTags=/^(code|pre|textarea)$/i,e.spaceSensitiveTags=/^(a|del|pre|s|strike|u)$/i,e.spaceLikeTags=/^(br|hr|i|img|pangu)$/i,e.blockTags=/^(div|h1|h2|h3|h4|h5|h6|p)$/i,e}return n(u,e),i(u,[{key:"canIgnoreNode",value:function(e){for(var u=e.parentNode;u&&u.nodeName&&u.nodeName.search(this.topTags)===-1;){if(u.nodeName.search(this.ignoreTags)>=0||u.isContentEditable||"true"===u.getAttribute("g_editable"))return!0;u=u.parentNode}return!1}},{key:"isFirstTextChild",value:function(e,u){for(var f=e.childNodes,a=0;a<f.length;a++){var t=f[a];if(t.nodeType!==o&&t.textContent)return t===u}return!1}},{key:"isLastTextChild",value:function(e,u){for(var f=e.childNodes,a=f.length-1;a>-1;a--){var t=f[a];if(t.nodeType!==o&&t.textContent)return t===u}return!1}},{key:"spacingNodeByXPath",value:function(e,u){for(var f=document.evaluate(e,u,null,XPathResult.ORDERED_NODE_SNAPSHOT_TYPE,null),a=void 0,t=void 0,n=f.snapshotLength-1;n>-1;--n)if(a=f.snapshotItem(n),this.canIgnoreNode(a))t=a;else{var i=this.spacing(a.data);if(a.data!==i&&(a.data=i),t){if(a.nextSibling&&a.nextSibling.nodeName.search(this.spaceLikeTags)>=0){t=a;continue}var r=a.data.toString().substr(-1)+t.data.toString().substr(0,1),o=this.spacing(r);if(o!==r){for(var s=t;s.parentNode&&s.nodeName.search(this.spaceSensitiveTags)===-1&&this.isFirstTextChild(s.parentNode,s);)s=s.parentNode;for(var c=a;c.parentNode&&c.nodeName.search(this.spaceSensitiveTags)===-1&&this.isLastTextChild(c.parentNode,c);)c=c.parentNode;if(c.nextSibling&&c.nextSibling.nodeName.search(this.spaceLikeTags)>=0){t=a;continue}if(c.nodeName.search(this.blockTags)===-1)if(s.nodeName.search(this.spaceSensitiveTags)===-1)s.nodeName.search(this.ignoreTags)===-1&&s.nodeName.search(this.blockTags)===-1&&(t.previousSibling?t.previousSibling.nodeName.search(this.spaceLikeTags)===-1&&(t.data=" "+t.data):this.canIgnoreNode(t)||(t.data=" "+t.data));else if(c.nodeName.search(this.spaceSensitiveTags)===-1)a.data=a.data+" ";else{var d=document.createElement("pangu");d.innerHTML=" ",s.previousSibling?s.previousSibling.nodeName.search(this.spaceLikeTags)===-1&&s.parentNode.insertBefore(d,s):s.parentNode.insertBefore(d,s),d.previousElementSibling||d.parentNode&&d.parentNode.removeChild(d)}}}t=a}}},{key:"spacingNode",value:function(e){var u=".//*/text()[normalize-space(.)]";this.spacingNodeByXPath(u,e)}},{key:"spacingElementById",value:function(e){var u='id("'+e+'")//text()';this.spacingNodeByXPath(u,document)}},{key:"spacingElementByClassName",value:function(e){var u='//*[contains(concat(" ", normalize-space(@class), " "), "'+e+'")]//text()';this.spacingNodeByXPath(u,document)}},{key:"spacingElementByTagName",value:function(e){var u="//"+e+"//text()";this.spacingNodeByXPath(u,document)}},{key:"spacingPageTitle",value:function(){var e="/html/head/title/text()";this.spacingNodeByXPath(e,document)}},{key:"spacingPageBody",value:function(){for(var e="/html/body//*/text()[normalize-space(.)]",u=["script","style","textarea"],f=0;f<u.length;f++){var a=u[f];e+='[translate(name(..),"ABCDEFGHIJKLMNOPQRSTUVWXYZ","abcdefghijklmnopqrstuvwxyz")!="'+a+'"]'}this.spacingNodeByXPath(e,document)}},{key:"spacingPage",value:function(){this.spacingPageTitle(),this.spacingPageBody()}}]),u}(r),c=new s;u=e.exports=c,u.Pangu=s},function(e,u){"use strict";function f(e,u){if(!(e instanceof u))throw new TypeError("Cannot call a class as a function")}var a=function(){function e(e,u){for(var f=0;f<u.length;f++){var a=u[f];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}}return function(u,f,a){return f&&e(u.prototype,f),a&&e(u,a),u}}(),t=/([\u2e80-\u2eff\u2f00-\u2fdf\u3040-\u309f\u30a0-\u30ff\u3100-\u312f\u3200-\u32ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff])(["])/g,n=/(["])([\u2e80-\u2eff\u2f00-\u2fdf\u3040-\u309f\u30a0-\u30ff\u3100-\u312f\u3200-\u32ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff])/g,i=/(["']+)(\s*)(.+?)(\s*)(["']+)/g,r=/([\u2e80-\u2eff\u2f00-\u2fdf\u3040-\u309f\u30a0-\u30ff\u3100-\u312f\u3200-\u32ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff])( )(')([A-Za-z])/g,o=/([\u2e80-\u2eff\u2f00-\u2fdf\u3040-\u309f\u30a0-\u30ff\u3100-\u312f\u3200-\u32ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff])(#)([A-Za-z0-9\u2e80-\u2eff\u2f00-\u2fdf\u3040-\u309f\u30a0-\u30ff\u3100-\u312f\u3200-\u32ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff]+)(#)([\u2e80-\u2eff\u2f00-\u2fdf\u3040-\u309f\u30a0-\u30ff\u3100-\u312f\u3200-\u32ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff])/g,s=/([\u2e80-\u2eff\u2f00-\u2fdf\u3040-\u309f\u30a0-\u30ff\u3100-\u312f\u3200-\u32ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff])(#([^ ]))/g,c=/(([^ ])#)([\u2e80-\u2eff\u2f00-\u2fdf\u3040-\u309f\u30a0-\u30ff\u3100-\u312f\u3200-\u32ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff])/g,d=/([\u2e80-\u2eff\u2f00-\u2fdf\u3040-\u309f\u30a0-\u30ff\u3100-\u312f\u3200-\u32ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff])([\+\-\*\/=&\\|<>])([A-Za-z0-9])/g,p=/([A-Za-z0-9])([\+\-\*\/=&\\|<>])([\u2e80-\u2eff\u2f00-\u2fdf\u3040-\u309f\u30a0-\u30ff\u3100-\u312f\u3200-\u32ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff])/g,l=/([\u2e80-\u2eff\u2f00-\u2fdf\u3040-\u309f\u30a0-\u30ff\u3100-\u312f\u3200-\u32ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff])([\(\[\{<\u201c]+(.*?)[\)\]\}>\u201d]+)([\u2e80-\u2eff\u2f00-\u2fdf\u3040-\u309f\u30a0-\u30ff\u3100-\u312f\u3200-\u32ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff])/g,g=/([\u2e80-\u2eff\u2f00-\u2fdf\u3040-\u309f\u30a0-\u30ff\u3100-\u312f\u3200-\u32ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff])([\(\[\{<\u201c>])/g,h=/([\)\]\}>\u201d<])([\u2e80-\u2eff\u2f00-\u2fdf\u3040-\u309f\u30a0-\u30ff\u3100-\u312f\u3200-\u32ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff])/g,v=/([\(\[\{<\u201c]+)(\s*)(.+?)(\s*)([\)\]\}>\u201d]+)/,b=/([\u2e80-\u2eff\u2f00-\u2fdf\u3040-\u309f\u30a0-\u30ff\u3100-\u312f\u3200-\u32ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff])([~!;:,\.\?\u2026])([A-Za-z0-9])/g,y=/([\u2e80-\u2eff\u2f00-\u2fdf\u3040-\u309f\u30a0-\u30ff\u3100-\u312f\u3200-\u32ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff])([A-Za-z0-9`\$%\^&\*\-=\+\\\|\/@\u00a1-\u00ff\u2022\u2027\u2150-\u218f])/g,m=/([A-Za-z0-9`~\$%\^&\*\-=\+\\\|\/!;:,\.\?\u00a1-\u00ff\u2022\u2026\u2027\u2150-\u218f])([\u2e80-\u2eff\u2f00-\u2fdf\u3040-\u309f\u30a0-\u30ff\u3100-\u312f\u3200-\u32ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff])/g,$=function(){function e(){f(this,e)}return a(e,[{key:"spacing",value:function(e){var u=e;u=u.replace(t,"$1 $2"),u=u.replace(n,"$1 $2"),u=u.replace(i,"$1$3$5"),u=u.replace(r,"$1$3$4"),u=u.replace(o,"$1 $2$3$4 $5"),u=u.replace(s,"$1 $2"),u=u.replace(c,"$1 $3"),u=u.replace(d,"$1 $2 $3"),u=u.replace(p,"$1 $2 $3");var f=u,a=u.replace(l,"$1 $2 $4");return u=a,f===a&&(u=u.replace(g,"$1 $2"),u=u.replace(h,"$1 $2")),u=u.replace(v,"$1$3$5"),u=u.replace(b,"$1$2 $3"),u=u.replace(y,"$1 $2"),u=u.replace(m,"$1 $2")}},{key:"spacingText",value:function(e){var u=arguments.length<=1||void 0===arguments[1]?function(){}:arguments[1];try{var f=this.spacing(e);u(null,f)}catch(a){u(a)}}}]),e}(),N=new $;u=e.exports=N,u.Pangu=$}])});
+
+ 
+ pangu.spacingElementByClassName('post');
+
+
+ 
\ No newline at end of file
diff --git a/page-archives.php b/page-archives.php
new file mode 100644
index 0000000..4cd9879
--- /dev/null
+++ b/page-archives.php
@@ -0,0 +1,39 @@
+<?php 
+    /**
+    * archives
+    *
+    * @package custom
+    */
+	$this->need('header.php'); ?>
+
+
+<div class="post">
+    <article class="post-block">
+        <h1 class="post-title"><?php $this->title() ?></h1>
+        <div class="post-content">
+            <?php $this->widget('Widget_Contents_Post_Recent', 'pageSize=10000')->to($archives);
+								$year=0; $mon=0; $i=0; $j=0;
+								while($archives->next()):
+								$year_tmp = date('Y',$archives->created);
+								$mon_tmp = date('m',$archives->created);
+								$y=$year; $m=$mon;
+								if ($mon != $mon_tmp && $mon > 0) $output .= '</ul>';
+								if ($year != $year_tmp && $year > 0) $output .= '</ul>';
+								if ($year != $year_tmp) {
+								$year = $year_tmp;
+								}
+								if ($mon != $mon_tmp || ($mon == $mon_tmp && $y != $year_tmp)) {
+								$mon = $mon_tmp;
+								$output .= '<h4>'. $year_tmp .' 年'. $mon_tmp .' 月</h4>';
+								$output .= '<ul>';
+								}
+								$output .= '<li><a href="'.$archives->permalink .'">'. $archives->title .'</a>&nbsp;&nbsp;&nbsp;&nbsp;('.date('M j, Y',$archives->created).')</li>';
+								endwhile;
+								$output .= '</ul>';
+								echo $output;
+						?>
+        </div>
+    </article>
+</div>
+
+<?php $this->need('footer.php'); ?>
diff --git a/page.php b/page.php
index 489f248..a9c8673 100644
--- a/page.php
+++ b/page.php
@@ -5,7 +5,6 @@
 <div class="post">
     <article class="post-block">
         <h1 class="post-title"><?php $this->title() ?></h1>
-        <div class="post-info"><time datetime="<?php $this->date('c'); ?>" itemprop="datePublished"><?php $this->date('F j, Y'); ?></time></div>
         <div class="post-content">
             <?php $this->content(); ?>
         </div>
diff --git a/post.php b/post.php
index 489f248..4caa878 100644
--- a/post.php
+++ b/post.php
@@ -10,6 +10,7 @@
             <?php $this->content(); ?>
         </div>
     </article>
+    <div class="paginator"><?php $this->thePrev('%s', '', ['title'=>'PREV ARTICLE', 'tagClass'=>'prev']); ?> <?php $this->theNext('%s', '', ['title'=>'NEXT ARTICLE', 'tagClass'=>'next']); ?></div>
     <?php $this->need('comments.php'); ?>
 </div>
 
diff --git a/style.css b/style.css
index 03566d2..9df9978 100644
--- a/style.css
+++ b/style.css
@@ -11,6 +11,9 @@ body {
 article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary {
 	display:block
 }
+.post article {
+	margin-bottom: 4em;
+}
 audio,canvas,progress,video {
 	display:inline-block;
 	vertical-align:baseline
@@ -392,8 +395,9 @@ code,pre {
 }
 
 .paginator {
-	margin:4em 0;
-	text-align:center
+	margin:1em 0;
+	margin-top:1em;
+	text-align:center;
 }
 .paginator .prev,.paginator .next {
 	display:inline-block;
@@ -624,7 +628,7 @@ pre[class*="language-"] {
 }
 
 #comments {
-	margin-top: 50px;
+	margin-top: 2em;
 	border-top: 1px solid #ddd;
 	padding-top: 15px;
 }
@@ -776,7 +780,7 @@ pre[class*="language-"] {
 
 .form-control,
 output {
-    /* display: block;  */
+	/* display: block;  */
     color: #555;
     font-size: 13px;
     line-height: 20px;