From 27265c104c9fb8b341ea00c45051ff7976a9ed68 Mon Sep 17 00:00:00 2001
From: zeekling <lingzhaohui@zeekling.cn>
Date: Fri, 4 Sep 2020 00:14:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9A=AE=E8=82=A4bolo-fantas?=
 =?UTF-8?q?tic=E7=BD=91=E7=AB=99=E5=BA=95=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bolo-fantastic/article.ftl     | 12 ------------
 bolo-fantastic/footer.ftl      | 31 +++++++++++++++++--------------
 bolo-fantastic/header.ftl      | 20 ++++++++++++++++++++
 bolo-fantastic/style.theme.ftl |  9 ++++++++-
 4 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/bolo-fantastic/article.ftl b/bolo-fantastic/article.ftl
index 74061ec..7434e0c 100644
--- a/bolo-fantastic/article.ftl
+++ b/bolo-fantastic/article.ftl
@@ -69,11 +69,9 @@
                                                     <div class="level-item has-text-grey">
                                                        跟新于${article.articleUpdateDate?string("yyyy年MM月dd日")}
                                                     </div>
-													<!--
                                                     <div class="level-item has-text-grey">
                                                        创建于${article.articleCreateDate?string("yyyy年MM月dd日")}
                                                     </div>
-													-->
 													<div>
 													   ${article.articleViewCount} 浏览&nbsp;
 													</div>
@@ -151,16 +149,6 @@
                     </div>
                 </section>
             </div>
-			<!-- 博客底部-->
-			<ins class="adsbygoogle"
-			     style="display:block;height:90px;width:728px;margin:auto;text-align:center;"
-				 data-ad-client="ca-pub-1331219010215317"
-				 data-ad-slot="2801313884"
-				 data-full-width-responsive="true">
-			</ins>
-			<script>
-				(adsbygoogle = window.adsbygoogle || []).push({});
-			</script>
             <a id="back-to-top" title="返回顶部" href="javascript:"><i class="fas fa-chevron-up"></i></a>
             <#include "footer.ftl">
             <@comment_script oId=article.oId commentable=article.commentable>
diff --git a/bolo-fantastic/footer.ftl b/bolo-fantastic/footer.ftl
index c966aa1..363c4f9 100644
--- a/bolo-fantastic/footer.ftl
+++ b/bolo-fantastic/footer.ftl
@@ -19,24 +19,27 @@
 -->
 <footer class="footer">
     <div class="container">
-        <div class="level">
+        <div class="level footer_main">
             <div class="level-start has-text-centered-mobile">
-                <p class="is-size-6">
-                    &copy; ${.now?string('yyyy')} ${blogTitle!}&nbsp;
+			        <div>
+                    <#include "../../common-template/macro-user_site.ftl"/>
+					<@userSite dir="n"/>
+					</div>
+                    &copy; ${.now?string('yyyy')} ${blogTitle!} • ${onlineVisitor1Label}${onlineVisitorCnt}
+					<br>
+					${footerContent}
+					<br>
                     Powered by <a href="https://github.com/AdlerED/bolo-solo" target="_blank">Bolo</a>
-                    <br>
-                </p>
+					Theme ${skinDirName}
+					<sup>[<a href="https://git.zeekling.cn/zeekling/bolo-skins/src/branch/master/bolo-fantastic"
+					target="_blank">ref</a>]</sup>
+					by <a href="https://www.zeekling.cn" target="_blank">唐墨夏</a>
             </div>
-            <div class="level-end">
-                    <a href="${servePath}/search"> 搜索</a>&nbsp;•&nbsp;
-                    <a href="${servePath}/tags.html"> ${allTagsLabel}</a>&nbsp;•&nbsp;
-                    <a href="${servePath}/archives.html"> ${archiveLabel}</a>&nbsp;•&nbsp;
-                    <a href="${servePath}/links.html">
-                        ${linkLabel}
-                    </a>
-                </div>
                 <div class="field has-addons is-flex-center-mobile has-mt-5-mobile is-flex-wrap is-flex-middle">
-                    <div>${footerContent} <br></div>
+					<#--
+                    <#include "../../common-template/macro-user_site.ftl"/>
+					<@userSite dir="n"/>
+					-->
                 </div>
             </div>
         </div>
diff --git a/bolo-fantastic/header.ftl b/bolo-fantastic/header.ftl
index 05b1dbe..a7bdb9f 100644
--- a/bolo-fantastic/header.ftl
+++ b/bolo-fantastic/header.ftl
@@ -17,6 +17,23 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 -->
+<style type="text/css">
+.user__site {
+	display: inline-block;
+	height: 16px;
+	line-height: 16px;
+	border-bottom: 0;
+	margin: 8px 5px 0 0;
+	width: 16px;
+}
+.footer_main{
+	max-width: 600px;
+	margin: auto;
+}
+.footer{
+	padding: 1rem 1.5rem 1.5rem;
+}
+</style>
 <nav class="navbar navbar-main  is-paddingless ">
     <div class="container ">
         <div class="navbar-brand transparent">
@@ -33,6 +50,9 @@
         <div id="navMenu" class="navbar-menu transparent">
             <div class="navbar-start transparent">
                 <div class="navbar-start">
+					<a class="navbar-item" href="${servePath}/tags.html"  rel="section">${allTagsLabel}</a>
+					<a class="navbar-item" href="${servePath}/archives.html"  rel="section">${archiveLabel}</a>
+					<a class="navbar-item" href="${servePath}/links.html"  rel="section">${linkLabel}</a>
                     <#list pageNavigations as page>
                         <a class="navbar-item" href="${page.pagePermalink}" target="${page.pageOpenTarget}"
                            rel="section">
diff --git a/bolo-fantastic/style.theme.ftl b/bolo-fantastic/style.theme.ftl
index 6782dac..9a5a621 100644
--- a/bolo-fantastic/style.theme.ftl
+++ b/bolo-fantastic/style.theme.ftl
@@ -507,4 +507,11 @@
     .has-text-black-ter {
         color: var(--color) !important;
     }
-</style>
\ No newline at end of file
+	.user__site{
+		    display: inline-block;
+			height: 16px;
+			line-height: 16px;
+			border-bottom: 0;
+			margin: 8px 5px 0 0;
+	}
+</style>