From 13c4e2c86e3df22be6d8dc5696cb43ce87d37ce7 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: Tue, 21 Mar 2023 10:07:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E5=9C=86=E8=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/dialog/select_images.php      |  6 ++--
 src/admin/dialog/select_media.php       |  2 +-
 src/admin/dialog/select_soft.php        |  4 +--
 src/admin/dialog/select_templets.php    |  4 +--
 src/admin/templets/content_i_list.htm   | 48 ++++++++++++-------------
 src/admin/templets/file_manage_main.htm |  5 ++-
 src/admin/templets/soft_add.htm         | 18 +++++-----
 7 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/src/admin/dialog/select_images.php b/src/admin/dialog/select_images.php
index db729683..f64855ad 100644
--- a/src/admin/dialog/select_images.php
+++ b/src/admin/dialog/select_images.php
@@ -143,11 +143,11 @@ if (!empty($iseditor)) {
                         <input type="hidden" name="imgstick" value="<?php echo $imgstick ?>">
                         <input type="hidden" name="CKEditorFuncNum" value="<?php echo isset($CKEditorFuncNum) ? $CKEditorFuncNum : 1;?>">
                         <input type="hidden" name="job" value="upload">
-                        <span>选择：<input type="file" name="imgfile" class="w-50"></span>
+                        <label>选择：<input type="file" name="imgfile" class="w-50"></label>
                         <label><input type="checkbox" name="needwatermark" value="1" <?php if ($photo_markup == '1') echo "checked";?>> 水印</label>
                         <label><input type="checkbox" name="resize" value="1"> 缩小</label>
-                        <span>宽：<input type="text" name="iwidth" value="<?php echo $cfg_ddimg_width ?>" class="admin-input-xs"></span>
-                        <span>高：<input type="text" name="iheight" value="<?php echo $cfg_ddimg_height ?>" class="admin-input-xs"></span>
+                        <label>宽：<input type="text" name="iwidth" value="<?php echo $cfg_ddimg_width ?>" class="admin-input-xs"></label>
+                        <label>高：<input type="text" name="iheight" value="<?php echo $cfg_ddimg_height ?>" class="admin-input-xs"></label>
                         <button type="submit" name="sb1" class="btn btn-success btn-sm">上传</button>
                     </form>
                 </td>
diff --git a/src/admin/dialog/select_media.php b/src/admin/dialog/select_media.php
index 82add19d..a9dbdaf3 100644
--- a/src/admin/dialog/select_media.php
+++ b/src/admin/dialog/select_media.php
@@ -76,7 +76,7 @@ if (!empty($noeditor)) {
                         <input type="hidden" name="f" value="<?php echo $f ?>">
                         <input type="hidden" name="job" value="upload">
                         <input type="hidden" name="CKEditorFuncNum" value="<?php echo isset($CKEditorFuncNum) ? $CKEditorFuncNum : 1;?>">
-                        <span>选择：<input type="file" name="uploadfile" class="w-75"></span>
+                        <label>选择：<input type="file" name="uploadfile" class="w-75"></label>
                         <button type="submit" name="sb1" class="btn btn-success btn-sm">上传</button>
                     </form>
                 </td>
diff --git a/src/admin/dialog/select_soft.php b/src/admin/dialog/select_soft.php
index 40d88dcc..6054a96c 100644
--- a/src/admin/dialog/select_soft.php
+++ b/src/admin/dialog/select_soft.php
@@ -80,8 +80,8 @@ if (!empty($noeditor)) {
                         <input type="hidden" name="activepath" value="<?php echo $activepath ?>">
                         <input type="hidden" name="f" value="<?php echo $f ?>">
                         <input type="hidden" name="job" value="upload">
-                        <span>选择：<input type="file" name="uploadfile" class="w-50"></span>
-                        <span>改名：<input type="text" name="newname" class="admin-input-sm"></span>
+                        <label>选择：<input type="file" name="uploadfile" class="w-50"></label>
+                        <label>改名：<input type="text" name="newname" class="admin-input-sm"></label>
                         <button type="submit" name="sb1" class="btn btn-success btn-sm">保存</button>
                     </form>
                 </td>
diff --git a/src/admin/dialog/select_templets.php b/src/admin/dialog/select_templets.php
index 7af6cd7b..893d3a9c 100644
--- a/src/admin/dialog/select_templets.php
+++ b/src/admin/dialog/select_templets.php
@@ -61,8 +61,8 @@ if (empty($comeback)) {
                         <input type="hidden" name="activepath" value="<?php echo $activepath ?>">
                         <input type="hidden" name="f" value="<?php echo $f ?>">
                         <input type="hidden" name="job" value="upload">
-                        <span>选择：<input type="file" name="uploadfile" class="w-50"></span>
-                        <span>改名：<input type="text" name="filename" class="admin-input-sm"></span>
+                        <label>选择：<input type="file" name="uploadfile" class="w-50"></label>
+                        <label>改名：<input type="text" name="filename" class="admin-input-sm"></label>
                         <button type="submit" name="sb1" class="btn btn-success btn-sm">保存</button>
                     </form>
                 </td>
diff --git a/src/admin/templets/content_i_list.htm b/src/admin/templets/content_i_list.htm
index 07b4357c..c5ff5557 100644
--- a/src/admin/templets/content_i_list.htm
+++ b/src/admin/templets/content_i_list.htm
@@ -75,32 +75,30 @@
 				<td width="6%">发布人</td>
 				<td>操作</td>
 			</tr>
+			<form name="form2">
+				{dede:datalist empty='<tr><td colspan="10">暂无文档</td></tr>'}
+					<tr align="center">
+						<td width="6%"><input type="checkbox" name="arcID" id="arcID" value="{dede:field.id/}"></td>
+						<td width="6%">{dede:field.id/}</td>
+						<td width="26%" align="left">
+							<img src="{dede:field.litpic function='CheckPic(@me)'/}" class="thumbnail-sm">
+							<a href="archives_do.php?aid={dede:field.id/}&dopost=editArchives">{dede:field.title/}{dede:field.flag function='IsCommendArchives(@me)'/}</a>
+						</td>
+						<td width="10%">{dede:field.senddate function='GetDateTimeMk(@me)'/}</td>
+						<td width="12%">{dede:field.typeid function='GetTypename(@me)'/}</td>
+						<td width="6%">{dede:field.click/}</td>
+						<td width="6%">{dede:field.ismake function='IsHtmlArchives(@me)'/}</td>
+						<td width="6%">{dede:field.arcrank function='GetRankName(@me)'/}</td>
+						<td width="6%">{dede:field.mid function=GetMemberName(@me)/}</td>
+						<td>
+							<a href="javascript:;" class="btn btn-light btn-sm" onclick="QuickEdit('{dede:field.id/}',event,this);"><i class="fa fa-sliders"></i> 属性</a>
+							<a href="javascript:;" class="btn btn-light btn-sm" onclick="editArc({dede:field.id/});"><i class="fa fa-pencil-square"></i> 修改</a>
+							<a href="javascript:;" class="btn btn-light btn-sm" onclick="viewArc({dede:field.id/});"><i class="fa fa-eye"></i> 预览</a>
+						</td>
+					</tr>
+				{/dede:datalist}
+			</form>
 		</table>
-		<form name="form2">
-			{dede:datalist empty='<div class="text-center py-2">暂无文档</div>'}
-			<table cellpadding="1" cellspacing="1" align="center" class="table maintable mb-3">
-				<tr align="center">
-					<td width="6%"><input type="checkbox" name="arcID" id="arcID" value="{dede:field.id/}"></td>
-					<td width="6%">{dede:field.id/}</td>
-					<td width="26%" align="left">
-						<img src="{dede:field.litpic function='CheckPic(@me)'/}" class="thumbnail-sm">
-						<a href="archives_do.php?aid={dede:field.id/}&dopost=editArchives">{dede:field.title/}{dede:field.flag function='IsCommendArchives(@me)'/}</a>
-					</td>
-					<td width="10%">{dede:field.senddate function='GetDateTimeMk(@me)'/}</td>
-					<td width="12%">{dede:field.typeid function='GetTypename(@me)'/}</td>
-					<td width="6%">{dede:field.click/}</td>
-					<td width="6%">{dede:field.ismake function='IsHtmlArchives(@me)'/}</td>
-					<td width="6%">{dede:field.arcrank function='GetRankName(@me)'/}</td>
-					<td width="6%">{dede:field.mid function=GetMemberName(@me)/}</td>
-					<td>
-						<a href="javascript:;" class="btn btn-light btn-sm" onclick="QuickEdit('{dede:field.id/}',event,this);"><i class="fa fa-sliders"></i> 属性</a>
-						<a href="javascript:;" class="btn btn-light btn-sm" onclick="editArc({dede:field.id/});"><i class="fa fa-pencil-square"></i> 修改</a>
-						<a href="javascript:;" class="btn btn-light btn-sm" onclick="viewArc({dede:field.id/});"><i class="fa fa-eye"></i> 预览</a>
-					</td>
-				</tr>
-			</table>
-			{/dede:datalist}
-		</form>
 		<table cellspacing="1" cellpadding="1" align="center" class="table maintable mb-3">
 			<tr>
 				<td>
diff --git a/src/admin/templets/file_manage_main.htm b/src/admin/templets/file_manage_main.htm
index c6253201..4d25599f 100644
--- a/src/admin/templets/file_manage_main.htm
+++ b/src/admin/templets/file_manage_main.htm
@@ -10,7 +10,10 @@
     </head>
     <body>
         <table cellspacing="1" cellpadding="2" align="center" class="table maintable icon my-3">
-            <tr bgcolor="#f5f5f5" align="center">
+            <tr>
+                <td bgcolor="#f5f5f5" colspan="4">文件管理器</td>
+            </tr>
+            <tr bgcolor="#e9ecef" align="center">
                 <td width="26%">文件名称</td>
                 <td width="26%">文件大小</td>
                 <td width="26%">修改时间</td>
diff --git a/src/admin/templets/soft_add.htm b/src/admin/templets/soft_add.htm
index 7bbd410b..df9baaf5 100644
--- a/src/admin/templets/soft_add.htm
+++ b/src/admin/templets/soft_add.htm
@@ -345,7 +345,8 @@
 				</tr>
 				<?php if ($softconfig['moresitedo'] == 0 && trim($softconfig['sites']) != '') {?>
 				<tr>
-					<td class="admin-td">（服务器地址 + 软件地址 = 软件真实地址）</a><br>
+					<td class="admin-td">
+						<div class="py-2">（服务器地址 + 软件地址 = 软件真实地址）</div>
 						<?php
 						$sites = explode("\n", $softconfig['sites']);
 						$startNum = 2;
@@ -357,13 +358,14 @@
 							$siteurl = trim($siteurl);
 							$sitename = trim($sitename);
 						?>
-						<?php echo $sitename;?>：
-						<input type='hidden' name='forconfig<?php echo $startNum;?>' value='1'>
-						<input type='text' name='softurlfirst<?php echo $startNum;?>' class='admin-input-md' 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='checkbox' name='need<?php echo $startNum;?>' value='1' checked> 启用</label>
-						<br>
+						<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-md' 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='checkbox' name='need<?php echo $startNum;?>' value='1' checked> 启用</label>
+						</div>
 						<?php
 						$startNum++;
 						}