From a6293be77a50d165d4b4780ba2a7f0a2a2ab20c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?=
 <xushubieli@qq.com>
Date: Fri, 24 May 2024 17:39:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/templets/album_add.htm         |  4 ++--
 src/admin/templets/album_edit.htm        |  4 ++--
 src/admin/templets/archives_add.htm      |  4 ++--
 src/admin/templets/archives_edit.htm     |  4 ++--
 src/admin/templets/article_add.htm       |  4 ++--
 src/admin/templets/article_edit.htm      |  4 ++--
 src/admin/templets/catalog_add.htm       | 11 ++++++-----
 src/admin/templets/catalog_add_quick.htm |  2 +-
 src/admin/templets/catalog_edit.htm      | 11 ++++++-----
 src/admin/templets/soft_add.htm          |  4 ++--
 src/admin/templets/soft_edit.htm         |  4 ++--
 src/admin/templets/spec_add.htm          |  4 ++--
 src/admin/templets/spec_edit.htm         |  4 ++--
 src/static/web/css/admin.css             |  2 +-
 14 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm
index d674272a..507b770c 100644
--- a/src/admin/templets/album_add.htm
+++ b/src/admin/templets/album_add.htm
@@ -277,8 +277,8 @@
 								</td>
 								<td width="120">发布选项：</td>
 								<td>
-									<label><input type="radio" name="ishtml" value="1" checked> 生成网页</label>
-									<label><input type="radio" name="ishtml" value="0"> 仅动态浏览</label>
+									<label><input type="radio" name="ishtml" value="1" checked> 静态浏览</label>
+									<label><input type="radio" name="ishtml" value="0"> 动态浏览</label>
 								</td>
 							</tr>
 						</table>
diff --git a/src/admin/templets/album_edit.htm b/src/admin/templets/album_edit.htm
index 0c81e876..825a3a55 100644
--- a/src/admin/templets/album_edit.htm
+++ b/src/admin/templets/album_edit.htm
@@ -328,8 +328,8 @@
 								</td>
 								<td width="120">发布选项：</td>
 								<td>
-									<label><input type="radio" name="ishtml" value="1" <?php if ($arcRow["ismake"]!=-1) echo 'checked';?>> 生成网页</label>
-									<label><input type="radio" name="ishtml" value="0" <?php if ($arcRow["ismake"]==-1) echo 'checked';?>> 仅动态浏览</label>
+									<label><input type="radio" name="ishtml" value="1" <?php if ($arcRow["ismake"]!=-1) echo 'checked';?>> 静态浏览</label>
+									<label><input type="radio" name="ishtml" value="0" <?php if ($arcRow["ismake"]==-1) echo 'checked';?>> 动态浏览</label>
 								</td>
 							</tr>
 						</table>
diff --git a/src/admin/templets/archives_add.htm b/src/admin/templets/archives_add.htm
index f4ebf0ea..16856c12 100644
--- a/src/admin/templets/archives_add.htm
+++ b/src/admin/templets/archives_add.htm
@@ -215,8 +215,8 @@
 								</td>
 								<td width="120">发布选项：</td>
 								<td>
-									<label><input type="radio" name="ishtml" value="1" checked> 生成网页</label>
-									<label><input type="radio" name="ishtml" value="0"> 仅动态浏览</label>
+									<label><input type="radio" name="ishtml" value="1" checked> 静态浏览</label>
+									<label><input type="radio" name="ishtml" value="0"> 动态浏览</label>
 								</td>
 							</tr>
 						</table>
diff --git a/src/admin/templets/archives_edit.htm b/src/admin/templets/archives_edit.htm
index 244e46e8..02404b3d 100644
--- a/src/admin/templets/archives_edit.htm
+++ b/src/admin/templets/archives_edit.htm
@@ -211,8 +211,8 @@
 								</td>
 								<td width="120">发布选项：</td>
 								<td>
-									<label><input name="ishtml" type="radio" value="1" <?php if ($arcRow["ismake"]!=-1) echo 'checked';?>> 生成网页</label>
-									<label><input type="radio" name="ishtml" value="0" <?php if ($arcRow["ismake"]==-1) echo 'checked';?>> 仅动态浏览</label>
+									<label><input name="ishtml" type="radio" value="1" <?php if ($arcRow["ismake"]!=-1) echo 'checked';?>> 静态浏览</label>
+									<label><input type="radio" name="ishtml" value="0" <?php if ($arcRow["ismake"]==-1) echo 'checked';?>> 动态浏览</label>
 								</td>
 							</tr>
 						</table>
diff --git a/src/admin/templets/article_add.htm b/src/admin/templets/article_add.htm
index a2d7aa0b..4c4c06bd 100644
--- a/src/admin/templets/article_add.htm
+++ b/src/admin/templets/article_add.htm
@@ -223,8 +223,8 @@
 								</td>
 								<td width="120">发布选项：</td>
 								<td>
-									<label><input type="radio" name="ishtml" value="1" checked> 生成网页</label>
-									<label><input type="radio" name="ishtml" value="0"> 仅动态浏览</label>
+									<label><input type="radio" name="ishtml" value="1" checked> 静态浏览</label>
+									<label><input type="radio" name="ishtml" value="0"> 动态浏览</label>
 								</td>
 							</tr>
 						</table>
diff --git a/src/admin/templets/article_edit.htm b/src/admin/templets/article_edit.htm
index c25b1d8c..bb893949 100644
--- a/src/admin/templets/article_edit.htm
+++ b/src/admin/templets/article_edit.htm
@@ -209,8 +209,8 @@
 								</td>
 								<td width="120">发布选项：</td>
 								<td>
-									<label><input name="ishtml" type="radio" value="1" <?php if ($arcRow["ismake"]!=-1) echo 'checked';?>> 生成网页</label>
-									<label><input type="radio" name="ishtml" value="0" <?php if ($arcRow["ismake"]==-1) echo 'checked';?>> 仅动态浏览</label>
+									<label><input name="ishtml" type="radio" value="1" <?php if ($arcRow["ismake"]!=-1) echo 'checked';?>> 静态浏览</label>
+									<label><input type="radio" name="ishtml" value="0" <?php if ($arcRow["ismake"]==-1) echo 'checked';?>> 动态浏览</label>
 								</td>
 							</tr>
 						</table>
diff --git a/src/admin/templets/catalog_add.htm b/src/admin/templets/catalog_add.htm
index 225b6afd..a65e3121 100644
--- a/src/admin/templets/catalog_add.htm
+++ b/src/admin/templets/catalog_add.htm
@@ -153,7 +153,7 @@
 					<td>
 						<label><input type="radio" name="isdefault" value="1" checked> 静态浏览</label>
 						<label><input type="radio" name="isdefault" value="-1"> 动态浏览</label>
-						<label><input type="radio" name="isdefault" value="0"> 浏览列表第一页</label>
+						<label><input type="radio" name="isdefault" value="0"> 列表第一页浏览</label>
 					</td>
 					<td>默认页的名称：</td>
 					<td><input type="text" name="defaultname" value="index.html" class="admin-input-lg"></td>
@@ -170,9 +170,9 @@
 						<label><input type="radio" name="cross" id="cross0" value="0" onclick="CheckCross();" checked> 不交叉</label>
 						<label><input type="radio" name="cross" id="cross1" value="1" onclick="CheckCross();"> 自动获取同名栏目</label>
 						<label><input type="radio" name="cross" id="cross2" value="2" onclick="CheckCross();"> 指定交叉栏目id（英文逗号隔开）</label>
-						<a href="javascript:ShowHide('helpvarco');" class="btn btn-success btn-sm">说明</a><br>
-						<textarea name="crossid" id="crossid" class="admin-textarea-sm" style="display:none"></textarea>
-						<div id="helpvarco" class="alert alert-info my-2" style="display:none">交叉栏目是大栏目与另一个非子栏目交叉的情况，相当于副栏目功能，需要在栏目里设置好</div>
+						<a href="javascript:ShowHide('helpvarco');" class="btn btn-success btn-sm">说明</a>
+						<div id="crossid"  style="display:none"><textarea name="crossid" class="admin-textarea-sm"></textarea></div>
+						<div id="helpvarco" class="alert alert-info my-2" style="display:none">交叉栏目该栏目与另一个非子栏目交叉的情况，相当于副栏目功能</div>
 					</td>
 				</tr>
 				<?php if ($id==0) {?>
@@ -180,7 +180,8 @@
 					<td>多站点支持：</td>
 					<td>
 						<label><input type="radio" name="moresite" value="1"> 启用</label>
-						<label><input type="radio" name="moresite" value="0" checked> 不启用</label>（需要绑定二级域名，系统变量中开启支持多站点）
+						<label><input type="radio" name="moresite" value="0" checked> 不启用</label>
+						<span>（需要绑定二级域名，系统变量中开启支持多站点）</span>
 					</td>
 					<td>绑定域名：</td>
 					<td><input type="text" name="siteurl" id="siteurl" onChange="CheckPathSet();" class="admin-input-lg">（请输入绑定域名http开头）</td>
diff --git a/src/admin/templets/catalog_add_quick.htm b/src/admin/templets/catalog_add_quick.htm
index 316903ab..201565db 100644
--- a/src/admin/templets/catalog_add_quick.htm
+++ b/src/admin/templets/catalog_add_quick.htm
@@ -66,7 +66,7 @@
 					<td>
 						<label><input type="radio" name="isdefault" value="1" checked> 静态浏览</label>
 						<label><input type="radio" name="isdefault" value="-1"> 动态浏览</label>
-						<label><input type="radio" name="isdefault" value="0"> 浏览列表第一页</label>
+						<label><input type="radio" name="isdefault" value="0"> 列表第一页浏览</label>
 					</td>
 					<td>列表命名规则：</td>
 					<td>
diff --git a/src/admin/templets/catalog_edit.htm b/src/admin/templets/catalog_edit.htm
index c0391c80..1d439366 100644
--- a/src/admin/templets/catalog_edit.htm
+++ b/src/admin/templets/catalog_edit.htm
@@ -138,7 +138,7 @@
 					<td>
 						<label><input type="radio" name="isdefault" value="1" <?php if ($myrow['isdefault']==1) echo 'checked';?>> 静态浏览</label>
 						<label><input type="radio" name="isdefault" value="-1" <?php if ($myrow['isdefault']==-1) echo 'checked';?>> 动态浏览</label>
-						<label><input type="radio" name="isdefault" value="0" <?php if ($myrow['isdefault']==0) echo 'checked';?>> 浏览列表第一页</label>
+						<label><input type="radio" name="isdefault" value="0" <?php if ($myrow['isdefault']==0) echo 'checked';?>> 列表第一页浏览</label>
 					</td>
 					<td>默认页的名称：</td>
 					<td><input type="text" name="defaultname" value="<?php echo $myrow['defaultname']?>" class="admin-input-lg"></td>
@@ -155,16 +155,17 @@
 						<label><input type="radio" name="cross" id="cross0" value="0" onclick="CheckCross();" <?php if ($myrow['cross']==0) echo 'checked';?>> 不交叉</label>
 						<label><input type="radio" name="cross" id="cross1" value="1" onclick="CheckCross();" <?php if ($myrow['cross']==1) echo 'checked';?>> 自动获取同名栏目</label>
 						<label><input type="radio" name="cross" id="cross2" value="2" onclick="CheckCross();" <?php if ($myrow['cross']==2) echo 'checked';?>> 指定交叉栏目id（英文逗号隔开）</label>
-						<a href="javascript:ShowHide('helpvarco');" class="btn btn-success btn-sm">说明</a><br>
-						<textarea name="crossid" id="crossid" class="admin-textarea-sm" style="<?php if ($myrow['cross']!=2) echo'display:none';?>"><?php echo $myrow['crossid'];?></textarea>
-						<div id="helpvarco" class="alert alert-info my-2" style="display:none">交叉栏目是大栏目与另一个非子栏目交叉的情况，相当于副栏目功能，需要在栏目里设置好</div>
+						<a href="javascript:ShowHide('helpvarco');" class="btn btn-success btn-sm">说明</a>
+						<div id="crossid" style="<?php if ($myrow['cross']!=2) echo'display:none';?>"><textarea name="crossid" class="admin-textarea-sm"><?php echo $myrow['crossid'];?></textarea></div>
+						<div id="helpvarco" class="alert alert-info my-2" style="display:none">交叉栏目该栏目与另一个非子栏目交叉的情况，相当于副栏目功能</div>
 					</td>
 				</tr>
 				<tr>
 					<td width="260">多站点支持：</td>
 					<td>
 						<label><input type="radio" name="moresite" value="1" <?php if ($myrow['moresite']==1) echo 'checked';?>> 启用</label>
-						<label><input type="radio" name="moresite" value="0" <?php if ($myrow['moresite']==0) echo 'checked';?>> 不启用</label>（仅顶级栏目启用，子类栏目无效）
+						<label><input type="radio" name="moresite" value="0" <?php if ($myrow['moresite']==0) echo 'checked';?>> 不启用</label>
+						<span>（仅顶级栏目启用，子类栏目无效）</span>
 					</td>
 					<td>绑定域名：</td>
 					<td><input type="text" name="siteurl" id="siteurl" value="<?php echo $myrow['siteurl']?>" class="admin-input-lg">（请输入绑定域名http开头）</td>
diff --git a/src/admin/templets/soft_add.htm b/src/admin/templets/soft_add.htm
index 1541aaaf..2f40c8f1 100644
--- a/src/admin/templets/soft_add.htm
+++ b/src/admin/templets/soft_add.htm
@@ -407,8 +407,8 @@
 								</td>
 								<td width="120">发布选项：</td>
 								<td>
-									<label><input type="radio" name="ishtml" value="1" checked> 生成网页</label>
-									<label><input type="radio" name="ishtml" value="0"> 仅动态浏览</label>
+									<label><input type="radio" name="ishtml" value="1" checked> 静态浏览</label>
+									<label><input type="radio" name="ishtml" value="0"> 动态浏览</label>
 								</td>
 							</tr>
 						</table>
diff --git a/src/admin/templets/soft_edit.htm b/src/admin/templets/soft_edit.htm
index d5cc20f2..435feca3 100644
--- a/src/admin/templets/soft_edit.htm
+++ b/src/admin/templets/soft_edit.htm
@@ -354,8 +354,8 @@
 								</td>
 								<td width="120">发布选项：</td>
 								<td>
-									<label><input type="radio" name="ishtml" value="1" <?php if ($arcRow["ismake"]!=-1) echo 'checked';?>> 生成网页</label>
-									<label><input type="radio" name="ishtml" value="0" <?php if ($arcRow["ismake"]==-1) echo 'checked';?>> 仅动态浏览</label>
+									<label><input type="radio" name="ishtml" value="1" <?php if ($arcRow["ismake"]!=-1) echo 'checked';?>> 静态浏览</label>
+									<label><input type="radio" name="ishtml" value="0" <?php if ($arcRow["ismake"]==-1) echo 'checked';?>> 动态浏览</label>
 								</td>
 							</tr>
 						</table>
diff --git a/src/admin/templets/spec_add.htm b/src/admin/templets/spec_add.htm
index 860262b1..a40a8f69 100644
--- a/src/admin/templets/spec_add.htm
+++ b/src/admin/templets/spec_add.htm
@@ -249,8 +249,8 @@
 								</td>
 								<td width="120">发布选项：</td>
 								<td>
-									<label><input type="radio" name="ishtml" value="1" checked> 生成网页</label>
-									<label><input type="radio" name="ishtml" value="0"> 仅动态浏览</label>
+									<label><input type="radio" name="ishtml" value="1" checked> 静态浏览</label>
+									<label><input type="radio" name="ishtml" value="0"> 动态浏览</label>
 								</td>
 							</tr>
 						</table>
diff --git a/src/admin/templets/spec_edit.htm b/src/admin/templets/spec_edit.htm
index 3526e2f9..7b7bd007 100644
--- a/src/admin/templets/spec_edit.htm
+++ b/src/admin/templets/spec_edit.htm
@@ -296,8 +296,8 @@
 									<label><input type="radio" name="notpost" value="1" <?php if ($arcRow['notpost']==1) echo 'checked';?>> 禁止评论</label>
 								<td width="120">发布选项：</td>
 								<td>
-									<label><input type="radio" name="ishtml" value="1" <?php if ($arcRow["ismake"]!=-1) echo 'checked';?>> 生成网页</label>
-									<label><input type="radio" name="ishtml" value="0" <?php if ($arcRow["ismake"]==-1) echo 'checked';?>> 仅动态浏览</label>
+									<label><input type="radio" name="ishtml" value="1" <?php if ($arcRow["ismake"]!=-1) echo 'checked';?>> 静态浏览</label>
+									<label><input type="radio" name="ishtml" value="0" <?php if ($arcRow["ismake"]==-1) echo 'checked';?>> 动态浏览</label>
 								</td>
 							</tr>
 						</table>
diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css
index 1292a870..b3da6074 100644
--- a/src/static/web/css/admin.css
+++ b/src/static/web/css/admin.css
@@ -85,7 +85,7 @@ body.menu-show .body-right{left:220px;transition:all 0.5s}
 .updates-dot{display:none;position:absolute;top:10px;right:5px;height:8px;width:8px;background:var(--danger);border-radius:50%}
 .spinner-border{width:20px;height:20px;vertical-align:bottom}
 .sys-search{position:relative}
-.sys-search .sys-times{position:absolute;top:1px;right:20px}
+.sys-search .sys-times{position:absolute;top:1px;right:1rem}
 .coolbg{padding:0.5rem;background:var(--white);border-bottom:1px solid var(--gray-300);text-align:right}
 .coolbg-box{padding:0.5rem;background:var(--white);overflow-y:auto}
 .colordlg{padding:0.5rem;background:var(--white);border:1px solid var(--gray-300);z-index:10005}