From 5567e96d6504e9858c674efce16694db2ebac2f4 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 3 Jun 2024 10:58:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0CMS=E5=85=A8=E6=96=87?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A8=A1=E5=9D=97=E5=AE=89=E8=A3=85=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/modules/cms/service/ArticleService.java   | 3 ++-
 .../static/modules/cmsfront/themes/css/custom.css         | 8 +++++---
 .../modules/cmsfront/themes/default/include/header.html   | 4 +++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/service/ArticleService.java b/modules/cms/src/main/java/com/jeesite/modules/cms/service/ArticleService.java
index a4f1338b..b48bd6ea 100644
--- a/modules/cms/src/main/java/com/jeesite/modules/cms/service/ArticleService.java
+++ b/modules/cms/src/main/java/com/jeesite/modules/cms/service/ArticleService.java
@@ -240,7 +240,8 @@ public class ArticleService extends CrudService<ArticleDao, Article> {
 	public Page<Map<String, Object>> searchPage(Page<Map<String, Object>> page, String qStr,
 			String qand, String qnot, String bd, String ed, Map<String, String> params) {
 		if (articleIndexService == null) {
-			page.addOtherData("message", text("您好，系统未安装全文检索模块。"));
+			page.addOtherData("message", text("您好，请安装全文检索模块后再试。" +
+					"<a href=\"https://jeesite.com/docs/cms/\" target=\"_blank\">安装文档</a>"));
 			return page;
 		}
 		return articleIndexService.searchPage(page, qStr, qand, qnot, bd, ed, params);
diff --git a/modules/cms/src/main/resources/static/modules/cmsfront/themes/css/custom.css b/modules/cms/src/main/resources/static/modules/cmsfront/themes/css/custom.css
index 2b0dd35d..c1dde087 100644
--- a/modules/cms/src/main/resources/static/modules/cmsfront/themes/css/custom.css
+++ b/modules/cms/src/main/resources/static/modules/cmsfront/themes/css/custom.css
@@ -1,4 +1,4 @@
-body{padding-top:50px;font-size:15px;background:#f7f8f9;}
+body{padding-top:50px;font-size:15px;background:#f7f8f9;font-family:Arial, sans-serif;}
 body>.navbar{-webkit-transition:background-color .3s ease-in;transition:background-color .3s ease-in}
 @media (min-width:768px){
 	body>.navbar-transparent{background-color:transparent}
@@ -51,6 +51,7 @@ footer p{clear:left;margin-bottom:0}
 	#banner{margin-bottom:2em;text-align:center}
 }
 
+.navbar-inverse {border-bottom:0;}
 .breadcrumb {border-radius:8px;background:transparent;padding:0;margin:2px 15px 21px 15px;}
 
 .jumbotron {background:#fff;margin:48px auto;border:1px solid #ededed;box-shadow:0 1px 4px 0 rgb(0 0 0 / 5%);border-radius:8px!important;}
@@ -64,8 +65,9 @@ footer p{clear:left;margin-bottom:0}
 .panel-title small .more {padding-top:4px;font-size:14px}
 
 .nav-search {margin-top:9px;}
-.nav-search .form-control {height:30px;padding:5px;}
-.nav-search .btn {height:31px;padding:5px 10px;}
+.nav-search .form-control {height:30px;line-height:30px;padding:5px;border-radius:4px;}
+.nav-search .btn {height:31px;padding:5px 10px;border-radius:15px;outline:none;}
+.nav-search .btn:focus {outline:none;}
 
 .main {background:#fff;box-shadow:0 1px 4px 0 rgb(0 0 0 / 8%);border-radius:0 0 8px 8px;padding:20px 10px;margin:0 -1px}
 .main-list {border-radius:8px;}
diff --git a/modules/cms/src/main/resources/views/modules/cmsfront/themes/default/include/header.html b/modules/cms/src/main/resources/views/modules/cmsfront/themes/default/include/header.html
index fead3cdd..998d8e20 100644
--- a/modules/cms/src/main/resources/views/modules/cmsfront/themes/default/include/header.html
+++ b/modules/cms/src/main/resources/views/modules/cmsfront/themes/default/include/header.html
@@ -40,7 +40,9 @@
             <div class="form-group" title="填写关键字，按 Enter 键进行全文检索...">
               <input type="text" name="q" class="form-control" placeholder="全站搜索...">
             </div>
-            <button type="submit" class="btn btn-primary hide">搜索</button>
+            <button type="submit" class="btn btn-primary">
+              <i class="fa fa-search"></i>
+            </button>
         </form>
       </ul>
     </div>