docs/changelog.md

@@ -1,6 +1,13 @@
 # 更新记录
 通过访问 https://www.dedebiz.com/git 获取完整更新记录
 
+# V6.5.10
+- 优化数据表文档；
+- 优化标签调用说明配合数据表文档利于用户开发模板；
+- 优化后台文件小图标和模板管理及特效；
+- 优化手机端、平板端后台管理按钮组问题，目前达到相对完美适配任何设备
+- 其他常规问题修复；
+
 # V6.5.9
 - 支持设置是否开启自动检查更新；
 - 增加数据表注释，方便开发者进行二次开发，移除无用表；

src/admin/ai_dialog.php

@@ -8,7 +8,7 @@
  * @license        GNU GPL v2 (https://www.dedebiz.com/license)
  * @link           https://www.dedebiz.com
  */
-require_once(dirname(__FILE__) . "/config.php");
+require_once(dirname(__FILE__)."/config.php");
 if (empty($f)) {
     $f = 'form1.enclosure';
 }
@@ -17,10 +17,10 @@ if (empty($comeback)) {
 }
 $addparm = '';
 if (!empty($CKEditor)) {
-    $addparm = '&CKEditor=' . $CKEditor;
+    $addparm = '&CKEditor='.$CKEditor;
 }
 if (!empty($CKEditorFuncNum)) {
-    $addparm .= '&CKEditorFuncNum=' . $CKEditorFuncNum;
+    $addparm .= '&CKEditorFuncNum='.$CKEditorFuncNum;
 }
 if (!empty($noeditor)) {
     $addparm .= '&noeditor=yes';
@@ -47,7 +47,7 @@ if (!empty($noeditor)) {
                     <div class="alert alert-warning mb-0">处理过程中请勿关闭小德AI助手对话框</div>
                 </div>
                 <div class="form-group">
-                    <textarea id="prompt" class="form-control" style="height:160px" placeholder="请输入内容处理要求，例如：我需要将内容润色下，希望更专业"></textarea>
+                    <textarea id="prompt" class="form-control" style="height:160px" placeholder="请输入内容处理要求，例：我需要将内容润色下，希望更专业"></textarea>
                 </div>
                 <div class="form-group">
                     <label for="modelid" class="form-label">选择模型</label>

src/admin/album_add.php

@@ -39,7 +39,6 @@ if ($dopost != 'save') {
     require_once(DEDEINC.'/libraries/oxwindow.class.php');
     $flag = isset($flags) ? join(',', $flags) : '';
     $notpost = isset($notpost) && $notpost == 1 ? 1 : 0;
-    if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000, 6000) : $cfg_arc_click);
     if (!isset($typeid2)) $typeid2 = 0;
     if (!isset($autokey)) $autokey = 0;
     if (!isset($remote)) $remote = 0;
@@ -69,7 +68,7 @@ if ($dopost != 'save') {
     }
     //对保存的文档进行处理
     if (empty($writer)) $writer = $cuserLogin->getUserName();
-    if (empty($source)) $source = '未知';
+    if (empty($source)) $source = $cuserLogin->getUserName();
     $pubdate = GetMkTime($pubdate);
     $senddate = time();
     $sortrank = AddDay($pubdate, $sortup);

src/admin/api.php

@@ -455,15 +455,14 @@ if ($action === 'is_need_check_code') {
     $params = $_GET;
     unset($params['action']);
     checkLogin();
-    $params['timestamp'] = time(); // 加入时间戳
+    $params['timestamp'] = time(); //加入时间戳
     $cuserLogin = new userLogin();
-    $params['adminid'] = $cuserLogin->getUserID(); // 加入时间戳
-    $params['ip'] = $_SERVER['REMOTE_ADDR'] ?? '127.0.0.1'; // 获取客户端IP
-
-    ksort($params); // 按字典序排序
-    $queryString = http_build_query($params); // 生成查询字符串
-    $params['sign'] = md5($queryString . $cfg_ai_apikey); // 计算MD5签名
-    $url = $cfg_ai_server . '/ai?' . http_build_query($params);
+    $params['adminid'] = $cuserLogin->getUserID(); //加入时间戳
+    $params['ip'] = $_SERVER['REMOTE_ADDR'] ?? '127.0.0.1'; //获取客户端IP
+    ksort($params); //按字典序排序
+    $queryString = http_build_query($params); //生成查询字符串
+    $params['sign'] = md5($queryString.$cfg_ai_apikey); //计算MD5签名
+    $url = $cfg_ai_server.'/ai?'.http_build_query($params);
     echo json_encode(array(
         "code" => 0,
         "data" => $url,
@@ -472,14 +471,14 @@ if ($action === 'is_need_check_code') {
     $params = $_GET;
     unset($params['action']);
     checkLogin();
-    $params['timestamp'] = time(); // 加入时间戳
+    $params['timestamp'] = time(); //加入时间戳
     $cuserLogin = new userLogin();
-    $params['adminid'] = $cuserLogin->getUserID(); // 加入时间戳
-    $params['ip'] = $_SERVER['REMOTE_ADDR'] ?? '127.0.0.1'; // 获取客户端IP
-    ksort($params); // 按字典序排序
-    $queryString = http_build_query($params); // 生成查询字符串
-    $params['sign'] = md5($queryString . $cfg_ai_apikey); // 计算MD5签名
-    $url = $cfg_ai_server . '/api/setbody?' . http_build_query($params);
+    $params['adminid'] = $cuserLogin->getUserID(); //加入时间戳
+    $params['ip'] = $_SERVER['REMOTE_ADDR'] ?? '127.0.0.1'; //获取客户端IP
+    ksort($params); //按字典序排序
+    $queryString = http_build_query($params); //生成查询字符串
+    $params['sign'] = md5($queryString.$cfg_ai_apikey); //计算MD5签名
+    $url = $cfg_ai_server.'/api/setbody?'.http_build_query($params);
     echo json_encode(array(
         "code" => 0,
         "data" => $url,

src/admin/archives_add.php

@@ -42,7 +42,6 @@ if ($dopost != 'save') {
     require_once(DEDEINC.'/libraries/oxwindow.class.php');
     $flag = isset($flags) ? join(',', $flags) : '';
     $notpost = isset($notpost) && $notpost == 1 ? 1 : 0;
-    if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000, 6000) : $cfg_arc_click);
     if (empty($typeid2)) $typeid2 = 0;
     if (!isset($autokey)) $autokey = 0;
     if (!isset($remote)) $remote = 0;
@@ -70,7 +69,7 @@ if ($dopost != 'save') {
     }
     //对保存的文档进行处理
     if (empty($writer)) $writer = $cuserLogin->getUserName();
-    if (empty($source)) $source = '未知';
+    if (empty($source)) $source = $cuserLogin->getUserName();
     $pubdate = GetMkTime($pubdate);
     $senddate = time();
     $sortrank = AddDay($pubdate, $sortup);

src/admin/archives_do.php

@@ -803,8 +803,8 @@ else if ($dopost == 'attsDlg') {
     echo "<div class='card shadow-sm'><div class='card-header'>选择副栏目</div><div class='card-body'>";
     $tus = new TypeUnitSelector();
     ?>    
-    <form name="quicksel" action="javascript:;" method="get">
-        <div class="quicksel"><?php $tus->ListAllType($channelid);?></div>
+    <form name="fastselectbox" action="javascript:;" method="get">
+        <div class="fastselectbox"><?php $tus->ListAllType($channelid);?></div>
         <div class="text-center">
             <button onclick="getSelCat('<?php echo $targetid;?>');" class="btn btn-success btn-sm">保存</button>
             <button type="button" onclick="HideObj('<?php echo $divname;?>');ChangeFullDiv('hide');" class="btn btn-outline-success btn-sm">关闭</button>

src/admin/archives_sg_add.php

@@ -58,7 +58,7 @@ if ($dopost != 'save') {
     }
     //对保存的文档进行处理
     if (empty($writer)) $writer = $cuserLogin->getUserName();
-    if (empty($source)) $source = '未知';
+    if (empty($source)) $source = $cuserLogin->getUserName();
     if (empty($flags)) $flag = '';
     else $flag = join(',', $flags);
     $senddate = time();

src/admin/article_add.php

@@ -48,6 +48,14 @@ if ($dopost != 'save') {
     if (!isset($dellink)) $dellink = 0;
     if (!isset($autolitpic)) $autolitpic = 0;
     if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000, 6000) : $cfg_arc_click);
+    //检测文档是否重复
+    if ($cfg_mb_cktitle == 'Y') {
+        $row = $dsql->GetOne("SELECT * FROM `#@__archives` WHERE title LIKE '$title' ");
+        if (is_array($row)) {
+            ShowMsg("请不要发布重复文档", "-1");
+            exit();
+        }
+    }
     if (trim($title) == '') {
         ShowMsg("文档标题不能为空", "-1");
         exit();
@@ -69,7 +77,7 @@ if ($dopost != 'save') {
     }
     //对保存的文档进行处理
     if (empty($writer)) $writer = $cuserLogin->getUserName();
-    if (empty($source)) $source = '未知';
+    if (empty($source)) $source = $cuserLogin->getUserName();
     $pubdate = GetMkTime($pubdate);
     $senddate = time();
     $sortrank = AddDay($pubdate, $sortup);

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")) {

src/admin/inc/inc_action_info.php

@@ -236,17 +236,17 @@ $actionSearch[7] = DEDEBIZ_SAFE_MODE? null : array(
             'linkurl' => 'templets_main.php'
         ),
         1  => array(
-            'title' => '标签源码管理',
+            'title' => '标签文件管理',
             'purview' => 'temp_All',
             'linkurl' => 'templets_tagsource.php'
         ),
         2  =>  array(
-            'title' => '自定义宏标记',
+            'title' => '自定义宏标签',
             'purview' => 'temp_MyTag',
             'linkurl' => 'mytag_main.php'
         ),
         3  =>  array(
-            'title' => '全局标记测试',
+            'title' => '标签调用测试',
             'purview' => 'temp_Test',
             'linkurl' => 'tag_test.php'
         ),

src/admin/inc/inc_menu.php

@@ -37,9 +37,9 @@ $adminMenu1 = $adminMenu2 = '';
 if ($cuserLogin->getUserType() >= 10) {
     $adminMenu1 = (DEDEBIZ_SAFE_MODE ? "" : "<m:top item='11_' name='模板管理' rank='temp_One,temp_Other,temp_MyTag,temp_test,temp_All' icon='fa fa-cube' data-target='templets'>
     <m:item name='默认模板管理' link='templets_main.php' rank='temp_All' target='main' />
-    <m:item name='标签源码管理' link='templets_tagsource.php' rank='temp_All' target='main' />
-    <m:item name='自定义宏标记' link='mytag_main.php' rank='temp_MyTag' target='main' />
-    <m:item name='全局标记测试' link='tag_test.php' rank='temp_Test' target='main' />
+    <m:item name='标签文件管理' link='templets_tagsource.php' rank='temp_All' target='main' />
+    <m:item name='自定义宏标签' link='mytag_main.php' rank='temp_MyTag' target='main' />
+    <m:item name='标签调用测试' link='tag_test.php' rank='temp_Test' target='main' />
 </m:top>")."
 <m:top item='4_' name='模型管理' rank='t_List,t_AccList,c_List,temp_One' icon='fa fa-area-chart' data-target='channel'>
     ".(DEDEBIZ_SAFE_MODE ? "" : "<m:item name='文档模型管理' link='mychannel_main.php' rank='c_List' target='main' />")."

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;

src/admin/module_main.php

@@ -434,11 +434,11 @@ if ($action == '') {
         $filelist .= "{$v['type']}|{$v['name']}\r\n";
     }
     if (file_exists(DEDEDATA."/module/{$hash}-readme.php")) {
-        $setupinfo = "已安装 <a href='module_main.php?action=uninstall&hash={$hash}'>卸载</a>";
+        $setupinfo = "已安装 <a href='module_main.php?action=uninstall&hash={$hash}' class='btn btn-danger btn-sm'>卸载</a>";
     } else {
-        $setupinfo = "未安装 <a href='module_main.php?action=setup&hash={$hash}'>安装</a>";
+        $setupinfo = "未安装 <a href='module_main.php?action=setup&hash={$hash}' class='btn btn-success btn-sm'>安装</a>";
     }
-    $dev_id = empty($infos['dev_id'])? "<a href='module_main.php?action=setup&hash={$hash}' class='btn btn-outline-success btn-sm'>安装</a><a href='{$cfg_biz_dedebizUrl}/developer' target='_blank' class='btn btn-success btn-sm'>{$s}</a>" : "{$infos['dev_id']} <a href='module_main.php?action=setup&hash={$hash}' class='btn btn-outline-success btn-sm'>安装</a><a href='{$cfg_biz_dedebizUrl}/developer?dev_id={$infos['dev_id']}' target='_blank' class='btn btn-success btn-sm'>{$s}</a>";
+    $dev_id = empty($infos['dev_id'])? "<a href='module_main.php?action=setup&hash={$hash}' class='btn btn-success btn-sm'>安装</a><a href='{$cfg_biz_dedebizUrl}/developer' target='_blank' class='btn btn-success btn-sm'>{$s}</a>" : "{$infos['dev_id']} <a href='module_main.php?action=setup&hash={$hash}' class='btn btn-success btn-sm'>安装</a><a href='{$cfg_biz_dedebizUrl}/developer?dev_id={$infos['dev_id']}' target='_blank' class='btn btn-success btn-sm'>{$s}</a>";
     $win = new OxWindow();
     $win->Init("", "/static/web/js/admin.blank.js", "");
     $wintitle = "{$infos['name']}";

src/admin/mychannel_field_add.php

@@ -24,7 +24,7 @@ if ($action == 'save') {
     $mxlen = $maxlength;
     if (preg_match("#^(select|radio|checkbox)$#i", $dtype)) {
         if (!preg_match("#,#", $dfvalue)) {
-            ShowMsg("您设定了字段为{$dtype}类型，必须在默认值中指定元素列表，如：'a,b,c' ", "-1");
+            ShowMsg("您设定了字段为{$dtype}类型，必须在默认值中指定元素列表，例：a,b,c ", "-1");
             exit();
         }
     }

src/admin/mychannel_field_edit.php

@@ -50,7 +50,7 @@ if ($action == 'save') {
     $dfvalue = $vdefault;
     if (preg_match("#^(select|radio|checkbox)#", $dtype)) {
         if (!preg_match("#,#", $dfvalue)) {
-            ShowMsg("您设定了字段为{$dtype}类型，必须在默认值中指定元素列表，如：'a,b,c' ", "-1");
+            ShowMsg("您设定了字段为{$dtype}类型，必须在默认值中指定元素列表，例：a,b,c ", "-1");
             exit();
         }
     }

src/admin/mytag_tag_guide.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * 自定义宏标记向导
+ * 自定义宏标签向导
  *
  * @version        $id:mytag_tag_guide.php 15:39 2010年7月20日 tianya $
  * @package        DedeBIZ.Administrator

src/admin/mytag_tag_guide_ok.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * 自定义宏标记向导预览
+ * 自定义宏标签向导预览
  *
  * @version        $id:mytag_tag_guide_ok.php 15:39 2010年7月20日 tianya $
  * @package        DedeBIZ.Administrator

src/admin/soft_add.php

@@ -40,12 +40,12 @@ if ($dopost != 'save') {
     require_once(DEDEINC.'/libraries/oxwindow.class.php');
     $flag = isset($flags) ? join(',', $flags) : '';
     $notpost = isset($notpost) && $notpost == 1 ? 1 : 0;
-    if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000, 6000) : $cfg_arc_click);
     if (!isset($typeid2)) $typeid2 = 0;
     if (!isset($autokey)) $autokey = 0;
     if (!isset($remote)) $remote = 0;
     if (!isset($dellink)) $dellink = 0;
     if (!isset($autolitpic)) $autolitpic = 0;
+    if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000, 6000) : $cfg_arc_click);
     if (trim($title) == '') {
         ShowMsg("文档标题不能为空", "-1");
         exit();
@@ -67,7 +67,7 @@ if ($dopost != 'save') {
     }
     //对保存的文档进行处理
     if (empty($writer)) $writer = $cuserLogin->getUserName();
-    if (empty($source)) $source = '未知';
+    if (empty($source)) $source = $cuserLogin->getUserName();
     $pubdate = GetMkTime($pubdate);
     $senddate = time();
     $sortrank = AddDay($pubdate, $sortup);

src/admin/spec_add.php

@@ -39,7 +39,7 @@ if ($dopost != 'save') {
     if (!isset($autolitpic)) $autolitpic = 0;
     //对保存的文档进行处理
     if (empty($writer)) $writer = $cuserLogin->getUserName();
-    if (empty($source)) $source = '未知';
+    if (empty($source)) $source = $cuserLogin->getUserName();
     $pubdate = GetMkTime($pubdate);
     $senddate = time();
     $sortrank = AddDay($pubdate, $sortup);

src/admin/stepselect_main.php

@@ -150,7 +150,7 @@ else if ($action == 'exarea') {
     ShowMsg("成功导入所有旧的地区数据", "stepselect_main.php?egroup=nativeplace");
     exit();
 }
-//关于二级枚举：为了节省查询速度，二级枚举是通过特殊算法生成的，原理为凡是能被500整除的都是一级枚举(500 * n) + 1 < em < 500 * (n+1)为下级枚举，如：1000的下级枚举对应的值为 1001,1002,10031499对于issign=1的，表示这个类别只有一级枚举，则不受上面的算法限制。更新算法：新增二级枚举下添加"-N"自己类别选择，例如：1001二级枚举下面的3级栏目，则为1001-1,1001-2这时候需要issign=2
+//关于二级枚举：为了节省查询速度，二级枚举是通过特殊算法生成的，原理为凡是能被500整除的都是一级枚举(500 * n) + 1 < em < 500 * (n+1)为下级枚举，例：1000的下级枚举对应的值为 1001,1002,10031499对于issign=1的，表示这个类别只有一级枚举，则不受上面的算法限制。更新算法：新增二级枚举下添加"-N"自己类别选择，例：1001二级枚举下面的3级栏目，则为1001-1,1001-2这时候需要issign=2
 else if ($action == 'addenum_save') {
     if (empty($ename) || empty($egroup)) {
         Showmsg("类别名称或组名称不能为空", "-1");

src/admin/sys_data.php

@@ -25,21 +25,21 @@ if ($dopost == "viewinfo") {
         if (empty($tablename)) {
             echo "没有指定表名";
         } else {
-            // 获取创建表的 SQL 语句
+            //获取创建表的SQL语句
             $dsql->SetQuery("SELECT sql FROM sqlite_master WHERE type='table' AND name='$tablename'");
             $dsql->Execute('me');
             $row = $dsql->GetArray('me', SQLITE3_ASSOC);
             if ($row) {
                 $createTableSql = $row['sql'];
                 echo "创建表的 SQL 语句:\n";
-                echo trim($createTableSql) . "\n\n";
+                echo trim($createTableSql)."\n\n";
             }
-            // 获取表的列信息
+            //获取表的列信息
             $dsql->SetQuery("PRAGMA table_info($tablename)");
             $dsql->Execute('cols');
             echo "表的列信息:\n";
             while ($colRow = $dsql->GetArray('cols', SQLITE3_ASSOC)) {
-                echo "列名: " . $colRow['name'] . ", 类型: " . $colRow['type'] . ", 是否为主键: " . ($colRow['pk'] ? '是' : '否') . "\n";
+                echo "列名: ".$colRow['name'].", 类型: ".$colRow['type'].", 是否为主键: ".($colRow['pk'] ? '是' : '否')."\n";
             }
         }
         echo '</xmp>';
@@ -70,7 +70,7 @@ else if ($dopost == "opimize") {
             if ($rs) {
                 echo "执行优化表 {$tablename} 完成<br>";
             } else {
-                echo "执行优化表 {$tablename} 失败，原因是：" . $dsql->GetError();
+                echo "执行优化表 {$tablename} 失败，原因是：".$dsql->GetError();
             }
         } else {
             $rs = $dsql->ExecuteNoneQuery("OPTIMIZE TABLE `$tablename`");

src/admin/sys_info.php

@@ -171,16 +171,14 @@ exit;
         unset($params['dopost']);
         unset($params['apikey']);
         unset($params['server']);
-        $params['timestamp'] = time(); // 加入时间戳
+        $params['timestamp'] = time(); //加入时间戳
         $cuserLogin = new userLogin();
-        $params['adminid'] = $cuserLogin->getUserID(); // 加入时间戳
-        $params['ip'] = $_SERVER['REMOTE_ADDR'] ?? '127.0.0.1'; // 获取客户端IP
-    
-        ksort($params); // 按字典序排序
-        $queryString = http_build_query($params); // 生成查询字符串
-        $params['sign'] = md5($queryString . $apikey); // 计算MD5签名
-        $url = $server . '/api/ping?' . http_build_query($params);
-
+        $params['adminid'] = $cuserLogin->getUserID(); //加入时间戳
+        $params['ip'] = $_SERVER['REMOTE_ADDR'] ?? '127.0.0.1'; //获取客户端IP
+        ksort($params); //按字典序排序
+        $queryString = http_build_query($params); //生成查询字符串
+        $params['sign'] = md5($queryString.$apikey); //计算MD5签名
+        $url = $server.'/api/ping?'.http_build_query($params);
         $dhd = new DedeHttpDown();
         $dhd->OpenUrl($url);
         $data = $dhd->GetJSON();
@@ -190,7 +188,6 @@ exit;
             echo 'error';
         }
     }
-
     exit();
 }
 include DedeInclude('templets/sys_info.htm');

src/admin/sys_repair.php

@@ -15,14 +15,14 @@ if (empty($dopost)) {
     $win = new OxWindow();
     $win->Init("sys_repair.php", "/static/web/js/admin.blank.js", "POST' enctype='multipart/form-data'");
     $wintitle = "系统修复工具";
-    $win->AddTitle('系统修复工具用于检测和修复系统数据错误');
+    $win->AddTitle('系统修复工具用于检测并修复数据错误');
     $msg = "<tr>
         <td>
-            由于手动升级时会员没运行指定的SQL语句，或自动升级的遗漏处理或处理出错，会导致一些错误，使用本工具会自动检测并处理，本工具目前主要执行下面动作：<br>
-            1、修复/优化数据表<br>
-            2、更新缓存<br>
-            3、检测系统变量一致性<br>
-            4、检测微表与主表数据一致性
+            <p>由于手动升级未运行指定SQL语句，或自动升级过程中出现遗漏或错误，可能会导致一些问题。使用本工具可自动检测并处理这些问题。目前，本工具主要执行以下操作：</p>
+            <p>1、修复/优化数据表</p>
+            <p>2、更新缓存</p>
+            <p>3、检测系统变量一致性</p>
+            <p>4、检测微表与主表数据一致性</p>
         </td>
     </tr>
     <tr>
@@ -38,14 +38,15 @@ else if ($dopost == 1) {
     $win = new OxWindow();
     $win->Init("sys_repair.php", "/static/web/js/admin.blank.js", "POST' enctype='multipart/form-data'");
     $wintitle = "检测数据结构";
-    $win->AddTitle('系统修复工具用于检测和修复系统数据错误');
+    $win->AddTitle('系统修复工具用于检测并修复数据错误');
     $msg = "<tr>
         <td>
-            已完成数据结构完整性检测：<br>
-            1、获取主键失败，无法进行后续操作<br>
-            2、更新数据库#@__archivess表时出错<br>
-            3、列表显示数据目与实际文档数不一致
+            <p>已完成数据结构完整性检测：</p>
+            <p>1、获取主键失败，无法进行后续操作</p>
+            <p>2、更新数据库#@__archivess表时出错</p>
+            <p>3、列表显示数据目与实际文档数不一致</p>
         </td>
+    </tr>
     <tr>
         <td align='center'><a href='sys_repair.php?dopost=2' class='btn btn-success btn-sm'>下一步</a></td>
     </tr>";
@@ -60,7 +61,7 @@ else if ($dopost == 2) {
     $allarcnum = 0;
     $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__archives`");
     $allarcnum = $arcnum = $row['dd'];
-    $msg .= "#@__archives表总记录数：{$arcnum}<br>";
+    $msg .= "<p>#@__archives表总记录数：{$arcnum}</p>";
     $shtables = array();
     $dsql->Execute('me', "SELECT addtable FROM `#@__channeltype` WHERE id < -1 ");
     while ($row = $dsql->GetArray('me')) {
@@ -71,21 +72,21 @@ else if ($dopost == 2) {
             if (!isset($shtables[$addtable])) {
                 $shtables[$addtable] = 1;
                 $row = $dsql->GetOne("SELECT COUNT(aid) AS dd FROM `$addtable`");
-                $msg .= "{$addtable} 表总记录数：{$row['dd']} <br>";
+                $msg .= "<p>{$addtable}表总记录数：{$row['dd']}</p>";
                 $allarcnum += $row['dd'];
             }
         }
     }
-    $msg .= "总有效记录数：{$allarcnum}<br>";
+    $msg .= "<p>总有效记录数：{$allarcnum}</p>";
     $errall = "<a href='index_body.php' class='btn btn-success btn-sm'>完成修复</a>";
     $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctiny`");
-    $msg .= "微统计表记录数：{$row['dd']}<br>";
+    $msg .= "<p>微统计表记录数：{$row['dd']}</p>";
     if ($row['dd'] == $allarcnum) {
-        $msg .= "两者记录一致，无需修复<br>";
+        $msg .= "<p>两者记录一致，无需修复</p>";
     } else {
         $sql = "TRUNCATE TABLE `#@__arctiny`";
         $dsql->ExecuteNoneQuery($sql);
-        $msg .= "两者记录不一致，尝试进行简单修复<br>";
+        $msg .= "<p>两者记录不一致，尝试进行简单修复</p>";
         //导入普通模型微数据
         $sql = "INSERT INTO `#@__arctiny` (id,typeid,typeid2,arcrank,channel,senddate,sortrank,mid) SELECT id,typeid,typeid2,arcrank,channel,senddate,sortrank,mid FROM `#@__archives` ";
         $dsql->ExecuteNoneQuery($sql);
@@ -97,17 +98,17 @@ else if ($dopost == 2) {
         }
         $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__arctiny`");
         if ($row['dd'] == $allarcnum) {
-            $msg .= "修复记录成功<br>";
+            $msg .= "<p>修复记录成功</p>";
         } else {
-            $msg .= "修复记录失败，建议高级结合检测<br>";
-            $errall = "<a href='sys_repair.php?dopost=3' class='btn btn-success btn-sm'>结合检测</a> ";
+            $msg .= "<p>修复记录失败，建议高级检测</p>";
+            $errall = "<a href='sys_repair.php?dopost=3' class='btn btn-success btn-sm'>高级检测</a>";
         }
     }
     UpDateCatCache();
     $win = new OxWindow();
     $win->Init("sys_repair.php", "/static/web/js/admin.blank.js", "POST' enctype='multipart/form-data'");
     $wintitle = "检测微表数据";
-    $win->AddTitle('系统修复工具用于检测和修复系统数据错误');
+    $win->AddTitle('系统修复工具用于检测并修复数据错误');
     $msg = "<tr>
         <td>{$msg}</td>
     </tr>
@@ -153,7 +154,7 @@ else if ($dopost == 3) {
     $win = new OxWindow();
     $win->Init("sys_repair.php", "/static/web/js/admin.blank.js", "POST' enctype='multipart/form-data'");
     $wintitle = "高级检测";
-    $win->AddTitle('系统修复工具用于检测和修复系统数据错误');
+    $win->AddTitle('系统修复工具用于检测并修复数据错误');
     $msg = "<tr>
         <td>完成所有修复操作，移除错误记录{$errnum}条</td>
     </tr>

src/admin/sys_sql_query.php

@@ -27,7 +27,7 @@ if ($dopost == "viewinfo") {
             $dsql->Execute('me');
             $row = $dsql->GetArray('me', SQLITE3_ASSOC);
             if ($row) {
-                $createTableSql = str_replace("	", "\r\n", $row['sql']);
+                $createTableSql = str_replace(" ", "\r\n", $row['sql']);
                 echo trim($createTableSql)."\n\n";
             }
         }
@@ -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{border:none;border-radius:0.5rem;box-shadow:0 4px 8px rgba(0,0,0,0.1);transition:transform 0.5s}.card:hover{transform:translateY(-0.25rem)}.card-header{background-color:#1eb867;color:white;border-top-left-radius:0.5rem!important;border-top-right-radius:0.5rem!important}.table thead th{background-color:#e9ecef;padding:0.5rem}.table tbody td{padding:0.5rem}</style>
 </head>
 <body>
     <div class="container-fluid">
@@ -235,30 +234,29 @@ else if ($dopost == "query") {
     </ol>';
     while ($row = $dsql->GetArray('t', MYSQL_BOTH)) {
         $tableName = $row[0];
-        $output .= '<div class="card mb-3">
-            <div class="card-header">
-                <span>表名: '.$tableName.'</span>
-            </div>
-            <div class="card-body">';
+        $output .= '<div class="card shadow-sm mb-3">
+            <div class="card-header">'.$tableName.'表</div>
+            <div class="card-body">
+            <div class="table-responsive">';
         //获取表的注释
         $dsql->SetQuery("SELECT TABLE_COMMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = '$tableName'");
         $dsql->Execute('c');
         $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-striped table-bordered">
+        $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>';
@@ -280,12 +278,11 @@ else if ($dopost == "query") {
         $output .= '</tbody>
         </table>
         </div>
+    </div>
     </div>';
     }
-    $output .= '</div>
-    <footer class="bg-light text-center py-3">
-        <p class="mb-0">版权所有 &copy; '.date('Y').' <a href="https://www.dedebiz.com/?from=dbdocs" class="text-success">DedeBIZ</a> 保留所有权利。</p>
-    </footer>
+    $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>';
     //输出网页文档

src/admin/tag_test.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * 全局标记测试
+ * 标签调用测试
  *
  * @version        $id:tag_test.php 23:07 2010年7月20日 tianya $
  * @package        DedeBIZ.Administrator

src/admin/tag_test_action.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * 全局标记测试操作
+ * 标签调用测试操作
  *
  * @version        $id:tag_test_action.php 23:07 2010年7月20日 tianya $
  * @package        DedeBIZ.Administrator

src/admin/templets/ad_add.htm

@@ -22,7 +22,6 @@
 			<div class="card shadow-sm">
 				<div class="card-header">添加广告</div>
 				<div class="card-body">
-					<div class="alert alert-info">标签{dede:myad name='广告标记'/}调用</div>
 					<form name="form1" action="ad_add.php" method="post">
 						<input type="hidden" name="normbody[style]" value="code" id="adstyle">
 						<input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">
@@ -78,7 +77,7 @@
 									<tr>
 										<td>广告内容</td>
 										<td>
-											<ul id="adTab" class="adtab">
+											<ul id="toolAd" class="toolad">
 												<li id="t_code" class="active">代码</li>
 												<li id="t_txt">文字</li>
 												<li id="t_img">图片</li>
@@ -134,12 +133,12 @@
 			}
 			showcode('code');
 			$(function($) {
-				$("#adTab>li").click(function() {
+				$("#toolAd>li").click(function() {
 					var tabLi = $(this);
 					var thistab = tabLi[0].id;
 					$(".content").each(function() {
 						if ("t_" + $(this)[0].id == thistab) {
-							$("#adTab>li").removeClass("active");
+							$("#toolAd>li").removeClass("active");
 							$("#t_" + $(this)[0].id).addClass("active");
 							showcode($(this)[0].id);
 						}

src/admin/templets/ad_main.htm

@@ -17,17 +17,19 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<form name="form3" action="ad_main.php" method="get">
-						<input type="hidden" name="dopost" value="listArchives">
-						<input type="text" name="keyword" placeholder="请输入关键词" class="admin-input-lg mr-2">
-						<select name="clsid" id="clsid" class="admin-input-sm">
-							<option value="0">默认分类</option>
-							<?php echo $option;?>
-						</select>
-						<button type="submit" class="btn btn-success btn-sm">搜索</button>
-						<a href="ad_add.php" class="btn btn-success btn-sm">添加广告</a>
-						<a href="adtype_main.php" class="btn btn-success btn-sm">广告分类管理</a>
-					</form>
+					<div class="admin-btns">
+						<form name="form3" action="ad_main.php" method="get">
+							<input type="hidden" name="dopost" value="listArchives">
+							<input type="text" name="keyword" placeholder="请输入关键词" class="admin-input-lg">
+							<select name="clsid" id="clsid" class="admin-input-sm">
+								<option value="0">默认分类</option>
+								<?php echo $option;?>
+							</select>
+							<button type="submit" class="btn btn-success btn-sm">搜索</button>
+							<a href="ad_add.php" class="btn btn-success btn-sm">添加广告</a>
+							<a href="adtype_main.php" class="btn btn-success btn-sm">广告分类管理</a>
+						</form>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/ai_add.htm

@@ -28,7 +28,7 @@
 								<tbody>
 									<tr>
 										<td width="260">名称</td>
-										<td><input type="text" name="title" id="title" value="" class="admin-input-lg" placeholder="模型名称，例如：deepseek" required></td>
+										<td><input type="text" name="title" id="title" value="" class="admin-input-lg" placeholder="模型名称，例：deepseek" required></td>
 									</tr>
 									<tr>
 										<td>描述</td>

src/admin/templets/ai_log_main.htm

@@ -16,22 +16,24 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<form name="formsearch">
-						<input type="text" name="cip" id="cip" placeholder="请输入ip地址" class="admin-input-lg mr-2" value="<?php echo empty($cip)? '' : $cip?>">
-						<select name="adminid" id="adminid" class="admin-input-sm mr-2">
-							<option value="0" selected>全部</option>
-							<?php echo $adminlist?>
-						</select>
-						<select name="dtime" id="dtime" class="admin-input-sm">
-							<option value="0" selected>全部</option>
-							<option value="7">一周内</option>
-							<option value="15">15天内</option>
-							<option value="30">30天以内</option>
-							<option value="60">60天以内</option>
-						</select>
-						<button type="submit" class="btn btn-success btn-sm">搜索</button>
-						<a href="ai_log_main.php" class="btn btn-outline-success btn-sm">重置</a>
-					</form>
+					<div class="admin-btns">
+						<form name="formsearch">
+							<input type="text" name="cip" id="cip" placeholder="请输入ip地址" class="admin-input-lg" value="<?php echo empty($cip)? '' : $cip?>">
+							<select name="adminid" id="adminid" class="admin-input-sm">
+								<option value="0" selected>全部</option>
+								<?php echo $adminlist?>
+							</select>
+							<select name="dtime" id="dtime" class="admin-input-sm">
+								<option value="0" selected>全部</option>
+								<option value="7">一周内</option>
+								<option value="15">15天内</option>
+								<option value="30">30天以内</option>
+								<option value="60">60天以内</option>
+							</select>
+							<button type="submit" class="btn btn-success btn-sm">搜索</button>
+							<a href="ai_log_main.php" class="btn btn-outline-success btn-sm">重置</a>
+						</form>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/ai_main.htm

@@ -20,10 +20,12 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<a href="ai_add.php" class="btn btn-success btn-sm">添加AI模型</a>
-					<a href="ai_model_main.php" class="btn btn-success btn-sm">模型版本</a>
-					<a href="https://www.dedebiz.com/help/ai.md" target="_blank" class="btn btn-primary btn-sm">操作说明</a>
-					<a href="https://www.dedebiz.com/ai?from=dedebiz#models" target="_blank" class="btn btn-primary btn-sm">模型优选</a>
+					<div class="admin-btns">
+						<a href="ai_add.php" class="btn btn-success btn-sm">添加AI模型</a>
+						<a href="ai_model_main.php" class="btn btn-success btn-sm">模型版本</a>
+						<a href="https://www.dedebiz.com/help/ai.md" target="_blank" class="btn btn-primary btn-sm">操作说明</a>
+						<a href="https://www.dedebiz.com/ai?from=dedebiz#models" target="_blank" class="btn btn-primary btn-sm">模型优选</a>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/ai_model_add.htm

@@ -48,7 +48,7 @@
 									</tr>
 									<tr>
 										<td>Model</td>
-										<td><input type="text" name="model" id="model" value="" class="admin-input-lg" placeholder="模型版本名称，例如：deepseek-chat" required><a href="https://www.dedebiz.com/ai?from=dedebiz#models" target="_blank" class="text-success">（获取Model）</a></td>
+										<td><input type="text" name="model" id="model" value="" class="admin-input-lg" placeholder="模型版本名称，例：deepseek-chat" required><a href="https://www.dedebiz.com/ai?from=dedebiz#models" target="_blank" class="text-success">（获取Model）</a></td>
 									</tr>
 									<tr>
 										<td>名称</td>

src/admin/templets/ai_prompt_main.htm

@@ -20,7 +20,9 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<a href="ai_prompt_add.php" class="btn btn-success btn-sm">添加提示词</a>
+					<div class="admin-btns">
+						<a href="ai_prompt_add.php" class="btn btn-success btn-sm">添加提示词</a>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/album_add.htm

@@ -67,7 +67,7 @@
 									</tr>
 									<tr>
 										<td>标签</td>
-										<td><input type="text" name="tags" id="tags" onChange="$Obj('keywords').value=this.value;" class="admin-input-lg">（英文逗号隔开，如：DedeBIZ,得德）</td>
+										<td><input type="text" name="tags" id="tags" onChange="$Obj('keywords').value=this.value;" class="admin-input-lg">（英文逗号隔开，例：DedeBIZ,得德）</td>
 										<td>权重</td>
 										<td><input type="text" name="weight" id="weight" value="<?php echo $maxWright['cc'];?>" class="admin-input-sm">（越小越靠前）</td>
 									</tr>
@@ -209,7 +209,7 @@
 											<select name="arcrank" id="arcrank" class="admin-input-sm">
 												<?php
 												$urank = $cuserLogin->getUserRank();
-												$dsql->SetQuery("SELECT * FROM `#@__arcrank` where adminrank<='$urank' ORDER BY `rank` ASC");
+												$dsql->SetQuery("SELECT * FROM `#@__arcrank` WHERE adminrank<='$urank' ORDER BY `rank` ASC");
 												$dsql->Execute();
 												while($row = $dsql->GetObject())
 												{

src/admin/templets/album_edit.htm

@@ -68,7 +68,7 @@
 								</tr>
 								<tr>
 									<td>标签</td>
-									<td><input type="text" name="tags" id="tags" value="<?php echo $tags;?>" class="admin-input-lg">（英文逗号隔开，如：DedeBIZ,得德）</td>
+									<td><input type="text" name="tags" id="tags" value="<?php echo $tags;?>" class="admin-input-lg">（英文逗号隔开，例：DedeBIZ,得德）</td>
 									<td>权重</td>
 									<td><input type="text" name="weight" id="weight" value="<?php echo $arcRow['weight'];?>" class="admin-input-sm">（越小越靠前）</td>
 								</tr>

src/admin/templets/archives_add.htm

@@ -63,7 +63,7 @@
 									</tr>
 									<tr>
 										<td>标签</td>
-										<td><input type="text" name="tags" id="tags" onChange="$Obj('keywords').value=this.value;" class="admin-input-lg">（英文逗号隔开，如：DedeBIZ,得德）</td>
+										<td><input type="text" name="tags" id="tags" onChange="$Obj('keywords').value=this.value;" class="admin-input-lg">（英文逗号隔开，例：DedeBIZ,得德）</td>
 										<td>权重</td>
 										<td><input type="text" name="weight" id="weight" value="<?php echo $maxWright['cc'];?>" class="admin-input-sm">（越小越靠前）</td>
 									</tr>
@@ -181,7 +181,7 @@
 											<select name="arcrank" id="arcrank" class="admin-input-sm">
 											<?php
 											$urank = $cuserLogin->getUserRank();
-											$dsql->SetQuery("SELECT * FROM `#@__arcrank` where adminrank<='$urank' ORDER BY `rank` ASC");
+											$dsql->SetQuery("SELECT * FROM `#@__arcrank` WHERE adminrank<='$urank' ORDER BY `rank` ASC");
 											$dsql->Execute();
 											while($row = $dsql->GetObject())
 											{

src/admin/templets/archives_edit.htm

@@ -64,7 +64,7 @@
 										<td colspan="3"><input name="redirecturl" type="text" id="redirecturl" value="<?php echo $addRow['redirecturl'];?>" class="admin-input-lg"></td>
 									<tr>
 										<td>标签</td>
-										<td><input type="text" name="tags" id="tags" value="<?php echo $tags;?>" class="admin-input-lg">（英文逗号隔开，如：DedeBIZ,得德）</td>
+										<td><input type="text" name="tags" id="tags" value="<?php echo $tags;?>" class="admin-input-lg">（英文逗号隔开，例：DedeBIZ,得德）</td>
 										<td>权重</td>
 										<td><input type="text" name="weight" id="weight" value="<?php echo $arcRow['weight'];?>" class="admin-input-sm">（越小越靠前）</td>
 									</tr>

src/admin/templets/article_add.htm

@@ -62,7 +62,7 @@
 									</tr>
 									<tr>
 										<td>标签</td>
-										<td><input type="text" name="tags" id="tags" onChange="$Obj('keywords').value=this.value;" class="admin-input-lg">（英文逗号隔开，如：DedeBIZ,得德）</td>
+										<td><input type="text" name="tags" id="tags" onChange="$Obj('keywords').value=this.value;" class="admin-input-lg">（英文逗号隔开，例：DedeBIZ,得德）</td>
 										<td>权重</td>
 										<td><input type="text" name="weight" id="weight" value="<?php echo $maxWright['cc'];?>" class="admin-input-sm">（越小越靠前）</td>
 									</tr>
@@ -184,7 +184,7 @@
 											<select name="arcrank" id="arcrank" class="admin-input-sm">
 												<?php
 												$urank = $cuserLogin->getUserRank();
-												$dsql->SetQuery("SELECT * FROM `#@__arcrank` where adminrank<='$urank' ORDER BY `rank` ASC");
+												$dsql->SetQuery("SELECT * FROM `#@__arcrank` WHERE adminrank<='$urank' ORDER BY `rank` ASC");
 												$dsql->Execute();
 												while($row = $dsql->GetObject())
 												{
@@ -233,7 +233,7 @@
 					<div class="modal-body">
 						<form>
 							<div class="form-group">
-								<textarea id="prompt" class="form-control" style="height:160px" placeholder="请输入生成文档要求，例如：我需要写一篇介绍穆云智能科技公司的文章"></textarea>
+								<textarea id="prompt" class="form-control" style="height:160px" placeholder="请输入生成文档要求，例：我需要写一篇介绍穆云智能科技公司的文章"></textarea>
 							</div>
 							<div class="form-group">
 								<label for="modelid" class="form-label">选择模型</label>

src/admin/templets/article_edit.htm

@@ -69,7 +69,7 @@
 									</tr>
 									<tr>
 										<td>标签</td>
-										<td><input type="text" name="tags" id="tags" value="<?php echo $tags;?>" class="admin-input-lg">（英文逗号隔开，如：DedeBIZ,得德）</td>
+										<td><input type="text" name="tags" id="tags" value="<?php echo $tags;?>" class="admin-input-lg">（英文逗号隔开，例：DedeBIZ,得德）</td>
 										<td>权重</td>
 										<td><input type="text" name="weight" id="weight" value="<?php echo $arcRow['weight'];?>" class="admin-input-sm">（越小越靠前）</td>
 									</tr>
@@ -185,7 +185,7 @@
 												<option value='<?php echo $arcRow["arcrank"]?>'><?php echo $arcRow["rankname"]?> </option>
 												<?php
 												$urank = $cuserLogin->getUserRank();
-												$dsql->SetQuery("SELECT * FROM `#@__arcrank` where adminrank<='$urank' ORDER BY `rank` ASC");
+												$dsql->SetQuery("SELECT * FROM `#@__arcrank` WHERE adminrank<='$urank' ORDER BY `rank` ASC");
 												$dsql->Execute();
 												while($row = $dsql->GetObject()){
 													echo "<option value='".$row->rank."'>".$row->membername."</option>";
@@ -241,7 +241,7 @@
 					<div class="modal-body">
 						<form>
 							<div class="form-group">
-								<textarea id="prompt" class="form-control" style="height:160px" placeholder="请输入修改文档要求，例如：我需要对当前文章就行润色，内容轻松活泼些，不要出现错别字。"></textarea>
+								<textarea id="prompt" class="form-control" style="height:160px" placeholder="请输入修改文档要求，例：我需要对当前文章就行润色，内容轻松活泼些，不要出现错别字。"></textarea>
 							</div>
 							<div class="form-group">
 								<label for="modelid" class="form-label">选择模型</label>

src/admin/templets/article_keywords_main.htm

@@ -16,13 +16,15 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<form name="form2" action="article_keywords_main.php">
-						<input type="hidden" name="dopost" value="add">
-						<input type="text" name="keyword" id="keyword" placeholder="请输入关键词" class="admin-input-lg mr-2">
-						<input type="text" name="rpurl" id="rpurl" placeholder="请输入链接" class="admin-input-lg mr-2">
-						<input type="text" name="rank" id="rank" value="30" class="admin-input-sm">
-						<button type="submit" class="btn btn-success btn-sm">添加</button>
-					</form>
+					<div class="admin-btns">
+						<form name="form2" action="article_keywords_main.php">
+							<input type="hidden" name="dopost" value="add">
+							<input type="text" name="keyword" id="keyword" placeholder="请输入关键词" class="admin-input-lg">
+							<input type="text" name="rpurl" id="rpurl" placeholder="请输入链接" class="admin-input-lg">
+							<input type="text" name="rank" id="rank" value="30" class="admin-input-sm">
+							<button type="submit" class="btn btn-success btn-sm">添加</button>
+						</form>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/article_keywords_select.htm

@@ -12,9 +12,11 @@
 		<div class="container-fluid">
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<input type="text" name="keywords" id="keywords" value="<?php echo $keywords?>" class="admin-input-lg mr-2">
-					<button type="button" onclick="ReturnValue();" class="btn btn-success btn-sm">选用</button>
-					<button type="button" onclick="location='article_keywords_main.php';" class="btn btn-success btn-sm">关键词管理</button>
+					<div class="admin-btns">
+						<input type="text" name="keywords" id="keywords" value="<?php echo $keywords?>" class="admin-input-lg">
+						<button type="button" onclick="ReturnValue();" class="btn btn-success btn-sm">选用</button>
+						<button type="button" onclick="location='article_keywords_main.php';" class="btn btn-success btn-sm">关键词管理</button>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/cards_manmage.htm

@@ -16,12 +16,14 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<a href="cards_manage.php" class="btn btn-success btn-sm">全部</a>
-					<a href="cards_manage.php?isexp=0" class="btn btn-success btn-sm">未使用</a>
-					<a href="cards_manage.php?isexp=1" class="btn btn-success btn-sm">已售出</a>
-					<a href="cards_manage.php?isexp=-1" class="btn btn-success btn-sm">已使用</a>
-					<a href="cards_make.php" class="btn btn-success btn-sm">生成积分</a>
-					<a href="cards_type.php" class="btn btn-success btn-sm">积分产品分类</a>
+					<div class="admin-btns">
+						<a href="cards_manage.php" class="btn btn-success btn-sm">全部</a>
+						<a href="cards_manage.php?isexp=0" class="btn btn-success btn-sm">未使用</a>
+						<a href="cards_manage.php?isexp=1" class="btn btn-success btn-sm">已售出</a>
+						<a href="cards_manage.php?isexp=-1" class="btn btn-success btn-sm">已使用</a>
+						<a href="cards_make.php" class="btn btn-success btn-sm">生成积分</a>
+						<a href="cards_type.php" class="btn btn-success btn-sm">积分产品分类</a>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/catalog_add.htm

@@ -87,7 +87,7 @@
 										<td>上级目录</td>
 										<td>
 											<?php
-											$pardir = '{cmspath}'.$cfg_arcdir;
+											$pardir = $cfg_arcdir;
 											if (!empty($typedir)) $pardir = $typedir.'/';
 											$pardir = preg_replace("#\/{1,}#", '/', $pardir);
 											echo $pardir;
@@ -171,7 +171,7 @@
 										<td>
 											<label><input type="radio" name="ispart" value="0" checked> 列表栏目（允许发布）</label>
 											<label><input type="radio" name="ispart" value="1"> 封面栏目（不允许发布）</label>
-											<label><input type="radio" name="ispart" id="ispart2" value="2"> 外部栏目（栏目生成目录填写链接）</label>
+											<label><input type="radio" name="ispart" id="ispart2" value="2"> 外部栏目（栏目生成目录处填写网址）</label>
 										</td>
 										<td>栏目交叉</td>
 										<td>
@@ -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 mt-3" style="display:none">交叉栏目该栏目与另一个非子栏目交叉的情况，相当于副栏目功能</div>
 										</td>
 									</tr>
 									<?php if ($id==0) {?>
@@ -192,7 +192,7 @@
 											<span>（需要绑定二级域名，系统变量中开启支持多站点）</span>
 										</td>
 										<td>绑定域名</td>
-										<td><input type="text" name="siteurl" id="siteurl" onChange="CheckPathSet();" class="admin-input-lg">（请输入绑定域名http开头）</td>
+										<td><input type="text" name="siteurl" id="siteurl" onChange="CheckPathSet();" class="admin-input-lg">（请输入网址，在系统设置开启多站点功能）</td>
 									</tr>
 									<?php }?>
 									<tr>
@@ -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 mt-3" 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 mt-3" 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 mt-3" style="display:none">
 												<p>静态规则</p>
 												<p>{Y}{M}{D} 年月日</p>
 												<p>{timestamp} INT类型的UNIX时间戳</p>
@@ -252,23 +252,16 @@
 											</div>
 										</td>
 										<td>SEO标题</td>
-										<td><input type="text" name="seotitle" id="seotitle" class="admin-input-lg">（标签{dede:field.seotitle/}调用）</td>
+										<td><input type="text" name="seotitle" id="seotitle" class="admin-input-lg"></td>
 									</tr>
 									<tr>
 										<td>关键词</td>
-										<td>
-											<textarea name="keywords" id="keywords" class="admin-textarea-sm"></textarea>
-											<span>（标签{dede:field.keywords/}调用）</span>
-										</td>
+										<td><textarea name="keywords" id="keywords" class="admin-textarea-sm"></textarea></td>
 										<td>描述</td>
-										<td>
-											<textarea name="description" id="description" class="admin-textarea-sm"></textarea>
-											<span>（标签{dede:field.description/}调用）</span>
-										</td>
+										<td><textarea name="description" id="description" class="admin-textarea-sm"></textarea></td>
 									</tr>
 									<tr>
-										<td>栏目文档</td>
-										<td>（标签{dede:field.content/}调用）</td>
+										<td colspan="2">栏目文档</td>
 										<td>是否支持跨站调用</td>
 										<td>
 											<input type="text" name="apikey" id="apikey" class="admin-input-lg" placeholder="请输入跨站调用秘钥">
@@ -303,7 +296,7 @@
 					<div class="modal-body">
 						<form>
 							<div class="form-group">
-								<textarea id="prompt" class="form-control" style="height:160px" placeholder="请输入创建栏目要求，例如：我需要创建一个介绍穆云智能科技公司的栏目"></textarea>
+								<textarea id="prompt" class="form-control" style="height:160px" placeholder="请输入创建栏目要求，例：我需要创建一个介绍穆云智能科技公司的栏目"></textarea>
 							</div>
 							<div class="form-group">
 								<label for="modelid" class="form-label">选择模型</label>

src/admin/templets/catalog_add_quick.htm

@@ -37,7 +37,7 @@
 										<td width="40%">
 											<label><input type="radio" name="referpath" value="parent" checked> 默认网页目录（
 												<?php
-												$pardir = '{cmspath}'.$cfg_arcdir;
+												$pardir = $cfg_arcdir;
 												if (!empty($typedir)) $pardir = $typedir.'/';
 												$pardir = preg_replace("#\/{1,}#", '/', $pardir);
 												echo $pardir;
@@ -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 mt-3" 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 mt-3" style="display:none">
 												<p>静态规则</p>
 												<p>{Y}{M}{D} 年月日</p>
 												<p>{timestamp} INT类型的UNIX时间戳</p>
@@ -119,7 +119,7 @@
 													<tr>
 														<td scope="col">排序</td>
 														<td scope="col">顶级栏目名称</td>
-														<td scope="col">子栏目名称（英文逗号隔开，如：栏目一,栏目二）</td>
+														<td scope="col">子栏目名称（英文逗号隔开，例：栏目一,栏目二）</td>
 														<td scope="col"><button type="button" class="btn btn-success btn-sm add">添加</button></td>
 													</tr>
 												</thead>
@@ -200,7 +200,7 @@
 					<div class="modal-body">
 						<form>
 							<div class="form-group">
-								<textarea id="prompt" class="form-control" style="height:160px" placeholder="请输入批量创建栏目要求，例如：我需要创建一个企业信息展示类站点"></textarea>
+								<textarea id="prompt" class="form-control" style="height:160px" placeholder="请输入批量创建栏目要求，例：我需要创建一个企业信息展示类站点"></textarea>
 							</div>
 							<div class="form-group">
 								<label for="modelid" class="form-label">选择模型</label>

src/admin/templets/catalog_edit.htm

@@ -82,7 +82,7 @@
 										<td>上级目录</td>
 										<td>
 											<?php
-											$pardir = '{cmspath}'.$cfg_arcdir;
+											$pardir = $cfg_arcdir;
 											if (!empty($typedir)) $pardir = $typedir.'/';
 											$pardir = preg_replace("#\/{1,}#", '/', $pardir);
 											echo $pardir;
@@ -156,7 +156,7 @@
 										<td>
 											<label><input type="radio" name="ispart" value="0" <?php if ($myrow['ispart']==0) echo 'checked';?>> 列表栏目（允许发布）</label>
 											<label><input type="radio" name="ispart" value="1" <?php if ($myrow['ispart']==1) echo 'checked';?>> 封面栏目（不允许发布）</label>
-											<label><input type="radio" name="ispart" value="2" <?php if ($myrow['ispart']==2) echo 'checked';?>> 外部栏目（栏目生成目录填写链接）</label>
+											<label><input type="radio" name="ispart" value="2" <?php if ($myrow['ispart']==2) echo 'checked';?>> 外部栏目（栏目生成目录处填写网址）</label>
 										</td>
 										<td>栏目交叉</td>
 										<td>
@@ -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 mt-3" style="display:none">交叉栏目该栏目与另一个非子栏目交叉的情况，相当于副栏目功能</div>
 										</td>
 									</tr>
 									<tr>
@@ -176,7 +176,7 @@
 											<span>（仅顶级栏目启用，子类栏目无效）</span>
 										</td>
 										<td>绑定域名</td>
-										<td><input type="text" name="siteurl" id="siteurl" value="<?php echo $myrow['siteurl']?>" class="admin-input-lg">（请输入绑定域名http开头）</td>
+										<td><input type="text" name="siteurl" id="siteurl" value="<?php echo $myrow['siteurl']?>" class="admin-input-lg">（请输入网址，在系统设置开启多站点功能）</td>
 									</tr>
 									<tr>
 										<td>列表模板</td>
@@ -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 mt-3" 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 mt-3" 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 mt-3" style="display:none">
 												<p>静态规则</p>
 												<p>{Y}{M}{D} 年月日</p>
 												<p>{timestamp} INT类型的UNIX时间戳</p>
@@ -235,23 +235,16 @@
 											</div>
 										</td>
 										<td>SEO标题</td>
-										<td><input type="text" name="seotitle" id="seotitle" value="<?php echo $myrow['seotitle']?>" class="admin-input-lg">（标签{dede:field.seotitle/}调用）</td>
+										<td><input type="text" name="seotitle" id="seotitle" value="<?php echo $myrow['seotitle']?>" class="admin-input-lg"></td>
 									</tr>
 									<tr>
 										<td>关键词</td>
-										<td>
-											<textarea name="keywords" cid="keywords" class="admin-textarea-sm"><?php echo $myrow['keywords']?></textarea>
-											<span>（标签{dede:field.keywords/}调用）</span>
-										</td>
+										<td><textarea name="keywords" cid="keywords" class="admin-textarea-sm"><?php echo $myrow['keywords']?></textarea></td>
 										<td>描述</td>
-										<td>
-											<textarea name="description" id="description" class="admin-textarea-sm"><?php echo $myrow['description']?></textarea>
-											<span>（标签{dede:field.description/}调用）</span>
-										</td>
+										<td><textarea name="description" id="description" class="admin-textarea-sm"><?php echo $myrow['description']?></textarea></td>
 									</tr>
 									<tr>
-										<td>栏目文档</td>
-										<td>（标签{dede:field.content/}调用）</td>
+										<td colspan="2">栏目文档</td>
 										<td>是否支持跨站调用</td>
 										<td>
 											<input value="<?php echo $myrow['apikey']?>" type="text" name="apikey" id="apikey" class="admin-input-lg" placeholder="请输入跨站调用秘钥">
@@ -333,7 +326,7 @@
 					<div class="modal-body">
 						<form>
 							<div class="form-group">
-								<textarea id="prompt" class="form-control" style="height:160px" placeholder="请输入修改栏目要求，例如：我需要栏目信息内容更丰富一些"></textarea>
+								<textarea id="prompt" class="form-control" style="height:160px" placeholder="请输入修改栏目要求，例：我需要栏目信息内容更丰富一些"></textarea>
 							</div>
 							<div class="form-group">
 								<label for="modelid" class="form-label">选择模型</label>

src/admin/templets/catalog_main.htm

@@ -19,15 +19,17 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<?php if (!isset($exallct)) {?>
-					<a href="catalog_main.php?exallct=all" class="btn btn-success btn-sm">展开栏目</a>
-					<?php } else {?>
-					<a href="catalog_main.php" class="btn btn-success btn-sm">收缩栏目</a>
-					<?php }?>
-					<a href="catalog_add.php?listtype=all" class="btn btn-success btn-sm">添加栏目</a>
-					<a href="catalog_add.php?dopost=quick" class="btn btn-success btn-sm">批量添加</a>
-					<a href="catalog_do.php?dopost=upcatcache" class="btn btn-success btn-sm">更新缓存</a>
-					<button type="button" class="btn btn-success btn-sm" onclick="document.form1.submit();">更新排序</button>
+					<div class="admin-btns">
+						<?php if (!isset($exallct)) {?>
+						<a href="catalog_main.php?exallct=all" class="btn btn-success btn-sm">展开栏目</a>
+						<?php } else {?>
+						<a href="catalog_main.php" class="btn btn-success btn-sm">收缩栏目</a>
+						<?php }?>
+						<a href="catalog_add.php?listtype=all" class="btn btn-success btn-sm">添加栏目</a>
+						<a href="catalog_add.php?dopost=quick" class="btn btn-success btn-sm">批量添加</a>
+						<a href="catalog_do.php?dopost=upcatcache" class="btn btn-success btn-sm">更新缓存</a>
+						<button type="button" class="btn btn-success btn-sm" onclick="document.form1.submit();">更新排序</button>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/content_att.htm

@@ -17,7 +17,6 @@
 			<div class="card shadow-sm">
 				<div class="card-header">文档自定义属性</div>
 				<div class="card-body">
-					<div class="alert alert-info shadow-sm">文档发布时选择属性后arclist标签加上flag='自定义属性'，例如：{dede:arclist flag='h,c'}h,c表示组合属性头条和推荐</div>
 					<form name="form1" action="content_att.php" method="post">
 						<input type="hidden" name="dopost" value="save">
 						<div class="table-responsive">

src/admin/templets/content_i_list.htm

@@ -24,40 +24,44 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<a class="btn btn-success btn-sm" href="catalog_do.php?channelid={dede:global.channelid/}&cid={dede:global.cid/}&dopost=addArchives">添加文档</a>
-					{dede:if $adminid==$mid}
-					<a class="btn btn-success btn-sm" href="content_i_list.php?cid={dede:global.cid/}&mid=0">全部文档</a>
-					{else}
-					<a class="btn btn-success btn-sm" href="content_i_list.php?cid={dede:global.cid/}&mid=<?php echo $cuserLogin->getUserID();?>">我的文档</a>
-					{/dede:if}
-					{dede:global.CheckUserSend/}
-					<a class="btn btn-success btn-sm" href="catalog_main.php">栏目管理</a>
-					<a class="btn btn-success btn-sm" href="makehtml_list.php?cid={dede:global.cid/}">更新列表</a>
-					<a class="btn btn-success btn-sm" href="makehtml_archives.php?cid={dede:global.cid/}">更新文档</a>
-					<a class="btn btn-success btn-sm" href="recycling.php?cid={dede:global.cid/}">文档回收站</a>
+					<div class="admin-btns">
+						<a class="btn btn-success btn-sm" href="catalog_do.php?channelid={dede:global.channelid/}&cid={dede:global.cid/}&dopost=addArchives">添加文档</a>
+						{dede:if $adminid==$mid}
+						<a class="btn btn-success btn-sm" href="content_i_list.php?cid={dede:global.cid/}&mid=0">全部文档</a>
+						{else}
+						<a class="btn btn-success btn-sm" href="content_i_list.php?cid={dede:global.cid/}&mid=<?php echo $cuserLogin->getUserID();?>">我的文档</a>
+						{/dede:if}
+						{dede:global.CheckUserSend/}
+						<a class="btn btn-success btn-sm" href="catalog_main.php">栏目管理</a>
+						<a class="btn btn-success btn-sm" href="makehtml_list.php?cid={dede:global.cid/}">更新列表</a>
+						<a class="btn btn-success btn-sm" href="makehtml_archives.php?cid={dede:global.cid/}">更新文档</a>
+						<a class="btn btn-success btn-sm" href="recycling.php?cid={dede:global.cid/}">文档回收站</a>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<form name="form3" action="content_i_list.php" method="get">
-						<input type="hidden" name="dopost" value="listArchives">
-						<input type="hidden" name="channelid" value="<?php echo $channelid;?>">
-						<input type="text" name="keyword" class="admin-input-lg mr-2" value="{dede:global.keyword/}" placeholder="请输入文档标题或文档id">
-						<select name="cid" class="admin-input-sm mr-2">
-							<option value="0">选择栏目</option>
-							{dede:global.optionarr/}
-						</select>
-						<select name="orderby" class="admin-input-sm mr-2">
-							<option value="id">排序</option>
-							<option value="pubdate">更新时间</option>
-							<option value="sortrank">置顶权值</option>
-							<option value="click">点击量</option>
-							<option value="scores">评论积分</option>
-							<option value="lastpost">最后评论</option>
-						</select>
-						<input type="text" name="timerange" autocomplete="off" id="timerange" class="admin-input-lg" value="<?php echo $strTimerange;?>" placeholder="请选择日期">
-						<button type="submit" class="btn btn-success btn-sm">搜索</button>
-					</form>
+					<div class="admin-btns">
+						<form name="form3" action="content_i_list.php" method="get">
+							<input type="hidden" name="dopost" value="listArchives">
+							<input type="hidden" name="channelid" value="<?php echo $channelid;?>">
+							<input type="text" name="keyword" class="admin-input-lg" value="{dede:global.keyword/}" placeholder="请输入文档标题或文档id">
+							<select name="cid" class="admin-input-sm">
+								<option value="0">选择栏目</option>
+								{dede:global.optionarr/}
+							</select>
+							<select name="orderby" class="admin-input-sm">
+								<option value="id">排序</option>
+								<option value="pubdate">更新时间</option>
+								<option value="sortrank">置顶权值</option>
+								<option value="click">点击量</option>
+								<option value="scores">评论积分</option>
+								<option value="lastpost">最后评论</option>
+							</select>
+							<input type="text" name="timerange" autocomplete="off" id="timerange" class="admin-input-lg" value="<?php echo $strTimerange;?>" placeholder="请选择日期">
+							<button type="submit" class="btn btn-success btn-sm">搜索</button>
+						</form>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/content_list.htm

@@ -24,43 +24,47 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<a class="btn btn-success btn-sm" href="catalog_do.php?channelid={dede:global.channelid/}&cid={dede:global.cid/}&dopost=addArchives">添加文档</a>
-					{dede:if $adminid==$mid}
-					<a class="btn btn-success btn-sm" href="content_list.php?cid={dede:global.cid/}&mid=0">全部文档</a>
-					{else}
-					<a class="btn btn-success btn-sm" href="content_list.php?cid={dede:global.cid/}&mid=<?php echo $cuserLogin->getUserID();?>">我的文档</a>
-					{/dede:if}
-					{dede:global.CheckUserSend/}
-					<a class="btn btn-success btn-sm" href="catalog_main.php">栏目管理</a>
-					<a class="btn btn-success btn-sm" href="makehtml_list.php?cid={dede:global.cid/}">更新列表</a>
-					<a class="btn btn-success btn-sm" href="makehtml_archives.php?cid={dede:global.cid/}">更新文档</a>
-					<a class="btn btn-success btn-sm" href="recycling.php?cid={dede:global.cid/}">文档回收站</a>
+					<div class="admin-btns">
+						<a class="btn btn-success btn-sm" href="catalog_do.php?channelid={dede:global.channelid/}&cid={dede:global.cid/}&dopost=addArchives">添加文档</a>
+						{dede:if $adminid==$mid}
+						<a class="btn btn-success btn-sm" href="content_list.php?cid={dede:global.cid/}&mid=0">全部文档</a>
+						{else}
+						<a class="btn btn-success btn-sm" href="content_list.php?cid={dede:global.cid/}&mid=<?php echo $cuserLogin->getUserID();?>">我的文档</a>
+						{/dede:if}
+						{dede:global.CheckUserSend/}
+						<a class="btn btn-success btn-sm" href="catalog_main.php">栏目管理</a>
+						<a class="btn btn-success btn-sm" href="makehtml_list.php?cid={dede:global.cid/}">更新列表</a>
+						<a class="btn btn-success btn-sm" href="makehtml_archives.php?cid={dede:global.cid/}">更新文档</a>
+						<a class="btn btn-success btn-sm" href="recycling.php?cid={dede:global.cid/}">文档回收站</a>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<form name="form3" action="content_list.php" method="get">
-						<input type="hidden" name="dopost" value="listArchives">
-						<input type="text" name="keyword" class="admin-input-lg mr-2" value="{dede:global.keyword/}" placeholder="请输入文档标题或文档id">
-						<select name="cid" class="admin-input-sm mr-2">
-							<option value="0">选择栏目</option>
-							{dede:global.optionarr/}
-						</select>
-						<select name="orderby" class="admin-input-sm mr-2">
-							<option value="id">选择排序</option>
-							<option value="pubdate">更新时间</option>
-							<option value="sortrank">置顶权值</option>
-							<option value="click">点击量</option>
-							<option value="scores">评论积分</option>
-							<option value="lastpost">最后评论</option>
-						</select>
-						<select name="flag" class="admin-input-sm mr-2">
-							<option value="">选择属性</option>
-							{dede:global.flagsArr/}
-						</select>
-						<input type="text" name="timerange" autocomplete="off" id="timerange" class="admin-input-lg" value="<?php echo $strTimerange;?>" placeholder="请选择日期">
-						<button type="submit" class="btn btn-success btn-sm">搜索</button>
-					</form>
+					<div class="admin-btns">
+						<form name="form3" action="content_list.php" method="get">
+							<input type="hidden" name="dopost" value="listArchives">
+							<input type="text" name="keyword" class="admin-input-lg" value="{dede:global.keyword/}" placeholder="请输入文档标题或文档id">
+							<select name="cid" class="admin-input-sm">
+								<option value="0">选择栏目</option>
+								{dede:global.optionarr/}
+							</select>
+							<select name="orderby" class="admin-input-sm">
+								<option value="id">选择排序</option>
+								<option value="pubdate">更新时间</option>
+								<option value="sortrank">置顶权值</option>
+								<option value="click">点击量</option>
+								<option value="scores">评论积分</option>
+								<option value="lastpost">最后评论</option>
+							</select>
+							<select name="flag" class="admin-input-sm">
+								<option value="">选择属性</option>
+								{dede:global.flagsArr/}
+							</select>
+							<input type="text" name="timerange" autocomplete="off" id="timerange" class="admin-input-lg" value="<?php echo $strTimerange;?>" placeholder="请选择日期">
+							<button type="submit" class="btn btn-success btn-sm">搜索</button>
+						</form>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/content_s_list.htm

@@ -21,25 +21,29 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<a class="btn btn-success btn-sm" href="spec_add.php">添加专题</a>
-					<?php echo $CheckUserSend?>
-					<a class="btn btn-success btn-sm" href="catalog_main.php">栏目管理</a>
-					<a class="btn btn-success btn-sm" href="makehtml_spec.php">更新专题</a>
+					<div class="admin-btns">
+						<a class="btn btn-success btn-sm" href="spec_add.php">添加专题</a>
+						<?php echo $CheckUserSend?>
+						<a class="btn btn-success btn-sm" href="catalog_main.php">栏目管理</a>
+						<a class="btn btn-success btn-sm" href="makehtml_spec.php">更新专题</a>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<form name="form3" action="content_s_list.php" method="get">
-						<input type="hidden" name="dopost" value="listArchives">
-						<input type="hidden" name="channelid" value="3">
-						<input type="text" name="keyword" class="admin-input-lg mr-2" value="<?php echo $keyword?>" placeholder="请输入文档标题或文档id">
-						<select name="cid" class="admin-input-sm mr-2">
-							<option value="0">选择分类</option>
-							<?php echo $optionarr?>
-						</select>
-						<input type="text" name="timerange" autocomplete="off" id="timerange" class="admin-input-lg" value="<?php echo $strTimerange;?>" placeholder="请选择日期">
-						<button type="submit" class="btn btn-success btn-sm">搜索</button>
-					</form>
+					<div class="admin-btns">
+						<form name="form3" action="content_s_list.php" method="get">
+							<input type="hidden" name="dopost" value="listArchives">
+							<input type="hidden" name="channelid" value="3">
+							<input type="text" name="keyword" class="admin-input-lg" value="<?php echo $keyword?>" placeholder="请输入文档标题或文档id">
+							<select name="cid" class="admin-input-sm">
+								<option value="0">选择分类</option>
+								<?php echo $optionarr?>
+							</select>
+							<input type="text" name="timerange" autocomplete="off" id="timerange" class="admin-input-lg" value="<?php echo $strTimerange;?>" placeholder="请选择日期">
+							<button type="submit" class="btn btn-success btn-sm">搜索</button>
+						</form>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/content_select_list.htm

@@ -12,15 +12,17 @@
 		<div class="container-fluid">
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<form name="form3" action="content_select_list.php" method="get">
-						<input type="hidden" name="f" value="<?php echo $f?>">
-						<input type="text" name="keyword" class="admin-input-lg mr-2" value="<?php echo $keyword?>" placeholder="请输入文档标题或文档id">
-						<select name="cid" class="admin-input-sm">
-							<option value="0">选择分类</option>
-							<?php echo $optionarr?>
-						</select>
-						<button type="submit" class="btn btn-success btn-sm">搜索</button>
-					</form>
+					<div class="admin-btns">
+						<form name="form3" action="content_select_list.php" method="get">
+							<input type="hidden" name="f" value="<?php echo $f?>">
+							<input type="text" name="keyword" class="admin-input-lg" value="<?php echo $keyword?>" placeholder="请输入文档标题或文档id">
+							<select name="cid" class="admin-input-sm">
+								<option value="0">选择分类</option>
+								<?php echo $optionarr?>
+							</select>
+							<button type="submit" class="btn btn-success btn-sm">搜索</button>
+						</form>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/content_sg_list.htm

@@ -24,31 +24,35 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<a class="btn btn-success btn-sm" href="catalog_do.php?channelid={dede:global.channelid/}&cid={dede:global.cid/}&dopost=addArchives">添加文档</a>
-					{dede:if $adminid==$mid}
-					<a class="btn btn-success btn-sm" href="content_list.php?cid={dede:global.cid/}&mid=0">全部文档</a>
-					{else}
-					<a class="btn btn-success btn-sm" href="content_list.php?cid={dede:global.cid/}&mid=<?php echo $cuserLogin->getUserID();?>">我的文档</a>
-					{/dede:if}
-					<a class="btn btn-success btn-sm" href="catalog_main.php">栏目管理</a>
-					<a class="btn btn-success btn-sm" href="makehtml_list.php?cid={dede:global.cid/}">更新列表</a>
-					<a class="btn btn-success btn-sm" href="makehtml_archives.php?cid={dede:global.cid/}">更新文档</a>
-					<?php echo $CheckUserSend;?>
+					<div class="admin-btns">
+						<a class="btn btn-success btn-sm" href="catalog_do.php?channelid={dede:global.channelid/}&cid={dede:global.cid/}&dopost=addArchives">添加文档</a>
+						{dede:if $adminid==$mid}
+						<a class="btn btn-success btn-sm" href="content_list.php?cid={dede:global.cid/}&mid=0">全部文档</a>
+						{else}
+						<a class="btn btn-success btn-sm" href="content_list.php?cid={dede:global.cid/}&mid=<?php echo $cuserLogin->getUserID();?>">我的文档</a>
+						{/dede:if}
+						<a class="btn btn-success btn-sm" href="catalog_main.php">栏目管理</a>
+						<a class="btn btn-success btn-sm" href="makehtml_list.php?cid={dede:global.cid/}">更新列表</a>
+						<a class="btn btn-success btn-sm" href="makehtml_archives.php?cid={dede:global.cid/}">更新文档</a>
+						<?php echo $CheckUserSend;?>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<form name="form3" action="content_sg_list.php" method="get">
-						<input type="hidden" name="dopost" value="listArchives">
-						<input type="hidden" name="channelid" value="{dede:global.channelid/}">
-						<input type="text" name="keyword" class="admin-input-lg mr-2" value="{dede:global.keyword/}" placeholder="请输入文档标题或文档id">
-						<select name="cid" class="admin-input-sm mr-2">
-							<option value="0">选择分类</option>
-							{dede:global.optionarr/}
-						</select>
-						<input type="text" name="timerange" autocomplete="off" id="timerange" class="admin-input-lg" value="<?php echo $strTimerange;?>" placeholder="请选择日期">
-						<button type="submit" class="btn btn-success btn-sm">搜索</button>
-					</form>
+					<div class="admin-btns">
+						<form name="form3" action="content_sg_list.php" method="get">
+							<input type="hidden" name="dopost" value="listArchives">
+							<input type="hidden" name="channelid" value="{dede:global.channelid/}">
+							<input type="text" name="keyword" class="admin-input-lg" value="{dede:global.keyword/}" placeholder="请输入文档标题或文档id">
+							<select name="cid" class="admin-input-sm">
+								<option value="0">选择分类</option>
+								{dede:global.optionarr/}
+							</select>
+							<input type="text" name="timerange" autocomplete="off" id="timerange" class="admin-input-lg" value="<?php echo $strTimerange;?>" placeholder="请选择日期">
+							<button type="submit" class="btn btn-success btn-sm">搜索</button>
+						</form>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/diy_field_add.htm

@@ -49,24 +49,24 @@
 									<tr>
 										<td>数据类型</td>
 										<td>
-											<div class="nw"><label><input type="radio" name="dtype" id="dtype1" value="text" checked> 单行文本(varchar)</label></div>
-											<div class="nw"><label><input type="radio" name="dtype" id="dtype2" value="textchar"> 单行文本(char)</label></div>
-											<div class="nw"><label><input type="radio" name="dtype" id="dtype3" value="multitext"> 多行文本</label></div>
-											<div class="nw"><label><input type="radio" name="dtype" id="dtype4" value="htmltext"> 网页文本</label></div>
-											<br class="cls">
-											<div class="nw"><label><input type="radio" name="dtype" id="dtype6" value="int"> 整数类型</label></div>
-											<div class="nw"><label><input type="radio" name="dtype" id="dtype7" value="float"> 小数类型</label></div>
-											<div class="nw"><label><input type="radio" name="dtype" id="dtype8" value="datetime"> 时间类型</label></div>
-											<div class="nw"><label><input type="radio" name="dtype" id="dtype13" value="select"> option下拉框</label></div>
-											<br class="cls">
-											<div class="nw"><label><input type="radio" name="dtype" id="dtype14" value="radio"> radio选项卡</label></div>
-											<div class="nw"><label><input type="radio" name="dtype" id="dtype15" value="checkbox"> checkbox多选框</label></div>
+											<div class="data-col"><label><input type="radio" name="dtype" id="dtype1" value="text" checked> 单行文本(varchar)</label></div>
+											<div class="data-col"><label><input type="radio" name="dtype" id="dtype2" value="textchar"> 单行文本(char)</label></div>
+											<div class="data-col"><label><input type="radio" name="dtype" id="dtype3" value="multitext"> 多行文本</label></div>
+											<div class="data-col"><label><input type="radio" name="dtype" id="dtype4" value="htmltext"> 网页文本</label></div>
+											<br class="clear">
+											<div class="data-col"><label><input type="radio" name="dtype" id="dtype6" value="int"> 整数类型</label></div>
+											<div class="data-col"><label><input type="radio" name="dtype" id="dtype7" value="float"> 小数类型</label></div>
+											<div class="data-col"><label><input type="radio" name="dtype" id="dtype8" value="datetime"> 时间类型</label></div>
+											<div class="data-col"><label><input type="radio" name="dtype" id="dtype13" value="select"> option下拉框</label></div>
+											<br class="clear">
+											<div class="data-col"><label><input type="radio" name="dtype" id="dtype14" value="radio"> radio选项卡</label></div>
+											<div class="data-col"><label><input type="radio" name="dtype" id="dtype15" value="checkbox"> checkbox多选框</label></div>
 										</td>
 									</tr>
 									<tr>
 										<td>默认值</td>
 										<td>
-											<p>（自定义字段数据类型为select、radio、checkbox时，下面填写数据，英文逗号隔开，如：DedeBIZ,得德）</p>
+											<p>（自定义字段数据类型为select、radio、checkbox时，下面填写数据，英文逗号隔开，例：DedeBIZ,得德）</p>
 											<textarea name="vdefault" id="vdefault" class="admin-textarea-xl"></textarea>
 										</td>
 									</tr>

src/admin/templets/diy_field_edit.htm

@@ -79,7 +79,7 @@
 									<tr>
 										<td>默认值</td>
 										<td>
-											<p>（自定义字段数据类型为select、radio、checkbox时，下面填写数据，英文逗号隔开，如：DedeBIZ,得德）</p>
+											<p>（自定义字段数据类型为select、radio、checkbox时，下面填写数据，英文逗号隔开，例：DedeBIZ,得德）</p>
 											<textarea name="vdefault" id="vdefault" class="admin-textarea-xl"><?php echo $ctag->GetAtt('default');?></textarea>
 										</td>
 									</tr>

src/admin/templets/diy_list.htm

@@ -17,24 +17,26 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<form name="form1" action="diy_list.php">
-						<input type="hidden" name="action" value="list">
-						<input type="hidden" name="diyid" value="<?php echo $diy->diyid; ?>">
-						<input type="text" name="keyword" class="admin-input-lg mr-2" value="<?php echo $keyword; ?>" placeholder="请输入关键词">
-						<select name="field" class="admin-input-sm">
-						<?php
-						foreach($fieldlist as $k=>$fielddata)
-						{
-							if ($k==$field) {
-								echo "<option value='{$k}' selected>{$fielddata[0]}</option>\r\n";
-							} else {
-								echo "<option value='{$k}'>{$fielddata[0]}</option>\r\n";
+					<div class="admin-btns">
+						<form name="form1" action="diy_list.php">
+							<input type="hidden" name="action" value="list">
+							<input type="hidden" name="diyid" value="<?php echo $diy->diyid; ?>">
+							<input type="text" name="keyword" class="admin-input-lg" value="<?php echo $keyword; ?>" placeholder="请输入关键词">
+							<select name="field" class="admin-input-sm">
+							<?php
+							foreach($fieldlist as $k=>$fielddata)
+							{
+								if ($k==$field) {
+									echo "<option value='{$k}' selected>{$fielddata[0]}</option>\r\n";
+								} else {
+									echo "<option value='{$k}'>{$fielddata[0]}</option>\r\n";
+								}
 							}
-						}
-						?>
-						</select>
-						<button type="submit" class="btn btn-success btn-sm">搜索</button>
-					</form>
+							?>
+							</select>
+							<button type="submit" class="btn btn-success btn-sm">搜索</button>
+						</form>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/feedback_main.htm

@@ -18,16 +18,17 @@
 				<li class="breadcrumb-item active">评论管理</li>
 			</ol>
 			<div class="card shadow-sm mb-3">
-				<div class="card-header">修改评论</div>
 				<div class="card-body">
-					<form name="form1">
-						<input type="text" name="keyword" placeholder="请输入关键词" class="admin-input-lg mr-2">
-						<select name="typeid" class="admin-input-sm">
-							<option value="0">请选择</option>
-							{dede:global.openarray/}
-						</select>
-						<button type="submit" class="btn btn-success btn-sm">搜索</button>
-					</form>
+					<div class="admin-btns">
+						<form name="form1">
+							<input type="text" name="keyword" placeholder="请输入关键词" class="admin-input-lg">
+							<select name="typeid" class="admin-input-sm">
+								<option value="0">请选择</option>
+								{dede:global.openarray/}
+							</select>
+							<button type="submit" class="btn btn-success btn-sm">搜索</button>
+						</form>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

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>

src/admin/templets/freelist_add.htm

@@ -27,7 +27,7 @@
 			<div class="card shadow-sm">
 				<div class="card-header">添加自由列表</div>
 				<div class="card-body">
-					<div class="alert alert-info">freelist标签基本等同于arclist标签，区别是freelist标签支持分页，按自定义排序规则的文档列表，且自由列是独立编译的，轻松的实现统一化管理</div>
+					<div class="alert alert-info">freelist标签类似于arclist标签，但支持分页和自定义排序的文档列表。此外，freelist是独立编译的，便于统一管理</div>
 					<div id="list1" style="display:none"><p><a href="[field:arcurl/]">[field:title/]</a></p></div>
 					<div id="list2" style="display:none"><p>[field:typelink/] - <a href="[field:arcurl/]">[field:title/]</a></p></div>
 					<div id="list3" style="display:none"><p>[field:imglink/]</p><p>[field:textlink/]</p></div>
@@ -49,7 +49,7 @@
 										<td width="160">自由列表标题</td>
 										<td width="550"><input type="text" name="title" id="title" class="admin-input-lg" required></td>
 										<td width="160">列表生成目录</td>
-										<td><input type="text" name="listdir" id="listdir" value="{cmspath}/a/freelist/" class="admin-input-lg"></td>
+										<td><input type="text" name="listdir" id="listdir" value="/a/freelist/" class="admin-input-lg"></td>
 									</tr>
 									<tr>
 										<td>默认页名称</td>

src/admin/templets/freelist_main.htm

@@ -108,12 +108,14 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<form action="freelist_main.php" name="form1" id="form1">
-						<input type="text" name="keyword" id="keyword" value="<?php echo $keyword?>" class="admin-input-lg" placeholder="请输入关键词">
-						<button type="submit" class="btn btn-success btn-sm">搜索</button>
-						<a href="freelist_add.php" class="btn btn-success btn-sm">添加自由列表</a>
-						<a href="makehtml_freelist.php" class="btn btn-success btn-sm">更新所有列表</a>
-					</form>
+					<div class="admin-btns">
+						<form action="freelist_main.php" name="form1" id="form1">
+							<input type="text" name="keyword" id="keyword" value="<?php echo $keyword?>" class="admin-input-lg" placeholder="请输入关键词">
+							<button type="submit" class="btn btn-success btn-sm">搜索</button>
+							<a href="freelist_add.php" class="btn btn-success btn-sm">添加自由列表</a>
+							<a href="makehtml_freelist.php" class="btn btn-success btn-sm">更新所有列表</a>
+						</form>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/friendlink_main.htm

@@ -20,23 +20,25 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<form action="friendlink_main.php" name="form1" method="get">
-						<input type="text" name="keyword" id="keyword" placeholder="请输入关键词" value="<?php echo $keyword;?>" class="admin-input-lg mr-2">
-						<select name="ischeck" id="ischeck" class="admin-input-sm">
-							<?php
-							foreach($selCheckArr as $k=>$v)
-							{
-								if ($k==$ischeck) echo "<option value='$k' selected>$v</option>";
-								else echo "<option value='$k'>$v</option>";
-							}
-							?>
-						</select>
-						<button type="submit" class="btn btn-success btn-sm">搜索</button>
-						<a href="friendlink_add.php" class="btn btn-success btn-sm">添加链接</a>
-						<a href="friendlink_type.php" class="btn btn-success btn-sm">网站类型管理</a>
-						<a href="<?php echo $cfg_phpurl;?>/flink.php?dopost=add" target="_blank" class="btn btn-success btn-sm">申请链接</a>
-						<a href="{dede:global name=' cfg_phpurl'/}/flink.php" target="_blank" class="btn btn-success btn-sm">链接预览</a>
-					</form>
+					<div class="admin-btns">
+						<form action="friendlink_main.php" name="form1" method="get">
+							<input type="text" name="keyword" id="keyword" placeholder="请输入关键词" value="<?php echo $keyword;?>" class="admin-input-lg">
+							<select name="ischeck" id="ischeck" class="admin-input-sm">
+								<?php
+								foreach($selCheckArr as $k=>$v)
+								{
+									if ($k==$ischeck) echo "<option value='$k' selected>$v</option>";
+									else echo "<option value='$k'>$v</option>";
+								}
+								?>
+							</select>
+							<button type="submit" class="btn btn-success btn-sm">搜索</button>
+							<a href="friendlink_add.php" class="btn btn-success btn-sm">添加链接</a>
+							<a href="friendlink_type.php" class="btn btn-success btn-sm">网站类型管理</a>
+							<a href="<?php echo $cfg_phpurl;?>/flink.php?dopost=add" target="_blank" class="btn btn-success btn-sm">申请链接</a>
+							<a href="{dede:global name=' cfg_phpurl'/}/flink.php" target="_blank" class="btn btn-success btn-sm">链接预览</a>
+						</form>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/index.htm

@@ -22,7 +22,7 @@
 				<?php }?>
 			</div>
 			<nav class="collapse navbar-collapse">
-				<ul class="navbar-nav mr-lg-auto">
+				<ul class="navbar-nav mr-md-auto">
 					<li class="nav-item"><a class="nav-link" href="javascript:;" id="togglemenu"><i class="fa fa-dedent" title="侧边伸缩"></i></a></li>
 					<?php if ($cuserLogin->getUserType() >= 5) {?>
 					<li class="nav-item d-none d-lg-block"><a class="nav-link" href="catalog_main.php" target="main" data-target="common"><i class="fa fa-navicon" title="栏目管理"></i></a></li>
@@ -45,7 +45,7 @@
 						</form>
 					</li>
 				</ul>
-				<div class="navbar-admin d-none d-xl-block">
+				<div class="navbar-admin d-none d-md-block">
 					<ul class="nav">
 						<li class="nav-item"><a class="nav-link" href="javascript:document.getElementById('main').contentWindow.location.reload(true);"><i class="fa fa-refresh" title="刷新页面"></i></a></li>
 						<li class="nav-item"><a class="nav-link user" href="sys_admin_user_edit.php?id=<?php echo $cuserLogin->getUserID();?>&dopost=edit" target="main"><img src="<?php echo $cuserLogin->getUserFace();?>"><?php echo $cuserLogin->getUserName();?></a></li>

src/admin/templets/index_body.htm

@@ -177,7 +177,7 @@
 								<button id="btnGoStep4" type="button" class="btn btn-success btn-sm">下载</button>
 							</div>
 							<div id="btnStep5" class="btnStep">
-								<div class="form-check form-check-inline" style="vertical-align: middle">
+								<div class="form-check form-check-inline" style="vertical-align:middle">
 									<input class="form-check-input" type="checkbox" id="chkUpdate" name="chkUpdate" value="true">
 									<label class="form-check-label" for="chkUpdate">自动检查更新</label>
 								</div>

src/admin/templets/log_list.htm

@@ -16,21 +16,23 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<form name="formsearch">
-						<input type="text" name="cip" id="cip" placeholder="请输入ip地址" class="admin-input-lg mr-2">
-						<select name="adminid" id="adminid" class="admin-input-sm mr-2">
-							<option value="0" selected>全部</option>
-							<?php echo $adminlist?>
-						</select>
-						<select name="dtime" id="dtime" class="admin-input-sm">
-							<option value="0" selected>全部</option>
-							<option value="7">一周内</option>
-							<option value="15">15天内</option>
-							<option value="30">30天以内</option>
-							<option value="60">60天以内</option>
-						</select>
-						<button type="submit" class="btn btn-success btn-sm">搜索</button>
-					</form>
+					<div class="admin-btns">
+						<form name="formsearch">
+							<input type="text" name="cip" id="cip" placeholder="请输入ip地址" class="admin-input-lg">
+							<select name="adminid" id="adminid" class="admin-input-sm">
+								<option value="0" selected>全部</option>
+								<?php echo $adminlist?>
+							</select>
+							<select name="dtime" id="dtime" class="admin-input-sm">
+								<option value="0" selected>全部</option>
+								<option value="7">一周内</option>
+								<option value="15">15天内</option>
+								<option value="30">30天以内</option>
+								<option value="60">60天以内</option>
+							</select>
+							<button type="submit" class="btn btn-success btn-sm">搜索</button>
+						</form>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/makehtml_spec.htm

@@ -17,7 +17,7 @@
 			<div class="card shadow-sm">
 				<div class="card-header">更新专题</div>
 				<div class="card-body">
-					<div class="alert alert-info">发布专题后需要手动更新，存放目录：<?php echo $cfg_cmspath.$cfg_special."/index.html"?></div>
+					<div class="alert alert-info">发布专题后需手动更新，专题存放目录：<?php echo $cfg_special."/index.html"?></div>
 					<form name="form1" action="makehtml_spec.php" method="get" target="stafrm">
 						<input type="hidden" name="dopost" value="ok">
 						<div class="table-responsive">

src/admin/templets/makehtml_tag_list.htm

@@ -17,7 +17,7 @@
 			<div class="card shadow-sm">
 				<div class="card-header">更新标签</div>
 				<div class="card-body">
-					<div class="alert alert-info">更新静态文件后浏览动态链接会自动跳转至静态链接，需要动态浏览则删除对应静态文件。标签首页模板：<?php echo $cfg_templets_dir;?>/<?php echo $cfg_df_style?>/tag.htm，标签文档列表模板：<?php echo $cfg_templets_dir;?>/<?php echo $cfg_df_style?>/tag_list.htm</div>
+					<div class="alert alert-info">更新静态文件后，访问动态链接会自动转向静态链接。若需查看动态内容，请删除对应的静态文件。标签首页模板：<?php echo $cfg_templets_dir;?>/<?php echo $cfg_df_style?>/tag.htm，标签列表模板：<?php echo $cfg_templets_dir;?>/<?php echo $cfg_df_style?>/tag_list.htm</div>
 					<form name="form1" action="makehtml_tag_action_list.php" method="get" target="stafrm">
 						<div class="table-responsive">
 							<table class="table table-borderless">

src/admin/templets/media_main.htm

@@ -16,23 +16,25 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<form name="forms" action="media_main.php" method="post">
-						<input type="text" name="keyword" id="keyword" placeholder="请输入关键词" value="<?php echo $keyword?>" class="admin-input-lg mr-2">
-						<select name="mediatype" class="admin-input-sm mr-2">
-							<option value="0">文件类型</option>
-							<option value="1" <?php if ($mediatype==1) echo "selected"?>>图片</option>
-							<option value="2" <?php if ($mediatype==2) echo "selected"?>>FLASH</option>
-							<option value="3" <?php if ($mediatype==3) echo "selected"?>>视频音频</option>
-							<option value="4" <?php if ($mediatype==4) echo "selected"?>>其它附件</option>
-						</select>
-						<select name="membertype" class="admin-input-sm">
-							<option value="0">会员组</option>
-							<option value="1" <?php if ($membertype==1) echo "selected"?>>管理员</option>
-							<option value="2" <?php if ($membertype==2) echo "selected"?>>外部会员</option>
-						</select>
-						<button type="submit" class="btn btn-success btn-sm">搜索</button>
-						<a href="media_add.php" class="btn btn-success btn-sm">添加附件</a>
-					</form>
+					<div class="admin-btns">
+						<form name="forms" action="media_main.php" method="post">
+							<input type="text" name="keyword" id="keyword" placeholder="请输入关键词" value="<?php echo $keyword?>" class="admin-input-lg">
+							<select name="mediatype" class="admin-input-sm">
+								<option value="0">文件类型</option>
+								<option value="1" <?php if ($mediatype==1) echo "selected"?>>图片</option>
+								<option value="2" <?php if ($mediatype==2) echo "selected"?>>FLASH</option>
+								<option value="3" <?php if ($mediatype==3) echo "selected"?>>视频音频</option>
+								<option value="4" <?php if ($mediatype==4) echo "selected"?>>其它附件</option>
+							</select>
+							<select name="membertype" class="admin-input-sm">
+								<option value="0">会员组</option>
+								<option value="1" <?php if ($membertype==1) echo "selected"?>>管理员</option>
+								<option value="2" <?php if ($membertype==2) echo "selected"?>>外部会员</option>
+							</select>
+							<button type="submit" class="btn btn-success btn-sm">搜索</button>
+							<a href="media_add.php" class="btn btn-success btn-sm">添加附件</a>
+						</form>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/member_edit.htm

@@ -21,7 +21,7 @@
 			<div class="card shadow-sm">
 				<div class="card-header">修改会员</div>
 				<div class="card-body">
-					<?php if ($row['matt']==10) echo '<div class="alert alert-info">该会员关连网站管理员，请谨慎修改</div>';?>
+					<?php if ($row['matt']==10) echo '<div class="alert alert-info">该会员关联网站管理员，请谨慎修改</div>';?>
 					<form name="form2" action="member_do.php" method="post">
 						<input type="hidden" name="dopost" value="edituser">
 						<input type="hidden" name="id" value="<?php echo $id?>">

src/admin/templets/member_main.htm

@@ -17,38 +17,40 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<form action="member_main.php" name="form1" method="get">
-						<input type="text" name="keyword" id="keyword" placeholder="请输入关键词" value="{dede:global name='keyword'/}" class="admin-input-lg mr-2">
-						<select name="sortkey" id="sortkey" class="admin-input-sm mr-2">
-							{dede:global name='sortform'/}
-							<option value="mid">mid/注册时间</option>
-							<option value="logintime">登录时间</option>
-							<option value="rank">会员等级</option>
-							<option value="money">会员金币</option>
-							<option value="scores">会员积分</option>
-						</select>
-						<select name="sex" id="sex" class="admin-input-sm mr-2">
-							{dede:global name='sexform'/}
-							<option value="男">男</option>
-							<option value="女">女</option>
-							<option value="保密">保密</option>
-						</select>
-						<select name="spacesta" id="spacesta" class="admin-input-sm">
-							<option value="-10">会员状态</option>
-							<?php
-							foreach($staArr as $k=>$v)
-							{
-								if ($spacesta==$k) echo "<option value='$k' selected>$v</option>";
-								else echo "<option value='$k'>$v</option>";
-							}
-							?>
-						</select>
-						<button type="submit" class="btn btn-success btn-sm">搜索</button>
-						<a href="member_main.php" class="btn btn-success btn-sm">所有会员</a>
-						<a href="member_main.php?spacesta=-2" class="btn btn-success btn-sm">禁言会员</a>
-						<a href="member_main.php?matt=1" class="btn btn-success btn-sm">推荐会员</a>
-						<a href="member_main.php?matt=0" class="btn btn-success btn-sm">注册会员</a>
-					</form>
+					<div class="admin-btns">
+						<form action="member_main.php" name="form1" method="get">
+							<input type="text" name="keyword" id="keyword" placeholder="请输入关键词" value="{dede:global name='keyword'/}" class="admin-input-lg">
+							<select name="sortkey" id="sortkey" class="admin-input-sm">
+								{dede:global name='sortform'/}
+								<option value="mid">mid/注册时间</option>
+								<option value="logintime">登录时间</option>
+								<option value="rank">会员等级</option>
+								<option value="money">会员金币</option>
+								<option value="scores">会员积分</option>
+							</select>
+							<select name="sex" id="sex" class="admin-input-sm">
+								{dede:global name='sexform'/}
+								<option value="男">男</option>
+								<option value="女">女</option>
+								<option value="保密">保密</option>
+							</select>
+							<select name="spacesta" id="spacesta" class="admin-input-sm">
+								<option value="-10">会员状态</option>
+								<?php
+								foreach($staArr as $k=>$v)
+								{
+									if ($spacesta==$k) echo "<option value='$k' selected>$v</option>";
+									else echo "<option value='$k'>$v</option>";
+								}
+								?>
+							</select>
+							<button type="submit" class="btn btn-success btn-sm">搜索</button>
+							<a href="member_main.php" class="btn btn-success btn-sm">所有会员</a>
+							<a href="member_main.php?spacesta=-2" class="btn btn-success btn-sm">禁言会员</a>
+							<a href="member_main.php?matt=1" class="btn btn-success btn-sm">推荐会员</a>
+							<a href="member_main.php?matt=0" class="btn btn-success btn-sm">注册会员</a>
+						</form>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/member_operations.htm

@@ -16,14 +16,16 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<form name="form2" method="get" action="member_operations.php">
-						<input type="text" name="buyid" id="buyid" placeholder="请输入订单号" class="admin-input-lg">
-						<button type="submit" class="btn btn-success btn-sm">搜索</button>
-						<a href="member_operations.php?sta=0" class="btn btn-success btn-sm">未付款</a>
-						<a href="member_operations.php?sta=1" class="btn btn-success btn-sm">已付款</a>
-						<a href="member_operations.php?sta=2" class="btn btn-success btn-sm">已完成</a>
-						<a href="member_operations.php" class="btn btn-success btn-sm">全部</a>
-					</form>
+					<div class="admin-btns">
+						<form name="form2" method="get" action="member_operations.php">
+							<input type="text" name="buyid" id="buyid" placeholder="请输入订单号" class="admin-input-lg">
+							<button type="submit" class="btn btn-success btn-sm">搜索</button>
+							<a href="member_operations.php?sta=0" class="btn btn-success btn-sm">未付款</a>
+							<a href="member_operations.php?sta=1" class="btn btn-success btn-sm">已付款</a>
+							<a href="member_operations.php?sta=2" class="btn btn-success btn-sm">已完成</a>
+							<a href="member_operations.php" class="btn btn-success btn-sm">全部</a>
+						</form>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/member_pm.htm

@@ -17,18 +17,20 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<form action="member_pm.php" name="form1" method="get">
-						<input type="text" name="keyword" id="keyword" value="{dede:global name='keyword'/}" placeholder="请输入关键词" class="admin-input-lg mr-2">
-						<input type="text" name="username" id="username" value="{dede:global name='username'/}" placeholder="请输入账号" autocomplete="off" class="admin-input-lg mr-2">
-						<select name="folder" id="folder" class="admin-input-sm">
-							<option value="inbox">收件箱</option>
-							<option value="outbox">发件箱</option>
-						</select>
-						<button type="submit" class="btn btn-success btn-sm">搜索</button>
-						<span class="btn btn-success btn-sm">短信列表</span>
-						<a href="member_pmall.php" class="btn btn-outline-success btn-sm">群发短信</a>
-						<a href="member_pmone.php" class="btn btn-outline-success btn-sm">单独短信</a>
-					</form>
+					<div class="admin-btns">
+						<form action="member_pm.php" name="form1" method="get">
+							<input type="text" name="keyword" id="keyword" value="{dede:global name='keyword'/}" placeholder="请输入关键词" class="admin-input-lg">
+							<input type="text" name="username" id="username" value="{dede:global name='username'/}" placeholder="请输入账号" autocomplete="off" class="admin-input-lg">
+							<select name="folder" id="folder" class="admin-input-sm">
+								<option value="inbox">收件箱</option>
+								<option value="outbox">发件箱</option>
+							</select>
+							<button type="submit" class="btn btn-success btn-sm">搜索</button>
+							<span class="btn btn-success btn-sm">短信列表</span>
+							<a href="member_pmall.php" class="btn btn-outline-success btn-sm">群发短信</a>
+							<a href="member_pmone.php" class="btn btn-outline-success btn-sm">单独短信</a>
+						</form>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/member_pmall.htm

@@ -16,18 +16,20 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<form action="member_pm.php" name="form1" method="get">
-						<input type="text" name="keyword" id="keyword" placeholder="请输入关键词" class="admin-input-lg mr-2">
-						<input type="text" name="username" id="username" placeholder="请输入账号" autocomplete="off" class="admin-input-lg mr-2">
-						<select name="folder" id="folder" class="admin-input-sm">
-							<option value="inbox">收件箱</option>
-							<option value="outbox">发件箱</option>
-						</select>
-						<button type="submit" class="btn btn-success btn-sm">搜索</button>
-						<a href="member_pm.php" class="btn btn-outline-success btn-sm">短信列表</a>
-						<span class="btn btn-success btn-sm">群发短信</span>
-						<a href="member_pmone.php" class="btn btn-outline-success btn-sm">单独短信</a>
-					</form>
+					<div class="admin-btns">
+						<form action="member_pm.php" name="form1" method="get">
+							<input type="text" name="keyword" id="keyword" placeholder="请输入关键词" class="admin-input-lg">
+							<input type="text" name="username" id="username" placeholder="请输入账号" autocomplete="off" class="admin-input-lg">
+							<select name="folder" id="folder" class="admin-input-sm">
+								<option value="inbox">收件箱</option>
+								<option value="outbox">发件箱</option>
+							</select>
+							<button type="submit" class="btn btn-success btn-sm">搜索</button>
+							<a href="member_pm.php" class="btn btn-outline-success btn-sm">短信列表</a>
+							<span class="btn btn-success btn-sm">群发短信</span>
+							<a href="member_pmone.php" class="btn btn-outline-success btn-sm">单独短信</a>
+						</form>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/member_pmone.htm

@@ -16,18 +16,20 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<form action="member_pm.php" name="form1" method="get">
-						<input type="text" name="keyword" id="keyword" placeholder="请输入关键词" class="admin-input-lg mr-2">
-						<input type="text" name="username" id="username" placeholder="请输入账号" autocomplete="off" class="admin-input-lg mr-2">
-						<select name="folder" id="folder" class="admin-input-sm">
-							<option value="inbox">收件箱</option>
-							<option value="outbox">发件箱</option>
-						</select>
-						<button type="submit" class="btn btn-success btn-sm">搜索</button>
-						<a href="member_pm.php" class="btn btn-outline-success btn-sm">短信列表</a>
-						<a href="member_pmall.php" class="btn btn-outline-success btn-sm">群发短信</a>
-						<span class="btn btn-success btn-sm">单独短信</span>
-					</form>
+					<div class="admin-btns">
+						<form action="member_pm.php" name="form1" method="get">
+							<input type="text" name="keyword" id="keyword" placeholder="请输入关键词" class="admin-input-lg">
+							<input type="text" name="username" id="username" placeholder="请输入账号" autocomplete="off" class="admin-input-lg">
+							<select name="folder" id="folder" class="admin-input-sm">
+								<option value="inbox">收件箱</option>
+								<option value="outbox">发件箱</option>
+							</select>
+							<button type="submit" class="btn btn-success btn-sm">搜索</button>
+							<a href="member_pm.php" class="btn btn-outline-success btn-sm">短信列表</a>
+							<a href="member_pmall.php" class="btn btn-outline-success btn-sm">群发短信</a>
+							<span class="btn btn-success btn-sm">单独短信</span>
+						</form>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/member_rank.htm

@@ -17,7 +17,7 @@
 			<div class="card shadow-sm">
 				<div class="card-header">会员级别设置</div>
 				<div class="card-body">
-					<div class="alert alert-info">注册会员级别不建议删除，否则会影响会员功能无法使用某些功能，会员级别值由低向高升级，因此添加组别时需注意此值，如果您添加会员组的级别值低于10，将自动被视为普通的注册会员</div>
+					<div class="alert alert-info">不建议删除注册会员级别，否则可能影响某些功能的使用。会员级别值从低到高递增，添加新组别时需注意此数值。若添加的会员组级别值低于10，则自动归类为普通注册会员</div>
 					<form name="form1" action="member_rank.php" method="post">
 						<input type="hidden" name="dopost" value="save">
 						<div class="table-responsive">

src/admin/templets/module_edit.htm

@@ -68,7 +68,7 @@
 											<div id="rboxct" style="display:<?php echo ($ismember=='0' ? 'none' : 'block');?>">
 												<label>导航使用名称：<input type="text" name="indexname" id="indexname" class="admin-input-sm" value="<?php echo $indexname;?>"></label>
 												<label>导航使用网址：<input type="text" name="indexurl" id="indexurl" class="admin-input-sm" value="<?php echo $indexurl;?>"></label>
-												<span>（用相对于会员中心的网址，如：/ask）</span>
+												<span>（用相对于会员中心的网址，例：/ask）</span>
 											</div>
 										</td>
 									</tr>
@@ -92,7 +92,7 @@
 											<label><input type="checkbox" name="autosetup" id="autosetup" value="1" onclick="ShowHideField('autosetup','autosetupinput','autosetupct')" <?php if (isset($autosetup) && $autosetup==1) echo 'checked';?>> 自动生成</label><br>
 											<div style="display:<?php if (!isset($autosetup) || $autosetup==0) echo 'block'; else echo 'none';?>" id="autosetupinput"><input type="file" name="setup" id="setup" class="admin-input-lg"></div>
 											<div style="display:<?php if (isset($autosetup) && $autosetup==1) echo 'block'; else echo 'none';?>" id="autosetupct">
-												<p>（由系统自动处理安装，请使用MySQL4.0版本格式的SQL语句：MySQL4.1/5.x版本请把创建表语句 ENGINE=MyISAM DEFAULT CHARSET=*，改为TYPE=MyISAM，SQL语句允许换行，但必须用;表示一条SQL语句结束，如果SQL中包含有模块网址的，用 _ROOTURL_ 表示，如：_ROOTURL_/ask/index.php）</p>
+												<p>（由系统自动处理安装，请使用MySQL4.0版本格式的SQL语句：MySQL4.1/5.x版本请把创建表语句 ENGINE=MyISAM DEFAULT CHARSET=*，改为TYPE=MyISAM，SQL语句允许换行，但必须用;表示一条SQL语句结束，如果SQL中包含有模块网址的，用 _ROOTURL_ 表示，例：_ROOTURL_/ask/index.php）</p>
 												<textarea name="setupsql40" id="setupsql40" class="admin-textarea-xl"><?php echo $setupsql40;?></textarea>
 											</div>
 										</td>
@@ -118,7 +118,7 @@
 									<tr>
 										<td>文件列表</td>
 										<td>
-											<p>（每行指定一个文件或目录，路径为相对于本目录，本目录的文件则直接用文件名即可，对于整个打包的目录，不需要指定子目录里的文件，如：如果已经指定了/book则不需要再指定目录里的/book/index.php 等文件或目录，系统会自动索引整个目录，对于不需要索引整个目录的，请不要指定这个目录，否则会把不必要的文件也放进模块中）</p>
+											<p>（每行指定一个文件或目录，路径为相对于本目录，本目录的文件则直接用文件名即可，对于整个打包的目录，不需要指定子目录里的文件，例：如果已经指定了/book则不需要再指定目录里的/book/index.php 等文件或目录，系统会自动索引整个目录，对于不需要索引整个目录的，请不要指定这个目录，否则会把不必要的文件也放进模块中）</p>
 											<textarea name="filelist" id="filelist" class="admin-textarea-xl"><?php echo $filelist;?></textarea>
 										</td>
 									</tr>

src/admin/templets/module_main.htm

@@ -27,12 +27,14 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<a class="btn btn-success btn-sm" href="module_main.php">全部</a>
-					<a class="btn btn-success btn-sm" href="module_main.php?moduletype=soft">模块</a>
-					<a class="btn btn-success btn-sm" href="module_main.php?moduletype=templets">模板</a>
-					<a class="btn btn-success btn-sm" href="module_main.php?moduletype=plus">小插件</a>
-					<a class="btn btn-success btn-sm" href="module_main.php?moduletype=patch">补丁</a>
-					<a class="btn btn-success btn-sm" href="module_upload.php">上传</a>
+					<div class="admin-btns">
+						<a class="btn btn-success btn-sm" href="module_main.php">全部</a>
+						<a class="btn btn-success btn-sm" href="module_main.php?moduletype=soft">模块</a>
+						<a class="btn btn-success btn-sm" href="module_main.php?moduletype=templets">模板</a>
+						<a class="btn btn-success btn-sm" href="module_main.php?moduletype=plus">小插件</a>
+						<a class="btn btn-success btn-sm" href="module_main.php?moduletype=patch">补丁</a>
+						<a class="btn btn-success btn-sm" href="module_upload.php">上传</a>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/module_make.htm

@@ -19,7 +19,7 @@
 			<div class="card shadow-sm">
 				<div class="card-header">模块打包</div>
 				<div class="card-body">
-					<div class="alert alert-info">开发模块插件，请先了解<a href="<?php echo $cfg_biz_dedebizUrl;?>/developer" target="_blank">《DedeBIZ贡献者》</a></div>
+					<div class="alert alert-info">开发模块插件前，请先了解<a href="<?php echo $cfg_biz_dedebizUrl;?>/developer" target="_blank">《DedeBIZ贡献者》</a></div>
 					<form name="form1" action="module_make.php" method="post" enctype="multipart/form-data">
 						<input type="hidden" name="action" value="make">
 						<div class="table-responsive">
@@ -61,7 +61,7 @@
 											<div id="rboxct" style="display:none">
 												<label>导航使用名称：<input type="text" name="indexname" id="indexname" class="admin-input-sm"></label><br>
 												<label>导航使用网址：<input type="text" name="indexurl" id="indexurl" class="admin-input-sm"></label>
-												<span>（用相对于会员中心的网址，如：/ask）</span>
+												<span>（用相对于会员中心的网址，例：/ask）</span>
 											</div>
 										</td>
 									</tr>
@@ -89,7 +89,7 @@
 											<label><input type="checkbox" name="autosetup" value="1" id="autosetup" onclick="ShowHideField('autosetup','autosetupinput','autosetupct')"> 自动生成</label>
 											<div id="autosetupinput"><input type="file" name="setup" id="setup" class="admin-input-lg"></div>
 											<div style="display:none" id="autosetupct">
-												<p>（由系统自动处理安装，请使用MySQL4.0版本格式的SQL语句：MySQL4.1/5.x版本请把创建表语句 ENGINE=MyISAM DEFAULT CHARSET=*，改为TYPE=MyISAM，SQL语句允许换行，但必须用;表示一条SQL语句结束，如果SQL中包含有模块网址的，用 _ROOTURL_ 表示，如：_ROOTURL_/ask/index.php）</p>
+												<p>（由系统自动处理安装，请使用MySQL4.0版本格式的SQL语句：MySQL4.1/5.x版本请把创建表语句 ENGINE=MyISAM DEFAULT CHARSET=*，改为TYPE=MyISAM，SQL语句允许换行，但必须用;表示一条SQL语句结束，如果SQL中包含有模块网址的，用 _ROOTURL_ 表示，例：_ROOTURL_/ask/index.php）</p>
 												<textarea name="setupsql40" id="setupsql40" class="admin-textarea-xl"></textarea>
 											</div>
 										</td>
@@ -108,7 +108,7 @@
 									<tr>
 										<td>文件列表</td>
 										<td>
-											<p>（每行指定一个文件或目录，路径为相对于本目录，本目录的文件则直接用文件名即可，对于整个打包的目录，不需要指定子目录里的文件，如：如果已经指定了/book则不需要再指定目录里的/book/index.php 等文件或目录，系统会自动索引整个目录，对于不需要索引整个目录的，请不要指定这个目录，否则会把不必要的文件也放进模块中）</p>
+											<p>（每行指定一个文件或目录，路径为相对于本目录，本目录的文件则直接用文件名即可，对于整个打包的目录，不需要指定子目录里的文件，例：如果已经指定了/book则不需要再指定目录里的/book/index.php 等文件或目录，系统会自动索引整个目录，对于不需要索引整个目录的，请不要指定这个目录，否则会把不必要的文件也放进模块中）</p>
 											<textarea name="filelist" id="filelist" class="admin-textarea-xl"></textarea>
 										</td>
 									</tr>

src/admin/templets/mychannel_edit.htm

@@ -95,7 +95,7 @@
 									</tr>
 									<tr>
 										<td>列表附加字段</td>
-										<td><input type="text" name="listfields" id="listfields" class="admin-input-lg" value="<?php echo $row['listfields'];?>" class="w-50">（用英文逗号隔开，标签{dede:list channelid='模型id' addfields='字段1,字段2'}[field:name/]{/dede:list}调用）</td>
+										<td><input type="text" name="listfields" id="listfields" class="admin-input-lg" value="<?php echo $row['listfields'];?>" class="w-50"></td>
 									</tr>
 									<tr>
 										<td>投稿标题使用名称</td>

src/admin/templets/mychannel_field_add.htm

@@ -49,7 +49,6 @@
 										<td>
 											<label><input type="checkbox" name="notsend" id="notsend" value="1"> 投稿和采集禁用字段</label>
 											<label><input type="checkbox" name="islist" id="islist" value="1"> 添加到列表附加字段</label>
-											<span>（标签{dede:list channelid='模型id' addfields='字段1,字段2'}[field:name/]{/dede:list}调用）</span>
 										</td>
 									</tr>
 									<tr>
@@ -64,25 +63,25 @@
 									<tr>
 										<td>数据类型</td>
 										<td id="dataType">
-											<div class="nw"><label><input type="radio" name="dtype" id="dtype1" value="text" checked> 单行文本(varchar)</label></div>
-											<div class="nw"><label><input type="radio" name="dtype" id="dtype2" value="textchar"> 单行文本(char)</label></div>
-											<div class="nw"><label><input type="radio" name="dtype" id="dtype3" value="multitext"> 多行文本</label></div>
-											<div class="nw"><label><input type="radio" name="dtype" id="dtype4" value="htmltext"> 网页文本</label></div>
-											<br class="cls">
-											<div class="nw"><label><input type="radio" name="dtype" id="dtype5" value="textdata"> 文本保存网页数据</label></div>
-											<div class="nw"><label><input type="radio" name="dtype" id="dtype6" value="int"> 整数类型</label></div>
-											<div class="nw"><label><input type="radio" name="dtype" id="dtype7" value="float"> 小数类型</label></div>
-											<div class="nw"><label><input type="radio" name="dtype" id="dtype8" value="datetime"> 时间类型</label></div>
-											<br class="cls">
-											<div class="nw"><label><input type="radio" name="dtype" id="dtype9" value="img"> 图片类型</label></div>
-											<div class="nw"><label><input type="radio" name="dtype" id="dtype10" value="media"> 多媒体文件</label></div>
-											<div class="nw"><label><input type="radio" name="dtype" id="dtype11" value="addon"> 附件类型</label></div>
-											<div class="nw"><label><input type="radio" name="dtype" id="dtype12" value="relation"> 关联文档</label></div>
-											<br class="cls">
-											<div class="nw"><label><input type="radio" name="dtype" id="dtype13" value="select"> option下拉框</label></div>
-											<div class="nw"><label><input type="radio" name="dtype" id="dtype14" value="radio"> radio选项卡</label></div>
-											<div class="nw"><label><input type="radio" name="dtype" id="dtype15" value="checkbox"> checkbox多选框</label></div>
-											<div class="nw"><label><input type="radio" name="dtype" id="dtype16" value="stepselect"> 联动类型</label></div>
+											<div class="data-col"><label><input type="radio" name="dtype" id="dtype1" value="text" checked> 单行文本(varchar)</label></div>
+											<div class="data-col"><label><input type="radio" name="dtype" id="dtype2" value="textchar"> 单行文本(char)</label></div>
+											<div class="data-col"><label><input type="radio" name="dtype" id="dtype3" value="multitext"> 多行文本</label></div>
+											<div class="data-col"><label><input type="radio" name="dtype" id="dtype4" value="htmltext"> 网页文本</label></div>
+											<br class="clear">
+											<div class="data-col"><label><input type="radio" name="dtype" id="dtype5" value="textdata"> 文本保存网页数据</label></div>
+											<div class="data-col"><label><input type="radio" name="dtype" id="dtype6" value="int"> 整数类型</label></div>
+											<div class="data-col"><label><input type="radio" name="dtype" id="dtype7" value="float"> 小数类型</label></div>
+											<div class="data-col"><label><input type="radio" name="dtype" id="dtype8" value="datetime"> 时间类型</label></div>
+											<br class="clear">
+											<div class="data-col"><label><input type="radio" name="dtype" id="dtype9" value="img"> 图片类型</label></div>
+											<div class="data-col"><label><input type="radio" name="dtype" id="dtype10" value="media"> 多媒体文件</label></div>
+											<div class="data-col"><label><input type="radio" name="dtype" id="dtype11" value="addon"> 附件类型</label></div>
+											<div class="data-col"><label><input type="radio" name="dtype" id="dtype12" value="relation"> 关联文档</label></div>
+											<br class="clear">
+											<div class="data-col"><label><input type="radio" name="dtype" id="dtype13" value="select"> option下拉框</label></div>
+											<div class="data-col"><label><input type="radio" name="dtype" id="dtype14" value="radio"> radio选项卡</label></div>
+											<div class="data-col"><label><input type="radio" name="dtype" id="dtype15" value="checkbox"> checkbox多选框</label></div>
+											<div class="data-col"><label><input type="radio" name="dtype" id="dtype16" value="stepselect"> 联动类型</label></div>
 										</td>
 									</tr>
 									<tr id="_relation" style="display:none">
@@ -108,7 +107,7 @@
 									<tr>
 										<td>默认值</td>
 										<td>
-											<p>（自定义字段数据类型为select、radio、checkbox时，下面填写数据，英文逗号隔开，如：DedeBIZ,得德）</p>
+											<p>（自定义字段数据类型为select、radio、checkbox时，下面填写数据，英文逗号隔开，例：DedeBIZ,得德）</p>
 											<textarea name="vdefault" id="vdefault" class="admin-textarea-xl"></textarea>
 										</td>
 									</tr>

src/admin/templets/mychannel_field_edit.htm

@@ -50,7 +50,6 @@
 										<td>
 											<label><input type="checkbox" name="notsend" id="notsend" value="1" <?php echo ($ctag->GetAtt('notsend')==1 ? "checked" : "");?>> 投稿和采集禁用字段</label>
 											<label><input type="checkbox" name="islist" id="islist" value="1" <?php echo ($ctag->GetAtt('islist')==1 ? "checked" : "");?>> 添加到列表附加字段</label>
-											<span>（标签{dede:list channelid='模型id' addfields='字段1,字段2'}[field:name/]{/dede:list}调用）</span>
 										</td>
 									</tr>
 									<tr>
@@ -120,7 +119,7 @@
 									<tr>
 										<td>默认值</td>
 										<td>
-											<p>（自定义字段数据类型为select、radio、checkbox时，下面填写数据，英文逗号隔开，如：DedeBIZ,得德）</p>
+											<p>（自定义字段数据类型为select、radio、checkbox时，下面填写数据，英文逗号隔开，例：DedeBIZ,得德）</p>
 											<textarea name="vdefault" id="vdefault" class="admin-textarea-xl"><?php echo $ctag->GetAtt('default');?></textarea>
 										</td>
 									</tr>

src/admin/templets/mychannel_main.htm

@@ -17,8 +17,10 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<a href="mychannel_add.php" class="btn btn-success btn-sm">添加新模型</a>
-					<a href="mychannel_edit.php?dopost=exportin" class="btn btn-success btn-sm">导入文档模型</a>
+					<div class="admin-btns">
+						<a href="mychannel_add.php" class="btn btn-success btn-sm">添加新模型</a>
+						<a href="mychannel_edit.php?dopost=exportin" class="btn btn-success btn-sm">导入文档模型</a>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/mytag_add.htm

@@ -3,7 +3,7 @@
 	<head>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
-		<title>添加自定义宏标记</title>
+		<title>添加自定义宏标签</title>
 		<link rel="stylesheet" href="/static/web/css/font-awesome.min.css">
 		<link rel="stylesheet" href="/static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="/static/web/css/admin.css">
@@ -18,13 +18,13 @@
 		<div class="container-fluid">
 			<ol class="breadcrumb">
 				<li class="breadcrumb-item"><a href="index_body.php">后台面板</a></li>
-				<li class="breadcrumb-item"><a href="mytag_main.php">自定义宏标记</a></li>
-				<li class="breadcrumb-item active">添加自定义宏标记</li>
+				<li class="breadcrumb-item"><a href="mytag_main.php">自定义宏标签</a></li>
+				<li class="breadcrumb-item active">添加自定义宏标签</li>
 			</ol>
 			<div class="card shadow-sm">
-				<div class="card-header">添加自定义宏标记</div>
+				<div class="card-header">添加自定义宏标签</div>
 				<div class="card-body">
-					<div class="alert alert-info">标签{dede:mytag name='标记名称' ismake='yes或no' typeid='栏目id'/}调用</div>
+					<div class="alert alert-info">mytag标签类似于myad标签，自定义宏标签{dede:mytag name='' ismake='yes/no' typeid=''/}标签调用</div>
 					<form name="form1" action="mytag_add.php" method="post" enctype="multipart/form-data">
 						<input type="hidden" name="dopost" value="save">
 						<input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">

src/admin/templets/mytag_edit.htm

@@ -3,7 +3,7 @@
 	<head>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
-		<title>修改自定义宏标记</title>
+		<title>修改自定义宏标签</title>
 		<link rel="stylesheet" href="/static/web/css/font-awesome.min.css">
 		<link rel="stylesheet" href="/static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="/static/web/css/admin.css">
@@ -12,11 +12,11 @@
 		<div class="container-fluid">
 			<ol class="breadcrumb">
 				<li class="breadcrumb-item"><a href="index_body.php">后台面板</a></li>
-				<li class="breadcrumb-item"><a href="mytag_main.php">自定义宏标记</a></li>
-				<li class="breadcrumb-item active">修改自定义宏标记</li>
+				<li class="breadcrumb-item"><a href="mytag_main.php">自定义宏标签</a></li>
+				<li class="breadcrumb-item active">修改自定义宏标签</li>
 			</ol>
 			<div class="card shadow-sm">
-				<div class="card-header">修改自定义宏标记</div>
+				<div class="card-header">修改自定义宏标签</div>
 				<div class="card-body">
 					<form action="mytag_edit.php" method="post" enctype="multipart/form-data" name="form1">
 						<input type="hidden" name="aid" value="<?php echo $aid?>">

src/admin/templets/mytag_main.htm

@@ -4,7 +4,7 @@
 	<head>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
-		<title>自定义宏标记</title>
+		<title>自定义宏标签</title>
 		<link rel="stylesheet" href="/static/web/css/font-awesome.min.css">
 		<link rel="stylesheet" href="/static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="/static/web/css/admin.css">
@@ -13,16 +13,18 @@
 		<div class="container-fluid">
 			<ol class="breadcrumb">
 				<li class="breadcrumb-item"><a href="index_body.php">后台面板</a></li>
-				<li class="breadcrumb-item active">自定义宏标记</li>
+				<li class="breadcrumb-item active">自定义宏标签</li>
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<a href="mytag_add.php" class="btn btn-success btn-sm">添加自定义宏标记</a>
-					<a href="mytag_tag_guide.php" class="btn btn-success btn-sm">自定义宏标记向导</a>
+					<div class="admin-btns">
+						<a href="mytag_add.php" class="btn btn-success btn-sm">添加自定义宏标签</a>
+						<a href="mytag_tag_guide.php" class="btn btn-success btn-sm">自定义宏标签向导</a>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">
-				<div class="card-header">自定义宏标记</div>
+				<div class="card-header">自定义宏标签</div>
 				<div class="card-body">
 					<div class="table-responsive">
 						<table class="table table-borderless table-hover">

src/admin/templets/mytag_tag_guide.htm

@@ -3,7 +3,7 @@
 	<head>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
-		<title>自定义宏标记向导</title>
+		<title>自定义宏标签向导</title>
 		<link rel="stylesheet" href="/static/web/css/font-awesome.min.css">
 		<link rel="stylesheet" href="/static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="/static/web/css/admin.css">
@@ -20,11 +20,11 @@
 		<div class="container-fluid">
 			<ol class="breadcrumb">
 				<li class="breadcrumb-item"><a href="index_body.php">后台面板</a></li>
-				<li class="breadcrumb-item"><a href="mytag_main.php">自定义宏标记</a></li>
-				<li class="breadcrumb-item active">自定义宏标记向导</li>
+				<li class="breadcrumb-item"><a href="mytag_main.php">自定义宏标签</a></li>
+				<li class="breadcrumb-item active">自定义宏标签向导</li>
 			</ol>
 			<div class="card shadow-sm">
-				<div class="card-header">自定义宏标记向导</div>
+				<div class="card-header">自定义宏标签向导</div>
 				<div class="card-body">
 					<span id="list1" style="display:none">[field:textlink/]（[field:pubdate function=MyDate('m-d',@me)/]）</span>
 					<span id="list2" style="display:none">[field:typelink/] [field:textlink/]</span>

src/admin/templets/mytag_tag_guide_ok.htm

@@ -3,7 +3,7 @@
 	<head>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
-		<title>自定义宏标记向导预览</title>
+		<title>自定义宏标签向导预览</title>
 		<link rel="stylesheet" href="/static/web/css/font-awesome.min.css">
 		<link rel="stylesheet" href="/static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="/static/web/css/admin.css">

src/admin/templets/soft_add.htm

@@ -79,7 +79,7 @@
 									</tr>
 									<tr>
 										<td>标签</td>
-										<td><input type="text" name="tags" id="tags" onChange="$Obj('keywords').value=this.value;" class="admin-input-lg">（英文逗号隔开，如：DedeBIZ,得德）</td>
+										<td><input type="text" name="tags" id="tags" onChange="$Obj('keywords').value=this.value;" class="admin-input-lg">（英文逗号隔开，例：DedeBIZ,得德）</td>
 										<td>权重</td>
 										<td><input type="text" name="weight" id="weight" value="<?php echo $maxWright['cc'];?>" class="admin-input-sm">（越小越靠前）</td>
 									</tr>

src/admin/templets/soft_edit.htm

@@ -80,7 +80,7 @@
 									</tr>
 									<tr>
 										<td>标签</td>
-										<td><input type="text" name="tags" id="tags" value="<?php echo $tags;?>" class="admin-input-lg">（英文逗号隔开，如：DedeBIZ,得德）</td>
+										<td><input type="text" name="tags" id="tags" value="<?php echo $tags;?>" class="admin-input-lg">（英文逗号隔开，例：DedeBIZ,得德）</td>
 										<td>权重</td>
 										<td><input type="text" name="weight" id="weight" value="<?php echo $arcRow['weight'];?>" class="admin-input-sm">（越小越靠前）</td>
 									</tr>

src/admin/templets/spec_add.htm

@@ -65,7 +65,7 @@
 			<div class="card shadow-sm">
 				<div class="card-header">发布专题</div>
 				<div class="card-body">
-					<div class="alert alert-info">专题在主分类栏目显示，需要调用专题列表，标签{dede:arclist typeid='1,2,3' type='spec'}调用，请参考arclist标签</div>
+					<div class="alert alert-info">专题在主分类栏目显示，专题列表{dede:arclist typeid='' type='spec'}标签调用</div>
 					<form name="form1" action="spec_add.php" method="post" enctype="multipart/form-data">
 						<input type="hidden" name="dopost" value="save">
 						<input type="hidden" name="channelid" value="<?php echo $channelid?>">

src/admin/templets/statistics_list.htm

@@ -19,15 +19,17 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<form name="form1" action="statistics_list.php" method="get">
-						<input type="text" name="ip" class="admin-input-lg mr-2" placeholder="请输入地址ip" value="<?php echo !empty($ip)? $ip : '';?>">
-						<select name="url_type" class="admin-input-sm mr-2">
-							<option value="0"<?php echo $url_type ===0? ' selected' : '';?>>选择类型</option>
-							<option value="1"<?php echo $url_type ===1? ' selected' : '';?>>用户</option>
-							<option value="-1"<?php echo $url_type ===-1? ' selected' : '';?>>蜘蛛</option>
-						</select>
-						<button type="submit" class="btn btn-success btn-sm">搜索</button>
-					</form>
+					<div class="admin-btns">
+						<form name="form1" action="statistics_list.php" method="get">
+							<input type="text" name="ip" class="admin-input-lg" placeholder="请输入地址ip" value="<?php echo !empty($ip)? $ip : '';?>">
+							<select name="url_type" class="admin-input-sm">
+								<option value="0"<?php echo $url_type ===0? ' selected' : '';?>>选择类型</option>
+								<option value="1"<?php echo $url_type ===1? ' selected' : '';?>>用户</option>
+								<option value="-1"<?php echo $url_type ===-1? ' selected' : '';?>>蜘蛛</option>
+							</select>
+							<button type="submit" class="btn btn-success btn-sm">搜索</button>
+						</form>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/stepselect_main.htm

@@ -147,28 +147,30 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<select name="egroup1" onChange="ChangePage(this);" id="egroup1" class="admin-input-sm">
-						<option value="0">所有组</option>
-						<?php
-						$selgroup = '';
-						foreach($etypes as $arr)
-						{
-							$stylecolor = '';
-							if ($arr['issystem']==1) $stylecolor = "class='text-black-50'";
-							if ($egroup==$arr['egroup']) {
-								$selgroup = $arr['itemname'];
-								echo "<option value='{$arr['id']}' $stylecolor selected='1'>{$arr['egroup']}|{$arr['itemname']}</option>";
-							} else {
-								echo "<option value='{$arr['id']}' $stylecolor>{$arr['egroup']}|{$arr['itemname']}</option>";
+					<div class="admin-btns">
+						<select name="egroup1" onChange="ChangePage(this);" id="egroup1" class="admin-input-sm">
+							<option value="0">所有组</option>
+							<?php
+							$selgroup = '';
+							foreach($etypes as $arr)
+							{
+								$stylecolor = '';
+								if ($arr['issystem']==1) $stylecolor = "class='text-black-50'";
+								if ($egroup==$arr['egroup']) {
+									$selgroup = $arr['itemname'];
+									echo "<option value='{$arr['id']}' $stylecolor selected='1'>{$arr['egroup']}|{$arr['itemname']}</option>";
+								} else {
+									echo "<option value='{$arr['id']}' $stylecolor>{$arr['egroup']}|{$arr['itemname']}</option>";
+								}
 							}
-						}
-						?>
-					</select>
-					<a href="javascript:AddType();" class="btn btn-success btn-sm">添加</a>
-					<a href="javascript:EditType();" class="btn btn-success btn-sm">修改</a>
-					<a href="javascript:ViewType();" class="btn btn-success btn-sm">预览</a>
-					<a href="javascript:DelType();" class="btn btn-danger btn-sm">删除</a>
-					<a href="stepselect_main.php?action=upallcache" class="btn btn-success btn-sm">更新所有缓存</a>
+							?>
+						</select>
+						<a href="javascript:AddType();" class="btn btn-success btn-sm">添加</a>
+						<a href="javascript:EditType();" class="btn btn-success btn-sm">修改</a>
+						<a href="javascript:ViewType();" class="btn btn-success btn-sm">预览</a>
+						<a href="javascript:DelType();" class="btn btn-danger btn-sm">删除</a>
+						<a href="stepselect_main.php?action=upallcache" class="btn btn-success btn-sm">更新所有缓存</a>
+					</div>
 				</div>
 			</div>
 			<?php
@@ -189,18 +191,20 @@
 			?>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<form action="stepselect_main.php" method="post">
-						<input type="hidden" name="action" value="addenum_save">
-						<input type="hidden" name="issign" value="<?php echo $arr['issign'];?>">
-						<input type="hidden" name="egroup" value="<?php echo $arr['egroup'];?>">
-						<select name="topvalue" onChange="ChangePage2(this);" class="admin-input-sm mr-2">
-							<option value="0"><?php echo $selgroup;?></option>
-							<?php echo $options;?>
-						</select>
-						<input type="text" name="ename" class="admin-input-lg" placeholder="请填分类名称">
-						<button type="submit" class="btn btn-success btn-sm">添加分类</button>
-						<?php if ($egroup=='nativeplace') {echo "<a href='stepselect_main.php?action=exarea' class='btn btn-success btn-sm'>导入默认地区</a>";}?>
-					</form>
+					<div class="admin-btns">
+						<form action="stepselect_main.php" method="post">
+							<input type="hidden" name="action" value="addenum_save">
+							<input type="hidden" name="issign" value="<?php echo $arr['issign'];?>">
+							<input type="hidden" name="egroup" value="<?php echo $arr['egroup'];?>">
+							<select name="topvalue" onChange="ChangePage2(this);" class="admin-input-sm">
+								<option value="0"><?php echo $selgroup;?></option>
+								<?php echo $options;?>
+							</select>
+							<input type="text" name="ename" class="admin-input-lg" placeholder="请填分类名称">
+							<button type="submit" class="btn btn-success btn-sm">添加分类</button>
+							<?php if ($egroup=='nativeplace') {echo "<a href='stepselect_main.php?action=exarea' class='btn btn-success btn-sm'>导入默认地区</a>";}?>
+						</form>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/sys_admin_user.htm

@@ -17,8 +17,10 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<a href="sys_admin_user_add.php" class="btn btn-success btn-sm">添加管理员</a>
-					<a href="sys_group.php" class="btn btn-success btn-sm">会员组管理</a>
+					<div class="admin-btns">
+						<a href="sys_admin_user_add.php" class="btn btn-success btn-sm">添加管理员</a>
+						<a href="sys_group.php" class="btn btn-success btn-sm">会员组管理</a>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/sys_data.htm

@@ -20,8 +20,10 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<a href="sys_data_revert.php" class="btn btn-success btn-sm">数据还原</a>
-					<a href="sys_sql_query.php" class="btn btn-success btn-sm">SQL命令工具</a>
+					<div class="admin-btns">
+						<a href="sys_data_revert.php" class="btn btn-success btn-sm">数据还原</a>
+						<a href="sys_sql_query.php" class="btn btn-success btn-sm">SQL命令工具</a>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/sys_data_replace.htm

@@ -21,7 +21,7 @@
 			<div class="card shadow-sm">
 				<div class="card-header">数据批量替换</div>
 				<div class="card-body">
-					<div class="alert alert-warning">数据批量替换，请谨慎操作</div>
+					<div class="alert alert-warning">数据批量替换功能，请谨慎操作</div>
 					<form action="sys_data_replace.php" name="form1" method="post" target="stafrm">
 						<input type="hidden" name="action" value="apply">
 						<div class="table-responsive">

src/admin/templets/sys_data_revert.htm

@@ -17,8 +17,10 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<a href="sys_data.php" class="btn btn-success btn-sm">数据备份</a>
-					<a href="sys_sql_query.php" class="btn btn-success btn-sm">SQL命令工具</a>
+					<div class="admin-btns">
+						<a href="sys_data.php" class="btn btn-success btn-sm">数据备份</a>
+						<a href="sys_sql_query.php" class="btn btn-success btn-sm">SQL命令工具</a>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/sys_group.htm

@@ -16,8 +16,10 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<a href="sys_group_add.php" class="btn btn-success btn-sm">添加会员组</a>
-					<a href="sys_admin_user.php" class="btn btn-success btn-sm">管理员管理</a>
+					<div class="admin-btns">
+						<a href="sys_group_add.php" class="btn btn-success btn-sm">添加会员组</a>
+						<a href="sys_admin_user.php" class="btn btn-success btn-sm">管理员管理</a>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">

src/admin/templets/sys_info.htm

@@ -20,28 +20,30 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body">
-					<div class="sys-search d-inline-block">
-						<input type="text" name="keywds" id="keywds" class="admin-input-lg" placeholder="请输入变量说明">
-						<button type="button" id="btnClear" class="btn btn-sm d-none sys-times"><i class="fa fa-times"></i></button>
-					</div>
-					<a href="javascript:getSearch();" class="btn btn-success btn-sm">搜索</a>
-					<?php
-					$ds = file(DEDEADMIN.'/inc/configgroup.txt');
-					$totalGroup = count($ds);
-					$i = 0;
-					foreach($ds as $dl)
-					{
-						$dl = trim($dl);
-						if (empty($dl)) continue;
-						$dls = explode(',',$dl);
-						$i++;
-						if ($i>1) echo "<a href='javascript:ShowConfig($i,$totalGroup)' class='btn btn-success btn-sm'>{$dls[1]}</a>";
-						else {
-							echo "<a href='javascript:ShowConfig($i,$totalGroup)' class='btn btn-success btn-sm'>{$dls[1]}</a>";
+					<div class="admin-btns">
+						<div class="sys-search d-inline-block">
+							<input type="text" name="keywds" id="keywds" class="admin-input-lg" placeholder="请输入变量说明">
+							<button type="button" id="btnClear" class="btn btn-sm d-none sys-times"><i class="fa fa-times"></i></button>
+						</div>
+						<a href="javascript:getSearch();" class="btn btn-success btn-sm">搜索</a>
+						<?php
+						$ds = file(DEDEADMIN.'/inc/configgroup.txt');
+						$totalGroup = count($ds);
+						$i = 0;
+						foreach($ds as $dl)
+						{
+							$dl = trim($dl);
+							if (empty($dl)) continue;
+							$dls = explode(',',$dl);
+							$i++;
+							if ($i>1) echo "<a href='javascript:ShowConfig($i,$totalGroup)' class='btn btn-success btn-sm'>{$dls[1]}</a>";
+							else {
+								echo "<a href='javascript:ShowConfig($i,$totalGroup)' class='btn btn-success btn-sm'>{$dls[1]}</a>";
+							}
 						}
-					}
-					?>
-					<a href="javascript:ShowHide('addvar');" class="btn btn-success btn-sm">添加变量</a>
+						?>
+						<a href="javascript:ShowHide('addvar');" class="btn btn-success btn-sm">添加变量</a>
+					</div>
 				</div>
 			</div>
 			<div id="addvar" class="card shadow-sm mb-3" style="display:none">

src/admin/templets/sys_safetest.htm

@@ -21,12 +21,7 @@
 			<div class="card shadow-sm mb-3">
 				<div class="card-header">文件扫描工具</div>
 				<div class="card-body">
-					<div class="alert alert-info">
-						<ul>
-							<li>检测结果：结果仅供参考，请务必查看源码后才删除非法文件</li>
-							<li>安全建议：1、有条件的会员把data、system、theme修改为不可对外浏览，static、a目录设置为不允许执行脚本，其它目录禁止写入，系统更安全；2、本检测程以开发模式为标准，如果网站目录包含其它系统，此检测程序会产生错误判断；3、检测程序会跳过对模板缓存目录的检测，为了安全起见，检测完成后建议清空模板缓存</li>
-						</ul>
-					</div>
+					<div class="alert alert-info">检测结果仅供参阅，请确认源码后再删除非法文件。建议data、system、theme目录设置为不可浏览，static和a目录禁止执行脚本，以增强系统安全性。本检测程序基于开发模式设计，若网站目录包含其他系统，可能会导致误判。检测程序会跳过模板缓存目录的检查，为确保安全，建议在检测完成后清空模板缓存。</div>
 					<div class="table-responsive">
 						<table class="table table-borderless">
 							<tbody>

src/admin/templets/sys_sql_query.htm

@@ -18,50 +18,51 @@
 				<li class="breadcrumb-item active">SQL命令工具</li>
 			</ol>
 			<div class="card shadow-sm mb-3">
-				<div class="card-header d-flex justify-content-between align-items-center"><span>SQL命令工具</span><?php if ($cfg_dbtype !== 'sqlite'){;?><a  href="sys_sql_query.php?dopost=docs" class="btn btn-success btn-sm">数据库文档</a><?php };?></div>
+				<div class="card-body">
+					<div class="admin-btns">
+						<form name="infoform" action="sys_sql_query.php" method="post" target="stafrm">
+							<input type="hidden" name="dopost" value="viewinfo">
+							<input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">
+							<select name="tablename" id="tablename" class="admin-input-lg">
+								<?php
+								if ($cfg_dbtype=="sqlite") {
+									$query = "SELECT name FROM sqlite_master WHERE type='table' ORDER BY name;";
+								} else {
+									$query = "SHOW TABLES FROM {$GLOBALS['cfg_dbname']} ";
+								}
+								$dsql->SetQuery($query);
+								$dsql->Execute('t');
+								while($row = $dsql->GetArray('t',MYSQL_BOTH))
+								{
+									$dsql->SetQuery("SELECT count(*) FROM ".$row[0]);
+									$dsql->Execute('n');
+									$row2 = $dsql->GetArray('n',MYSQL_BOTH);
+									$dd = $row2[0];
+									echo "<option value='".$row[0]."'>".$row[0]."(".$dd.")</option>\r\n";
+								}
+								?>
+							</select>
+							<button type="Submit" class="btn btn-success btn-sm" onclick="this.form.dopost.value='opimize';">优化选中表</button>
+							<button type="Submit" class="btn btn-success btn-sm" onclick="this.form.dopost.value='repair';">修复选中表</button>
+							<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 };?>
+						</form>
+					</div>
+				</div>
+			</div>
+			<div class="card shadow-sm">
+				<div class="card-header">SQL命令工具</div>
 				<div class="card-body">
 					<div class="table-responsive">
-						<table class="table table-borderless">
-							<tbody>
-								<form name="infoform" action="sys_sql_query.php" method="post" target="stafrm">
-									<input type="hidden" name="dopost" value="viewinfo">
-									<input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">
-									<tr>
-										<td width="370">
-											<select name="tablename" id="tablename" class="admin-input-lg">
-												<?php
-												if ($cfg_dbtype=="sqlite") {
-													$query = "SELECT name FROM sqlite_master WHERE type='table' ORDER BY name;";
-												} else {
-													$query = "SHOW TABLES FROM {$GLOBALS['cfg_dbname']} ";
-												}
-												$dsql->SetQuery($query);
-												$dsql->Execute('t');
-												while($row = $dsql->GetArray('t',MYSQL_BOTH))
-												{
-													$dsql->SetQuery("SELECT count(*) FROM ".$row[0]);
-													$dsql->Execute('n');
-													$row2 = $dsql->GetArray('n',MYSQL_BOTH);
-													$dd = $row2[0];
-													echo "<option value='".$row[0]."'>".$row[0]."(".$dd.")</option>\r\n";
-												}
-												?>
-											</select>
-										</td>
-										<td>
-											<button type="Submit" class="btn btn-success btn-sm" onclick="this.form.dopost.value='opimize';">优化选中表</button>
-											<button type="Submit" class="btn btn-success btn-sm" onclick="this.form.dopost.value='repair';">修复选中表</button>
-											<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>
-										</td>
-									</tr>
-								</form>
-								<form name="form1" action="sys_sql_query.php" method="post" target="stafrm">
-									<input type="hidden" name="dopost" value="query">
-									<input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">
+						<form name="form1" action="sys_sql_query.php" method="post" target="stafrm">
+							<input type="hidden" name="dopost" value="query">
+							<input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">
+							<table class="table table-borderless">
+								<tbody>
 									<tr>
-										<td>运行SQL命令行</td>
+										<td width="260">运行SQL命令行</td>
 										<td>
 											<label><input type="radio" name="querytype" value="0"> 单行命令</label>
 											<label><input type="radio" name="querytype" value="2" checked> 多行命令</label>
@@ -76,9 +77,9 @@
 									<tr>
 										<td colspan="2"><iframe name="stafrm" frameborder="0" id="stafrm" width="100%" height="100%"></iframe></td>
 									</tr>
-								</form>
-							</tbody>
-						</table>
+								</tbody>
+							</table>
+						</form>
 					</div>
 				</div>
 			</div>

src/admin/templets/tag_test.htm

@@ -3,7 +3,7 @@
 	<head>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
-		<title>全局标记测试</title>
+		<title>标签调用测试</title>
 		<link rel="stylesheet" href="/static/web/css/font-awesome.min.css">
 		<link rel="stylesheet" href="/static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="/static/web/css/admin.css">
@@ -18,10 +18,10 @@
 		<div class="container-fluid">
 			<ol class="breadcrumb">
 				<li class="breadcrumb-item"><a href="index_body.php">后台面板</a></li>
-				<li class="breadcrumb-item active">全局标记测试</li>
+				<li class="breadcrumb-item active">标签调用测试</li>
 			</ol>
 			<div class="card shadow-sm mb-3">
-				<div class="card-header">全局标记测试</div>
+				<div class="card-header">标签调用测试</div>
 				<div class="card-body">
 					<form name="form1" action="tag_test_action.php" method="post" target="stafrm">
 						<input type="hidden" name="dopost" value="make">
@@ -30,8 +30,8 @@
 							<table class="table table-borderless">
 								<tbody>
 									<tr>
-										<td colspan="2">
-											<span>环境变量：</span>
+										<td width="260">环境变量</td>
+										<td>
 											<?php
 											if (empty($cid)) $cid="0";
 											$tl = new TypeLink($cid);

src/admin/templets/tags_main.htm

@@ -19,16 +19,20 @@
 			</ol>
 			<div class="card shadow-sm mb-3">
 				<div class="card-body d-flex justify-content-between">
-					<form name="form1" action="tags_main.php">
-						<input type="text" name="tag" value="<?php echo $tag;?>" placeholder="请输入标签" class="admin-input-lg">
-						<button type="submit" class="btn btn-success btn-sm">搜索</button>
-					</form>
-					<form name="form2" action="tags_main.php?action=fetch" method="post">
-						<input type="text" name="startaid" placeholder="请输入标签id开始" class="admin-input-sm mr-2">
-						<input type="text" name="endaid" placeholder="请输入标签id结束" class="admin-input-sm">
-						<button type="submit" class="btn btn-success btn-sm">获取标签</button>
-						<a href="makehtml_taglist.php" class="btn btn-success btn-sm">更新标签</a>
-					</form>
+					<div class="admin-btns">
+						<form name="form1" action="tags_main.php">
+							<input type="text" name="tag" value="<?php echo $tag;?>" placeholder="请输入标签" class="admin-input-lg">
+							<button type="submit" class="btn btn-success btn-sm">搜索</button>
+						</form>
+					</div>
+					<div class="admin-btns">
+						<form name="form2" action="tags_main.php?action=fetch" method="post">
+							<input type="text" name="startaid" placeholder="请输入标签id开始" class="admin-input-sm">
+							<input type="text" name="endaid" placeholder="请输入标签id结束" class="admin-input-sm">
+							<button type="submit" class="btn btn-success btn-sm">获取标签</button>
+							<a href="makehtml_taglist.php" class="btn btn-success btn-sm">更新标签</a>
+						</form>
+					</div>
 				</div>
 			</div>
 			<div class="card shadow-sm">