From 392dc8061781982fddfa884531e80ffc259ca3ca Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Wed, 17 Jan 2024 16:17:05 +0800
Subject: [PATCH] code format

---
 .../views/modules/cms/articleForm.html        | 238 +++++++++---------
 .../views/modules/cms/categoryForm.html       | 211 ++++++++--------
 .../resources/views/modules/cms/siteForm.html |  11 +-
 3 files changed, 229 insertions(+), 231 deletions(-)

diff --git a/modules/cms/src/main/resources/views/modules/cms/articleForm.html b/modules/cms/src/main/resources/views/modules/cms/articleForm.html
index e957815f..188d444d 100644
--- a/modules/cms/src/main/resources/views/modules/cms/articleForm.html
+++ b/modules/cms/src/main/resources/views/modules/cms/articleForm.html
@@ -21,7 +21,7 @@
 							<label class="control-label col-sm-4" title="">
 								<span class="required ">*</span> ${text('所属栏目')}：<i class="fa icon-question hide"></i></label>
 							<div class="col-sm-8">
-							<#form:treeselect id="category" title="${text('所属栏目')}"
+								<#form:treeselect id="category" title="${text('所属栏目')}"
 									path="category.categoryCode" labelPath="category.categoryName"
 									url="${ctx}/cms/category/treeData?excludeCode=${article.category.categoryCode}"
 									class="required" allowClear="false" canSelectRoot="true" canSelectParent="false" />
@@ -70,145 +70,145 @@
 						</div>
 					</div>
 				</div>
-			</div>
-			<div class="row">
-				<div class="col-xs-6">
-					<div class="form-group">
-						<label class="control-label col-sm-4" title="${text('数值越大排序越靠前，可设置权重过期时间')}。">
-							${text('权重/排序')}： <i class="fa icon-question"></i></label>
-						<div class="col-sm-8">
-							<div class="form-inline m0">
-								<#form:input path="weight" class="form-control  width-90 digits" maxlength="10"/> &nbsp;
-								<#form:checkbox id="weightTop" label="${text('置顶')}" value="${article.weight==9999 ?'1' : ''}"
-										class="form-control" style="vertical-align:middle;"/>
+				<div class="row">
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="${text('数值越大排序越靠前，可设置权重过期时间')}。">
+								${text('权重/排序')}： <i class="fa icon-question"></i></label>
+							<div class="col-sm-8">
+								<div class="form-inline m0">
+									<#form:input path="weight" class="form-control  width-90 digits" maxlength="10"/> &nbsp;
+									<#form:checkbox id="weightTop" label="${text('置顶')}" value="${article.weight==9999 ?'1' : ''}"
+											class="form-control" style="vertical-align:middle;"/>
+								</div>
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="${text('时间到期后，权重自动恢复为0，如果为空，则权重永不过期')}。">
+								${text('权重过期时间')}： <i class="fa icon-question"></i></label>
+							<div class="col-sm-8">
+								<#form:input path="weightDate" readonly="true" maxlength="20" class="form-control laydate"
+									dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>
 							</div>
 						</div>
 					</div>
 				</div>
-				<div class="col-xs-6">
-					<div class="form-group">
-						<label class="control-label col-sm-4" title="${text('时间到期后，权重自动恢复为0，如果为空，则权重永不过期')}。">
-							${text('权重过期时间')}： <i class="fa icon-question"></i></label>
-						<div class="col-sm-8">
-						<#form:input path="weightDate" readonly="true" maxlength="20" class="form-control laydate"
-								dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="form-unit">${text('详细信息')}</div>
-			<div class="row">
-				<div class="col-xs-12">
-					<div class="form-group">
-						<label class="control-label col-sm-1">${text('摘要')}：</label>
-						<div class="col-sm-11">
-							<#form:textarea path="description" maxlength="500" class="form-control"/>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="row">
-				<div class="col-xs-12">
-					<div class="form-group">
-						<label class="control-label col-sm-1">${text('正文')}：</label>
-						<div class="col-sm-11">
-							<#form:ueditor id="content" path="articleData.content" maxlength="10000" height="500" class="required" outline="${parameter.outline}"/>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="form-unit">${text('其他信息')}</div>
-			<div class="row">
-				<div class="col-xs-12">
-					<div class="form-group">
-						<label class="control-label col-sm-2" title="">
-							<span class="required hide">*</span> ${text('内容图片')}：<i class="fa icon-question hide"></i></label>
-						<div class="col-sm-10">
-						<#form:fileupload id="uploadImage" bizKey="${article.id}"
-								bizType="article_image" returnPath="true"
-								filePathInputId="image" uploadType="image" readonly="false"
-								maxUploadNum="4" isMini="false" />
-						<#form:input path="image" maxlength="1000" readonly="true" class="form-control" />
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="row">
-				<div class="col-xs-6">
-					<div class="form-group">
-						<label class="control-label col-sm-4" title="">
-							<span class="required hide">*</span> ${text('关键字')}：<i class="fa icon-question hide"></i></label>
-						<div class="col-sm-8">
-							<#form:input path="keywords" maxlength="500" class="form-control"/>
-						</div>
-					</div>
-				</div>
-				<!--<div class="col-xs-6">
-					<div class="form-group">
-						<label class="control-label col-sm-4">${text('推荐位')}：</label>
-						<div class="col-sm-8">
-							<div class="checkbox-list">
-								<#form:checkbox path="posidList" dictType="cms_post" class="form-control" />
+				<div class="form-unit">${text('详细信息')}</div>
+				<div class="row">
+					<div class="col-xs-12">
+						<div class="form-group">
+							<label class="control-label col-sm-1">${text('摘要')}：</label>
+							<div class="col-sm-11">
+								<#form:textarea path="description" maxlength="500" class="form-control"/>
 							</div>
 						</div>
 					</div>
 				</div>
-			</div>
-			<div class="row">
-				<div class="col-xs-6">
-					<div class="form-group">
-						<label class="control-label col-sm-4" title="${text('文章的发布状态')}">${text('状态')}：<i class="fa icon-question"></i></label>
-						<div class="col-sm-8">
-							<#form:select path="state" dictType="sys_status" blankOption="true" class="form-control" />
-						</div>
-					</div>
-				</div>-->
-				<div class="col-xs-6">
-					<div class="form-group">
-						<label class="control-label col-sm-4" title="${text('可修改发布时间，不填则使用当前时间')}">
-							${text('发布时间')}： <i class="fa icon-question"></i></label>
-						<div class="col-sm-8">
-							<#form:input path="createDate" readonly="true" maxlength="20" class="form-control laydate"
-								dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>
+				<div class="row">
+					<div class="col-xs-12">
+						<div class="form-group">
+							<label class="control-label col-sm-1">${text('正文')}：</label>
+							<div class="col-sm-11">
+								<#form:ueditor id="content" path="articleData.content" maxlength="10000" height="500" class="required" outline="${parameter.outline}"/>
+							</div>
 						</div>
 					</div>
 				</div>
-			</div>
-			<div class="form-unit">${text('高级信息')}</div>
-			<div class="row">
-				<div class="col-xs-6">
-					<div class="form-group">
-						<label class="control-label col-sm-4" title="">
-							<span class="required hide">*</span> ${text('自定义内容视图')}：<i class="fa icon-question" title="自定义内容视图名称必须以'${article_DEFAULT_TEMPLATE}'开始"></i></label>
-						<div class="col-sm-8">
-							<#form:select path="customContentView" items="${contentViewList}" itemLabel="id" itemValue="id" blankOption="true" class="form-control " />
+				<div class="form-unit">${text('其他信息')}</div>
+				<div class="row">
+					<div class="col-xs-12">
+						<div class="form-group">
+							<label class="control-label col-sm-2" title="">
+								<span class="required hide">*</span> ${text('内容图片')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-10">
+								<#form:fileupload id="uploadImage" bizKey="${article.id}"
+									bizType="article_image" returnPath="true"
+									filePathInputId="image" uploadType="image" readonly="false"
+									maxUploadNum="4" isMini="false" />
+								<#form:input path="image" maxlength="1000" readonly="true" class="form-control" />
+							</div>
 						</div>
 					</div>
 				</div>
-			</div>
-			<div class="row">
-				<div class="col-xs-12">
-					<div class="form-group">
-						<label class="control-label col-sm-2" title="">
-							<span class="required hide">*</span> ${text('视图参数配置')}：<i class="fa icon-question" title="视图参数例如: {count:2, title_show:'yes'} 则在视图文件中的获取方法是：\${viewConfig_count}、\${viewConfig_titleShow}"></i></label>
-						<div class="col-sm-10">
-							<#form:input path="viewConfig" maxlength="1000" placeholder="视图参数例如: {count:2, title_show:'yes'} 则在视图文件中的获取方法是：${'${'}viewConfig_count}、${'${'}viewConfig_titleShow}" class="form-control"/>
+				<div class="row">
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required hide">*</span> ${text('关键字')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<#form:input path="keywords" maxlength="500" class="form-control"/>
+							</div>
+						</div>
+					</div>
+					<!--<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4">${text('推荐位')}：</label>
+							<div class="col-sm-8">
+								<div class="checkbox-list">
+									<#form:checkbox path="posidList" dictType="cms_post" class="form-control" />
+								</div>
+							</div>
 						</div>
 					</div>
 				</div>
-			</div>
-			<div class="row">
-				<div class="col-xs-12">
-					<div class="form-group">
-						<label class="control-label col-sm-2" title="">
-							<span class="required hide">*</span> ${text('备注信息')}：<i class="fa icon-question hide"></i></label>
-						<div class="col-sm-10">
-							<#form:textarea path="remarks" rows="4" maxlength="500" class="form-control"/>
+				<div class="row">
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="${text('文章的发布状态')}">${text('状态')}：<i class="fa icon-question"></i></label>
+							<div class="col-sm-8">
+								<#form:select path="state" dictType="sys_status" blankOption="true" class="form-control" />
+							</div>
+						</div>
+					</div>-->
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="${text('可修改发布时间，不填则使用当前时间')}">
+								${text('发布时间')}： <i class="fa icon-question"></i></label>
+							<div class="col-sm-8">
+								<#form:input path="createDate" readonly="true" maxlength="20" class="form-control laydate"
+									dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>
+							</div>
 						</div>
 					</div>
 				</div>
+				<div class="form-unit">${text('页面配置')}</div>
+				<div class="row">
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required hide">*</span> ${text('自定义内容视图')}：<i class="fa icon-question" title="自定义内容视图名称必须以'${article_DEFAULT_TEMPLATE}'开始"></i></label>
+							<div class="col-sm-8">
+								<#form:select path="customContentView" items="${contentViewList}" itemLabel="id" itemValue="id" blankOption="true" class="form-control " />
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-xs-12">
+						<div class="form-group">
+							<label class="control-label col-sm-2" title="">
+								<span class="required hide">*</span> ${text('视图参数配置')}：<i class="fa icon-question" title="视图参数例如: {count:2, title_show:'yes'} 则在视图文件中的获取方法是：\${viewConfig_count}、\${viewConfig_titleShow}"></i></label>
+							<div class="col-sm-10">
+								<#form:input path="viewConfig" maxlength="1000" placeholder="视图参数例如: {count:2, title_show:'yes'} 则在视图文件中的获取方法是：${'${'}viewConfig_count}、${'${'}viewConfig_titleShow}" class="form-control"/>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-xs-12">
+						<div class="form-group">
+							<label class="control-label col-sm-2" title="">
+								<span class="required hide">*</span> ${text('备注信息')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-10">
+								<#form:textarea path="remarks" rows="4" maxlength="500" class="form-control"/>
+							</div>
+						</div>
+					</div>
+				</div>
+				<#form:extend collapsed="true" pathPrefix="articleData"/>
 			</div>
-			<#form:extend collapsed="true" pathPrefix="articleData"/>
 			<div class="box-footer">
 				<div class="row">
 					<div class="col-sm-offset-2 col-sm-10">
diff --git a/modules/cms/src/main/resources/views/modules/cms/categoryForm.html b/modules/cms/src/main/resources/views/modules/cms/categoryForm.html
index d5de4d7b..340b6d6d 100644
--- a/modules/cms/src/main/resources/views/modules/cms/categoryForm.html
+++ b/modules/cms/src/main/resources/views/modules/cms/categoryForm.html
@@ -11,6 +11,7 @@
 		</div>
 		<#form:form id="inputForm" model="${category}" action="${ctx}/cms/category/save" method="post" class="form-horizontal">
 			<div class="box-body">
+				<div class="form-unit">${text('基本信息')}</div>
 				<div class="row">
 					<div class="col-xs-6">
 						<div class="form-group">
@@ -131,112 +132,112 @@
 						</div>
 					</div>
 				</div>
+				<div class="form-unit">${text('栏目配置')}</div>
+				<div class="row">
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="是否在导航中显示该栏目">
+								<span class="required hide">*</span> ${text('是否在导航中显示')}：<i class="fa icon-question"></i></label>
+							<div class="col-sm-8">
+								<#form:radio path="inMenu" dictType="sys_show_hide" class="form-control" />
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required hide">*</span> ${text('是否允许评论')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<#form:radio path="isCanComment" dictType="sys_yes_no" class="form-control" />
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="是否在分类页中显示该栏目的文章列表">
+								<span class="required hide">*</span> ${text('是否在分类页中显示')}：<i class="fa icon-question" ></i></label>
+							<div class="col-sm-8">
+								<#form:radio path="inList" dictType="sys_show_hide" class="form-control" />
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title=""> <span class="required hide">*</span>
+								${text('是否需要审核')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+								<#form:radio path="isNeedAudit" dictType="sys_yes_no" class="form-control" />
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="默认展现方式,首栏目内容列表,栏目第一条内容">
+								<span class="required hide">*</span> ${text('内容展现模式')}：<i class="fa icon-question" ></i></label>
+							<div class="col-sm-8">
+								<#form:radio path="showModes" dictType="cms_show_modes" class="form-control" />
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="自定义内容视图名称必须以'${category_DEFAULT_TEMPLATE}'开始">
+								${text('自定义列表视图')}：<i class="fa icon-question "></i></label>
+							<div class="col-sm-8">
+								<#form:select path="customListView" items="${listViewList}" itemLabel="id" itemValue="id" blankOption="true" class="form-control " />
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="自定义内容视图名称必须以'${article_DEFAULT_TEMPLATE}'开始"> <span class="required hide">*</span>
+								${text('自定义内容视图')}：<i class="fa icon-question "></i></label>
+							<div class="col-sm-8">
+								<#form:select path="customContentView" items="${contentViewList}" itemLabel="id" itemValue="id" blankOption="true" class="form-control " />
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-xs-12">
+						<div class="form-group">
+							<label class="control-label col-sm-2" title="视图参数例如: {count:2, title_show:'yes'} 则在视图文件中的获取方法是：\${viewConfig_count}、\${viewConfig_titleShow}">
+								${text('视图参数配置')}：<i class="fa icon-question"></i></label>
+							<div class="col-sm-10">
+								<#form:input path="viewConfig" maxlength="1000" class="form-control"
+									placeholder="视图参数例如: {count:2, title_show:'yes'} 则在视图文件中的获取方法是：${'${'}viewConfig_count}、${'${'}viewConfig_titleShow}" />
+								<br />
+								<ul class="text-muted well well-lg no-shadow m0 pt10 pb10">
+									<li>例如视图参数设置为：{count:2,titleShow:'yes'} 则在视图文件中的获取方法是：\${viewConfig_count}、\${viewConfig_titleShow}。</li>
+									<li>设置栏目的管理地址：若设置【adminUrl:false】表示无管理地址，在内容发布栏目列表中不显示该栏目；</li>
+									<li>设置【adminUrl:'/cms/guestbook'】表示有管理地址，在内容发布栏目列表中点击该栏目链接到该地址。</li>
+									<!-- <li>管理地址参数：若设置【adminUrlParam:'fileDownload=true'】则代表链接模型为文件下载的栏目，新增链接的时候出现文件上传对话框。</li>
+									<li>管理地址参数：若设置【adminUrlParam:'outlineView=true'】则代表文章模型开启大纲视图编辑，在线编辑器左侧显示大纲视图。</li> -->
+								</ul>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="form-unit">${text('其他信息')}</div>
+				<div class="row">
+					<div class="col-xs-12">
+						<div class="form-group">
+							<label class="control-label col-sm-2" title="">
+								<span class="required hide">*</span> ${text('备注信息')}：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-10">
+								<#form:textarea path="remarks" rows="4" maxlength="500" class="form-control" />
+							</div>
+						</div>
+					</div>
+				</div>
+				<#form:extend collapsed="true" />
 			</div>
-			<div class="form-unit">${text('栏目配置')}</div>
-			<div class="row">
-				<div class="col-xs-6">
-					<div class="form-group">
-						<label class="control-label col-sm-4" title="是否在导航中显示该栏目">
-							<span class="required hide">*</span> ${text('是否在导航中显示')}：<i class="fa icon-question"></i></label>
-						<div class="col-sm-8">
-							<#form:radio path="inMenu" dictType="sys_show_hide" class="form-control" />
-						</div>
-					</div>
-				</div>
-				<div class="col-xs-6">
-					<div class="form-group">
-						<label class="control-label col-sm-4" title="">
-							<span class="required hide">*</span> ${text('是否允许评论')}：<i class="fa icon-question hide"></i></label>
-						<div class="col-sm-8">
-							<#form:radio path="isCanComment" dictType="sys_yes_no" class="form-control" />
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="row">
-				<div class="col-xs-6">
-					<div class="form-group">
-						<label class="control-label col-sm-4" title="是否在分类页中显示该栏目的文章列表">
-							<span class="required hide">*</span> ${text('是否在分类页中显示')}：<i class="fa icon-question" ></i></label>
-						<div class="col-sm-8">
-							<#form:radio path="inList" dictType="sys_show_hide" class="form-control" />
-						</div>
-					</div>
-				</div>
-				<div class="col-xs-6">
-					<div class="form-group">
-						<label class="control-label col-sm-4" title=""> <span class="required hide">*</span>
-							${text('是否需要审核')}：<i class="fa icon-question hide"></i></label>
-						<div class="col-sm-8">
-							<#form:radio path="isNeedAudit" dictType="sys_yes_no" class="form-control" />
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="row">
-				<div class="col-xs-6">
-					<div class="form-group">
-						<label class="control-label col-sm-4" title="默认展现方式,首栏目内容列表,栏目第一条内容">
-							<span class="required hide">*</span> ${text('内容展现模式')}：<i class="fa icon-question" ></i></label>
-						<div class="col-sm-8">
-							<#form:radio path="showModes" dictType="cms_show_modes" class="form-control" />
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="row">
-				<div class="col-xs-6">
-					<div class="form-group">
-						<label class="control-label col-sm-4" title="自定义内容视图名称必须以'${category_DEFAULT_TEMPLATE}'开始">
-							${text('自定义列表视图')}：<i class="fa icon-question "></i></label>
-						<div class="col-sm-8">
-							<#form:select path="customListView" items="${listViewList}" itemLabel="id" itemValue="id" blankOption="true" class="form-control " />
-						</div>
-					</div>
-				</div>
-				<div class="col-xs-6">
-					<div class="form-group">
-						<label class="control-label col-sm-4" title="自定义内容视图名称必须以'${article_DEFAULT_TEMPLATE}'开始"> <span class="required hide">*</span>
-							${text('自定义内容视图')}：<i class="fa icon-question "></i></label>
-						<div class="col-sm-8">
-							<#form:select path="customContentView" items="${contentViewList}" itemLabel="id" itemValue="id" blankOption="true" class="form-control " />
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="row">
-				<div class="col-xs-12">
-					<div class="form-group">
-						<label class="control-label col-sm-2" title="视图参数例如: {count:2, title_show:'yes'} 则在视图文件中的获取方法是：\${viewConfig_count}、\${viewConfig_titleShow}">
-							${text('视图参数配置')}：<i class="fa icon-question"></i></label>
-						<div class="col-sm-10">
-							<#form:input path="viewConfig" maxlength="1000" class="form-control"
-								placeholder="视图参数例如: {count:2, title_show:'yes'} 则在视图文件中的获取方法是：${'${'}viewConfig_count}、${'${'}viewConfig_titleShow}" />
-							<br />
-							<ul class="text-muted well well-lg no-shadow m0 pt10 pb10">
-								<li>例如视图参数设置为：{count:2,titleShow:'yes'} 则在视图文件中的获取方法是：\${viewConfig_count}、\${viewConfig_titleShow}。</li>
-								<li>设置栏目的管理地址：若设置【adminUrl:false】表示无管理地址，在内容发布栏目列表中不显示该栏目；</li>
-								<li>设置【adminUrl:'/cms/guestbook'】表示有管理地址，在内容发布栏目列表中点击该栏目链接到该地址。</li>
-								<!-- <li>管理地址参数：若设置【adminUrlParam:'fileDownload=true'】则代表链接模型为文件下载的栏目，新增链接的时候出现文件上传对话框。</li>
-								<li>管理地址参数：若设置【adminUrlParam:'outlineView=true'】则代表文章模型开启大纲视图编辑，在线编辑器左侧显示大纲视图。</li> -->
-							</ul>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="form-unit">${text('其他信息')}</div>
-			<div class="row">
-				<div class="col-xs-12">
-					<div class="form-group">
-						<label class="control-label col-sm-2" title="">
-							<span class="required hide">*</span> ${text('备注信息')}：<i class="fa icon-question hide"></i></label>
-						<div class="col-sm-10">
-							<#form:textarea path="remarks" rows="4" maxlength="500" class="form-control" />
-						</div>
-					</div>
-				</div>
-			</div>
-			<#form:extend collapsed="true" />
 			<div class="box-footer">
 				<div class="row">
 					<div class="col-sm-offset-2 col-sm-10">
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 ca6879c6..008aecaa 100644
--- a/modules/cms/src/main/resources/views/modules/cms/siteForm.html
+++ b/modules/cms/src/main/resources/views/modules/cms/siteForm.html
@@ -1,5 +1,4 @@
 <% layout('/layouts/default.html', {title: '站点管理', libs: ['validate','fileupload','ueditor','dataGrid']}){ %>
-
 <div class="main-content">
 	<div class="box box-main">
 		<div class="box-header with-border">
@@ -71,12 +70,10 @@
 						<div class="form-group">
 							<label class="control-label col-sm-2">${text('站点logo')}</label>
 							<div class="col-sm-10">
-							<#form:fileupload   id="uploadLogo"   bizKey="${site.id}" bizType="site_logo" returnPath="true"
-							    filePathInputId="logo" 
-							    uploadType="image" readonly="false" maxUploadNum="1" isMini="false"/>
-							<#form:input path="logo" class="form-control"/>
-
-
+								<#form:fileupload id="uploadLogo" bizKey="${site.id}" bizType="site_logo" returnPath="true"
+									filePathInputId="logo" uploadType="image" readonly="false" maxUploadNum="1" isMini="false"/>
+								<#form:input path="logo" class="form-control"/>
+							</div>
 						</div>
 					</div>
 				</div>