From 1d4908273539b2e90fa4bd1ef263f07bd9d6d327 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 21 Aug 2021 10:56:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E9=A1=B5=E5=AF=BC=E8=88=AA=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/views/modules/cms/siteForm.html   | 9 +--------
 .../modules/cmsfront/themes/default/include/header.html  | 6 ++++--
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/modules/cms/src/main/resources/views/modules/cms/siteForm.html b/modules/cms/src/main/resources/views/modules/cms/siteForm.html
index 5f8a1ff6..6bb8c7b1 100644
--- a/modules/cms/src/main/resources/views/modules/cms/siteForm.html
+++ b/modules/cms/src/main/resources/views/modules/cms/siteForm.html
@@ -110,8 +110,6 @@
 								<span class="required hide">*</span> ${text('主题风格')}：<i class="fa icon-question hide"></i></label>
 							<div class="col-sm-8">
 								<#form:select path="theme" dictType="cms_theme"  class="form-control" />
-								
-								
 							</div>
 						</div>
 					</div>
@@ -120,8 +118,7 @@
 							<label class="control-label col-sm-4" title="">
 								<span class="required hide">*</span> ${text('首页视图')}：<i class="fa icon-question " title='自定义首页视图名称必须以"index"开始'></i></label>
 							<div class="col-sm-8">
-								<#form:select path="customIndexView" items="${indexViewList}" itemLabel="id" itemValue="id" class="form-control required" />
-								
+								<#form:select path="customIndexView" items="${indexViewList}" itemLabel="id" itemValue="id" class="form-control " />
 							</div>
 						</div>
 					</div>
@@ -132,11 +129,9 @@
 							<label class="control-label col-sm-2" title="">
 								<span class="required ">*</span> ${text('版权信息')}：<i class="fa icon-question hide"></i></label>
 							<div class="col-sm-10">
-								
 							<#form:ueditor name="copyright" path="copyright" maxlength="10000" height="200" class="required"
 							    simpleToolbars="false" readonly="false" outline="false"/>
 							</div>
-							
 						</div>
 					</div>
 				</div>
@@ -152,8 +147,6 @@
 						</div>
 					</div>
 				</div>
-				
-				
 			</div>
 			<div class="box-footer">
 				<div class="row">
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 d143047e..dc82b387 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
@@ -14,8 +14,10 @@
     <div class="navbar-collapse collapse" id="navbar-main">
       <ul class="nav navbar-nav mr-auto">
         <#html:foreach items="${categoryList(site.siteCode, '0', 4, '')}" var="c">
-          <li class="${c.categoryCode == category.categoryCode! ? 'active' : ''}"><a
-            href="${ctx}/list-${c.categoryCode}">${c.categoryName}</a></li>
+        	<#html:if test="${c.inMenu == @Global.YES}">
+	          <li class="${c.categoryCode == category.categoryCode! ? 'active' : ''}"><a
+	            href="${ctx}/list-${c.categoryCode}">${c.categoryName}</a></li>
+            </#html:if>
         </#html:foreach>
         <li><a href="http://jeesite.com" target="_blank">官方网站</a></li>
         <li><a href="http://s.jeesite.com" target="_blank">技术服务</a></li>