From 500fd010c39f53ebe545530ec2778b738e70fd5b 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: Sat, 3 May 2025 17:55:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0icon=E5=92=8C=E5=B8=AE?=
 =?UTF-8?q?=E5=8A=A9=E8=AF=B4=E6=98=8E=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/dialog/select_images.php        |  2 +-
 src/admin/index_body.php                  |  2 +-
 src/admin/sys_sql_query.php               | 17 ++++++++---------
 src/admin/templets/catalog_add.htm        |  8 ++++----
 src/admin/templets/catalog_add_quick.htm  |  4 ++--
 src/admin/templets/catalog_edit.htm       |  8 ++++----
 src/admin/templets/file_manage_main.htm   |  2 +-
 src/admin/templets/sys_sql_query.htm      |  2 +-
 src/admin/templets/templets_default.htm   |  2 +-
 src/admin/templets/templets_tagsource.htm |  2 +-
 src/static/web/css/admin.css              |  8 +++++---
 11 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/src/admin/dialog/select_images.php b/src/admin/dialog/select_images.php
index fd507f0c..a8d1b540 100644
--- a/src/admin/dialog/select_images.php
+++ b/src/admin/dialog/select_images.php
@@ -112,7 +112,7 @@ if (!empty($iseditor)) {
                         $tmp = preg_replace("#[\/][^\/]*$#i", "", $activepath);
                         $line = "<div class='d-flex justify-content-between align-items-center mb-3'>
                             <span>当前目录：$activepath</span>
-                            <a href='select_images.php?imgstick=$imgstick&v=$v&f=$f&activepath=".urlencode($tmp).$addparm."'><img src='/static/web/img/icon_dir2.png'> 返回上级</a>
+                            <a href='select_images.php?imgstick=$imgstick&v=$v&f=$f&activepath=".urlencode($tmp).$addparm."' class='btn btn-success btn-sm'>返回上级</a>
                         </div>";
                         echo $line;
                     } else if (is_dir("$inpath/$file")) {
diff --git a/src/admin/index_body.php b/src/admin/index_body.php
index d5a6e235..1a8e2228 100644
--- a/src/admin/index_body.php
+++ b/src/admin/index_body.php
@@ -157,7 +157,7 @@ if (empty($dopost)) {
     exit;
 } elseif ($dopost == 'safe_mode') {
     $safemsg = "系统运行模式为安全模式，模板管理、标签管理、数据库管理、模块管理等功能已暂停，如果您需要这些功能，在/system/common.inc.php文件大约第10行代码找到DEDEBIZ_SAFE_MODE后面值TRUE修改为FALSE恢复使用";
-    $unsafemsg = "系统运行模式为开发模式，模板管理、标签管理、数据库管理、模块管理等功能已恢复，建议在上线后更改为<strong>安全模式</strong>，在/system/common.inc.php文件大约第10行代码找到DEDEBIZ_SAFE_MODE后面值FALSE修改为TRUE暂停使用";
+    $unsafemsg = "系统运行模式为开发模式，模板管理、标签管理、数据库管理、模块管理等功能已恢复，建议在上线后更改为<span class='text-success'>安全模式</span>，在/system/common.inc.php文件大约第10行代码找到DEDEBIZ_SAFE_MODE后面值FALSE修改为TRUE暂停使用";
     $modeStr = DEDEBIZ_SAFE_MODE? $safemsg : $unsafemsg;
     ShowMsg($modeStr, "javascript:;");
     exit;
diff --git a/src/admin/sys_sql_query.php b/src/admin/sys_sql_query.php
index 5bb8d82e..3f45ebed 100644
--- a/src/admin/sys_sql_query.php
+++ b/src/admin/sys_sql_query.php
@@ -224,7 +224,6 @@ else if ($dopost == "query") {
     <link rel="stylesheet" href="/static/web/css/bootstrap.min.css">
     <link rel="stylesheet" href="/static/web/css/admin.css">
     <title>DedeBIZ数据库文档</title>
-    <style>.card-header{border-top-left-radius:0.5rem!important;border-top-right-radius:0.5rem!important}.table thead th{padding:0.5rem;background:#e9ecef;border-bottom:none}.table tbody td{padding:0.5rem}</style>
 </head>
 <body>
     <div class="container-fluid">
@@ -245,19 +244,19 @@ else if ($dopost == "query") {
         $tableCommentRow = $dsql->GetArray('c', MYSQL_BOTH);
         $tableComment = $tableCommentRow['TABLE_COMMENT'];
         if (!empty($tableComment)) {
-            $output .= '<p><strong>表注释:</strong> '.$tableComment.'</p>';
+            $output .= '<p>表注释：'.$tableComment.'</p>';
         }
         //获取表的字段信息
         $dsql->SetQuery("SELECT COLUMN_NAME, COLUMN_TYPE, IS_NULLABLE, COLUMN_DEFAULT, COLUMN_COMMENT FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = '$tableName'");
         $dsql->Execute('col');
-        $output .= '<table class="table table-bordered table-hover">
+        $output .= '<table class="table table-borderless table-hover">
             <thead>
                 <tr>
-                    <th>字段名</th>
-                    <th>类型</th>
-                    <th>是否可为空</th>
-                    <th>默认值</th>
-                    <th>字段注释</th>
+                    <th width="10%">字段名</th>
+                    <th width="20%">类型</th>
+                    <th width="10%">是否可为空</th>
+                    <th width="10%">默认值</th>
+                    <th scope="col">字段注释</th>
                 </tr>
             </thead>
             <tbody>';
@@ -282,7 +281,7 @@ else if ($dopost == "query") {
     </div>
     </div>';
     }
-    $output .= '<p class="text-center">版权所有 &copy; '.date('Y').' <a href="https://www.dedebiz.com/?from=dbdocs" class="text-success">DedeBIZ</a> 保留所有权利。</p>
+    $output .= '<p class="text-center">版权所有 &copy; '.date('Y').' <a href="https://www.dedebiz.com/?from=dbdocs" class="text-success">DedeBIZ</a> 保留所有权利</p>
     </div>
 </body>
 </html>';
diff --git a/src/admin/templets/catalog_add.htm b/src/admin/templets/catalog_add.htm
index 49f6058f..7546d9d8 100644
--- a/src/admin/templets/catalog_add.htm
+++ b/src/admin/templets/catalog_add.htm
@@ -180,7 +180,7 @@
 											<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>
 											<div id="crossid"  style="display:none"><textarea name="crossid" class="admin-textarea-sm"></textarea></div>
-											<div id="helpvarco" class="alert alert-secondary my-2" style="display:none">交叉栏目该栏目与另一个非子栏目交叉的情况，相当于副栏目功能</div>
+											<div id="helpvarco" class="helpinfo my-2" style="display:none">交叉栏目该栏目与另一个非子栏目交叉的情况，相当于副栏目功能</div>
 										</td>
 									</tr>
 									<?php if ($id==0) {?>
@@ -206,7 +206,7 @@
 											<input type="text" name="tempindex" value="{style}/index_<?php echo $nid?>.htm" class="admin-input-lg">
 											<button type="button" class="btn btn-success btn-sm" onclick="SelectTemplets('form1.tempindex')">选择</button>
 											<a href="javascript:ShowHide('helpvar1');" class="btn btn-success btn-sm">说明</a>
-											<div id="helpvar1" class="alert alert-secondary my-2" style="display:none">
+											<div id="helpvar1" class="helpinfo my-2" style="display:none">
 												<p>{tid} 栏目id</p>
 												<span>{cid} 栏目模型名字id</span>
 											</div>
@@ -222,7 +222,7 @@
 										<td>
 											<input type="text" name="namerule2" id="namerule2" value="{typedir}/{tid}-{page}.html" class="admin-input-lg">
 											<a href="javascript:ShowHide('helpvar2');" class="btn btn-success btn-sm">说明</a>
-											<div id="helpvar2" class="alert alert-secondary my-2" style="display:none">
+											<div id="helpvar2" class="helpinfo my-2" style="display:none">
 												<p>静态规则</p>
 												<p>{tid} 栏目id</p>
 												<p>{page} 栏目页码数</p>
@@ -237,7 +237,7 @@
 										<td>
 											<input type="text" name="namerule" tid="namerule" value="<?php echo $cfg_df_namerule;?>" class="admin-input-lg">
 											<a href="javascript:ShowHide('helpvar3');" class="btn btn-success btn-sm">说明</a>
-											<div id="helpvar3" class="alert alert-secondary my-2" style="display:none">
+											<div id="helpvar3" class="helpinfo my-2" style="display:none">
 												<p>静态规则</p>
 												<p>{Y}{M}{D} 年月日</p>
 												<p>{timestamp} INT类型的UNIX时间戳</p>
diff --git a/src/admin/templets/catalog_add_quick.htm b/src/admin/templets/catalog_add_quick.htm
index ffbc2bad..828e16ae 100644
--- a/src/admin/templets/catalog_add_quick.htm
+++ b/src/admin/templets/catalog_add_quick.htm
@@ -80,7 +80,7 @@
 										<td>
 											<input type="text" name="namerule2" id="namerule2" value="{typedir}/{tid}-{page}.html" class="admin-input-lg">
 											<a href="javascript:ShowHide('helpvar1');" class="btn btn-success btn-sm">说明</a>
-											<div id="helpvar1" class="alert alert-secondary my-2" style="display:none">
+											<div id="helpvar1" class="helpinfo my-2" style="display:none">
 												<p>静态规则</p>
 												<p>{tid} 栏目id</p>
 												<p>{page} 栏目页码数</p>
@@ -95,7 +95,7 @@
 										<td>
 											<input type="text" name="namerule" id="namerule" value="{typedir}/{aid}.html" class="admin-input-lg">
 											<a href="javascript:ShowHide('helpvar2');" class="btn btn-success btn-sm">说明</a>
-											<div id="helpvar2" class="alert alert-secondary my-2" style="display:none">
+											<div id="helpvar2" class="helpinfo my-2" style="display:none">
 												<p>静态规则</p>
 												<p>{Y}{M}{D} 年月日</p>
 												<p>{timestamp} INT类型的UNIX时间戳</p>
diff --git a/src/admin/templets/catalog_edit.htm b/src/admin/templets/catalog_edit.htm
index f83566e9..5ae7bf14 100644
--- a/src/admin/templets/catalog_edit.htm
+++ b/src/admin/templets/catalog_edit.htm
@@ -165,7 +165,7 @@
 											<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>
 											<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-secondary my-2" style="display:none">交叉栏目该栏目与另一个非子栏目交叉的情况，相当于副栏目功能</div>
+											<div id="helpvarco" class="helpinfo my-2" style="display:none">交叉栏目该栏目与另一个非子栏目交叉的情况，相当于副栏目功能</div>
 										</td>
 									</tr>
 									<tr>
@@ -189,7 +189,7 @@
 											<input type="text" name="tempindex" value="<?php echo $myrow['tempindex']?>" class="admin-input-lg">
 											<button type="button" class="btn btn-success btn-sm" onclick="SelectTemplets('form1.tempindex')">选择</button>
 											<a href="javascript:ShowHide('helpvar1');" class="btn btn-success btn-sm">说明</a>
-											<div id="helpvar1" class="alert alert-secondary my-2" style="display:none">
+											<div id="helpvar1" class="helpinfo my-2" style="display:none">
 												<p>{tid} 栏目id</p>
 												<p>{cid} 栏目模型名字id</p>
 											</div>
@@ -205,7 +205,7 @@
 										<td>
 											<input type="text" name="namerule2" id="namerule2" value="<?php echo $myrow['namerule2']?>" class="admin-input-lg">
 											<a href="javascript:ShowHide('helpvar2');" class="btn btn-success btn-sm">说明</a>
-											<div id="helpvar2" class="alert alert-secondary my-2" style="display:none">
+											<div id="helpvar2" class="helpinfo my-2" style="display:none">
 												<p>静态规则</p>
 												<p>{tid} 栏目id</p>
 												<p>{page} 栏目页码数</p>
@@ -220,7 +220,7 @@
 										<td>
 											<input type="text" name="namerule" id="namerule" value="<?php echo $myrow['namerule']?>" class="admin-input-lg">
 											<a href="javascript:ShowHide('helpvar3');" class="btn btn-success btn-sm">说明</a>
-											<div id="helpvar3" class="alert alert-secondary my-2" style="display:none">
+											<div id="helpvar3" class="helpinfo my-2" style="display:none">
 												<p>静态规则</p>
 												<p>{Y}{M}{D} 年月日</p>
 												<p>{timestamp} INT类型的UNIX时间戳</p>
diff --git a/src/admin/templets/file_manage_main.htm b/src/admin/templets/file_manage_main.htm
index 165374df..689248ac 100644
--- a/src/admin/templets/file_manage_main.htm
+++ b/src/admin/templets/file_manage_main.htm
@@ -18,7 +18,7 @@
 				<div class="card-header">文件管理器</div>
 				<div class="card-body">
 					<div class="table-responsive">
-						<table class="table table-borderless table-hover">
+						<table class="table table-borderless table-hover icon">
 							<thead>
 								<tr>
 									<td scope="col">文件名称</td>
diff --git a/src/admin/templets/sys_sql_query.htm b/src/admin/templets/sys_sql_query.htm
index 5f62d2e5..12a28f02 100644
--- a/src/admin/templets/sys_sql_query.htm
+++ b/src/admin/templets/sys_sql_query.htm
@@ -54,7 +54,7 @@
 											<button type="Submit" class="btn btn-success btn-sm" onclick="this.form.dopost.value='viewinfo';">查看表结构</button>
 											<button type="Submit" class="btn btn-success btn-sm" onclick="this.form.dopost.value='opimizeAll';">优化全部表</button>
 											<button type="Submit" class="btn btn-success btn-sm" onclick="this.form.dopost.value='repairAll';">修复全部表</button>
-											<?php if ($cfg_dbtype !== 'sqlite'){;?><a  href="sys_sql_query.php?dopost=docs" class="btn btn-primary btn-sm">数据库文档说明</a><?php };?>
+											<?php if ($cfg_dbtype !== 'sqlite'){;?><a  href="sys_sql_query.php?dopost=docs" class="btn btn-primary btn-sm">数据库文档</a><?php };?>
 										</td>
 									</tr>
 								</form>
diff --git a/src/admin/templets/templets_default.htm b/src/admin/templets/templets_default.htm
index 5a6fb6e0..e8816e5d 100644
--- a/src/admin/templets/templets_default.htm
+++ b/src/admin/templets/templets_default.htm
@@ -24,7 +24,7 @@
 				</div>
 				<div class="card-body">
 					<div class="table-responsive">
-						<table class="table table-borderless">
+						<table class="table table-borderless icon">
 							<thead>
 								<tr>
 									<td scope="col">模板名</td>
diff --git a/src/admin/templets/templets_tagsource.htm b/src/admin/templets/templets_tagsource.htm
index 5f42cf7c..4efc41a5 100644
--- a/src/admin/templets/templets_tagsource.htm
+++ b/src/admin/templets/templets_tagsource.htm
@@ -19,7 +19,7 @@
 				<div class="card-body">
 					<div class="alert alert-warning">默认标签源码文件，请谨慎修改</div>
 					<div class="table-responsive">
-						<table class="table table-borderless">
+						<table class="table table-borderless icon">
 							<thead>
 								<tr>
 									<td scope="col">标签文件名</td>
diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css
index 991eb18c..11db6b15 100644
--- a/src/static/web/css/admin.css
+++ b/src/static/web/css/admin.css
@@ -400,7 +400,7 @@ body.menu-show .admin-content {
 }
 .helpinfo {
 	display:none;
-	padding:1rem;
+	padding:0.5rem;
 	width:100%;
 	background:var(--bg);
 	border:1px solid var(--gray-300);
@@ -708,11 +708,13 @@ body.menu-show .admin-content {
 	color:var(--gray)
 }
 .table.icon img {
-	width:20px;
-	height:20px
+	width:18px;
+	height:18px;
+	border-radius:var(--b-radius-sm)
 }
 .table th,.table td {
 	padding:0.5rem 0.5rem 0.5rem 0;
+	font-weight:400;
 	vertical-align:middle
 }
 .form-control {
