From 89254ff12f88a0d0b201e46b0e176d1ddb53f245 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?=
 <93301500+xushubieli@users.noreply.github.com>
Date: Fri, 2 Jun 2023 19:12:49 +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/soft_edit.php                  | 13 +++++--------
 src/admin/templets/catalog_add.htm       | 10 +++++-----
 src/admin/templets/catalog_add_quick.htm |  6 +++---
 src/admin/templets/catalog_edit.htm      | 16 ++++++++--------
 src/admin/templets/makehtml_list.htm     |  2 +-
 src/admin/templets/media_add.htm         |  8 +-------
 src/admin/templets/media_edit.htm        |  5 -----
 src/admin/templets/soft_add.htm          | 14 ++++++--------
 src/admin/templets/soft_edit.htm         |  6 +++---
 9 files changed, 32 insertions(+), 48 deletions(-)

diff --git a/src/admin/soft_edit.php b/src/admin/soft_edit.php
index dc971d18..949f00dc 100644
--- a/src/admin/soft_edit.php
+++ b/src/admin/soft_edit.php
@@ -47,12 +47,9 @@ if ($dopost != 'save') {
             foreach ($dtp->CTags as $ctag) {
                 if ($ctag->GetName() == 'link') {
                     $islocal = $ctag->GetAtt('islocal');
-                    if ($islocal != 1) $needmsg = "<label><input type='checkbox' name='del{$newRowStart}' value='1'> 删除</label>";
-                    else $needmsg = '<button name="sel1" class="btn btn-success btn-sm" type="button" id="sel1" onClick="SelectSoft(\'form1.softurl'.$newRowStart.'\')">选取</button>';
-                    $nForm .= "<div class='py-2'>软件地址{$newRowStart}：<input type='text' name='softurl{$newRowStart}' value='".trim($ctag->GetInnerText())."' class='admin-input-lg'> 服务器名称：<input type='text' name='servermsg{$newRowStart}' value='".$ctag->GetAtt("text")."' class='admin-input-sm'>
-                    <input type='hidden' name='islocal{$newRowStart}' value='{$islocal}'>
-                    $needmsg
-                    </div>\r\n";
+                    if ($islocal != 1) $needmsg = "<label class='ml-2'><input type='checkbox' name='del{$newRowStart}' value='1'> 删除</label>";
+                    else $needmsg = '<button type="button" name="sel1" id="sel1" class="btn btn-success btn-sm ml-2" onClick="SelectSoft(\'form1.softurl'.$newRowStart.'\')">选取</button>';
+                    $nForm .= "<div class='py-2'><label>软件地址{$newRowStart}：<input type='text' name='softurl{$newRowStart}' value='".trim($ctag->GetInnerText())."' class='admin-input-lg'></label><label class='ml-2'>地址名称：<input type='text' name='servermsg{$newRowStart}' value='".$ctag->GetAtt("text")."' class='admin-input-sm'></label><input type='hidden' name='islocal{$newRowStart}' value='{$islocal}'>$needmsg</div>\r\n";
                     $newRowStart++;
                 }
             }
@@ -135,8 +132,8 @@ if ($dopost != 'save') {
                     continue;
                 }
                 $vs = explode(',', $v);
-                if ($vs[1] == 'htmltext' || $vs[1] == 'textdata') //网页文本特殊处理
-                {
+                //网页文本特殊处理
+                if ($vs[1] == 'htmltext' || $vs[1] == 'textdata') {
                     ${$vs[0]} = AnalyseHtmlBody(${$vs[0]}, $description, $litpic, $keywords, $vs[1]);
                 } else {
                     if (!isset(${$vs[0]})) {
diff --git a/src/admin/templets/catalog_add.htm b/src/admin/templets/catalog_add.htm
index a3cdf81f..f1b4cbe5 100644
--- a/src/admin/templets/catalog_add.htm
+++ b/src/admin/templets/catalog_add.htm
@@ -149,9 +149,9 @@
 				<tr>
 					<td>栏目列表选项：</td>
 					<td>
-						<label><input type="radio" name="isdefault" value="1" checked="checked"> 链接到默认页</label>
-						<label><input type="radio" name="isdefault" value="0"> 链接到列表第一页</label>
-						<label><input type="radio" name="isdefault" value="-1"> 使用动态页</label>
+						<label><input type="radio" name="isdefault" value="1" checked="checked"> 静态浏览</label>
+						<label><input type="radio" name="isdefault" value="-1"> 动态浏览</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>
@@ -166,8 +166,8 @@
 					<td>栏目交叉：</td>
 					<td>
 						<label class="l-height-28"><input type="radio" name="cross" id="cross0" value="0" onclick="CheckCross()" checked="checked"> 不交叉</label>
-						<label class="l-height-28"><input type="radio" name="cross" id="cross1" value="1" onclick="CheckCross()"> 自动获取同名栏目文档</label>
-						<label class="l-height-28"><input type="radio" name="cross" id="cross2" value="2" onclick="CheckCross()"> 手工指定交叉栏目id（用英文逗号）</label>
+						<label class="l-height-28"><input type="radio" name="cross" id="cross1" value="1" onclick="CheckCross()"> 自动获取同名栏目</label>
+						<label class="l-height-28"><input type="radio" name="cross" id="cross2" value="2" onclick="CheckCross()"> 指定交叉栏目id（英文逗号分开）</label>
 						<span onclick="ShowHide('helpvarco')" title="帮助" class="btn btn-success btn-sm"><i class="fa fa-question-circle"></i></span><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>
diff --git a/src/admin/templets/catalog_add_quick.htm b/src/admin/templets/catalog_add_quick.htm
index 9cb61164..4f251264 100644
--- a/src/admin/templets/catalog_add_quick.htm
+++ b/src/admin/templets/catalog_add_quick.htm
@@ -63,9 +63,9 @@
 				<tr>
 					<td>栏目列表选项：</td>
 					<td>
-						<label><input type="radio" name="isdefault" value="1" checked="checked"> 链接到默认页</label>
-						<label><input type="radio" name="isdefault" value="0"> 链接到列表第一页</label>
-						<label><input type="radio" name="isdefault" value="-1"> 使用动态页</label>
+						<label><input type="radio" name="isdefault" value="1" checked="checked"> 静态浏览</label>
+						<label><input type="radio" name="isdefault" value="-1"> 动态浏览</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 585b29fa..e48d181d 100644
--- a/src/admin/templets/catalog_edit.htm
+++ b/src/admin/templets/catalog_edit.htm
@@ -129,15 +129,15 @@
 				<tr>
 					<td>文件保存目录：</td>
 					<td><input type="text" name="typedir" id="typedir" value="<?php echo $myrow['typedir']?>" class="admin-input-lg">（标签“{cmspath}”必填）</td>
-					<td>继承选项：</td>
-					<td><label><input type="checkbox" name="upnext" id="upnext" value="1"> 同时继承下级栏目浏览权限、文档类型、模板风格、命名规则等通用属性</label></td>
+					<td>是否继承选项：</td>
+					<td><label><input type="checkbox" name="upnext" id="upnext" value="1"> 子类栏目继承顶级栏目的浏览权限、文档类型、模板风格等属性</label></td>
 				</tr>
 				<tr>
 					<td>栏目列表选项：</td>
 					<td>
-						<label><input type="radio" name="isdefault" value="1" <?php if ($myrow['isdefault']==1) echo "checked='checked'";?>> 链接到默认页</label>
-						<label><input type="radio" name="isdefault" value="0" <?php if ($myrow['isdefault']==0) echo "checked='checked'";?>> 链接到列表第一页</label>
-						<label><input type="radio" name="isdefault" value="-1" <?php if ($myrow['isdefault']==-1) echo "checked='checked'";?>> 使用动态页</label>
+						<label><input type="radio" name="isdefault" value="1" <?php if ($myrow['isdefault']==1) echo "checked='checked'";?>> 静态浏览</label>
+						<label><input type="radio" name="isdefault" value="-1" <?php if ($myrow['isdefault']==-1) echo "checked='checked'";?>> 动态浏览</label>
+						<label><input type="radio" name="isdefault" value="0" <?php if ($myrow['isdefault']==0) echo "checked='checked'";?>> 浏览列表第一页</label>
 					</td>
 					<td>默认页的名称：</td>
 					<td><input type="text" name="defaultname" value="<?php echo $myrow['defaultname']?>" class="admin-input-lg"></td>
@@ -152,8 +152,8 @@
 					<td>栏目交叉：</td>
 					<td>
 						<label class="l-height-28"><input type="radio" name="cross" id="cross0" value="0" onclick="CheckCross()" <?php if ($myrow['cross']==0) echo "checked='checked'";?>> 不交叉</label>
-						<label class="l-height-28"><input type="radio" name="cross" id="cross1" value="1" onclick="CheckCross()" <?php if ($myrow['cross']==1) echo "checked='checked'";?>> 自动获取同名栏目文档</label>
-						<label class="l-height-28"><input type="radio" name="cross" id="cross2" value="2" onclick="CheckCross()" <?php if ($myrow['cross']==2) echo "checked='checked'";?>> 手工指定交叉栏目id（用英文逗号）</label>
+						<label class="l-height-28"><input type="radio" name="cross" id="cross1" value="1" onclick="CheckCross()" <?php if ($myrow['cross']==1) echo "checked='checked'";?>> 自动获取同名栏目</label>
+						<label class="l-height-28"><input type="radio" name="cross" id="cross2" value="2" onclick="CheckCross()" <?php if ($myrow['cross']==2) echo "checked='checked'";?>> 指定交叉栏目id（英文逗号分开）</label>
 						<span onclick="ShowHide('helpvarco')" title="帮助" class="btn btn-success btn-sm"><i class="fa fa-question-circle"></i></span><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>
@@ -163,7 +163,7 @@
 					<td width="260">多站点支持：</td>
 					<td>
 						<label><input type="radio" name="moresite" value="1" <?php if ($myrow['moresite']==1) echo "checked='checked'";?>> 启用</label>
-						<label><input type="radio" name="moresite" value="0" <?php if ($myrow['moresite']==0) echo "checked='checked'";?>> 不启用</label>（只需要顶级栏目设置，子级栏目修改无效）
+						<label><input type="radio" name="moresite" value="0" <?php if ($myrow['moresite']==0) echo "checked='checked'";?>> 不启用</label>（仅顶级栏目启用，子类栏目无效）
 					</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/makehtml_list.htm b/src/admin/templets/makehtml_list.htm
index ac21b63f..b2d969f0 100644
--- a/src/admin/templets/makehtml_list.htm
+++ b/src/admin/templets/makehtml_list.htm
@@ -38,7 +38,7 @@
 				<tr>
 					<td>是否更新子栏目：</td>
 					<td>
-						<label><input type="radio" name="upnext" value="1" checked="checked"> 更新子级栏目</label>
+						<label><input type="radio" name="upnext" value="1" checked="checked"> 更新子类栏目</label>
 						<label><input type="radio" name="upnext" value="0"> 仅更新所选栏目</label>
 					</td>
 				</tr>
diff --git a/src/admin/templets/media_add.htm b/src/admin/templets/media_add.htm
index 1c5387ee..1f6b9cfc 100644
--- a/src/admin/templets/media_add.htm
+++ b/src/admin/templets/media_add.htm
@@ -19,11 +19,6 @@
 				<tr>
 					<td bgcolor="#f5f5f5" colspan="2">添加附件</td>
 				</tr>
-				<tr>
-					<td colspan="2">
-						<div class="alert alert-info mb-0">图片类型仅支持jpg、png、gif、wbmp格式，视音频和附件为限定扩展名类型，在系统变量中修改</div>
-					</td>
-				</tr>
 				<tr>
 					<td width="260">媒体类型：</td>
 					<td>
@@ -54,8 +49,7 @@
 					</td>
 				</tr>
 				<tr>
-					<td></td>
-					<td>
+					<td colspan="2">
 						<p><input type="file" name="upfile1" id="upfile1" class="admin-input-lg"></p>
 						<p><input type="file" name="upfile2" id="upfile2" class="admin-input-lg"></p>
 						<p><input type="file" name="upfile3" id="upfile3" class="admin-input-lg"></p>
diff --git a/src/admin/templets/media_edit.htm b/src/admin/templets/media_edit.htm
index 0f3e1138..8e220a62 100644
--- a/src/admin/templets/media_edit.htm
+++ b/src/admin/templets/media_edit.htm
@@ -20,11 +20,6 @@
 				<tr>
 					<td bgcolor="#f5f5f5" colspan="2">修改附件</td>
 				</tr>
-				<tr>
-					<td colspan="2">
-						<div class="alert alert-info mb-0">图片类型仅支持jpg、png、gif、wbmp格式，视音频和附件为限定扩展名类型，在系统变量中修改</div>
-					</td>
-				</tr>
 				<tr>
 					<td width="260">媒体类型：</td>
 					<td>
diff --git a/src/admin/templets/soft_add.htm b/src/admin/templets/soft_add.htm
index 7d0c4718..2d7da55c 100644
--- a/src/admin/templets/soft_add.htm
+++ b/src/admin/templets/soft_add.htm
@@ -24,7 +24,7 @@
 				var endNum = parseInt(document.form1.picnum.value) + startNum - 1;
 				if (endNum > 30) endNum = 30;
 				for (startNum; startNum <= endNum; startNum++) {
-					upfield.innerHTML += "<div class='py-2'>软件地址" + startNum + "：<input type='text' name='softurl" + startNum + "' value='http://' class='admin-input-lg'> 服务器名称：<input type='text' name='servermsg" + startNum + "' class='admin-input-sm'></div>";
+					upfield.innerHTML += "<div class='py-2'><label>软件地址" + startNum + "：<input type='text' name='softurl" + startNum + "' value='http://' class='admin-input-lg'></label><label class='ml-2'>地址名称：<input type='text' name='servermsg" + startNum + "' class='admin-input-sm'></label></div>";
 				}
 			}
 			function ShowHideAddr() {
@@ -325,7 +325,7 @@
 									<input type="text" name="softurl1" id="softurl1" class="admin-input-lg">
 									<button type="button" name="sel1" id="sel1" class="btn btn-success btn-sm" onclick="SelectSoft('form1.softurl1')">选取</button>
 								</td>
-								<td width="120">服务器名称：</td>
+								<td width="120">地址名称：</td>
 								<td><input type="text" name="servermsg1" id="servermsg1" value="本地下载" class="admin-input-sm"></td>
 							</tr>
 						</table>
@@ -334,7 +334,6 @@
 				<?php if ($softconfig['moresitedo'] == 0 && trim($softconfig['sites']) != '') {?>
 				<tr>
 					<td class="admin-td">
-						<div class="py-2">（服务器地址 + 软件地址 = 软件真实地址）</div>
 						<?php
 						$sites = explode("\n", $softconfig['sites']);
 						$startNum = 2;
@@ -347,11 +346,10 @@
 							$sitename = trim($sitename);
 						?>
 						<div class="py-2">
-							<?php echo $sitename;?>
 							<input type="hidden" name="forconfig<?php echo $startNum;?>" value="1">
-							<input type="text" name="softurlfirst<?php echo $startNum;?>" class="admin-input-lg" value="<?php echo $siteurl;?>"> +
-							<input type="text" name="softurl<?php echo $startNum;?>" class="admin-input-sm"> =
-							<input type="text" name="servermsg<?php echo $startNum;?>" class="admin-input-sm" value="<?php echo $sitename;?>">
+							<label>填写域名：<input type="text" name="softurlfirst<?php echo $startNum;?>" class="admin-input-lg" value="<?php echo $siteurl;?>"></label>
+							<label>填写目录：<input type="text" name="softurl<?php echo $startNum;?>" class="admin-input-sm"></label>
+							<label>地址名称：<input type="text" name="servermsg<?php echo $startNum;?>" class="admin-input-sm" value="<?php echo $sitename;?>"></label>
 							<label><input type="checkbox" name="need<?php echo $startNum;?>" value="1" checked="checked"> 启用</label>
 						</div>
 						<?php
@@ -370,7 +368,7 @@
 								<td>
 									<input type="text" name="picnum" id="picnum" value="5" class="admin-input-sm">
 									<button type="button" name="kkkup" class="btn btn-success btn-sm" id="kkkup2" onclick="MakeUpload();">添加地址</button>
-									<button type="button" class="btn btn-success btn-sm" name="Submit3" id="btsh3" onclick="ShowHideAddr();">隐藏地址</button>（最多为30个链接）
+									<button type="button" class="btn btn-success btn-sm" name="Submit3" id="btsh3" onclick="ShowHideAddr();">隐藏地址</button>
 								</td>
 							</tr>
 						</table>
diff --git a/src/admin/templets/soft_edit.htm b/src/admin/templets/soft_edit.htm
index e3e257d4..541a874e 100644
--- a/src/admin/templets/soft_edit.htm
+++ b/src/admin/templets/soft_edit.htm
@@ -24,7 +24,7 @@
 				var endNum = parseInt(document.form1.picnum.value) + startNum;
 				if (endNum > 30) endNum = 30;
 				for (startNum; startNum < endNum; startNum++) {
-					upfield.innerHTML += "<div class='py-2'>软件地址" + startNum + "：<input type='text' name='softurl" + startNum + "' value='http://' class='admin-input-lg'> 服务器名称：<input type='text' name='servermsg" + startNum + "' class='admin-input-sm'></div>";
+					upfield.innerHTML += "<div class='py-2'><label>软件地址" + startNum + "：<input type='text' name='softurl" + startNum + "' value='http://' class='admin-input-lg'></label><label class='ml-2'>地址名称：<input type='text' name='servermsg" + startNum + "' class='admin-input-sm'><label></div>";
 				}
 			}
 			function ShowHideAddr() {
@@ -321,8 +321,8 @@
 								<td width="120">其它地址：</td>
 								<td>
 									<input type="text" name="picnum" id="picnum" size="8" value="5">
-									<button type="button" name="kkkup" id="kkkup2" class="btn btn-success btn-sm" onclick="MakeUpload();">添加数量</button>
-									<button type="button" name="Submit3" id="btsh3" class="btn btn-success btn-sm" onclick="ShowHideAddr();">隐藏地址</button>（最多为30个链接）
+									<button type="button" name="kkkup" id="kkkup2" class="btn btn-success btn-sm" onclick="MakeUpload();">添加地址</button>
+									<button type="button" name="Submit3" id="btsh3" class="btn btn-success btn-sm" onclick="ShowHideAddr();">隐藏地址</button>
 								</td>
 							</tr>
 						</table>