From cb5548d8497bf4f2e40ab9c273eb6e1e92c87bd3 Mon Sep 17 00:00:00 2001
From: zeekling <lingzhaohui@zeekling.cn>
Date: Mon, 31 Aug 2020 23:02:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9A=AE=E8=82=A4bolo-fantas?=
 =?UTF-8?q?tic=E6=9C=80=E6=96=B0=E8=AF=84=E8=AE=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bolo-fantastic/footer.ftl     | 12 +++++++
 bolo-fantastic/side-right.ftl | 17 ++++++++++
 bolo-fantastic/side.ftl       | 59 ++++++++++++++++++++++-------------
 3 files changed, 66 insertions(+), 22 deletions(-)

diff --git a/bolo-fantastic/footer.ftl b/bolo-fantastic/footer.ftl
index f36cc6a..c966aa1 100644
--- a/bolo-fantastic/footer.ftl
+++ b/bolo-fantastic/footer.ftl
@@ -144,6 +144,18 @@ function search(){
 	}
 	window.open("https://www.zeekling.cn/search?keyword=" + s);
 }
+function search_m(){
+	var s = $("#search-m").val();
+	if (s == ""){
+		layer.open({
+			title:"${blogTitle!}友情提示",
+			content:"搜索关键词不能为空!",
+			anim:4
+		});
+		return;
+	}
+	window.open("https://www.zeekling.cn/search?keyword=" + s);
+}
 </script>
 <#include "../../common-template/label.ftl">
 
diff --git a/bolo-fantastic/side-right.ftl b/bolo-fantastic/side-right.ftl
index 113d89b..f0b2732 100644
--- a/bolo-fantastic/side-right.ftl
+++ b/bolo-fantastic/side-right.ftl
@@ -69,3 +69,20 @@
 
     </div>
 </div>
+<div class="card widget">
+	<div class="card-content">
+		<div class="menu">
+			<h3 class="menu-label">${tagLabel}</h3>
+			<div class="field is-grouped is-grouped-multiline">
+			<#list mostUsedTags as tag>
+				<div class="control">
+					<a class="tags has-addons" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
+						<span class="tag">${tag.tagTitle}</span>
+					    <span class="tag is-grey">${tag.tagPublishedRefCount!}</span>
+					</a>
+				</div>
+			</#list>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/bolo-fantastic/side.ftl b/bolo-fantastic/side.ftl
index 00f7687..b4a680f 100644
--- a/bolo-fantastic/side.ftl
+++ b/bolo-fantastic/side.ftl
@@ -143,25 +143,6 @@ box-shadow: 0 1px 2px 0 rgba(0,0,0,0.1);">
                 </ul>
             </div>
         </div>
-    </div>
-    <div class="card widget">
-        <div class="card-content">
-            <div class="menu">
-                <h3 class="menu-label">
-                    ${tagLabel}
-                </h3>
-                <div class="field is-grouped is-grouped-multiline">
-                    <#list mostUsedTags as tag>
-                        <div class="control">
-                            <a class="tags has-addons" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
-                                <span class="tag">${tag.tagTitle}</span>
-                                <span class="tag is-grey">${tag.tagPublishedRefCount!}</span>
-                            </a>
-                        </div>
-                    </#list>
-                </div>
-            </div>
-        </div>
     </div>
         <div class="card widget">
            <div class="card-content">
@@ -171,15 +152,21 @@ box-shadow: 0 1px 2px 0 rgba(0,0,0,0.1);">
 			   <#list recentComments as comment>
                 <article class="media">
 				   <a href="${servePath}${comment.commentSharpURL}" class="media-left">
-				      <p class="image is-64x64">
-					     <img class="thumbnail" src="${adminUser.userAvatar!}"   data-src="${comment.commentThumbnailURL}"
+				      <p class="image is-48x48">
+					     <img class="thumbnail" src="${adminUser.userAvatar!}"
+						    data-src="${comment.commentThumbnailURL}"
 						    alt="${comment.commentName}">
 					 </p>
 				   </a>
 				   <div class="media-content">
 				      <div class="content">
                          <div style="padding-top: 10px;">
-							<div class="has-text-grey is-size-7 is-uppercase">${comment.commentName}</div>
+							<div class="has-text-grey is-size-7 is-uppercase">
+							   <a href="${comment.commentURL}" rel="nofollow" target="_black">
+							   ${comment.commentName}</a>
+							   评论于
+							   ${comment.commentDate2?string("yyyy-MM-dd")}
+							</div>
 						 </div>
 						 <a href="${servePath}${comment.commentSharpURL}"
 						     class="title has-link-black-ter is-size-6
@@ -203,6 +190,15 @@ box-shadow: 0 1px 2px 0 rgba(0,0,0,0.1);">
 			  </div>
 		  </div>
 		</div>
+		<div class="card widget">
+		    <div class="card-content" style="width:100%">
+				<div class="menu">
+					&nbsp;<input type="text" required="required" value="" name="s" id="search-m"
+						onkeydown="enterSearch(event)">&nbsp;
+						<input type="submit" id="searchsubmit" class="button" value="搜索" onclick="search_m()">
+				</div>
+			</div>
+		</div>
         <div class="card widget">
             <div class="card-content">
                 <h3 class="menu-label">
@@ -235,6 +231,25 @@ box-shadow: 0 1px 2px 0 rgba(0,0,0,0.1);">
             </div>
         </div>
 
+    <div class="card widget">
+        <div class="card-content">
+            <div class="menu">
+                <h3 class="menu-label">
+                    ${tagLabel}
+                </h3>
+                <div class="field is-grouped is-grouped-multiline">
+                    <#list mostUsedTags as tag>
+                        <div class="control">
+                            <a class="tags has-addons" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
+                                <span class="tag">${tag.tagTitle}</span>
+                                <span class="tag is-grey">${tag.tagPublishedRefCount!}</span>
+                            </a>
+                        </div>
+                    </#list>
+                </div>
+            </div>
+        </div>
+    </div>
     </div>