细节优化

src/admin/inc/grouplist.txt

@@ -67,7 +67,7 @@
 >sys_Edit>修改系统变量
 >sys_Log>管理日志
 >sys_plus>插件管理
->sys_Data>数据备份还原>unsafe
+>sys_Data>数据备份>unsafe
 >sys_Att>自定义文档属性
 >sys_ArcBatch>文档批量维护
 >sys_ArcTj>文档信息统计

src/admin/inc/inc_action_info.php

@@ -246,11 +246,6 @@ $actionSearch[7] = DEDEBIZ_SAFE_MODE? null : array(
             'linkurl' => 'mytag_main.php'
         ),
         3  =>  array(
-            'title' => '智能标记向导',
-            'purview' => 'temp_Other',
-            'linkurl' => 'mytag_tag_guide.php'
-        ),
-        4  =>  array(
             'title' => '全局标记测试',
             'purview' => 'temp_Test',
             'linkurl' => 'tag_test.php'

src/admin/inc/inc_menu.php

@@ -39,7 +39,6 @@ if ($cuserLogin->getUserType() >= 10) {
     <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='mytag_tag_guide.php' rank='temp_Other' 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'>
@@ -63,7 +62,7 @@ if ($cuserLogin->getUserType() >= 10) {
     <m:item name='图片水印设置' link='sys_info_mark.php' rank='sys_Edit' target='main' />
     <m:item name='自定义文档属性' link='content_att.php' rank='sys_Att' target='main' />
     <m:item name='软件下载设置' link='soft_config.php' rank='sys_SoftConfig' target='main' />
-    ".(DEDEBIZ_SAFE_MODE ? "" : "<m:item name='数据备份还原' link='sys_data.php' rank='sys_Data' target='main' />")."
+    ".(DEDEBIZ_SAFE_MODE ? "" : "<m:item name='数据备份' link='sys_data.php' rank='sys_Data' target='main' />")."
     ".(DEDEBIZ_SAFE_MODE ? "" : "<m:item name='SQL命令工具' link='sys_sql_query.php' rank='sys_Data' target='main' />")."
     <m:item name='文件扫描工具' link='sys_safetest.php' rank='sys_verify' target='main' />
     <m:item name='系统修复工具' link='sys_repair.php' rank='sys_verify' target='main' />

src/admin/index_testenv.php

@@ -154,7 +154,7 @@ if ($rs < 0) {
 <?php
 if (count($safeMsg) > 0) {
 ?>
-<div class="alert alert-warning shadow-sm">
+<div class="alert alert-warning">
 	<ul>
 		<?php
 		$i = 1;

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/templets/ad_add.htm

@@ -18,7 +18,7 @@
 			<li class="breadcrumb-item"><a href="ad_main.php">广告管理</a></li>
 			<li class="breadcrumb-item active">添加广告</li>
 		</ol>
-		<div class="alert alert-info">标签{dede:myad name='广告标记'/}调用</div>
+		<div class="alert alert-info shadow-sm">标签{dede:myad name='广告标记'/}调用</div>
 		<div class="card shadow-sm">
 			<div class="card-header">添加广告</div>
 			<div class="card-body">

src/admin/templets/article_description_main.htm

@@ -16,17 +16,17 @@
 		<div class="card shadow-sm">
 			<div class="card-header">自动摘要分页</div>
 			<div class="card-body">
-				<form action="article_description_main.php" name="form1" target="stafrm" method="post">
+				<form name="form1" action="article_description_main.php" method="post" target="stafrm">
 					<div class="table-responsive">
 						<table class="table table-borderless">
 							<tbody>
 								<tr>
 									<td width="260">文档模型id</td>
-									<td><input type="text" name="channel" id="channel" value="1" class="admin-input-xs"></td>
+									<td><input type="text" name="channel" id="channel" value="1" class="admin-input-sm"></td>
 								</tr>
 								<tr>
 									<td>摘要字节</td>
-									<td><input type="text" name="dsize" id="dsize" class="admin-input-xs" value="<?php echo $cfg_auot_description?>">（最大255字节，自动分页<?php echo $cfg_arcautosp_size?>K）</td>
+									<td><input type="text" name="dsize" id="dsize" class="admin-input-sm" value="<?php echo $cfg_auot_description?>">（最大255字节，自动分页<?php echo $cfg_arcautosp_size?>K）</td>
 								</tr>
 								<tr>
 									<td>数据表</td>
@@ -38,11 +38,11 @@
 								</tr>
 								<tr>
 									<td>最小值</td>
-									<td><input type="text" name="msize" id="msize2" value="512" class="admin-input-xs">（字节）</td>
+									<td><input type="text" name="msize" id="msize2" value="512" class="admin-input-sm">（字节）</td>
 								</tr>
 								<tr>
 									<td>每页更新</td>
-									<td><input type="text" name="pagesize" id="pagesize" value="100" class="admin-input-xs">（网页）</td>
+									<td><input type="text" name="pagesize" id="pagesize" value="100" class="admin-input-sm">（网页）</td>
 								</tr>
 								<tr>
 									<td>文档id</td>

src/admin/templets/article_test_same.htm

@@ -16,7 +16,7 @@
 		<div class="card shadow-sm">
 			<div class="card-header">文档重复检测</div>
 			<div class="card-body">
-				<form action="article_test_same.php" name="form1" target="stafrm">
+				<form name="form1" action="article_test_same.php" target="stafrm">
 					<input type="hidden" name="dopost" value="analyse">
 					<div class="table-responsive">
 						<table class="table table-borderless">

src/admin/templets/cards_make.htm

@@ -17,7 +17,7 @@
 		<div class="card shadow-sm">
 			<div class="card-header">生成积分</div>
 			<div class="card-body">
-				<form action="cards_make.php" name="form1" target="stafrm">
+				<form name="form1" action="cards_make.php" target="stafrm">
 					<input type="hidden" name="dopost" value="make">
 					<div class="table-responsive">
 						<table class="table table-borderless">

src/admin/templets/content_att.htm

@@ -13,7 +13,7 @@
 			<li class="breadcrumb-item"><a href="index_body.php">后台面板</a></li>
 			<li class="breadcrumb-item active">文档自定义属性</li>
 		</ol>
-		<div class="alert alert-info">文档发布时选择属性后arclist标签加上flag='自定义属性'，例如：{dede:arclist flag='h,c'}h,c表示组合属性头条和推荐</div>
+		<div class="alert alert-info shadow-sm">文档发布时选择属性后arclist标签加上flag='自定义属性'，例如：{dede:arclist flag='h,c'}h,c表示组合属性头条和推荐</div>
 		<div class="card shadow-sm">
 			<div class="card-header">文档自定义属性</div>
 			<div class="card-body">

src/admin/templets/content_batch_up.htm

@@ -20,7 +20,7 @@
 		<div class="card shadow-sm">
 			<div class="card-header">文档批量维护</div>
 			<div class="card-body">
-				<form name="form1" action="content_batchup_action.php" target="stafrm" method="post">
+				<form name="form1" action="content_batchup_action.php" method="post" target="stafrm">
 					<input type="hidden" name="dopost" value="go">
 					<div class="table-responsive">
 						<table class="table table-borderless">
@@ -40,7 +40,7 @@
 								</tr>
 								<tr>
 									<td>会员登录id</td>
-									<td><input name="userid" type="text" id="userid" class="admin-input-xs">（网址uid=后面跟的id）</td>
+									<td><input name="userid" type="text" id="userid" class="admin-input-sm">（网址uid=后面跟的id）</td>
 								</tr>
 								<tr>
 									<td>文档id</td>

src/admin/templets/file_manage_main.htm

@@ -14,7 +14,7 @@
 			<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="table-responsive">
 					<table class="table table-borderless">

src/admin/templets/freelist_add.htm

@@ -37,29 +37,25 @@
 						<table class="table table-borderless">
 							<tbody>
 								<tr>
-									<td colspan="2">
-										<label><img src="/static/web/img/g_t2.jpg"><input type="radio" name="liststyle" onclick="ChangeListStyle();" value="1"></label>
-										<label><img src="/static/web/img/g_t1.jpg"><input type="radio" name="liststyle" onclick="ChangeListStyle();" value="2" checked></label>
-										<label><img src="/static/web/img/g_t3.jpg"><input type="radio" name="liststyle" onclick="ChangeListStyle();" value="3"></label>
-										<label><img src="/static/web/img/g_t4.jpg"><input type="radio" name="liststyle" onclick="ChangeListStyle();" value="4"></label>
+									<td colspan="4">
+										<label><input type="radio" name="liststyle" onclick="ChangeListStyle();" value="1" checked><img src="/static/web/img/g_t2.jpg"></label>
+										<label><input type="radio" name="liststyle" onclick="ChangeListStyle();" value="2"><img src="/static/web/img/g_t1.jpg"></label>
+										<label><input type="radio" name="liststyle" onclick="ChangeListStyle();" value="3"><img src="/static/web/img/g_t3.jpg"></label>
+										<label><input type="radio" name="liststyle" onclick="ChangeListStyle();" value="4"><img src="/static/web/img/g_t4.jpg"></label>
 									</td>
 								</tr>
 								<tr>
-									<td width="260">自由列表标题</td>
-									<td><input type="text" name="title" id="title" class="admin-input-lg" required></td>
-								</tr>
-								<tr>
-									<td>列表存放目录</td>
+									<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>
 								</tr>
 								<tr>
-									<td>目录默认页名称</td>
+									<td>默认页名称</td>
 									<td>
 										<input type="text" name="defaultpage" id="defaultpage" value="index.html" class="admin-input-lg">
-										<label><input type="checkbox" name="nodefault" id="nodefault" value="1"> 不使用目录默认首页</label>
+										<label><input type="checkbox" name="nodefault" id="nodefault" value="1"> 不使用默认首页</label>
 									</td>
-								</tr>
-								<tr>
 									<td>命名规则</td>
 									<td><input type="text" name="namerule" id="namerule" value="{listdir}/index_{listid}_{page}.html" class="admin-input-lg">（{listdir}列表存放目录）</td>
 								</tr>
@@ -69,22 +65,18 @@
 										<input type="text" name="templet" id="templet" value="{style}/list_free.htm" class="admin-input-lg">
 										<button type="button" name="set4" onclick="SelectTemplets('form1.templet');" class="btn btn-success btn-sm">选择</button>
 									</td>
-								</tr>
-								<tr>
 									<td>最大列出页数</td>
 									<td><input type="text" name="maxpage" id="maxpage" value="100" class="admin-input-sm"></td>
 								</tr>
 								<tr>
-									<td>关键词</td>
+									<td>列表关键词</td>
 									<td><input type="text" name="keywords" id="keywords" class="admin-input-lg"></td>
-								</tr>
-								<tr>
 									<td>列表描述</td>
 									<td><textarea name="description" id="description" class="admin-textarea-sm"></textarea></td>
 								</tr>
 								<tr>
-									<td colspan="2">
-										<span>调用栏目：</span>
+									<td>调用栏目</td>
+									<td>
 										<?php
 										echo "<select name='typeid' class='admin-input-sm'>";
 										echo "<option value='0'>不限栏目</option>";
@@ -99,7 +91,9 @@
 											}
 											echo "</select>";
 										?>
-										<span>限定模型：</span>
+									</td>
+									<td>限定模型</td>
+									<td>
 										<?php
 										echo "<select name='channel' class='admin-input-sm'>";
 										echo "<option value='0' selected>不限模型</option>";
@@ -111,7 +105,11 @@
 											}
 											echo "</select>";
 										?>
-										<span>附加属性：</span>
+									</td>
+								</tr>
+								<tr>
+									<td>附加属性</td>
+									<td>
 										<?php
 										echo "<select name='att' class='admin-input-sm'>";
 										echo "<option value='0' selected>不限</option>";
@@ -123,27 +121,31 @@
 										}
 										echo "</select>";
 										?>
-										<label>发布天数：<input type="text" name="subday" id="subday2" value="0" class="admin-input-sm">（0表示不限）</label>
 									</td>
+									<td>发布天数</td>
+									<td><input type="text" name="subday" id="subday2" value="0" class="admin-input-sm">（0表示不限）</td>
 								</tr>
 								<tr>
-									<td colspan="2">
-										<label>每页记录数：<input type="text" name="pagesize" id="pagesize" value="30" class="admin-input-sm"></label>
-										<label>显示列数： <input type="text" name="col" id="col3" value="1" class="admin-input-sm"></label>
-										<label>标题长度：<input type="text" name="titlelen" id="titlelen" value="60" class="admin-input-sm">（1字节=0.5个中文字）</label>
-									</td>
+									<td>每页记录数</td>
+									<td><input type="text" name="pagesize" id="pagesize" value="30" class="admin-input-sm"></td>
+									<td>显示列数</td>
+									<td><input type="text" name="col" id="col3" value="1" class="admin-input-sm"></td>
 								</tr>
 								<tr>
-									<td colspan="2">
-										<label>高级筛选：<input type="checkbox" name="types[]" id="type1" value="image"> 带缩略图</label>
+									<td>标题长度</td>
+									<td><input type="text" name="titlelen" id="titlelen" value="60" class="admin-input-sm">（1字节=0.5个中文字）</td>
+									<td>高级筛选</td>
+									<td>
+										<label><input type="checkbox" name="types[]" id="type1" value="image"> 带缩略图</label>
 										<label><input type="checkbox" name="types[]" id="type2" value="commend"> 推荐</label>
 										<label><input type="checkbox" name="types[]" id="type3" value="spec"> 专题</label>
-										<label>关键词：<input type="text" name="keywordarc" id="keywordarc">（英文逗号隔开）</label>
 									</td>
 								</tr>
 								<tr>
-									<td colspan="2">
-										<span>排列顺序：</span>
+									<td>关键词</td>
+									<td><input type="text" name="keywordarc" id="keywordarc">（英文逗号隔开）</td>
+									<td>排列顺序</td>
+									<td>
 										<select name="orderby" id="orderby" class="admin-input-sm">
 											<option value="sortrank">置顶权限值</option>
 											<option value="pubdate" selected>发布时间</option>
@@ -158,15 +160,12 @@
 									</td>
 								</tr>
 								<tr>
-									<td colspan="2">
+									<td colspan="4">
 										<textarea name="innertext" id="myinnertext" class="admin-textarea-xl"></textarea>
-										<script>
-											document.form1.innertext.value = document.getElementById("list2").innerHTML.toLowerCase();
-										</script>
 									</td>
 								</tr>
 								<tr>
-									<td colspan="2" align="center">
+									<td colspan="4" align="center">
 										<button type="submit" class="btn btn-success btn-sm">保存</button>
 										<button type="reset" class="btn btn-outline-success btn-sm">重置</button>
 									</td>
@@ -199,6 +198,7 @@
 				var pos = GetWinPos(800,600);
 				window.open("./dialog/select_templets.php?&activepath=<?php echo urlencode($cfg_templets_dir)?>&f=" + fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + pos.left + ", top=" + pos.top);
 			}
+			document.form1.innertext.value = document.getElementById("list1").innerHTML.toLowerCase();
 			var editor = CodeMirror.fromTextArea(document.getElementById("myinnertext"), {
 				lineNumbers: true,
 				lineWrapping: true,

src/admin/templets/freelist_edit.htm

@@ -33,21 +33,17 @@
 						<table class="table table-borderless">
 							<tbody>
 								<tr>
-									<td width="260">自由列表标题</td>
-									<td><input type="text" name="title" id="title" value="<?php echo $row['title']?>" class="admin-input-lg"></td>
-								</tr>
-								<tr>
-									<td>列表存放目录</td>
+									<td width="160">自由列表标题</td>
+									<td width="550"><input type="text" name="title" id="title" value="<?php echo $row['title']?>" class="admin-input-lg"></td>
+									<td width="160">列表生成目录</td>
 									<td><input type="text" name="listdir" id="listdir" value="<?php echo $row['listdir']?>" class="admin-input-lg"></td>
 								</tr>
 								<tr>
-									<td>目录默认页名称</td>
+									<td>默认页名称</td>
 									<td>
 										<input type="text" name="defaultpage" id="defaultpage" value="<?php echo $row['defaultpage']?>" class="admin-input-lg">
-										<label><input type="checkbox" name="nodefault" id="nodefault" value="1" <?php if ($row['nodefault']==1) echo 'checked';?>> 不使用目录默认首页</label>
+										<label><input type="checkbox" name="nodefault" id="nodefault" value="1" <?php if ($row['nodefault']==1) echo 'checked';?>> 不使用默认首页</label>
 									</td>
-								</tr>
-								<tr>
 									<td>命名规则</td>
 									<td><input type="text" name="namerule" id="namerule" value="<?php echo $row['namerule']?>" class="admin-input-lg">（{listdir}列表存放目录）</td>
 								</tr>
@@ -57,22 +53,18 @@
 										<input type="text" name="templet" id="templet" value="<?php echo $row['templet']?>" class="admin-input-lg">
 										<button type="button" name="set4" onclick="SelectTemplets('form1.templet');" class="btn btn-success btn-sm">选择</button>
 									</td>
-								</tr>
-								<tr>
 									<td>最大列出页数</td>
 									<td><input type="text" name="maxpage" id="maxpage" value="<?php echo $row['maxpage'];?>" class="admin-input-sm"></td>
 								</tr>
 								<tr>
-									<td>关键词</td>
+									<td>列表关键词</td>
 									<td><input type="text" name="keywords" id="keywords" value="<?php echo $row['keywords'];?>" class="admin-input-lg"></td>
-								</tr>
-								<tr>
 									<td>列表描述</td>
 									<td><textarea name="description" id="description" class="admin-textarea-sm"><?php echo $row['description']?></textarea></td>
 								</tr>
 								<tr>
-									<td colspan="2">
-										<span>调用栏目：</span>
+									<td>调用栏目</td>
+									<td>
 										<?php
 										$typeid = $ctag->GetAtt('typeid');
 										echo "<select name='typeid' class='admin-input-sm'>";
@@ -90,7 +82,9 @@
 										}
 										echo "</select>";
 										?>
-										<span>限定模型：</span>
+									</td>
+									<td>限定模型</td>
+									<td>
 										<?php
 										$channel  = $ctag->GetAtt('channel');
 										echo "<select name='channel' class='admin-input-sm'><option value='0'>不限模型</option>";
@@ -103,7 +97,11 @@
 										}
 										echo "</select>";
 										?>
-										<span>附加属性：</span>
+									</td>
+								</tr>
+								<tr>
+									<td>附加属性</td>
+									<td>
 										<?php
 										$att  = $ctag->GetAtt('att');
 										echo "<select name='att' class='admin-input-sm'>";
@@ -121,32 +119,40 @@
 										}
 										echo "</select>";
 										?>
-										<label>发布天数：<input type="text" name="subday" id="subday" class="admin-input-sm" value="<?php echo $ctag->GetAtt('subday')?>">（0表示不限）</label>
 									</td>
+									<td>发布天数</td>
+									<td><input type="text" name="subday" id="subday" class="admin-input-sm" value="<?php echo $ctag->GetAtt('subday')?>">（0表示不限）</td>
+									
+
 								</tr>
 								<tr>
-									<td colspan="2">
-										<label>每页记录数：<input type="text" name="pagesize" id="pagesize" value="<?php echo $ctag->GetAtt('pagesize')?>" class="admin-input-sm"></label>
-										<label>显示列数：<input type="text" name="col" id="col" value="<?php  $col = $ctag->GetAtt('col'); $v = ( empty($col) ? '1' :  $col ); echo $v;?>" class="admin-input-sm"></label>
-										<label>标题长度：<input type="text" name="titlelen" id="titlelen" value="<?php echo $ctag->GetAtt('titlelen')?>" class="admin-input-sm">（1字节=0.5个中文字）</label>
-									</td>
+									<td>每页记录数</td>
+									<td><input type="text" name="pagesize" id="pagesize" value="<?php echo $ctag->GetAtt('pagesize')?>" class="admin-input-sm"></td>
+									<td>显示列数</td>
+									<td><input type="text" name="col" id="col" value="<?php  $col = $ctag->GetAtt('col'); $v = ( empty($col) ? '1' :  $col ); echo $v;?>" class="admin-input-sm"></td>
+
 								</tr>
 								<tr>
-									<td colspan="2">
+									<td>标题长度</td>
+									<td><input type="text" name="titlelen" id="titlelen" value="<?php echo $ctag->GetAtt('titlelen')?>" class="admin-input-sm">（1字节=0.5个中文字）</td>
+									<td>
 										<?php
 										$setype = $ctag->GetAtt('type');
 										if ($setype=='') $setype = 'X';
 										?>
-										<span>高级筛选：</span>
+										高级筛选
+									</td>
+									<td>
 										<label><input type="checkbox" name="types[]" id="type1" value="image" <?php if (preg_match("#image#i",$setype)) echo 'checked';?>> 带缩略图</label>
 										<label><input type="checkbox" name="types[]" id="type2" value="commend" <?php if (preg_match("#commend#i", $setype)) echo 'checked';?>> 推荐</label>
 										<label><input type="checkbox" name="types[]" id="type3" value="spec" <?php if (preg_match("#spec#i", $setype)) echo 'checked';?>> 专题</label>
-										<label>关键词：<input type="text" name="keywordarc" id="keywordarc" value="<?php echo $ctag->GetAtt('keyword')?>">（英文逗号隔开）</label>
 									</td>
 								</tr>
 								<tr>
-									<td colspan="2">
-										<span>排列顺序：</span>
+									<td>关键词</td>
+									<td><input type="text" name="keywordarc" id="keywordarc" value="<?php echo $ctag->GetAtt('keyword')?>">（英文逗号隔开）</td>
+									<td>排列顺序</td>
+									<td>
 										<?php
 										$orderby = $ctag->GetAtt('orderby');
 										$sorta = "sortrank,置顶权限值;pubdate,发布时间;senddate,录入时间;click,点击量;id,文档id,lastpost,最后评论时间;postnum,评论总数;rand,随机获取";
@@ -173,10 +179,10 @@
 									</td>
 								</tr>
 								<tr>
-									<td colspan="2"><textarea name="innertext" id="myinnertext" class="admin-textarea-xl"><?php echo $ctag->GetInnerText()?></textarea></td>
+									<td colspan="4"><textarea name="innertext" id="myinnertext" class="admin-textarea-xl"><?php echo $ctag->GetInnerText()?></textarea></td>
 								</tr>
 								<tr>
-									<td colspan="2" align="center">
+									<td colspan="4" align="center">
 										<button type="submit" class="btn btn-success btn-sm">保存</button>
 										<button type="reset" class="btn btn-outline-success btn-sm">重置</button>
 									</td>

src/admin/templets/member_edit.htm

@@ -59,9 +59,9 @@
 								<tr>
 									<td>钱包积分</td>
 									<td>
-										<label>金币：<input type="text" name="money" id="money" class="admin-input-xs" value="<?php echo $row['money'];?>"></label>
-										<label>积分：<input type="text" name="scores" id="scores" class="admin-input-xs" value="<?php echo $row['scores'];?>"></label>
-										<label>余额：<input type="text" name="user_money" id="user_money" class="admin-input-xs" value="<?php echo $row['user_money'];?>"></label>
+										<label>金币：<input type="text" name="money" id="money" class="admin-input-sm" value="<?php echo $row['money'];?>"></label>
+										<label>积分：<input type="text" name="scores" id="scores" class="admin-input-sm" value="<?php echo $row['scores'];?>"></label>
+										<label>余额：<input type="text" name="user_money" id="user_money" class="admin-input-sm" value="<?php echo $row['user_money'];?>"></label>
 									</td>
 								</tr>
 								<tr>
@@ -110,7 +110,7 @@
 								</tr>
 								<tr>
 									<td>投稿限制</td>
-									<td><input type="text" name="send_max" class="admin-input-xs" value="<?php echo $row['send_max']?>">（0不能投稿、-1无限次）</td>
+									<td><input type="text" name="send_max" class="admin-input-sm" value="<?php echo $row['send_max']?>">（0不能投稿、-1无限次）</td>
 								</tr>
 								<tr>
 									<td>投稿剩余次数</td>

src/admin/templets/mytag_main.htm

@@ -17,11 +17,11 @@
 		<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>
+				<a href="mytag_tag_guide.php" class="btn btn-success btn-sm">添加自定义宏标记</a>
 			</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">

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,31 +20,31 @@
 		<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 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>
 				<div id="list3" style="display:none"><p>[field:imglink/]</p><p>[field:textlink/]</p></div>
 				<div id="list4" style="display:none"><p>[field:imglink/] - <a href="[field:filename/]">[field:title/]</a></p><p>[field:info/]</p></div>
-				<form action="mytag_tag_guide_ok.php" method="post" target="stafrm" name="form1">
+				<form name="form1" action="mytag_tag_guide_ok.php" method="post" target="stafrm">
 					<input type="hidden" name="dopost" value="gettag">
 					<div class="table-responsive">
 						<table class="table table-borderless">
 							<tbody>
 								<tr>
-									<td>
-										<label><img src="/static/web/img/g_t2.jpg"><input type="radio" name="liststyle" onclick="ChangeListStyle();" value="1" checked></label>
-										<label><img src="/static/web/img/g_t1.jpg"><input type="radio" name="liststyle" onclick="ChangeListStyle();" value="2"></label>
-										<label><img src="/static/web/img/g_t3.jpg"><input type="radio" name="liststyle" onclick="ChangeListStyle();" value="3"></label>
-										<label><img src="/static/web/img/g_t4.jpg"><input type="radio" name="liststyle" onclick="ChangeListStyle();" value="4"></label>
+									<td colspan="4">
+										<label><input type="radio" name="liststyle" onclick="ChangeListStyle();" value="1" checked><img src="/static/web/img/g_t2.jpg"></label>
+										<label><input type="radio" name="liststyle" onclick="ChangeListStyle();" value="2"><img src="/static/web/img/g_t1.jpg"></label>
+										<label><input type="radio" name="liststyle" onclick="ChangeListStyle();" value="3"><img src="/static/web/img/g_t3.jpg"></label>
+										<label><input type="radio" name="liststyle" onclick="ChangeListStyle();" value="4"><img src="/static/web/img/g_t4.jpg"></label>
 									</td>
 								</tr>
 								<tr>
-									<td>
-										<span>调用栏目：</span>
+									<td width="160">调用栏目</td>
+									<td width="550">
 										<?php
 										$tl = new TypeLink(0);
 										$typeOptions = $tl->GetOptionArray(0,$admin_catalogs,0,1);
@@ -53,7 +53,9 @@
 										echo $typeOptions;
 										echo "</select>";
 										?>
-										<span>限定模型：</span>
+									</td>
+									<td width="160">限定模型</td>
+									<td>
 										<?php
 										echo "<select name='channel' class='admin-input-sm'>";
 										echo "<option value='0' selected>不限模型</option>";
@@ -65,7 +67,11 @@
 										}
 										echo "</select>";
 										?>
-										<span>附加属性：</span>
+									</td>
+								</tr>
+								<tr>
+									<td>附加属性</td>
+									<td>
 										<?php
 										echo "<select name='att' class='admin-input-sm'>";
 										echo "<option value='0' selected>不限</option>";
@@ -78,30 +84,30 @@
 										echo "</select>";
 										?>
 									</td>
+									<td>调用记录条数</td>
+									<td><input type="text" name="row" id="row" value="10" class="admin-input-sm"></td>
 								</tr>
 								<tr>
-									<td>
-										<label>调用记录条数：<input type="text" name="row" id="row" value="10" class="admin-input-xs"></label>
-										<label>显示列数：<input type="text" name="col" id="col" value="1" class="admin-input-xs"></label>
-										<label>标题长度：<input type="text" name="titlelen" id="titlelen" value="24" class="admin-input-xs"></label>
-										<span>（1字节=0.5个中文字）</span>
-									</td>
+									<td>显示列数</td>
+									<td><input type="text" name="col" id="col" value="1" class="admin-input-sm"></td>
+									<td>标题长度</td>
+									<td><input type="text" name="titlelen" id="titlelen" value="24" class="admin-input-sm">（1字节=0.5个中文字）</td>
 								</tr>
 								<tr>
+									<td>关键词</td>
+									<td><input type="text" name="keyword" id="keyword" class="admin-input-sm">（英文逗号隔开）</td>
+									<td>高级筛选</td>
 									<td>
-										<label>关键词：<input type="text" name="keyword" id="keyword" class="admin-input-sm"></label>
-										<span>（英文逗号隔开）</span>
-										<span>高级筛选：</span>
 										<label><input type="checkbox" name="types[]" value="image"> 带缩略图</label>
 										<label><input type="checkbox" name="types[]" value="commend"> 推荐</label>
 										<label><input type="checkbox" name="types[]" value="spec"> 专题</label>
 									</td>
 								</tr>
 								<tr>
+									<td>文档发布时间</td>
+									<td><input type="text" name="subday" value="0" id="subday" class="admin-input-sm">（天以内，0表示不限）</td>
+									<td>排列顺序</td>
 									<td>
-										<label>文档发布时间：<input type="text" name="subday" value="0" id="subday" class="admin-input-xs"> 天以内</label>
-										<span>（0表示不限）</span>
-										<span>排列顺序：</span>
 										<select name="orderby" id="orderby" class="admin-input-sm">
 											<option value="sortrank">置顶权限值</option>
 											<option value="pubdate" selected>发布时间</option>
@@ -117,23 +123,23 @@
 									</td>
 								</tr>
 								<tr>
-									<td>
-										<span>提取特定文档：</span>
+									<td>提取特定文档</td>
+									<td colspan="3">
 										<textarea name="arcid" class="admin-textarea-sm"></textarea>
 										<button type="button" id="selarc" class="btn btn-success btn-sm" onclick="SelectArcList('form1.arcid');">选择节点文档</button>
 									</td>
 								</tr>
 								<tr>
-									<td><textarea name="innertext" id="myinnertext" class="admin-textarea-xl">[field:textlink/]（[field:pubdate function=MyDate('m-d',@me)/]）<br></textarea></td>
+									<td colspan="4"><textarea name="innertext" id="myinnertext" class="admin-textarea-xl">[field:textlink/]（[field:pubdate function=MyDate('m-d',@me)/]）<br></textarea></td>
 								</tr>
 								<tr>
-									<td align="center">
+									<td colspan="4" align="center">
 										<a href="javascript:DoSubmit('gettag');" class="btn btn-success btn-sm">模板调用标记</a>
 										<a href="javascript:DoSubmit('savetag');" class="btn btn-success btn-sm">模板调用标签</a>
 									</td>
 								</tr>
 								<tr>
-									<td>
+									<td colspan="4">
 										<div class="admin-win-iframe"><iframe name="stafrm" frameborder="0" width="100%" height="100%" id="stafrm"></iframe></div>
 									</td>
 								</tr>

src/admin/templets/mytag_tag_guide_ok.htm

@@ -3,20 +3,16 @@
 	<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">
 	</head>
 	<body>
-		<div class="card shadow-sm">
-			<div class="card-body">
-				<form name="f1" action="tag_test_action.php" method="post" target="_blank">
-					<input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">
-					<textarea name="partcode" id="partcode" class="admin-textarea-xl mb-3"><?php echo $fulltag?></textarea>
-					<button type="submit" class="btn btn-success btn-sm">预览</button>
-				</form>
-			</div>
-		</div>
+		<form name="f1" action="tag_test_action.php" method="post" target="_blank">
+			<input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">
+			<textarea name="partcode" id="partcode" class="admin-textarea-xl mb-3"><?php echo $fulltag?></textarea>
+			<button type="submit" class="btn btn-success btn-sm">预览</button>
+		</form>
 	</body>
 </html>

src/admin/templets/sys_data.htm

@@ -138,9 +138,9 @@
 										<?php if (@function_exists('gzcompress') && false) {?>
 										<label><input type="checkbox" name="iszip" id="iszip" value="1" checked> 完成后压缩成ZIP</label>
 										<?php }?>
-										<a href="javascript:SelAll();" class="btn btn-light btn-sm">全选</a>
-										<a href="javascript:ReSel();" class="btn btn-light btn-sm">反选</a>
-										<a href="javascript:NoneSel();" class="btn btn-light btn-sm">取消</a>
+										<a href="javascript:SelAll();" class="btn btn-success btn-sm">全选</a>
+										<a href="javascript:ReSel();" class="btn btn-success btn-sm">反选</a>
+										<a href="javascript:NoneSel();" class="btn btn-success btn-sm">取消</a>
 										<button type="submit" class="btn btn-success btn-sm">备份</button>
 									</td>
 								</tr>

src/admin/templets/sys_data_revert.htm

@@ -49,9 +49,9 @@
 									<td colspan="4">
 										<label><input name="structfile" type="checkbox" id="structfile" value="<?php echo $structfile?>" checked> 还原数据表结构信息（<?php echo $structfile?>）</label>
 										<label><input name="delfile" type="checkbox" id="delfile" value="1"> 还原后删除备份文件</label>
-										<a href="javascript:SelAll();" class="btn btn-light btn-sm">全选</a>
-										<a href="javascript:ReSel();" class="btn btn-light btn-sm">反选</a>
-										<a href="javascript:NoneSel();" class="btn btn-light btn-sm">取消</a>
+										<a href="javascript:SelAll();" class="btn btn-success btn-sm">全选</a>
+										<a href="javascript:ReSel();" class="btn btn-success btn-sm">反选</a>
+										<a href="javascript:NoneSel();" class="btn btn-success btn-sm">取消</a>
 										<button type="submit"class="btn btn-success btn-sm">还原</button>
 									</td>
 								</tr>

src/admin/templets/sys_sql_query.htm

@@ -22,7 +22,7 @@
 				<div class="table-responsive">
 					<table class="table table-borderless">
 						<tbody>
-							<form action="sys_sql_query.php" method="post" name="infoform" target="stafrm">
+							<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>
@@ -33,17 +33,17 @@
 												$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>";
-												}
+											}
+											$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>
@@ -56,7 +56,7 @@
 									</td>
 								</tr>
 							</form>
-							<form action="sys_sql_query.php" method="post" name="form1" target="stafrm">
+							<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'];?>">
 								<tr>

src/admin/templets/tag_test.htm

@@ -22,7 +22,7 @@
 		<div class="card shadow-sm mb-3">
 			<div class="card-header">全局标记测试</div>
 			<div class="card-body">
-				<form name="form1" action="tag_test_action.php" target="stafrm" method="post">
+				<form name="form1" action="tag_test_action.php" method="post" target="stafrm">
 					<input type="hidden" name="dopost" value="make">
 					<input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">
 					<div class="table-responsive">

src/admin/templets/vote_getcode.htm

@@ -17,7 +17,7 @@
 		<div class="card shadow-sm">
 			<div class="card-header">获取投票标签</div>
 			<div class="card-body">
-				<form name="form1" action="tag_test_action.php" target="stafrm" method="post">
+				<form name="form1" action="tag_test_action.php" method="post" target="stafrm">
 					<input type="hidden" name="showsource" value="no">
 					<input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">
 					<div class="table-responsive">