Merge remote-tracking branch 'origin/diy' into develop

src/admin/diy_add.php

@@ -20,18 +20,18 @@ if (empty($action)) {
     include(DEDEADMIN."/templets/diy_add.htm");
 } else {
     if (preg_match("#[^0-9-]#", $diyid) || empty($diyid)) {
-        ShowMsg("<span class='text-primary'>'自定义表单id'</span>必须为数字", "-1");
+        ShowMsg("自定义表单id必须为数字", "-1");
         exit();
     }
     if ($table == "") {
-        ShowMsg("表名不能为空", "-1");
+        ShowMsg("自定义表单表名不能为空", "-1");
         exit();
     }
     $public = isset($public) && is_numeric($public) ? $public : 0;
     $name = dede_htmlspecialchars($name);
     $row = $dsql->GetOne("SELECT * FROM `#@__diyforms` WHERE diyid='$diyid' OR `table` LIKE '$table' OR name LIKE '$name'");
     if (is_array($row)) {
-        ShowMsg("可能自定义表单的‘diyid’、‘名称’在数据库中已存在，不能重复使用", "-1");
+        ShowMsg("自定义表单diyid或名称在数据库中重复", "-1");
         exit();
     }
     if ($cfg_dbtype=="sqlite") {
@@ -44,7 +44,7 @@ if (empty($action)) {
     while ($row = $dsql->GetArray("biz")) {
         if (empty($row[0])) $row[0] = '';
         if ($table == $row[0]) {
-            showmsg('指定的表在数据库中重复', '-1');
+            showmsg('指定的自定义表单在数据库中重复', '-1');
             exit();
         }
     }
@@ -60,7 +60,7 @@ if (empty($action)) {
     if ($dsql->ExecuteNoneQuery($sql)) {
         $query = "INSERT INTO `#@__diyforms` (`diyid`,`name`,`table`,`info`,`listtemplate`,`viewtemplate`,`posttemplate`,`public` ) VALUES ('$diyid','$name','$table','','$listtemplate','$viewtemplate','$posttemplate','$public')";
         $dsql->ExecuteNoneQuery($query);
-        showmsg('自定义表单创建成功，请自行添加字段', 'diy_main.php');
+        showmsg('自定义表单创建成功，请添加字段', 'diy_main.php');
     } else {
         showmsg('自定义表单创建失败', '-1');
     }

src/admin/diy_edit.php

@@ -35,7 +35,7 @@ if ($dopost == "save") {
         $win->AddHidden("job", "yes");
         $win->AddHidden("dopost", $dopost);
         $win->AddHidden("diyid", $diyid);
-        $win->AddTitle("删除所有自定义表单相关的文件和数据，您确定要删除<span class='text-primary'>\"".$row['name']."\"</span>自定义表单吗");
+        $win->AddTitle("删除所有自定义表单数据，您确定要删除<span class='text-primary'>".$row['name']."</span>自定义表单吗");
         $winform = $win->GetWindow("ok");
         $win->Display();
         exit();
@@ -44,7 +44,7 @@ if ($dopost == "save") {
     else if ($job == "yes") {
         $row = $dsql->GetOne("SELECT `table` FROM `#@__diyforms` WHERE diyid='$diyid'", MYSQL_ASSOC);
         if (!is_array($row)) {
-            ShowMsg("您所指定的自定义表单信息不存在", "-1");
+            ShowMsg("您所指定的自定义表单不存在", "-1");
             exit();
         }
         //删除表

src/admin/diy_field_add.php

@@ -60,7 +60,7 @@ if ($action == 'save') {
     $rs = $dsql->ExecuteNoneQuery("UPDATE `#@__diyforms` SET `info`='$oksetting' WHERE diyid='$diyid' ");
     if (!$rs) {
         $grr = $dsql->GetError();
-        ShowMsg("保存节点配置出错".$grr, "javascript:;");
+        ShowMsg("保存字段失败".$grr, "javascript:;");
         exit();
     }
     ShowMsg("成功添加一个字段", "diy_edit.php?diyid=$diyid");

src/admin/diy_field_edit.php

@@ -39,10 +39,7 @@ if ($action == 'save') {
         exit();
     }
     //检测数据库是否存在附加表，不存在则新建一个
-    $tabsql = "CREATE TABLE IF NOT EXISTS  `$trueTable`(
-    `id` int(10) unsigned NOT NULL auto_increment,
-    `ifcheck` tinyint(1) NOT NULL default '0',
-    ";
+    $tabsql = "CREATE TABLE IF NOT EXISTS  `$trueTable`(`id` int(10) unsigned NOT NULL auto_increment,`ifcheck` tinyint(1) NOT NULL default '0', ";
     if ($mysql_version < 4.1) {
         $tabsql .= " PRIMARY KEY (`id`)\r\n) TYPE=MyISAM; ";
     } else {
@@ -85,7 +82,7 @@ if ($action == 'save') {
     $oksetting = $dtp->GetResultNP();
     $oksetting = addslashes($oksetting);
     $dsql->ExecuteNoneQuery("UPDATE `#@__diyforms` SET info='$oksetting' WHERE diyid='$diyid' ");
-    ShowMsg("成功修改一个字段的配置", "diy_edit.php?diyid={$diyid}");
+    ShowMsg("成功修改一个字段", "diy_edit.php?diyid={$diyid}");
     exit();
 }
 //删除字段

src/admin/diy_list.php

@@ -11,7 +11,7 @@
 require_once(dirname(__FILE__)."/config.php");
 CheckPurview('c_New');
 $diyid = isset($diyid) && is_numeric($diyid) ? $diyid : 0;
-$action = isset($action) && in_array($action, array('post', 'list', 'edit', 'check', 'delete','excel')) ? $action : '';
+$action = isset($action) && in_array($action, array('post', 'list', 'edit', 'check', 'delete', 'excel')) ? $action : '';
 if (empty($diyid)) {
     showMsg("操作失败", 'javascript:;');
     exit();
@@ -173,7 +173,7 @@ if ($action == 'post') {
 } elseif ($action == 'excel') {
     ob_end_clean();//清除缓冲区，避免乱码
     header("Content-type:application/vnd.ms-excel");
-    header("Content-Disposition:attachment;filename={$diy->name}_".date("Y-m-d").".xls");
+    header("Content-Disposition:attachment;filename={$diy->name}".date("Y-m-d").".xls");
     print(chr(0xEF).chr(0xBB).chr(0xBF));//清除bom
     $fieldlist = (array)$diy->getFieldList();
     echo "<table><tr>";
@@ -193,7 +193,7 @@ if ($action == 'post') {
         {
             echo "<td>".$arr[$key]."</td>";
         }
-    $status = $arr['ifcheck'] == 1 ? '<span class="btn btn-success btn-sm">已审核</span>' : '<span class="btn btn-danger btn-sm">未审核</span>';
+    $status = $arr['ifcheck'] == 1 ? '已审核' : '未审核';
     echo "<td>".$status."</td>";
     echo "</tr>";
     }

src/admin/file_class.php

@@ -13,7 +13,7 @@ class FileManagement
 {
     var $baseDir = "";
     var $activeDir = "";
-    //是否允许文件管理器删除目录，默认为不允许0，如果希望可能管理整个目录，请把值设为1
+    //是否允许文件管理器删除目录，默认为不允许0，如果希望管理整个目录，请把值设为1
     var $allowDeleteDir = 0;
     //初始化系统
     function Init()
@@ -86,7 +86,7 @@ class FileManagement
                 ShowMsg("成功移动文件", "file_manage_main.php?activepath=$mpath", 0, 1000);
                 return 1;
             } else {
-                ShowMsg("移动文件<span class='text-primary'>$oldfile</span>&gt;<span class='text-primary'>$truepath/$mfile</span>失败，可能是某个位置权限不足", "file_manage_main.php?activepath=$mpath", 0, 1000);
+                ShowMsg("移动文件<span class='text-primary'>$oldfile</span>&gt;<span class='text-primary'>$truepath/$mfile</span>失败，某个位置权限不足", "file_manage_main.php?activepath=$mpath", 0, 1000);
                 return 0;
             }
         } else {

src/admin/inc/fieldtype.txt

@@ -7,7 +7,6 @@ int,整数类型
 float,小数类型
 datetime,时间类型
 img,图片
-imgfile,图片(无格式)
 media,多媒体文件
 addon,附件类型
 select,select下拉框

src/admin/js/body.js

@@ -73,7 +73,7 @@ function LoadServer() {
 					<td>${rsp.msg}</td>
 				</tr>
 				<tr>
-					<td>您已购买了商业版授权，登录DedeBIZ官网会员中心可查看相关授权信息。若授权结果与实际授权存在差异，可能购买到其它非商业授权，及时与我们取得联系。</td>
+					<td>您已购买了商业版授权，登录DedeBIZ官网会员中心可查看相关授权信息。若授权结果与实际授权存在差异，购买到其它非商业授权，及时与我们取得联系。</td>
 				</tr>
 			</table>`);
 		}
@@ -181,31 +181,31 @@ async function LoadStatChart() {
 				{
 					label:'PV',
 					data:pvs,
-					lineTension:.35,
+					lineTension:.5,
 					borderColor:'rgba(54, 162, 235, 1)',
 					backgroundColor:'rgba(54, 162, 235, 0.2)',
-					borderWidth:1
+					borderWidth:2
 				}, {
 					label:'UV',
 					data:uvs,
-					lineTension:.35,
+					lineTension:.5,
 					borderColor:'rgba(255, 206, 86, 1)',
 					backgroundColor:'rgba(255, 206, 86, 0.2)',
-					borderWidth:1
+					borderWidth:2
 				}, {
 					label:'IP',
 					data:ips,
-					lineTension:.35,
+					lineTension:.5,
 					borderColor:'rgba(255, 99, 132, 1)',
 					backgroundColor:'rgba(255, 99, 132, 0.2)',
-					borderWidth:1
+					borderWidth:2
 				}, {
 					label:'VV',
 					data:vvs,
-					lineTension:.35,
+					lineTension:.5,
 					borderColor:'rgba(75, 192, 192, 1)',
 					backgroundColor:'rgba(75, 192, 192, 0.2)',
-					borderWidth:1
+					borderWidth:2
 				}
 			]
 		},

src/admin/makehtml_list_action.php

@@ -67,7 +67,7 @@ $reurl = '';
 //更新数组所记录栏目
 if (!empty($tid)) {
     if (!isset($cfg_Cs[$tid])) {
-        ShowMsg('没有该栏目数据，可能缓存文件没有更新，请检查是否有写入权限', 'javascript:;');
+        ShowMsg('没有该栏目数据，缓存文件没有更新，请检查是否有写入权限', 'javascript:;');
         exit();
     }
     if ($cfg_Cs[$tid][1] > 0) {

src/admin/media_main.php

@@ -18,7 +18,7 @@ if ($dopost == 'filemanager') {
     if (file_exists('./file_manage_main.php')) {
         header("location:file_manage_main.php?activepath=$cfg_medias_dir");
     } else {
-        ShowMsg("找不到文件管理器，可能已经卸载", "-1");
+        ShowMsg("找不到文件管理器", "-1");
     }
     exit();
 }

src/admin/member_pmone.php

@@ -30,7 +30,7 @@ function CheckUserID($uid, $msgtitle = '会员名', $ckhas = true)
             if (isset($ck_uid[$i + 1]) && ord($ck_uid[$i + 1]) > 0x40) {
                 $i++;
             } else {
-                return $msgtitle.'可能含有乱码，建议您改用英文字母和数字组合';
+                return $msgtitle.'含有乱码，建议您改用英文字母和数字组合';
             }
         } else {
             if (preg_match("#[^0-9a-z@\.-]i#", $ck_uid[$i])) {

src/admin/module_main.php

@@ -71,7 +71,7 @@ if ($action == '') {
     $dm = new DedeModule($mdir);
     $info = $dm->GetModuleInfo($hash);
     if ($info == null) {
-        ShowMsg("获取模块信息错误，模块文件可能被篡改", -1);
+        ShowMsg("获取模块信息错误，模块文件错误", -1);
         exit;
     }
     $dev_id = $info['dev_id'];
@@ -95,7 +95,7 @@ if ($action == '') {
     $dm = new DedeModule($mdir);
     $infos = $dm->GetModuleInfo($hash);
     if ($infos == null) {
-        ShowMsg("获取模块信息错误，模块文件可能被篡改", -1);
+        ShowMsg("获取模块信息错误，模块文件错误", -1);
         exit;
     }
     $alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '<br>该模块的语言编码与您系统的编码不一致，请向开发者确认它的兼容性');

src/admin/module_upload.php

@@ -64,7 +64,7 @@ if ($action == 'upload') {
     </tr>
     <tr>
         <td>已有模块：</td>
-        <td><label><input type='checkbox' name='delhas' id='delhas' value='1'> 是否删除同名模块可能会导致已经安装模块无法卸载</label></td>
+        <td><label><input type='checkbox' name='delhas' id='delhas' value='1'> 是否删除同名模块会导致已经安装模块无法卸载</label></td>
     </tr>
     <tr>
         <td>选择文件：</td>

src/admin/sys_cache_up.php

@@ -42,7 +42,7 @@ if ($dopost == "ok") {
         $msg[] = "正在清理arclist调用缓存，继续清理过期会员浏览历史";
         $oldtime = time() - (90 * 24 * 3600);
         $dsql->ExecuteNoneQuery("DELETE FROM `#@__member_pms` WHERE sendtime<'$oldtime' ");
-        $msg[] = "正在清理过期短信，继续修正错误文档，可能要占较长时间";
+        $msg[] = "正在清理过期短信，继续修正错误文档，要占较长时间";
         $limit = date('Ymd', strtotime('-15 days'));
         $dsql->ExecuteNoneQuery("DELETE FROM `#@__statistics_detail` WHERE created_date < '$limit'");
         $msg[] = "正在清理15天之前流量统计";

src/admin/sys_info.php

@@ -82,7 +82,7 @@ else if ($dopost == 'add') {
     $inquery = "INSERT INTO `#@__sysconfig` (`aid`,`varname`,`info`,`value`,`type`,`groupid`) VALUES ('$aid','$nvarname','$varmsg','$nvarvalue','$vartype','$vargroup')";
     $rs = $dsql->ExecuteNoneQuery($inquery);
     if (!$rs) {
-        ShowMsg("新增变量失败，可能有非法字符", "sys_info.php?gp=$vargroup");
+        ShowMsg("新增变量失败，有非法字符", "sys_info.php?gp=$vargroup");
         exit();
     }
     if (!is_writeable($configfile)) {

src/admin/sys_repair.php

@@ -16,11 +16,11 @@ if (empty($dopost)) {
     $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data' ");
     $win->mainTitle = "系统修复工具";
     $wecome_info = "系统修复工具";
-    $win->AddTitle('本工具用于检测和修复您的系统可能存在的错误');
+    $win->AddTitle('本工具用于检测和修复您的系统存在的错误');
     $msg = "<table>
         <tr>
             <td>
-                由于手动升级时会员没运行指定的SQL语句，或自动升级的遗漏处理或处理出错，可能会导致一些错误，使用本工具会自动检测并处理，本工具目前主要执行下面动作：<br>
+                由于手动升级时会员没运行指定的SQL语句，或自动升级的遗漏处理或处理出错，会导致一些错误，使用本工具会自动检测并处理，本工具目前主要执行下面动作：<br>
                 1、修复/优化数据表<br>
                 2、更新缓存<br>
                 3、检测系统变量一致性<br>
@@ -40,7 +40,7 @@ else if ($dopost == 1) {
     $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data' ");
     $win->mainTitle = "系统修复工具";
     $wecome_info = "<a href='sys_repair.php'>系统修复工具</a> &gt; 检测数据结构";
-    $win->AddTitle('本工具用于检测和修复您的系统可能存在的错误');
+    $win->AddTitle('本工具用于检测和修复您的系统存在的错误');
     $msg = "<table>
         <tr>
             <td>
@@ -112,7 +112,7 @@ else if ($dopost == 2) {
     $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data' ");
     $win->mainTitle = "系统修复工具";
     $wecome_info = "<a href='sys_repair.php'>系统修复工具</a> &gt; 检测微表正确性";
-    $win->AddTitle('本工具用于检测和修复您的系统可能存在的错误');
+    $win->AddTitle('本工具用于检测和修复您的系统存在的错误');
     $msg = "<table>
         <tr>
             <td>
@@ -161,7 +161,7 @@ else if ($dopost == 3) {
     $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data'");
     $win->mainTitle = "系统修复工具";
     $wecome_info = "<a href='sys_repair.php'>系统修复工具</a> &gt; 高级综合检测修复";
-    $win->AddTitle('本工具用于检测和修复您的系统可能存在的错误');
+    $win->AddTitle('本工具用于检测和修复您的系统存在的错误');
     $msg = "<table>
     <tr>
         <td>

src/admin/templets/diy_edit_content.htm

@@ -3,7 +3,7 @@
 	<head>
 		<meta charset="utf-8">
 		<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
-		<title>修改表单数据</title>
+		<title>修改自定义表单数据</title>
 		<link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
 		<link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="../static/web/css/admin.css">
@@ -16,39 +16,27 @@
 			<input type="hidden" name="id" value="<?php echo $row['id'];?>">
 			<table cellpadding="1" cellspacing="1" align="center" class="table maintable my-3">
 				<tr>
-					<td bgcolor="#f5f5f5" colspan="2"><a href="<?php echo $ENV_GOBACK_URL;?>">自定义表单管理</a> &gt; 修改表单数据</td>
+					<td bgcolor="#f5f5f5" colspan="2"><a href="<?php echo $ENV_GOBACK_URL;?>">自定义表单管理</a> &gt; 修改自定义表单数据</td>
 				</tr>
+				<?php
+				$formfields = '';
+				foreach($fieldlist as $field=>$fielddata)
+				{
+				   $allowhtml = array('htmltext');
+					if ($row[$field]=='') continue;
+					if (!in_array($fielddata[1],$allowhtml)) {
+						$row[$field] = dede_htmlspecialchars($row[$field]);
+						$row[$field] = "<input type='text' name='".$field."' value='".$row[$field]."'>";
+					}
+					echo '<tr><td width="260">'.$fielddata[0].'：'.'</td><td>'.$row[$field].'</td></tr>';
+					$formfields .= 	$formfields == ''? $field.','.$fielddata[1] : ';'.$field.','.$fielddata[1];	
+				}
+				echo "<input type='hidden' name='dede_fields' value='".$formfields."'>";
+				?>
 				<tr>
-					<td colspan="2">
-						<table width="100%" cellpadding="3" cellspacing="1">
-							<?php
-							$formfields = '';
-							foreach($fieldlist as $field=>$fielddata)
-							{
-							   $allowhtml = array('htmltext');
-								if ($row[$field]=='') continue;
-								if ($fielddata[1]=='img') {
-									$row[$field] = "<input type='file' name='photo'> <a href='{$row[$field]}' target='_blank' class='btn btn-light btn-sm'>浏览原图</a><a href='diy_list.php?action=delete&diyid=$diy->diyid&id=$row[id]&do=1&name=$field' class='btn btn-light btn-sm'>删除原图</a>";
-								} else if ($fielddata[1]=='addon') {
-									$row[$field] = "<input type='file' name='file'> <a href='{$row[$field]}' target='_blank' class='btn btn-light btn-sm'>浏览附件</a><a href='diy_list.php?action=delete&diyid=$diy->diyid&id=$row[id]&do=1&name=$field' class='btn btn-danger btn-sm'>删除附件</a>";
-								} else {
-									if (!in_array($fielddata[1],$allowhtml)) {
-										$row[$field] = dede_htmlspecialchars($row[$field]);
-										$row[$field] = "<input type='text' name='".$field."' value='".$row[$field]."'>";
-									}
-								}
-								echo '<tr><td width="260">'.$fielddata[0].'：'.'</td><td>'.$row[$field].'</td></tr>';
-								$formfields .= 	$formfields == ''? $field.','.$fielddata[1] : ';'.$field.','.$fielddata[1];	
-							}
-							echo "<input type='hidden' name='dede_fields' value='".$formfields."'>";
-							?>
-							<tr>
-								<td colspan="2" align="center">
-									<button type="submit" name="Submit1" class="btn btn-success btn-sm">保存</button>
-									<button type="button" name="Submit2" class="btn btn-outline-success btn-sm" onclick="location='<?php echo $ENV_GOBACK_URL;?>';">返回</button>
-								</td>
-							</tr>
-						</table>
+					<td colspan="2" bgcolor="#f5f5f5" align="center">
+						<button type="submit" name="Submit1" class="btn btn-success btn-sm">保存</button>
+						<button type="button" name="Submit2" class="btn btn-outline-success btn-sm" onclick="location='<?php echo $ENV_GOBACK_URL;?>';">返回</button>
 					</td>
 				</tr>
 			</table>

src/admin/templets/diy_field_add.htm

@@ -3,7 +3,7 @@
 	<head>
 		<meta charset="utf-8">
 		<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
-		<title>自定义表单添加字段</title>
+		<title>添加自定义表单字段</title>
 		<link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
 		<link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="../static/web/css/admin.css">
@@ -30,7 +30,7 @@
 					<td width="260">提示文字：</td>
 					<td>
 						<input type="text" name="itemname" id="itemname" class="admin-input-sm">
-						<span>（发布文档时显示的提示文字）</span>
+						<span>（发布表单时显示的提示文字）</span>
 					</td>
 				</tr>
 				<tr>
@@ -64,8 +64,6 @@
 						<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="nw"><label><input type="radio" name="dtype" id="dtype9" value="img"> 图片</label></div>
-						<div class="nw"><label><input type="radio" name="dtype" id="dtype12" value="addon"> 附件类型</label></div>
 					</td>
 				</tr>
 				<tr>

src/admin/templets/diy_field_edit.htm

@@ -3,7 +3,7 @@
 	<head>
 		<meta charset="utf-8">
 		<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
-		<title>自定义表单修改字段</title>
+		<title>修改自定义表单字段</title>
 		<link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
 		<link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="../static/web/css/admin.css">
@@ -27,7 +27,7 @@
 					<td>提示文字：</td>
 					<td>
 						<input type="text" name="itemname" id="itemname" class="admin-input-sm" value="<?php echo $ctag->GetAtt('itemname')?>">
-						<span>（发布文档时显示的项名字）</span>
+						<span>（发布表单时显示的项名字）</span>
 					</td>
 				</tr>
 				<tr>
@@ -56,8 +56,6 @@
 							<option value="int">整数类型</option>
 							<option value="float">小数类型</option>
 							<option value="datetime">时间类型</option>
-							<option value="img">图片</option>
-							<option value="addon">附件类型</option>
 							<option value="select">option下拉框</option>
 							<option value="radio">radio选项卡</option>
 							<option value="checkbox">checkbox多选框</option>

src/admin/templets/diy_list.htm

@@ -20,20 +20,14 @@
 				if (!empty($fields)) {
 					$allowhtml = array('htmltext');
 					$fields['sta'] = $fields['ifcheck'] == 1 ? '<span class="btn btn-success btn-sm">已审核</span>':'<span class="btn btn-danger btn-sm">未审核</span>';
-					echo '<tr bgcolor="#e9ecef"><td width="8%"><input type="checkbox" name="id[]" value="'.$fields['id'].'"></td><td width="8%"><a href="diy_list.php?action=edit&diyid='.$diy->diyid.'&id='.$fields['id'].'">'.$fields['id'].'</a></td><td align="right">'.$fields['sta'].'<a href="diy_list.php?action=edit&diyid='.$diy->diyid.'&id='.$fields['id'].'" class="btn btn-light btn-sm"><i class="fa fa-pencil-square"></i></a></td></tr>';
+					echo '<tr bgcolor="#e9ecef"><td width="8%"><input type="checkbox" name="id[]" value="'.$fields['id'].'"></td><td width="8%"><a href="diy_list.php?action=edit&diyid='.$diy->diyid.'&id='.$fields['id'].'">表单'.$fields['id'].'</a></td><td align="right">'.$fields['sta'].'<a href="diy_list.php?action=edit&diyid='.$diy->diyid.'&id='.$fields['id'].'" class="btn btn-light btn-sm"><i class="fa fa-pencil-square"></i></a></td></tr>';
 					foreach($fieldlist as $field=>$fielddata)
 					{
 						if ($fields[$field]=='') continue;
-						if ($fielddata[1]=='img') {
-							$fields[$field] = "<a href='{$fields[$field]}' target='_blank' class='btn btn-light btn-sm'>图片附件</a>";
-						} else if ($fielddata[1]=='addon') {
-						$fields[$field] = "<a href='../apps/jump.php?url={$fields[$field]}' target='_blank' class='btn btn-light btn-sm'>其它附件</a>";
-						} else {
-							if (!in_array($fielddata[1],$allowhtml)) {
-								$fields[$field] = dede_htmlspecialchars($fields[$field]);
-							}
+						if (!in_array($fielddata[1],$allowhtml)) {
+							$fields[$field] = dede_htmlspecialchars($fields[$field]);
 						}
-						echo '<tr><td>'.$fielddata[0].'</td><td colspan="2">'.$fields[$field].'</td></tr>';
+						echo '<tr><td colspan="2">'.$fielddata[0].'</td><td>'.$fields[$field].'</td></tr>';
 					}
 				} else {
 					echo '<tr><td>暂无记录</td></tr>';

src/admin/templets/diy_main.htm

@@ -4,7 +4,7 @@
 	<head>
 		<meta charset="utf-8">
 		<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
-		<title>自定义表单管理</title>
+		<title>自定义表单列表管理</title>
 		<link rel="stylesheet" href="../static/web/font/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,7 +12,7 @@
 	<body>
 		<table cellpadding="1" cellspacing="1" align="center" class="table maintable my-3">
 			<tr bgcolor="#f5f5f5">
-				<td colspan="4">自定义表单管理</td>
+				<td colspan="4">自定义表单列表管理</td>
 			</tr>
 			<tr bgcolor="#e9ecef" align="center">
 				<td width="6%">表单</td>

src/admin/templets/diy_post.htm

@@ -17,8 +17,6 @@
 				<tr>
 					<td><?phpecho $postform;?></td>
 				</tr>
-			</table>
-			<table width="98%" align="center" cellpadding="3" cellspacing="1">
 				<tr>
 					<td bgcolor="#f5f5f5" align="center">
 						<input type="submit" name="submit" class="btn btn-success btn-sm" value="提交">

src/admin/templets/module_edit.htm

@@ -126,7 +126,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_make.htm

@@ -119,7 +119,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_field_add.htm

@@ -3,7 +3,7 @@
 	<head>
 		<meta charset="utf-8">
 		<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
-		<title>模型添加字段</title>
+		<title>添加文档模型字段</title>
 		<link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
 		<link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="../static/web/css/admin.css">
@@ -19,7 +19,7 @@
 			<input type="hidden" name="fieldstring" value="">
 			<table cellpadding="1" cellspacing="1" align="center" class="table maintable my-3">
 				<tr>
-					<td bgcolor="#f5f5f5" colspan="2">文档模型管理</a> &gt; 模型添加字段</td>
+					<td bgcolor="#f5f5f5" colspan="2">文档模型管理</a> &gt; 添加文档模型字段</td>
 				</tr>
 				<tr>
 					<td colspan="2">
@@ -77,16 +77,14 @@
 						<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="imgfile"> 图片(仅网址)</label></div>
-						<div class="nw"><label><input type="radio" name="dtype" id="dtype11" value="media"> 多媒体文件</label></div>
-						<div class="nw"><label><input type="radio" name="dtype" id="dtype12" value="addon"> 附件类型</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>
-						<br class="cls">
-						<div class="nw"><label><input type="radio" name="dtype" id="dtype16" value="relation"> 关联文档</label></div>
 					</td>
 				</tr>
 				<tr id="_relation" style="display:none">

src/admin/templets/mychannel_field_edit.htm

@@ -3,7 +3,7 @@
 	<head>
 		<meta charset="utf-8">
 		<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
-		<title>模型修改字段</title>
+		<title>修改文档模型字段</title>
 		<link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
 		<link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="../static/web/css/admin.css">
@@ -21,7 +21,7 @@
 			<input type="hidden" name="fieldstring" value="">
 			<table wcellpadding="1" cellspacing="1" align="center" class="table maintable my-3">
 				<tr>
-					<td bgcolor="#f5f5f5" colspan="2">文档模型管理</a> &gt; 模型修改字段</td>
+					<td bgcolor="#f5f5f5" colspan="2">文档模型管理</a> &gt; 修改文档模型字段</td>
 				</tr>
 				<?php if ($row['issystem']==1) {?>
 				<tr>
@@ -79,7 +79,6 @@
 							<option value="float">小数类型</option>
 							<option value="datetime">时间类型</option>
 							<option value="img">图片</option>
-							<option value="imgfile">图片(仅网址)</option>
 							<option value="media">多媒体文件</option>
 							<option value="addon">附件类型</option>
 							<option value="select">option下拉框</option>

src/admin/templets/sys_safetest.htm

@@ -22,7 +22,7 @@
 					<div class="alert alert-info mb-0">
 						<ul>
 							<li>检测结果：结果仅供参考，请务必查看源码后才删除非法文件</li>
-							<li>安全建议：1、有条件的会员把data、system、theme修改为不可对外浏览，static、a目录设置为不允许执行脚本，其它目录禁止写入，系统更安全；2、本检测程以开发模式为标准，如果您的网站目录包含其它系统，此检测程序可能会产生错误判断；3、检测程序会跳过对模板缓存目录的检测，为了安全起见，检测完成后建议清空模板缓存</li>
+							<li>安全建议：1、有条件的会员把data、system、theme修改为不可对外浏览，static、a目录设置为不允许执行脚本，其它目录禁止写入，系统更安全；2、本检测程以开发模式为标准，如果您的网站目录包含其它系统，此检测程序会产生错误判断；3、检测程序会跳过对模板缓存目录的检测，为了安全起见，检测完成后建议清空模板缓存</li>
 						</ul>
 					</div>
 				</td>

src/admin/templets_main.php

@@ -37,7 +37,7 @@ function GetInfoArray($filename)
 }
 $dirlists  = GetInfoArray($templetdir.'/templet-dirlist.inc');
 $filelists = GetInfoArray($templetdir.'/templet-filelist.inc');
-$pluslists = GetInfoArray($templetdir.'/templet-pluslist.inc');
+$pluslists = GetInfoArray($templetdir.'/templet-appslist.inc');
 $fileinfos = ($acdir == 'plus' ? $pluslists : $filelists);
 include DedeInclude('templets/templets_default.htm');
 ?>

src/apps/download.php

@@ -37,7 +37,7 @@ if ($open == 0) {
     include_once(DEDEINC.'/taglib/channel/softlinks.lib.php');
     $ctag = '';
     $downlinks = ch_softlinks($row[$vname], $ctag, $cu, '', TRUE);
-    require_once(DEDETEMPLATE.'/apps/download_links_templet.htm');
+    require_once(DEDETEMPLATE.'/apps/download_links.htm');
     exit();
 }
 //提供软件给会员下载旧模式

src/apps/flink.php

@@ -30,9 +30,9 @@ if ($dopost == 'save') {
     exit;
 } elseif ($dopost == 'add') {
     //显示模板简单PHP文件
-    include_once(DEDETEMPLATE.'/apps/flink-add.htm');
+    include_once(DEDETEMPLATE.'/apps/flink_add.htm');
     exit;
 }
 //显示模板简单PHP文件
-include_once(DEDETEMPLATE.'/apps/flink-list.htm');
+include_once(DEDETEMPLATE.'/apps/flink_list.htm');
 ?>

src/system/archive/archives.class.php

@@ -997,7 +997,7 @@ function _highlightkeywords($matches)
 {
     return _highlight($matches[2], $GLOBALS['_dd_karr'], $GLOBALS['_dd_kaarr'], $matches[1]);
 }
-//高亮专用，替换多次是可能不能达到最多次
+//高亮专用，替换多次是但不能达到最多次
 function _highlight($string, $words, $result, $pre)
 {
     global $cfg_replace_num;

src/system/common.func.php

@@ -210,7 +210,7 @@ if (!function_exists('CheckSql')) {
             $fail = TRUE;
             $error = "union detect";
         }
-        //发布版本的程序可能比较少包括--,#这样的注释，但黑客经常使用它们
+        //发布版本的程序比较少包括--,#这样的注释，但黑客经常使用它们
         elseif (strpos($clean, '/*') > 2 || strpos($clean, '--') !== FALSE || strpos($clean, '#') !== FALSE) {
             $fail = TRUE;
             $error = "comment detect";
@@ -289,7 +289,7 @@ function dede_htmlspecialchars($str)
     else return htmlspecialchars($str);
 }
 /**
- *  载入助手，这里会员可能载入用helps载入多个助手
+ *  载入助手，这里会员载入用helps载入多个助手
  *
  * @access    public
  * @param     string

src/system/common.inc.php

@@ -7,7 +7,7 @@
  * @link           https://www.dedebiz.com
  */
 //系统默认运行模式为安全模式，模板管理、标签管理、数据库管理、模块管理等功能已暂停，如果您需要这些功能，DEDEBIZ_SAFE_MODE后面值`TRUE`改为`FALSE`恢复使用
-define('DEDEBIZ_SAFE_MODE', TRUE);
+define('DEDEBIZ_SAFE_MODE', FALSE);
 //生产环境使用`production`，如果采用`dev`模式，会有一些php的报错信息提示，用于开发调试
 if (!defined('DEDE_ENVIRONMENT')) {
     define('DEDE_ENVIRONMENT', 'production');

src/system/customfields.func.php

@@ -103,11 +103,9 @@ function GetFormItem($ctag, $admintype = 'admin')
     } else if ($fieldType == "datetime") {
         $nowtime = GetDateTimeMk(time());
         $innertext = "<input type='text' name='$fieldname' value='$nowtime' id='$fieldname' class='form-control admin-input-lg'>";
-    } else if ($fieldType == 'img' || $fieldType == 'imgfile') {
+    } else if ($fieldType == 'img') {
         $fname = defined('DEDEADMIN')? 'form1' : 'addcontent';
-        $sstr = $fieldType == 'imgfile'? '' : "<input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='选择' onClick=\"SelectImage('$fname.$fieldname','big')\">";
-        $pstr = $fieldType == 'imgfile'? '请填写图片地址' : '请选择图片上传或填写图片地址';
-        $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-lg' placeholder='$pstr'> $sstr";
+        $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-lg' placeholder='请选择图片上传或填写图片地址'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='选择' onClick=\"SelectImage('$fname.$fieldname','big')\">";
     } else if ($fieldType == 'media') {
         $fname = defined('DEDEADMIN')? 'form1' : 'addcontent';
         $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-lg' placeholder='请选择多媒体上传或填写多媒体地址'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='选择' onClick=\"SelectMedia('$fname.$fieldname')\">";

src/system/database/dedesqli.class.php

@@ -109,7 +109,7 @@ class DedeSqli
                 mysqli_real_connect($this->linkID, $dbhost, $this->dbUser, $this->dbPwd, false, $dbport);
                 mysqli_errno($this->linkID) != 0 && $this->DisplayError('链接（'.$this->pconnect.'）到MySQL发生错误');
             } catch (Exception $e) {
-                $this->DisplayError("连接数据库失败，可能数据库密码不对或数据库服务器出错");
+                $this->DisplayError("连接数据库失败，数据库密码不对或数据库服务器出错");
                 exit;
             }
             
@@ -118,7 +118,7 @@ class DedeSqli
         }
         //处理错误，成功连接则选择数据库
         if (!$this->linkID) {
-            $this->DisplayError("连接数据库失败，可能数据库密码不对或数据库服务器出错");
+            $this->DisplayError("连接数据库失败，数据库密码不对或数据库服务器出错");
             exit();
         }
         $this->isInit = TRUE;
@@ -130,7 +130,7 @@ class DedeSqli
             mysqli_query($this->linkID, "SET sql_mode=''");
         }
         if ($this->dbName && !@mysqli_select_db($this->linkID, $this->dbName)) {
-            $this->DisplayError('连接数据库失败，可能数据库服务器奔溃');
+            $this->DisplayError('连接数据库失败，数据库服务器奔溃');
         }
         return TRUE;
     }

src/system/database/dedesqlite.class.php

@@ -113,7 +113,7 @@ class DedeSqlite
         }
         //处理错误，成功连接则选择数据库
         if (!$this->linkID) {
-            $this->DisplayError("系统提示：<span class='text-primary'>连接数据库失败，可能数据库密码不对或数据库服务器出错</span>");
+            $this->DisplayError("系统提示：连接数据库失败，数据库密码不对或数据库服务器出错");
             exit();
         }
         $this->isInit = TRUE;

src/system/dedetemplate.class.php

@@ -619,7 +619,7 @@ class DedeTemplate
     {
         $this->loopNum++;
         if ($this->loopNum > 10) {
-            return;//限制最大递归深度为 10 以防止因标记出错等可能性导致死循环
+            return;//限制最大递归深度为10以防止因标记出错等，导致死循环
         }
         $ResultString = '';
         $nextTagEnd = 0;

src/system/inc/inc_fun_funAdmin.php

@@ -123,7 +123,7 @@ function jsScript($js)
     return $out;
 }
 /**
- *  获取修改器
+ *  获取富文本
  *
  * @access    public
  * @param     string  $fname 表单名称
@@ -157,7 +157,7 @@ function SpGetEditor($fname, $fvalue, $nheight = "350", $etype = "Basic", $gtype
         }
         $code = <<<EOT
 <script src="{$GLOBALS['cfg_static_dir']}/ckeditor/ckeditor.js"></script>
-<textarea id="{$fname}" name="{$fname}" rows="8" cols="60">{$fvalue}</textarea>
+<textarea id="{$fname}" name="{$fname}">{$fvalue}</textarea>
 <script>var editor = CKEDITOR.replace('{$fname}'{$addConfig});</script>
 EOT;
         if ($gtype == "print") {

src/system/uploadsafe.inc.php

@@ -10,7 +10,7 @@ if (isset($_FILES['GLOBALS'])) exit ('Request not allow!');
  * @license        https://www.dedebiz.com/license
  * @link           https://www.dedebiz.com
  */
-//为了防止会员通过注入的可能性改动了数据库，这里强制限定的某些文件类型禁止上传
+//为了防止会员通过注入，这里强制限定的某些文件类型禁止上传
 $cfg_not_allowall = "php|pl|cgi|asp|aspx|jsp|php3|shtm|shtml";
 $keyarr = array('name', 'type', 'tmp_name', 'size');
 if (

src/theme/apps/download_links_templet.htm → src/theme/apps/download_links.htm

@@ -15,10 +15,14 @@
 		<main class="container py-3">
 			<div class="row">
 				<div class="col-md-12">
-					<h4 class="mb-3">文件：<a href="<?php echo $arcurl;?>"><?php echo $title;?></a></h4>
-					<table width="100%" align="center" cellspacing="2" class="table">
+					<nav class="navbar navbar-expand-lg p-0">
+						<ol class="breadcrumb mr-auto">
+							<li class="breadcrumb-item">文件：<?php echo $title;?></li>
+						</ol>
+					</nav>
+					<table class="table mb-0">
 						<tr>
-							<td bgcolor="#F2F7E6">下载地址列表：</td>
+							<td bgcolor="#e9ecef">下载地址列表：</td>
 						</tr>
 						<tr>
 							<td><?php echo $downlinks;?></td>

src/theme/apps/flink-add.htm → src/theme/apps/flink_add.htm

@@ -14,19 +14,16 @@
 		<main class="container py-3">
 			<div class="row">
 				<div class="col-md-12">
-					<nav class="navbar navbar-expand-lg mb-3">
-						<ul class="navbar-nav mr-auto">
-							<li class="nav-item">
-								<h3>申请链接</h3>
-							</li>
+					<nav class="navbar navbar-expand-lg p-0">
+						<ul class="breadcrumb mr-auto">
+							<li class="breadcrumb-item">友情链接</li>
+							<li class="breadcrumb-item">申请链接</li>
 						</ul>
-						<span class="navbar-text">
-							<a href="<?php echo '$cfg_phpurl/flink.php';?>" class="btn btn-success">查看链接</a>
-						</span>
+						<span class="navbar-text"><a href="<?php echo '$cfg_phpurl/flink.php';?>" class="btn btn-success btn-sm">查看链接</a></span>
 					</nav>
 					<form name="form1" method="post" action="flink.php">
 						<input type="hidden" name="dopost" value="save">
-			 			<table width="100%" cellspacing="1" cellpadding="3" class="table">
+			 			<table class="table mb-0">
 							<tr>
 								<td>网址：</td>
 								<td><input name="url" type="text" id="url" value="http://" size="30"></td>
@@ -71,8 +68,8 @@
 							</tr>
 							<tr>
 								<td colspan="2" align="center">
-									<button type="submit" name="Submit" class="btn btn-success">提交</button>
-									<button type="reset" name="Submit" class="btn btn-outline-success">重置</button>
+									<button type="submit" name="Submit" class="btn btn-success btn-sm">提交</button>
+									<button type="reset" name="Submit" class="btn btn-outline-success btn-sm">重置</button>
 								</td>
 							</tr>
 						</table>

src/theme/apps/flink-list.htm → src/theme/apps/flink_list.htm

@@ -14,20 +14,16 @@
 		<main class="container py-3">
 			<div class="row">
 				<div class="col-md-12">
-					<nav class="navbar navbar-expand-lg mb-3">
-						<ul class="navbar-nav mr-auto">
-							<li class="nav-item">
-								<h3>友情链接</h3>
-							</li>
+					<nav class="navbar navbar-expand-lg p-0">
+						<ul class="breadcrumb mr-auto">
+							<li class="breadcrumb-item">友情链接</li>
 						</ul>
-						<span class="navbar-text">
-							<a href="flink.php?dopost=add" class="btn btn-success">申请链接</a>
-						</span>
+						<span class="navbar-text"><a href="flink.php?dopost=add" class="btn btn-success btn-sm">申请链接</a></span>
 					</nav>
 					<ul class="list-group list-group-horizontal">
 					<?php
-					$row = 180;
-					$titlelen = 50;
+					$row = 100;
+					$titlelen = 160;
 					$dsql->SetQuery("SELECT * FROM `#@__flink` WHERE ischeck>0 ORDER BY sortrank ASC");
 					$dsql->Execute();
 					$revalue = "";

src/theme/apps/heightsearch.htm

@@ -14,9 +14,9 @@
 			<div class="row">
 				<div class="col-md-12">
 					<form name="form1" action="search.php" method="get">
-						<table width="100%" cellpadding="0" cellspacing="0" class="table">
+						<table class="table">
 							<tr>
-								<td align="center" width="20%">网站栏目：</td>
+								<td width="160">网站栏目：</td>
 								<td>
 									<?php
 									$tl = new TypeLink(0);
@@ -29,11 +29,11 @@
 								</td>
 							</tr>
 							<tr>
-								<td align="center">关 键 字：</td>
-								<td width="380" ><input name="q" type="text" id="q" class="form-control"></td>
+								<td>关键字：</td>
+								<td><input name="q" type="text" id="q" class="form-control"></td>
 							</tr>
 							<tr>
-								<td align="center">发布时间：</td>
+								<td>发布时间：</td>
 								<td>
 									<select name="starttime" id="starttime">
 										<option value="-1" selected>不限</option>
@@ -45,7 +45,7 @@
 								</td>
 							</tr>
 							<tr>
-								<td align="center">文档类型：</td>
+								<td>文档类型：</td>
 								<td>
 									<select name="channeltype" id="channeltype" class="form-control">
 										<option value="0" selected>不限</option>
@@ -61,7 +61,7 @@
 								</td>
 							</tr>
 							<tr>
-								<td align="center">排序方式：</td>
+								<td>排序方式：</td>
 								<td>
 									<select name="orderby" id="orderby" class="form-control">
 										<option value="sortrank" selected>默认</option>
@@ -72,18 +72,18 @@
 								</td>
 							</tr>
 							<tr>
-								<td align="center">显示条数：</td>
+								<td>显示条数：</td>
 								<td><input name="pagesize" type="text" id="pagesize" value="10" size="4" class="form-control"></td>
 							</tr>
 							<tr>
-								<td align="center">关键词模式：</td>
+								<td>关键词模式：</td>
 								<td>
 									<label><input type="radio" name="kwtype" value="1" checked> 或</label>
 									<label><input type="radio" name="kwtype" value="0"> 与</label>
 								</td>
 							</tr>
 							<tr>
-								<td align="center">搜索文档：</td>
+								<td>搜索文档：</td>
 								<td>
 									<select name="searchtype" id="searchtype" class="form-control">
 										<option value="titlekeyword" selected>默认搜索</option>
@@ -92,9 +92,9 @@
 								</td>
 							</tr>
 							<tr>
-								<td height="30" bgcolor="#F4FCE4" colspan="2" align="center">
-									<button type="submit" class="btn btn-success">搜索</button>
-									<button type="reset" class="btn btn-outline-success">重置</button>
+								<td colspan="2">
+									<button type="submit" class="btn btn-success btn-sm">搜索</button>
+									<button type="reset" class="btn btn-outline-success btn-sm">重置</button>
 								</td>
 							</tr>
 						</table>

src/theme/apps/list_diyform.htm

@@ -14,49 +14,31 @@
 		<main class="container py-3">
 			<div class="row">
 				<div class="col-md-12">
-					<nav class="navbar navbar-expand-lg mb-3">
-						<ul class="navbar-nav mr-auto">
-							<li class="nav-item">
-								<h3><?php echo $diy->name;?>文档列表</h3>
-							</li>
+					<nav class="navbar navbar-expand-lg p-0">
+						<ul class="breadcrumb mr-auto">
+							<li class="breadcrumb-item"><a href="/apps/diy.php?action=list&diyid=<?php echo $diy->diyid;?>"><?php echo $diy->name;?>列表</a></li>
 						</ul>
-						<span class="navbar-text"><a href="diy.php?action=post&diyid=<?php echo $diy->diyid;?>" class="btn btn-success">发布信息</a></span>
+						<span class="navbar-text"><a href="/apps/diy.php?action=post&diyid=<?php echo $diy->diyid;?>" class="btn btn-success btn-sm">发布信息</a></span>
 					</nav>
 					{dede:datalist}
-					<table class="table" cellspacing="1">
+					<table class="table">
 						<?php
 						if (!empty($fields)) {
-							echo '<tbody>';
-							echo '<tr><td width="30%" bgcolor="#f5f5f5">id</td>';
-							echo '<td bgcolor="#f5f5f5">'.$fields['id'].'<a href="diy.php?action=view&diyid='.$diy->diyid.'&id='.$fields['id'].'" target="_blank">详细</a></td></tr>';
+							echo "<tbody>";
+							echo '<tr><td bgcolor="#e9ecef">表单'.$fields['id'].'<a href="diy.php?action=view&diyid='.$diy->diyid.'&id='.$fields['id'].'" target="_blank" class="btn btn-light btn-sm ml-2">详细</a></td></tr></td>';
 							foreach($fieldlist as $field=>$fielddata)
 							{
 								if ($fields[$field]=='') continue;
-								if ($fielddata[1]=='img') {
-									$fields[$field] = "<a href='{$fields[$field]}' target='_blank' class='btn btn-light btn-sm'>图片附件</a>";
-								} else if ($fielddata[1]=='addon') {
-									$fields[$field] = "<a href='{$fields[$field]}' target='_blank' class='btn btn-light btn-sm'>其它附件</a>";
-								} else {
-									if ($fielddata[1]=='htmltext') $fields[$field] = html2text($fields[$field]);
-									else $fields[$field] = dede_htmlspecialchars($fields[$field]);
-									if (strlen($fields[$field]) > 250) {
-										$fields[$field] = cn_substr( $fields[$field], 250).'';
-									}
-								}
-								echo "<tr><td>{$fielddata[0]}</td><td>{$fields[$field]}</td></tr>";
+								echo "<tr><td bgcolor='#f5f5f5'>{$fielddata[0]}</td></tr><tr><td>{$fields[$field]}</td></tr>";
 							}
-							echo '</tbody>';
+							echo "</tbody>";
 						} else {
 							echo "<tr><td>暂无记录</td></tr>";
 						}
 						?>
 					</table>
 					{/dede:datalist}
-					<table class="listtable" cellspacing="2">
-						<tr>
-							<td>{dede:pagelist listsize='6'/}</td>
-						</tr>
-					</table>
+					{dede:pagelist listsize='6'/}
 				</div>
 			</div>
 		</main>

src/theme/apps/post_diyform.htm

@@ -15,18 +15,26 @@
 		<main class="container py-3">
 			<div class="row">
 				<div class="col-md-12">
-					<h4 class="mb-3"><?php echo $diy->name;?>发布</h4>
+					<nav class="navbar navbar-expand-lg p-0">
+						<ul class="breadcrumb mr-auto">
+							<li class="breadcrumb-item"><a href="/apps/diy.php?action=list&diyid=<?php echo $diy->diyid;?>"><?php echo $diy->name;?>列表</a></li>
+							<li class="breadcrumb-item"><?php echo $diy->name;?>发布</li>
+						</ul>
+						<span class="navbar-text"><a href="/apps/diy.php?action=list&diyid=<?php echo $diy->diyid;?>" class="btn btn-success btn-sm">返回列表</a></span>
+					</nav>
 					<form name="addcontent" action="<?php echo $cfg_cmspath;?>/apps/diy.php" enctype="multipart/form-data" method="post">
 						<input type="hidden" name="action" value="post">
 						<input type="hidden" name="diyid" value="<?php echo $diyid;?>">
 						<input type="hidden" name="do" value="2">
-						<table cellpadding="0" cellspacing="1" class="table">
+						<table class="table mb-0">
 							<?php echo $postform;?>
+							<tr>
+								<td align="center">
+									<button type="submit" name="submit" class="btn btn-success btn-sm">提交</button>
+									<button type="reset" name="reset" class="btn btn-outline-success btn-sm">重置</button>
+								</td>
+							</tr>
 						</table>
-						<div class="text-center">
-							<button type="submit" name="submit" class="btn btn-success">提交</button>
-							<button type="reset" name="reset" class="btn btn-outline-success">重置</button>
-						</div>
 					</form>
 				</div>
 			</div>

src/theme/apps/recommend.htm

@@ -13,24 +13,28 @@
 		<main class="container py-3">
 			<div class="row">
 				<div class="col-md-12">
-					<h4 class="mb-3">推荐：<?php echo $title;?></h4>
+					<nav class="navbar navbar-expand-lg p-0">
+						<ul class="breadcrumb mr-auto">
+							<li class="breadcrumb-item">推荐：<?php echo $title;?></li>
+						</ul>
+					</nav>
 					<form name="form1" method="post" action="recommend.php">
 						<input type="hidden" name="arcurl" value="<?php echo $arcurl;?>">
 						<input type="hidden" name="action" value="send">
 						<input type="hidden" name="arcID" value="<?php echo $aid;?>">
-						<table width="100%" class="table" cellspacing="2" cellpadding="1">
+						<table class="table mb-0">
 							<tr>
-								<td align="right" width="160">您好友的邮箱：</td>
-								<td align="left"><input name="email" type="text" class="form-control" id="email"></td>
+								<td width="160">好友邮箱：</td>
+								<td><input name="email" type="text" class="form-control" id="email"></td>
 							</tr>
 							<tr>
-								<td align="right">您的留言：</td>
-								<td align="left">
-									<textarea name="msg" cols="80" rows="16" id="msg" class="form-control">我在<?php echo $cfg_webname;?>发现了一个很好的东东，文档的名称是：<?php echo $title;?>，网址是：<?php $arcUrl = ($cfg_multi_site != 'Y' ? $cfg_basehost : '').$arcurl; echo $arcUrl;?></textarea>
+								<td>您的留言：</td>
+								<td>
+									<textarea name="msg" id="msg" class="form-control">我在<?php echo $cfg_webname;?>发现一篇很好的文档：<?php echo $title;?>，网址：<?php $arcUrl = ($cfg_multi_site != 'Y' ? $cfg_basehost : '').$arcurl; echo $arcUrl;?></textarea>
 								</td>
 							</tr>
 							<tr>
-								<td colspan="2" align="center"><button type="submit" class="btn btn-success">发送</button></td>
+								<td colspan="2" align="center"><button type="submit" class="btn btn-success btn-sm">发送</button></td>
 							</tr>
 						</table>
 					</form>

src/theme/apps/showphoto.htm

@@ -11,13 +11,17 @@
 		<main class="container py-3">
 			<div class="row">
 				<div class="col-md-12">
-					<h4 class="mb-3">图片详细页面：<a href="<?php echo $arcurl?>"><?php echo $arctitle;?></a></h4>
-					<table width="100%" cellpadding="2" cellspacing="1">
+					<nav class="navbar navbar-expand-lg p-0">
+						<ul class="breadcrumb mr-auto">
+							<li class="breadcrumb-item">页面：<?php echo $arctitle;?></li>
+						</ul>
+					</nav>
+					<table class="table mb-0">
 						<tr>
-							<td align="center">
+							<td>
 								<a href="<?php echo $nextlink;?>"><img src="<?php echo $src?>"></a>
 								<a href="<?php echo $src;?>" target="_blank">[查看原图]</a>
-								<div style="border-top:1px dashed #BED6A7"><?php echo $pageGuide?></div>
+								<div><?php echo $pageGuide?></div>
 							</td>
 						</tr>
 					</table>

src/theme/apps/view_diyform.htm

@@ -14,31 +14,24 @@
 		<main class="container py-3">
 			<div class="row">
 				<div class="col-md-12">
-					<h3 class="mb-3"><?php echo $diy->name;?>详细文档</h3>
-					<table cellspacing="1" class="table">
+					<nav class="navbar navbar-expand-lg p-0">
+						<ul class="breadcrumb mr-auto">
+							<li class="breadcrumb-item"><a href="/apps/diy.php?action=list&diyid=<?php echo $diy->diyid;?>"><?php echo $diy->name;?>列表</a></li>
+							<li class="breadcrumb-item"><?php echo $diy->name;?>查看</li>
+						</ul>
+						<span class="navbar-text"><a href="/apps/diy.php?action=post&diyid=<?php echo $diy->diyid;?>" class="btn btn-success btn-sm">发布信息</a></span>
+					</nav>
+					<table class="table mb-0">
 						<?php
 						echo '<tbody>';
-						echo '<tr><td bgcolor="#f5f5f5" width="20%">id</td><td bgcolor="#f5f5f5">'.$row['id'].'</td></tr>';
+						echo '<tr><td bgcolor="#f5f5f5">id'.$row['id'].'</td></tr>';
 						$allowhtml = array('htmltext');
 						foreach($fieldlist as $field=>$fielddata)
 						{
 							if ($row[$field]=='') continue;
-							if ($fielddata[1]=='img')
-							{
-								$row[$field] = "<a href='{$row[$field]}' target='_blank'><img src='{$row[$field]}'/></a>";
-								}
-								else if ($fielddata[1]=='addon')
-								{
-									$row[$field] = "<a href='{$row[$field]}' target='_blank'><img src='img/icon_addon.png'> 相关附件</a>";
-								} else {
-									if (!in_array($fielddata[1], $allowhtml))
-									{
-										$row[$field] = htmlspecialchars($row[$field]);
-									}
-								}
-								echo '<tr><td>'.$fielddata[0].'</td><td>'.$row[$field].'</td></tr>';
-							}
-							echo '</tbody>';
+						}
+						echo '<tr><td>'.$fielddata[0].'</td></tr><tr><td>'.$row[$field].'</td></tr>';
+						echo '</tbody>';
 						?>
 					</table>
 				</div>

src/theme/apps/view_msg.htm

@@ -14,25 +14,27 @@
 		<main class="container py-3">
 			<div class="row">
 				<div class="col-md-12">
-					<table width="100%" cellpadding="3" cellspacing="1" class="table table-bordered">
+					<nav class="navbar navbar-expand-lg p-0">
+						<ul class="breadcrumb mr-auto">
+							<li class="breadcrumb-item">文档错误提示</li>
+						</ul>
+					</nav>
+					<table class="table mb-0">
 						<tr>
-							<td colspan="2">错误具体提示信息：</td>
+							<td colspan="2"><?php echo $moremsg;?></td>
 						</tr>
 						<tr>
-							<td colspan="2" align="center"><?php echo $moremsg;?></td>
+							<td width="160">文档标题：</td>
+							<td><?php echo $arcLinktitle;?></td>
 						</tr>
 						<tr>
-							<td width="30%" align="center">文档标题：</td>
-							<td width="70%"><?php echo $arcLinktitle;?></td>
+							<td>文档简介：</td>
+							<td><?php echo $description;?></td>
 						</tr>
 						<tr>
-							<td align="center">发布时间：</td>
+							<td>发布时间：</td>
 							<td><?php echo $pubdate;?></td>
 						</tr>
-						<tr>
-							<td align="center">文档简介：</td>
-							<td><?php echo $description;?></td>
-						</tr>
 					</table>
 				</div>
 			</div>

src/theme/apps/view_msg_catalog.htm

@@ -14,19 +14,21 @@
 		<main class="container py-3">
 			<div class="row">
 				<div class="col-md-12">
-					<table width="100%" cellpadding="3" cellspacing="1" bgcolor="#DDEAC8" class="table">
-						<tr bgcolor="#EFF4EA">
-							<td colspan="2">错误具体提示信息：</td>
-						</tr>
+					<nav class="navbar navbar-expand-lg p-0">
+						<ul class="breadcrumb mr-auto">
+							<li class="breadcrumb-item">栏目错误提示</li>
+						</ul>
+					</nav>
+					<table class="table mb-0">
 						<tr>
-							<td colspan="2" align="center"><?php echo $moremsg;?></td>
+							<td colspan="2"><?php echo $moremsg;?></td>
 						</tr>
 						<tr>
-							<td width="30%" align="center">栏目名称：</td>
-							<td width="70%"><?php echo $lv->Fields['typename'];?></td>
+							<td width="160">栏目名称：</td>
+							<td><?php echo $lv->Fields['typename'];?></td>
 						</tr>
 						<tr>
-							<td align="center">栏目简介：</td>
+							<td>栏目简介：</td>
 							<td><?php echo $lv->Fields['description'];?></td>
 						</tr>
 					</table>

src/theme/apps/vote.htm

@@ -14,13 +14,17 @@
 		<main class="container py-3">
 			<div class="row">
 				<div class="col-md-12">
-					<h4 class="mb-3"><?php echo $voname?></h4>
+					<nav class="navbar navbar-expand-lg p-0">
+						<ul class="breadcrumb mr-auto">
+							<li class="breadcrumb-item"><?php echo $voname?></li>
+						</ul>
+					</nav>
 					<div class="mb-3">
-						投票开始时间：<?php echo $starttime;?><br>
-						投票结束时间:<?php echo $endtime;?><br>
-						投票人数：<?php echo $totalcount;?>
+						<span>投票开始时间：<?php echo $starttime;?></span>
+						<span>投票结束时间：<?php echo $endtime;?></span>
+						<span>投票人数：<?php echo $totalcount;?></span>
 					</div>
-					<div><?php echo $rsmsg;?></div>
+					<div class="mb-3"><?php echo $rsmsg;?></div>
 					<div><?php echo $votelist;?></div>
 				</div>
 			</div>

src/theme/system/channel_addon.htm

@@ -1,6 +1,5 @@
-<table width="300">
+<table>
 	<tr>
-		<td width="20"><a href="~link~" target="_blank"><img src="~~cfg_phpurl~~/img/icon_addon.png" align="center"></a></td>
-		<td><a href="~link~" target="_blank">~link~</a></td>
+		<td><a href="~link~" target="_blank"><img src="~~cfg_phpurl~~/img/icon_addon.png">~link~</a></td>
 	</tr>
 </table>

src/theme/system/channel_article_image.htm

@@ -1,4 +1 @@
-<li>
-  	<a href="[field:linkurl/]" target="_blank"><img src="[field:imgsrc/]" [field:imgwidth/]></a><br>
-  	<a href="[field:linkurl/]" target="_blank">[field:text/]</a>
-</li>
+<li><a href="[field:linkurl/]" target="_blank"><img src="[field:imgsrc/]" [field:imgwidth/]>[field:text/]</a></li>

src/theme/system/channel_downlinkpage.htm

@@ -1 +1 @@
-<a href="~link~">进入下载地址列表</a>
+<a href="~link~">下载地址列表</a>

src/theme/system/channel_list.htm

@@ -1 +1 @@
--<a href="[field:typelink/]">[field:typename/]</a>
+·<a href="[field:typelink/]">[field:typename/]</a>

src/theme/system/channel_spec_note.htm

@@ -1,10 +1,4 @@
-<div class="col-md-6 mb-3">
-	<div class="card ddcard-normal">
-		<div class="card-header">
-			<div class="row">
-				<div class="col-6 caption"><span>~notename~</span></div>
-			</div>
-		</div>
-		<ul class="list-group list-group-flush">~spec_arclist~</ul>
-	</div>
+<div class="col-md-6">
+	<h5>~notename~</h5>
+	<ul>~spec_arclist~</ul>
 </div>

src/theme/system/custom_fields_diy.htm

@@ -1,4 +1,6 @@
 <tr>
-	<td align="right">~name~：</td>
+	<td bgcolor="#f5f5f5">~name~</td>
+</tr>
+<tr>
 	<td>~form~</td>
 </tr>

src/theme/system/info_link.htm

@@ -1,26 +1,16 @@
-<style>#dedeinfolink{margin-bottom:6px}#dedeinfolink tr td div{padding:6px 5px 2px 5px;background:#c5e09d;margin-right:8px}#dedeinfolink tr td{line-height:20px}#dedeinfolink tr td.spline{font-size:1px;height:1px;line-height:1px;border-bottom:1px dashed #dedede}#dedeinfolink tr td.iftitle{font-weight:bold;color:#688730;line-height:24px;border-bottom:1px dashed #dedede;padding-left:20px;background:url(/images/dd2.gif) 5px 5px no-repeat}</style>
 <table id="dedeinfolink">
 	<tr>
-		<td colspan="3" class="iftitle">信息附加条件：</td>
-	</tr>
-	<tr>
-		<td width="50"> 地区：</td>
-		<td align="center" nowrap="yes">
+		<td width="60">地区：</td>
+		<td nowrap="yes">
 			<div>[field:linkallplace/]</div>
 		</td>
 		<td>[field:nativeplace/]</td>
 	</tr>
 	<tr>
-		<td colspan="3" class="spline"></td>
-	</tr>
-	<tr>
-		<td> 类型：</td>
-		<td align="center" nowrap="yes">
+		<td>类型：</td>
+		<td nowrap="yes">
 			<div>[field:linkalltype/]</div>
 		</td>
 		<td>[field:infotype/]</td>
 	</tr>
-	<tr>
-		<td colspan="3" class="spline"></td>
-	</tr>
 </table>

src/theme/system/list_fulllist.htm

@@ -1,10 +1,8 @@
-<div class="col1">
-	<div class="mainlinklist"><a href="[field:arcurl/]">[field:title/]</a></div>
-	<div class="descriptions">[field:description/]</div>
-	<div class="addinfos">
-		<span>日期：[field:pubdate function="GetDateTimeMK(@me)"/]</span>
-		<span>浏览：[field:click/]</span>
-		<span>好评度：[field:scores/]</span>
-		<a href="[field:phpurl/]/feedback.php?aid=[field:id/]"><img src="[field:global.cfg_cmsurl/]/images/comment.gif" title="前往踩踩"></a>
-	</div>
-</div>
+<p><a href="[field:arcurl/]">[field:title/]</a></p>
+<p>
+	<span>[field:description/]</span>
+	<span>日期：[field:pubdate function="GetDateTimeMK(@me)"/]</span>
+	<span>浏览：[field:click/]</span>
+	<span>好评度：[field:scores/]</span>
+</p>
+<p><a href="[field:phpurl/]/feedback.php?aid=[field:id/]">前往踩踩</a></p>

src/theme/system/list_sglist.htm

@@ -1,7 +1,5 @@
-<div class="col1">
-	<div><a href="[field:arcurl/]">[field:title/]</a></div>
-	<div>
-		<span>日期：[field:senddate function="GetDateMK(@me)"/]</span>
-		<span>浏览：[field:click/]</span>
-	</div>
-</div>
+<p><a href="[field:arcurl/]">[field:title/]</a></p>
+<p>
+	<span>日期：[field:senddate function="GetDateMK(@me)"/]</span>
+	<span>浏览：[field:click/]</span>
+</p>

src/theme/system/memberlist.htm

@@ -1,4 +1 @@
-<li>
-	<div><a href="[field:spaceurl/]" target="_blank"><img src="[field:face/]" alt="[field:spacename/]"></a></div>
-	<div><a href="[field:spaceurl/]" target="_blank">[field:uname/]</a></div>
-</li>
+<li><a href="[field:spaceurl/]" target="_blank"><img src="[field:face/]" alt="[field:spacename/]">[field:uname/]</a></li>

src/theme/system/mynews.htm

@@ -0,0 +1,14 @@
+<table width="100%" cellpadding="1" cellspacing="1">
+	<tr>
+		<td bgcolor="#e9ecef">[field:title/]</td>
+	</tr>
+	<tr>
+		<td>
+			<span>发布人：[field:writer/]</span>
+			<span>时间：[field:senddate function='MyDate("Y-m-d H:i:s","@me")'/]</span>
+		</td>
+	</tr>
+	<tr>
+		<td>[field:body/]</td>
+	</tr>
+</table>

src/theme/system/part_autochannel.htm

@@ -1,4 +1,3 @@
 <ul>
 	<li><a href="[field:typelink/]">[field:typename/]</a></li>
-	<li><a href="[field:typelink/]">更多</a></li>
 </ul>

src/theme/system/part_channelartlist.htm

@@ -1,19 +1,11 @@
-<table width="98%" cellpadding="3" cellspacing="1" bgcolor="#BFCFA9">
+<table width="100%" cellpadding="3" cellspacing="1">
 	<tr>
-		<td bgcolor="#E6F2CC">
-			{dede:type}
-			<table cellpadding="0" cellspacing="0" width="98%">
-				<tr>
-					<td width="10%">▪</td>
-					<td width="60%"><a href="[field:typelink/]">[field:typename/]</a></td>
-					<td width="30%" align="right"><a href="[field:typelink/]">更多</a></td>
-				</tr>
-			</table>
-			{/dede:type}
-		</td>
+		{dede:type}
+		<td><a href="[field:typelink/]">[field:typename/]</a>·<a href="[field:typelink/]">更多</a></td>
+		{/dede:type}
 	</tr>
 	<tr>
-		<td height="100">
+		<td>
 			{dede:arclist}
 			<a href="[field:arcurl/]">[field:title/]</a><br>
 			{/dede:arclist}

src/theme/system/part_imginfolist.htm

@@ -1,9 +1,9 @@
-<table width="100%" cellspacing="2" cellpadding="2">
+<table width="100%" cellpadding="2" cellspacing="2">
 	<tr>
-		<td width="30%" rowspan="2" align="center">[field:imglink/]</td>
-		<td width="70%"><a href='[field:filename/]'>[field:title/]</a></td>
+		<td width="30%">[field:imglink/]</td>
+		<td><a href="[field:filename/]">[field:title/]</a></td>
 	</tr>
 	<tr>
-		<td>[field:info/]</td>
+		<td colspan="2">[field:info/]</td>
 	</tr>
 </table>

src/theme/system/part_imglist.htm

@@ -1,2 +1,2 @@
-<div>[field:imglink/]</div>
-<div>[field:textlink/]</div>
+<p>[field:imglink/]</p>
+<p>[field:textlink/]</p>

src/theme/system/spec_arclist.htm

@@ -1 +1 @@
-<li>[field:typename/]·<a href="[field:arcurl/]" target="_blank">[field:title/]</a></li>
+<li><span>[field:typename/]</span>·<a href="[field:arcurl/]" target="_blank">[field:title/]</a></li>

src/theme/system/spec_list.htm

@@ -1,18 +1,16 @@
-<table width="100%">
+<table width="100%" cellpadding="1" cellspacing="1">
 	<tr>
-		<td width="25%" rowspan="2">
-			<table width="90" height="75" cellpadding="1" cellspacing="1" bgcolor="#E6EAE3">
-				<tr>
-					<td>[field:imglink/]</td>
-				</tr>
-			</table>
+		<td>[field:imglink/]</td>
+		<td>
+			<span>[field:typelink/]</span>
+			<span>[field:textlink/]</span>
 		</td>
-		<td width="50%">[field:typelink/] [field:textlink/]</td>
-		<td width="25%">点击:[field:click/]</td>
+		<td>点击：[field:click/]</td>
 	</tr>
 	<tr>
-		<td height="56" colspan="2">
-			[field:description/]<span>([field:stime/])</span>
+		<td colspan="3">
+			<span>[field:description/]<span>
+			<span>（[field:stime/]）</span>
 		</td>
 	</tr>
 </table>

src/theme/system/tag_feedback.htm

@@ -1,4 +1,4 @@
 <ul>
-	<li>[field:username function="(@me=='guest' ? '游客' : @me)"/] 对 [field:title/] 的评论：</li>
+	<li>[field:username function="(@me=='guest' ? '游客' : @me)"/]对[field:title/]评论：</li>
 	<li><a href="apps/feedback.php?aid=[field:aid/]">[field:msg/]</a></li>
 </ul>

src/theme/system/tag_fieldlist.htm

@@ -1,6 +1,6 @@
-<table width="98%" cellpadding="1" cellspacing="1" bgcolor="#BED1AB">
+<table width="100%" cellpadding="1" cellspacing="1">
 	<tr>
-		<td  bgcolor="#FAFDEE">[field:name/]</td>
+		<td bgcolor="#e9ecef">[field:name/]</td>
 	</tr>
 	<tr>
 		<td>[field:value/]</td>

src/theme/templet-appslist.inc

@@ -0,0 +1,14 @@
+advancedsearch.htm,高级搜索模板
+download_links,下载地址列表模板
+flink_add.htm,添加友情链接模板
+flink_list.htm,友情链接列表模板
+heightsearch.htm,高级搜索模板
+list_diyform.htm,自定义表单列表模板
+post_diyform.htm,自定义表单发布模板
+recommend.htm,文档推荐模板
+showphoto.htm,图片展示模板
+view_diyform.htm,自定义表单查看数据
+view_msg.htm,文档权限模板
+view_msg_catalog.htm,栏目权限模板
+vote.htm,投票模板
+win_templet.htm,窗口模板

src/theme/templet-dirlist.inc

@@ -1,3 +1,3 @@
 templets,模板目录
-plus,插件目录
+apps,插件目录
 system,系统目录

src/theme/templet-filelist.inc

@@ -1,4 +1,5 @@
-advancedsearch.htm,高级搜索模板
+top.htm,顶部模板
+head.htm,头部模板
 article_article.htm,文档模板
 article_default.htm,默认文档模板
 article_default_sg.htm,默认表单文档模板
@@ -6,8 +7,6 @@ article_image.htm,图片文档模板
 article_infos.htm,分类文档模板
 article_soft.htm,软件文档模板
 article_spec.htm,专题文档模板
-foot.htm,底部模板
-head.htm,头部模板
 index.htm,首页模板
 index_article.htm,文档封面模板
 index_default.htm,默认封面模板
@@ -24,7 +23,6 @@ list_infos.htm,分类列表模板
 list_soft.htm,软件列表模板
 list_spec.htm,专题列表模板
 search.htm,搜索模板
-top.htm,顶部模板
 tag.htm,标签首页模板
 taglist.htm,标签文档列表模板
 widget_article_feedback.htm,小部件评论模板
@@ -33,4 +31,5 @@ widget_hot.htm,小部件头条文档模板
 widget_menu.htm,小部件栏目模板
 widget_recommend.htm,小部件推荐栏目模板
 widget_search.htm,小部件搜索模板
-widget_vote.htm,小部件投票模板
+widget_vote.htm,小部件投票模板
+foot.htm,底部模板

src/theme/templet-pluslist.inc

@@ -1,12 +0,0 @@
-download_links_templet.htm,下载地址列表模板
-flink-add.htm,添加友情链接模板
-flink-list.htm,友情链接列表模板
-heightsearch.htm,高级搜索模板
-list_diyform.htm,自定义表单文档列表模板
-post_diyform.htm,自定义表单文档发送模板
-recommend.htm,文档推荐模板
-showphoto.htm,图片展示模板
-view_diyform.htm,自定义表单文档查看模板
-view_msg.htm,文档权限模板
-vote.htm,投票模板
-win_templet.htm,窗口模板

src/user/templets/album_add.htm

@@ -18,10 +18,10 @@
 				<div class="col-md-12">
 					<div class="pannel-main-container shadow-sm rounded">
 						<nav class="navbar navbar-expand-lg p-0">
-							<ol class="breadcrumb mr-auto">
+							<ul class="breadcrumb mr-auto">
 								<li class="breadcrumb-item"><a href="<?php echo $cfg_memberurl;?>/">会员中心</a></li>
 								<li class="breadcrumb-item">发布<?php echo $cInfos['typename'];?></li></li>
-							</ol>
+							</ul>
 							<span class="navbar-text"><a href="javascript:location.href='content_list.php?channelid=<?php echo $channelid;?>'" class="btn btn-outline-success btn-sm">返回</a></span>
 						</nav>
 						<form name="addcontent" action="album_add.php" method="post" enctype="multipart/form-data" onsubmit="return checkSubmit();">

src/user/templets/album_edit.htm

@@ -18,10 +18,10 @@
 				<div class="col-md-12">
 					<div class="pannel-main-container shadow-sm rounded">
 						<nav class="navbar navbar-expand-lg p-0">
-							<ol class="breadcrumb mr-auto">
+							<ul class="breadcrumb mr-auto">
 								<li class="breadcrumb-item"><a href="<?php echo $cfg_memberurl;?>/">会员中心</a></li>
 								<li class="breadcrumb-item">修改<?php echo $row['title']?></li></li>
-							</ol>
+							</ul>
 							<span class="navbar-text"><a href="javascript:location.href='content_list.php?channelid=<?php echo $channelid;?>'" class="btn btn-outline-success btn-sm">返回</a></span>
 						</nav>
 						<form name="addcontent" action="album_edit.php" method="post" enctype="multipart/form-data" onsubmit="return checkSubmit();">

src/user/templets/archives_add.htm

@@ -17,10 +17,10 @@
 				<div class="col-md-12">
 					<div class="pannel-main-container shadow-sm rounded">
 						<nav class="navbar navbar-expand-lg p-0">
-							<ol class="breadcrumb mr-auto">
+							<ul class="breadcrumb mr-auto">
 								<li class="breadcrumb-item"><a href="<?php echo $cfg_memberurl;?>/">会员中心</a></li>
 								<li class="breadcrumb-item">发布<?php echo $cInfos['typename'];?></li></li>
-							</ol>
+							</ul>
 							<span class="navbar-text"><a href="javascript:location.href='content_list.php?channelid=<?php echo $channelid;?>'" class="btn btn-outline-success btn-sm">返回</a></span>
 						</nav>
 						<form name="addcontent" action="archives_add.php" method="post" enctype="multipart/form-data" onsubmit="return checkSubmit(`<?php echo $cInfos['titlename'];?>`);">

src/user/templets/archives_edit.htm

@@ -17,10 +17,10 @@
 				<div class="col-md-12">
 					<div class="pannel-main-container shadow-sm rounded">
 						<nav class="navbar navbar-expand-lg p-0">
-							<ol class="breadcrumb mr-auto">
+							<ul class="breadcrumb mr-auto">
 								<li class="breadcrumb-item"><a href="<?php echo $cfg_memberurl;?>/">会员中心</a></li>
 								<li class="breadcrumb-item">修改<?php echo $row['title']?></li></li>
-							</ol>
+							</ul>
 							<span class="navbar-text"><a href="javascript:location.href='content_list.php?channelid=<?php echo $channelid;?>'" class="btn btn-outline-success btn-sm">返回</a></span>
 						</nav>
 						<form name="addcontent" action="archives_edit.php?aid=<?php echo $aid;?>" method="post" enctype="multipart/form-data" onsubmit="return checkSubmit(`<?php echo $cInfos['titlename'];?>`);">

src/user/templets/archives_sg_add.htm

@@ -17,10 +17,10 @@
 				<div class="col-md-12">
 					<div class="pannel-main-container shadow-sm rounded">
 						<nav class="navbar navbar-expand-lg p-0">
-							<ol class="breadcrumb mr-auto">
+							<ul class="breadcrumb mr-auto">
 								<li class="breadcrumb-item"><a href="<?php echo $cfg_memberurl;?>/">会员中心</a></li>
 								<li class="breadcrumb-item">发布<?php echo $cInfos['typename'];?></li></li>
-							</ol>
+							</ul>
 							<span class="navbar-text"><a href="javascript:location.href='content_list.php?channelid=<?php echo $channelid;?>'" class="btn btn-outline-success btn-sm">返回</a></span>
 						</nav>
 						<form name="addcontent" action="archives_sg_add.php" method="post" enctype="multipart/form-data" onsubmit="return checkSubmit(`<?php echo $cInfos['titlename'];?>`);">

src/user/templets/archives_sg_edit.htm

@@ -17,10 +17,10 @@
 				<div class="col-md-12">
 					<div class="pannel-main-container shadow-sm rounded">
 						<nav class="navbar navbar-expand-lg p-0">
-							<ol class="breadcrumb mr-auto">
+							<ul class="breadcrumb mr-auto">
 								<li class="breadcrumb-item"><a href="<?php echo $cfg_memberurl;?>/">会员中心</a></li>
 								<li class="breadcrumb-item">修改<?php echo $row['title']?></li></li>
-							</ol>
+							</ul>
 							<span class="navbar-text"><a href="javascript:location.href='content_list.php?channelid=<?php echo $channelid;?>'" class="btn btn-outline-success btn-sm">返回</a></span>
 						</nav>
 						<form name="addcontent" action="archives_sg_edit.php?aid=<?php echo $aid;?>" method="post" enctype="multipart/form-data" onsubmit="return checkSubmit(`<?php echo $cInfos['titlename'];?>`);">

src/user/templets/article_add.htm

@@ -17,10 +17,10 @@
 				<div class="col-md-12">
 					<div class="pannel-main-container shadow-sm rounded">
 						<nav class="navbar navbar-expand-lg p-0">
-							<ol class="breadcrumb mr-auto">
+							<ul class="breadcrumb mr-auto">
 								<li class="breadcrumb-item"><a href="<?php echo $cfg_memberurl;?>/">会员中心</a></li>
 								<li class="breadcrumb-item">发布<?php echo $cInfos['typename'];?></li></li>
-							</ol>
+							</ul>
 							<span class="navbar-text"><a href="javascript:location.href='content_list.php?channelid=<?php echo $channelid;?>'" class="btn btn-outline-success btn-sm">返回</a></span>
 						</nav>
 						<form name="addcontent" action="article_add.php" method="post" enctype="multipart/form-data" onsubmit="return checkSubmit(`<?php echo $cInfos['titlename'];?>`);">

src/user/templets/article_edit.htm

@@ -17,10 +17,10 @@
 				<div class="col-md-12">
 					<div class="pannel-main-container shadow-sm rounded">
 						<nav class="navbar navbar-expand-lg p-0">
-							<ol class="breadcrumb mr-auto">
+							<ul class="breadcrumb mr-auto">
 								<li class="breadcrumb-item"><a href="<?php echo $cfg_memberurl;?>/">会员中心</a></li>
 								<li class="breadcrumb-item">修改<?php echo $row['title']?></li></li>
-							</ol>
+							</ul>
 							<span class="navbar-text"><a href="javascript:location.href='content_list.php?channelid=<?php echo $channelid;?>'" class="btn btn-outline-success btn-sm">返回</a></span>
 						</nav>
 						<form name="addcontent" action="article_edit.php" method="post" enctype="multipart/form-data" onsubmit="return checkSubmit(`<?php echo $cInfos['titlename'];?>`);">

src/user/templets/buy.htm

@@ -17,10 +17,10 @@
 				<div class="col-md-9">
 					<div class="pannel-main-container shadow-sm rounded">
 						<nav class="navbar navbar-expand-lg p-0">
-							<ol class="breadcrumb mr-auto">
+							<ul class="breadcrumb mr-auto">
 								<li class="breadcrumb-item"><a href="<?php echo $cfg_memberurl;?>/">会员中心</a></li>
 								<li class="breadcrumb-item">积分钱包</li></li>
-							</ol>
+							</ul>
 							<span class="navbar-text"><a href="javascript:history.back(-1);" class="btn btn-outline-success btn-sm">返回</a></span>
 						</nav>
 						<div class="alert alert-success"><?php echo $cfg_ml->GetSta();?></div>

src/user/templets/buy_action_payment.htm

@@ -17,11 +17,11 @@
 				<div class="col-md-9">
 					<div class="pannel-main-container shadow-sm rounded">
 						<nav class="navbar navbar-expand-lg p-0">
-							<ol class="breadcrumb mr-auto">
+							<ul class="breadcrumb mr-auto">
 								<li class="breadcrumb-item"><a href="<?php echo $cfg_memberurl;?>/">会员中心</a></li>
 								<li class="breadcrumb-item"><a href="<?php echo $cfg_memberurl;?>/buy.php">积分钱包</a></li>
 								<li class="breadcrumb-item">确认订单</li></li>
-							</ol>
+							</ul>
 							<span class="navbar-text"><a href="javascript:history.back(-1);" class="btn btn-outline-success btn-sm">返回</a></span>
 						</nav>
 						<div class="alert alert-success">您申请购买的产品如下，确认无误后请点击“购买并支付”按钮，进行网上支付，如果支付失败，请与管理员联系其它支付方式</div>

src/user/templets/soft_add.htm

@@ -17,10 +17,10 @@
 				<div class="col-md-12">
 					<div class="pannel-main-container shadow-sm rounded">
 						<nav class="navbar navbar-expand-lg p-0">
-							<ol class="breadcrumb mr-auto">
+							<ul class="breadcrumb mr-auto">
 								<li class="breadcrumb-item"><a href="<?php echo $cfg_memberurl;?>/">会员中心</a></li>
 								<li class="breadcrumb-item">发布<?php echo $cInfos['typename'];?></li></li>
-							</ol>
+							</ul>
 							<span class="navbar-text"><a href="javascript:history.back(-1);" class="btn btn-outline-success btn-sm">返回</a></span>
 						</nav>
 						<form name="addcontent" action="soft_add.php" method="post" enctype="multipart/form-data" onsubmit="return checkSubmit();">

src/user/templets/soft_edit.htm

@@ -17,10 +17,10 @@
 				<div class="col-md-12">
 					<div class="pannel-main-container shadow-sm rounded">
 						<nav class="navbar navbar-expand-lg p-0">
-							<ol class="breadcrumb mr-auto">
+							<ul class="breadcrumb mr-auto">
 								<li class="breadcrumb-item"><a href="<?php echo $cfg_memberurl;?>/">会员中心</a></li>
 								<li class="breadcrumb-item">修改<?php echo $row['title']?></li></li>
-							</ol>
+							</ul>
 							<span class="navbar-text"><a href="javascript:history.back(-1);" class="btn btn-outline-success btn-sm">返回</a></span>
 						</nav>
 						<form name="addcontent" action="soft_edit.php" method="post" enctype="multipart/form-data" onsubmit="return checkSubmit();">