细节调整

src/admin/ad_edit.php

@@ -22,19 +22,16 @@ if ($dopost == 'delete') {
     require_once(DEDEINC.'/libraries/oxwindow.class.php');
     $jscode = "<script src='{$cfg_phpurl}/ad_js.php?aid=$aid'></script>";
     $showhtml = "<xmp>\r\n\r\n$jscode\r\n\r\n</xmp>";
-    $showhtml .= "预览：<iframe name='testfrm' frameborder='0' src='ad_edit.php?aid={$aid}&dopost=testjs' id='testfrm' width='100%' height='360'></iframe>";
+    $showhtml .= "<iframe name='testfrm' frameborder='0' src='ad_edit.php?aid={$aid}&dopost=testjs' id='testfrm' width='100%' height='360'></iframe>";
     $row = $dsql->GetOne("SELECT tagname from `#@__myad` WHERE aid='$aid' ");
     $showtag = '{'."dede:myad name='{$row['tagname']}'/".'}';
-    $info = "广告标签会解析成标签中文档到页面，广告修改后需要重新生成，如果不希望重新生成所有页面，则直接js调用标签";
-    $wintitle = "广告管理-获取广告标签";
     $wecome_info = "<a href='ad_main.php'>广告管理</a> - 获取标签";
     $win = new OxWindow();
     $win->Init();
-    $winform = $win->GetWindow("hand", $info);
     $win->AddTitle("标签调用代码");
     $winform = $win->GetWindow("hand", $showtag);
     $win->myWinItem = '';
-    $win->AddTitle("以下为选定广告的js调用代码");
+    $win->AddTitle("js调用代码");
     $winform = $win->GetWindow("hand", $showhtml);
     $win->Display();
     exit();

src/admin/diy_main.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * 自定义表单列表管理
+ * 自定义表单管理
  *
  * @version        $id:diy_main.php 18:31 2010年7月12日 tianya $
  * @package        DedeBIZ.Administrator

src/admin/freelist_add.php

@@ -20,8 +20,12 @@ if (empty($dopost)) {
     $atts = " pagesize='$pagesize' col='$col' titlelen='$titlelen' orderby='$orderby' orderway='$order' ";
     $ntype = '';
     $edtime = time();
+    if (trim($title) == '') {
+        ShowMsg("请输入自由列表标题", "-1");
+        exit();
+    }
     if (empty($channel)) {
-        showmsg('栏目类型不能为空', '-1');
+        showmsg("请选择一个限定模型", "-1");
         exit();
     }
     if (is_array($types)) {

src/admin/freelist_edit.php

@@ -26,6 +26,14 @@ if (empty($dopost)) {
     $atts = " pagesize='$pagesize' col='$col' titlelen='$titlelen' orderby='$orderby' orderway='$order' \r\n";
     $ntype = '';
     $edtime = time();
+    if (trim($title) == '') {
+        ShowMsg("请输入自由列表标题", "-1");
+        exit();
+    }
+    if (empty($channel)) {
+        showmsg("请选择一个限定模型", "-1");
+        exit();
+    }
     if (is_array($types)) {
         foreach ($types as $v) $ntype .= $v.' ';
     }

src/admin/freelist_main.php

@@ -82,8 +82,8 @@ function GetTagList($dsql,$pageno,$pagesize,$orderby='aid')
         <td>{$row['click']}</td>
         <td>".MyDate("y-m-d",$row['edtime'])."</td>
         <td>
-            <a href='javascript:;' onclick='EditNote({$row['aid']})' class='btn btn-light btn-sm'><i class='fa fa-pencil-square'></i> 修改</a>
             <a href='javascript:;' onclick='CreateNote({$row['aid']})' class='btn btn-light btn-sm'><i class='fa fa-repeat'></i> 更新</a>
+            <a href='javascript:;' onclick='EditNote({$row['aid']})' class='btn btn-light btn-sm'><i class='fa fa-pencil-square'></i> 修改</a>
             <a href='javascript:;' onclick='DelNote({$row['aid']})' class='btn btn-danger btn-sm'><i class='fa fa-trash'></i> 删除</a>
         </td>
     </tr>";

src/admin/inc/inc_menu.php

@@ -38,6 +38,7 @@ if ($cuserLogin->getUserType() >= 10) {
     $adminMenu1 = (DEDEBIZ_SAFE_MODE? "" : "<m:top item='11_' name='模板管理' rank='temp_One,temp_Other,temp_MyTag,temp_test,temp_All' icon='fa fa-cube'>
     <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>")."
@@ -46,8 +47,6 @@ if ($cuserLogin->getUserType() >= 10) {
     <m:item name='文档单页管理' link='templets_one.php' rank='temp_One' target='main' />
     <m:item name='联动类别管理' link='stepselect_main.php' rank='c_Stepseclect' target='main' />
     <m:item name='自由列表管理' link='freelist_main.php' rank='c_List' target='main' />
-    <m:item name='自定义宏标记' link='mytag_main.php' rank='temp_MyTag' target='main' />
-    <m:item name='自定义文档属性' link='content_att.php' rank='sys_Att' target='main' />
     <m:item name='自定义表单管理' link='diy_main.php' rank='c_List' target='main' />
 </m:top>";
   $adminMenu2 = "<m:top item='10_' name='财务管理' rank='sys_Data' icon='fa fa-credit-card'>
@@ -83,6 +82,7 @@ $menusMain = "<m:top item='1_' name='常用功能' icon='fa fa-desktop'>
 </m:top>
 <m:top item='2_' name='文档管理' icon='fa fa-file-text'>
     $addset
+    <m:item name='自定义文档属性' link='content_att.php' rank='sys_Att' target='main' />
 </m:top>
 <m:top item='3_' name='附件管理' rank='sys_Upload,sys_MyUpload,plus_文件管理器' icon='fa fa-folder'>
     <m:item name='上传新文件' link='media_add.php' rank='' target='main' />
@@ -106,7 +106,7 @@ $adminMenu1
     <m:item name='更新文档' link='makehtml_archives.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新标签' link='makehtml_taglist.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新专题' link='makehtml_spec.php' rank='sys_MakeHtml' target='main' />
-    <m:item name='更新列表' link='makehtml_freelist.php' rank='sys_MakeHtml' target='main' />
+    <m:item name='更新自由列表' link='makehtml_freelist.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新缓存' link='sys_cache_up.php' rank='sys_ArcBatch' target='main' />
 </m:top>
 <m:top item='9_' name='会员管理' rank='member_List,member_Type' icon='fa fa-user-circle'>

src/admin/mytag_edit.php

@@ -33,13 +33,11 @@ if ($dopost == 'delete') {
     require_once(DEDEINC."/libraries/oxwindow.class.php");
     $jscode = "<script src='{$cfg_phpurl}/mytag_js.php?aid=$aid'></script>";
     $showhtml = "<xmp>\r\n\r\n$jscode\r\n\r\n</xmp>";
-    $showhtml .= "预览：<iframe name='testfrm' frameborder='0' id='testfrm' src='mytag_edit.php?aid={$aid}&dopost=testjs'></iframe>";
-    $wintitle = "宏标记定义-获取标签";
-    $wecome_info = "<a href='mytag_main.php'>宏标记定义</a> - 获取标记";
+    $showhtml .= "<iframe name='testfrm' frameborder='0' id='testfrm' src='mytag_edit.php?aid={$aid}&dopost=testjs'></iframe>";
+    $wecome_info = "<a href='mytag_main.php'>自定义宏标记</a> - 获取标签";
     $win = new OxWindow();
     $win->Init();
-    $win->AddTitle('以下为选定宏标记的js调用代码：');
-    $winform = $win->GetWindow('hand', $showhtml);
+    $winform = $win->GetWindow("hand", $showhtml);
     $win->Display();
     exit();
 } else if ($dopost == "testjs") {

src/admin/templets/ad_add.htm

@@ -172,7 +172,7 @@
 		<script>
 			function checkSubmit() {
 				if (document.form1.tagname.value == "") {
-					alert("广告标识不能为空");
+					alert("请输入广告位标识");
 					document.form1.tagname.focus();
 					return false;
 				}

src/admin/templets/ad_edit.htm

@@ -80,6 +80,13 @@
 			</table>
 		</form>
 		<script>
+			function checkSubmit() {
+				if (document.form1.tagname.value == "") {
+					alert("请输入广告位标识");
+					document.form1.tagname.focus();
+					return false;
+				}
+			}
 			$(document).ready(function () {
 				$('.datepicker').daterangepicker({
 					"singleDatePicker": true,

src/admin/templets/ad_main.htm

@@ -21,7 +21,7 @@
 							<?php echo $option;?>
 						</select>
 						<button type="submit" class="btn btn-success btn-sm">搜索</button>
-						<a href="ad_add.php" class="btn btn-success btn-sm">添加一个新广告</a>
+						<a href="ad_add.php" class="btn btn-success btn-sm">添加广告</a>
 						<a href="adtype_main.php" class="btn btn-success btn-sm">广告分类管理</a>
 					</td>
 				</tr>
@@ -49,9 +49,9 @@
 				<td>{dede:field.timeset function='TimeSetValue(@me)'/}</td>
 				<td>{dede:field.endtime function='GetDateMk(@me)'/}</td>
 				<td>
-					<a href="ad_edit.php?aid={dede:field.aid/}&dopost=gettag" class="btn btn-success btn-sm">代码</a>
-					<a href="ad_edit.php?aid={dede:field.aid/}&dopost=edit" class="btn btn-success btn-sm">修改</a>
-					<a href="ad_edit.php?aid={dede:field.aid/}&dopost=delete" class="btn btn-danger btn-sm">删除</a>
+					<a href="ad_edit.php?aid={dede:field.aid/}&dopost=edit" class="btn btn-light btn-sm"><i class="fa fa-pencil-square"></i> 修改</a>
+					<a href="ad_edit.php?aid={dede:field.aid/}&dopost=gettag" class="btn btn-light btn-sm"><i class="fa fa-code"></i> 代码</a>
+					<a href="ad_edit.php?aid={dede:field.aid/}&dopost=delete" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i> 删除</a>
 				</td>
 			</tr>
 			{/dede:datalist}

src/admin/templets/article_test_same.htm

@@ -29,6 +29,11 @@
 							?>
 						</select>
 					</td>
+				</tr>
+				<tr>
+					<td>每排列出记录：</td>
+					<td><input type="text" name="pagesize" id="pagesize" value="100" class="admin-input-sm"> 条</td>
+				</tr>
 				<tr>
 					<td>删除选项：</td>
 					<td>
@@ -36,10 +41,6 @@
 						<label><input type="radio" name="deltype" value="delold"> 保留最新的一条</label>
 					</td>
 				</tr>
-				<tr>
-					<td>每排列出记录：</td>
-					<td><input type="text" name="pagesize" id="pagesize" value="100" class="admin-input-sm"> 条</td>
-				</tr>
 				<tr>
 					<td colspan="2" bgcolor="#e9ecef" align="center"><button type="submit" name="Submit" class="btn btn-success btn-sm">分析标题重复文档</button></td>
 				</tr>

src/admin/templets/content_batch_up.htm

@@ -40,27 +40,24 @@
 					</td>
 				</tr>
 				<tr>
-					<td>文档发布时间：</td>
-					<td class="p-0">
-						<table class="table table-borderless">
-							<tr>
-								<td colspan="2">
-									<label><input type="checkbox" name="seltime" id="seltime" value="1" onclick="ShowHideTime()"> 启用时间筛选（仅移动或删除文档可用该选项）</label>
-								</td>
-							</tr>
-							<tr id="seltimeField" style="display:none">
-								<td width="260">开始：<?php $nowtime = GetDateTimeMk(time()-(24*3600*30));?> <input type="text" name="starttime" id="starttime" class="admin-input-sm" value="<?php echo $nowtime;?>"></td>
-								<td width="260">结束：<?php $nowtime = GetDateTimeMk(time());?> <input type="text" name="endtime" id="endtime" class="admin-input-sm" value="<?php echo $nowtime;?>"></td>
-							</tr>
-						</table>
+					<td>会员的登录id：</td>
+					<td>
+						<input name="userid" type="text" id="userid" class="admin-input-xs">
+						<span>（网址uid=后面跟的id）</span>
 					</td>
 				</tr>
 				<tr>
-					<td>会员的登录id：</td>
-					<td><input name="userid" type="text" id="userid" class="admin-input-xs">（网址uid=后面跟的id）</td>
+					<td>文档发布时间：</td>
+					<td>
+						<label><input type="checkbox" name="seltime" id="seltime" value="1" onclick="ShowHideTime()"> 启用时间筛选（仅移动或删除文档可用该选项）</label>
+						<div id="seltimeField" style="display:none">
+							<label>开始：<?php $nowtime = GetDateTimeMk(time()-(24*3600*30));?> <input type="text" name="starttime" id="starttime" class="admin-input-sm" value="<?php echo $nowtime;?>"></label>
+							<label>结束：<?php $nowtime = GetDateTimeMk(time());?> <input type="text" name="endtime" id="endtime" class="admin-input-sm" value="<?php echo $nowtime;?>"></label>
+						</div>
+					</td>
 				</tr>
 				<tr>
-					<td>条件操作：</td>
+					<td>文档操作：</td>
 					<td>
 						<label><input type="radio" name="action" value="check" onclick="ShowHideMove()" checked="1"> 审核文档</label>
 						<label><input type="radio" name="action" value="makehtml" onclick="ShowHideMove()"> 更新网页</label>

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 align="center" class="table maintable my-3">
 			<tr>
-				<td bgcolor="#f5f5f5" colspan="4">自定义表单列表管理</td>
+				<td bgcolor="#f5f5f5" colspan="4">自定义表单管理</td>
 			</tr>
 			<tr bgcolor="#e9ecef" align="center">
 				<td width="6%">表单</td>

src/admin/templets/freelist_add.htm

@@ -33,6 +33,26 @@
 						<div class="alert alert-info mb-0">自由列表标记说明：自由列表标记（freelist）的功能基本等同于arclist标记，区别是freelist标记支持分页，这让生成按自定义排序规则的文档列表（如按标题拼音部首排序等）等轻松的实现统一化管理，并且自由列是独立编译的，不与其它模板混在一起，这样不会影响系统生成网页或浏览速度</div>
 					</td>
 				</tr>
+				<tr>
+					<td colspan="2">
+						<table class="w-100 table-borderless">
+							<tr>
+								<td width="25%" height="126">
+									<label><img src="../static/web/img/g_t2.jpg"><input type="radio" name="liststyle" onclick="ChangeListStyle()" value="1"></label>
+								</td>
+								<td width="25%">
+									<label><img src="../static/web/img/g_t1.jpg"><input type="radio" name="liststyle" onclick="ChangeListStyle()" value="2"></label>
+								</td>
+								<td width="25%">
+									<label><img src="../static/web/img/g_t3.jpg"><input type="radio" name="liststyle" onclick="ChangeListStyle()" value="3"></label>
+								</td>
+								<td>
+									<label><img src="../static/web/img/g_t4.jpg"><input type="radio" name="liststyle" onclick="ChangeListStyle()" value="4" checked></label>
+								</td>
+							</tr>
+						</table>
+					</td>
+				</tr>
 				<tr>
 					<td width="260">自由列表标题：</td>
 					<td><input type="text" name="title" id="title" class="admin-input-lg"></td>
@@ -73,27 +93,7 @@
 				</tr>
 				<tr>
 					<td colspan="2">
-						<table class="table table-borderless">
-							<tr>
-								<td width="25%" height="126">
-									<label><img src="../static/web/img/g_t2.jpg"><input type="radio" name="liststyle" onclick="ChangeListStyle()" value="1"></label>
-								</td>
-								<td width="25%">
-									<label><img src="../static/web/img/g_t1.jpg"><input type="radio" name="liststyle" onclick="ChangeListStyle()" value="2"></label>
-								</td>
-								<td width="25%">
-									<label><img src="../static/web/img/g_t3.jpg"><input type="radio" name="liststyle" onclick="ChangeListStyle()" value="3"></label>
-								</td>
-								<td>
-									<label><img src="../static/web/img/g_t4.jpg"><input type="radio" name="liststyle" onclick="ChangeListStyle()" value="4" checked></label>
-								</td>
-							</tr>
-						</table>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="2">
-						<span>限定栏目：</span>
+						<span>调用栏目：</span>
 						<?php
 						echo "<select name='typeid' class='admin-input-sm'>";
 						echo "<option value='0'>不限栏目</option>";
@@ -108,14 +108,10 @@
 							}
 							echo "</select>";
 						?>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="2">
-						<span>限定栏目：</span>
+						<span>限定模型：</span>
 						<?php
 						echo "<select name='channel' class='admin-input-sm'>";
-						echo "<option value='0' selected>不限</option>";
+						echo "<option value='0' selected>不限模型</option>";
 						$dsql->SetQuery("Select ID,typename From `#@__channeltype` where ID>0");
 							$dsql->Execute();
 							while($row = $dsql->GetObject())
@@ -124,11 +120,6 @@
 							}
 							echo "</select>";
 						?>
-						<span>（如果限定了栏目文档模型，则允许使用附加表指定的列表字段作为底层变量）</span>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="2">
 						<span>附加属性：</span>
 						<?php
 						echo "<select name='att' class='admin-input-sm'>";

src/admin/templets/freelist_edit.htm

@@ -71,7 +71,7 @@
 				</tr>
 				<tr>
 					<td colspan="2">
-						<span>限定栏目：</span>
+						<span>调用栏目：</span>
 						<?php
 						$typeid = $ctag->GetAtt('typeid');
 						echo "<select name='typeid' class='admin-input-sm'>";
@@ -89,14 +89,10 @@
 						}
 						echo "</select>";
 						?>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="2">
-						<span>限定栏目：</span>
+						<span>限定模型：</span>
 						<?php
 						$channel  = $ctag->GetAtt('channel');
-						echo "<select name='channel' class='admin-input-sm'><option value='0'>不限</option>";
+						echo "<select name='channel' class='admin-input-sm'><option value='0'>不限模型</option>";
 						$dsql->SetQuery("Select id,typename From `#@__channeltype` where id>0");
 						$dsql->Execute();
 						while($nrow = $dsql->GetObject())
@@ -105,11 +101,7 @@
 							else echo "<option value='{$nrow->id}'>{$nrow->typename}</option>";
 						}
 						echo "</select>";
-						?>（如果限定了栏目文档模型，则允许使用附加表指定的列表字段作为底层变量）
-					</td>
-				</tr>
-				<tr>
-					<td colspan="2">
+						?>
 						<span>附加属性：</span>
 						<?php
 						$att  = $ctag->GetAtt('att');

src/admin/templets/freelist_main.htm

@@ -111,7 +111,7 @@
 				<td bgcolor="#f5f5f5">
 					<input type="text" name="keyword" id="keyword" value="<?php echo $keyword?>" class="admin-input-lg mr-3">
 					<button type="submit" name="Submit2" class="btn btn-success btn-sm">搜索</button>
-					<button type="button" name="bt1" onclick="location='freelist_add.php';" class="btn btn-success btn-sm">添加列表</button>
+					<button type="button" name="bt1" onclick="location='freelist_add.php';" class="btn btn-success btn-sm">添加自由列表</button>
 					<button type="button" name="bt2" onclick="location='makehtml_freelist.php';" class="btn btn-success btn-sm">更新所有列表</button>
 				</td>
 			</tr>

src/admin/templets/mytag_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">
@@ -20,11 +20,11 @@
 			<input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">
 			<table align="center" class="table maintable my-3">
 				<tr>
-					<td bgcolor="#f5f5f5" colspan="2"><a href="mytag_main.php">自定义宏标记</a> - 添加新标记</td>
+					<td bgcolor="#f5f5f5" colspan="2"><a href="mytag_main.php">自定义宏标记</a> - 添加自定义宏标记</td>
 				</tr>
 				<tr>
 					<td colspan="2">
-						<div class="alert alert-info mb-0">自定义标记的调用方法：{dede:mytag name='标记名称' ismake='是否含板块代码（yes或no）' typeid='栏目id'/} 1、name标记名称，该项是必须的属性，以下2、3是可选属性；2、ismake默认是no表示设定的纯网页代码，yes表示含板块标记的代码；3、typeid表示所属栏目的id，默认为0，表示所有栏目通用的显示文档，在列表和文档模板中，typeid默认是这个列表或文档本身的栏目id</div>
+						<div class="alert alert-info mb-0">自定义标记调用方法：{dede:mytag name='标记名称' ismake='是否含板块代码yes或no' typeid='栏目id'/} 1、name标记名称，该项是必须的属性；2、ismake默认是no表示设定的纯网页代码，yes表示含板块标记的代码；3、typeid表示所属栏目的id，默认为0，表示所有栏目通用的显示文档，在列表和文档模板中，typeid默认是这个列表或文档本身的栏目id</div>
 					</td>
 				</tr>
 				<tr>

src/admin/templets/mytag_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">
@@ -15,7 +15,7 @@
 			<input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">
 			<table align="center" class="table maintable my-3">
 				<tr>
-					<td bgcolor="#f5f5f5" colspan="2"><a href="mytag_main.php">自定义宏标记</a> - 修改标记</td>
+					<td bgcolor="#f5f5f5" colspan="2"><a href="mytag_main.php">自定义宏标记</a> - 修改自定义宏标记</td>
 				</tr>
 				<tr>
 					<td width="260">所属栏目：</td>

src/admin/templets/mytag_main.htm

@@ -30,7 +30,7 @@
 				<td>{dede:field.timeset function='TimeSetValue(@me)'/}</td>
 				<td>{dede:field.endtime function='GetDateMk(@me)'/}</td>
 				<td>
-					<a href="mytag_edit.php?aid={dede:field.aid/}&dopost=edit" class="btn btn-light btn-sm"><i class="fa fa-pencil-square"></i>修改</a>
+					<a href="mytag_edit.php?aid={dede:field.aid/}&dopost=edit" class="btn btn-light btn-sm"><i class="fa fa-pencil-square"></i> 修改</a>
 					<a href="mytag_edit.php?aid={dede:field.aid/}&dopost=getjs" class="btn btn-light btn-sm"><i class="fa fa-code"></i> js调用</a>
 					<a href="mytag_edit.php?aid={dede:field.aid/}&dopost=delete" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i> 删除</a>
 				</td>
@@ -38,7 +38,7 @@
 			{/dede:datalist}
 			<tr>
 				<td colspan="6">
-					<a href="mytag_add.php" class="btn btn-success btn-sm">添加新标记</a>
+					<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>
 				</td>
 			</tr>

src/admin/templets/mytag_tag_guide.htm

@@ -29,7 +29,7 @@
 				</tr>
 				<tr>
 					<td class="p-0">
-						<table class="table table-borderless">
+						<table class="w-100 table-borderless">
 							<tr>
 								<td width="25%">
 									<label><img src="../static/web/img/g_t2.jpg"><input type="radio" name="liststyle" onclick="ChangeListStyle()" value="1" checked="1"></label>
@@ -58,14 +58,10 @@
 						echo $typeOptions;
 						echo "</select>";
 						?>
-					</td>
-				</tr>
-				<tr>
-					<td>
-						<span>限定栏目：</span>
+						<span>限定模型：</span>
 						<?php
 						echo "<select name='channel' class='admin-input-sm'>";
-						echo "<option value='0' selected>不限栏目</option>";
+						echo "<option value='0' selected>不限模型</option>";
 						$tl->dsql->SetQuery("Select id,typename From `#@__channeltype` where id>0");
 						$tl->dsql->Execute();
 						while($row = $tl->dsql->GetObject())
@@ -98,16 +94,18 @@
 				</tr>
 				<tr>
 					<td>
+						<label>关键词：<input type="text" name="keyword" id="keyword" class="admin-input-sm"></label>
+						<span>（英文逗号分开）</span>
 						<span>高级筛选：</span>
 						<label><input type="checkbox" name="types[]" id="type[]" value="image"> 带缩略图</label>
 						<label><input type="checkbox" name="types[]" id="type[]" value="commend"> 推荐</label>
 						<label><input type="checkbox" name="types[]" id="type[]" value="spec"> 专题</label>
-						<label>关键词：<input type="text" name="keyword" id="keyword" class="admin-input-sm"></label>
-						<span>（英文逗号分开）</span>
 					</td>
 				</tr>
 				<tr>
 					<td>
+						<label>文档发布时间：<input type="text" name="subday" id="subday" value="0" class="admin-input-xs"> 天以内</label>
+						<span>（0表示不限）</span>
 						<span>排列顺序：</span>
 						<select name="orderby" id="orderby" class="admin-input-sm">
 							<option value="sortrank">置顶权限值</option>
@@ -123,17 +121,11 @@
 						<label><input type="radio" name="order" value="asc"> 由低到高</label>
 					</td>
 				</tr>
-				<tr>
-					<td>
-						<label>文档发布时间：<input type="text" name="subday" id="subday" value="0" class="admin-input-xs"> 天以内</label>
-						<span>（0表示不限）</span>
-					</td>
-				</tr>
 				<tr>
 					<td>
 						<span>提取特定文档：</span>
-						<button type="button" class="btn btn-success btn-sm" id="selarc" onclick="SelectArcList('form1.arcid');">选择节点文档</button>
 						<textarea name="arcid" id="arcid" class="admin-textarea-sm"></textarea>
+						<button type="button" class="btn btn-success btn-sm" id="selarc" onclick="SelectArcList('form1.arcid');">选择节点文档</button>
 					</td>
 				</tr>
 				<tr>

src/admin/templets/templets_one.htm

@@ -28,9 +28,9 @@
 						echo "</select>";
 						?>
 						<button type="submit" name="button1" id="button1" class="btn btn-success btn-sm">搜索</button>
-						<a href="templets_one_add.php" class="btn btn-success btn-sm">添加一个页面</a>
-						<a href="javascript:;" onclick="document.form1.submit();" class="btn btn-success btn-sm">更新选中页面</a>
-						<a href="templets_one_edit.php?dopost=mkall" class="btn btn-success btn-sm">更新所有页面</a>
+						<a href="templets_one_add.php" class="btn btn-success btn-sm">添加一个单页</a>
+						<a href="javascript:;" onclick="document.form1.submit();" class="btn btn-success btn-sm">更新选中单页</a>
+						<a href="templets_one_edit.php?dopost=mkall" class="btn btn-success btn-sm">更新所有单页</a>
 					</td>
 				</tr>
 			</table>

src/admin/templets/templets_one_add.htm

@@ -41,7 +41,7 @@
 						<input type="text" name="likeid" id="likeid" value="" class="admin-input-lg">
 						<?php
 						echo "<select name='likeidsel' id='likeidsel' class='admin-input-sm'>";
-						$dsql->Execute('s',"Select likeid From `#@__sgpage` group  by likeid ");
+						$dsql->Execute('s',"SELECT likeid FROM `#@__sgpage` GROUP BY likeid "); 
 						echo "<option value='default'>default</option>";
 						while($arr = $dsql->GetArray('s'))
 						{

src/admin/templets/vote_getcode.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">
@@ -14,7 +14,7 @@
 			<input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">
 			<table align="center" class="table maintable my-3">
 				<tr>
-					<td bgcolor="#f5f5f5" colspan="2"><a href="vote_main.php">投票管理</a> - 获取投票代码</td>
+					<td bgcolor="#f5f5f5" colspan="2"><a href="vote_main.php">投票管理</a> - 获取投票标签</td>
 				</tr>
 				<tr>
 					<td><textarea name="partcode" id="partcode" class="admin-textarea-xl">{dede:vote id='<?php echo $aid?>'}{/dede:vote}</textarea></td>

src/admin/templets/vote_main.htm

@@ -32,9 +32,9 @@
 				<td>{dede:field.totalcount/}</td>
 				<td><?php if ($fields['isenable'] == 1){echo "<span class='text-primary'>未启用</span>";} else {echo "<span class='text-dark'>启用</span>";} ?></td>
 				<td>
-					<a href="vote_getcode.php?aid={dede:field.aid/}" class="btn btn-success btn-sm">代码</a>
-					<a href="vote_edit.php?aid={dede:field.aid/}&dopost=edit" class="btn btn-success btn-sm">修改</a>
-					<a href="vote_edit.php?aid={dede:field.aid/}&dopost=delete" class="btn btn-danger btn-sm">删除</a>
+					<a href="vote_edit.php?aid={dede:field.aid/}&dopost=edit" class="btn btn-light btn-sm"><i class="fa fa-pencil-square"></i> 修改</a>
+					<a href="vote_getcode.php?aid={dede:field.aid/}" class="btn btn-light btn-sm"><i class="fa fa-code"></i> 代码</a>
+					<a href="vote_edit.php?aid={dede:field.aid/}&dopost=delete" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i> 删除</a>
 				</td>
 			</tr>
 			{/dede:datalist}

src/admin/templets_one_add.php

@@ -38,7 +38,7 @@ if ($dopost == "save") {
     include_once(DEDEINC."/archive/sgpage.class.php");
     $sg = new sgpage($id);
     $sg->SaveToHtml();
-    ShowMsg("成功添加一个页面", "templets_one.php");
+    ShowMsg("成功添加一个单页", "templets_one.php");
     exit();
 }
 $row = $dsql->GetOne("SELECT MAX(aid) AS aid FROM `#@__sgpage`");

src/admin/templets_one_edit.php

@@ -39,7 +39,7 @@ if ($dopost == "saveedit") {
     }
     $sg = new sgpage($aid);
     $sg->SaveToHtml();
-    ShowMsg("成功修改一个页面", "templets_one.php");
+    ShowMsg("成功修改一个单页", "templets_one.php");
     exit();
 } else if ($dopost == "delete") {
     $row = $dsql->GetOne("SELECT filename FROM `#@__sgpage` WHERE aid='$aid'");
@@ -48,7 +48,7 @@ if ($dopost == "saveedit") {
     if (is_file($filename)) {
         unlink($filename);
     }
-    ShowMsg("成功删除一个页面", "templets_one.php");
+    ShowMsg("成功删除一个单页", "templets_one.php");
     exit();
 } else if ($dopost == "make") {
     include_once(DEDEINC."/archive/sgpage.class.php");
@@ -56,7 +56,7 @@ if ($dopost == "saveedit") {
     $fileurl = $cfg_cmsurl.'/'.preg_replace("#\/{1,}#", "/", $row['filename']);
     $sg = new sgpage($aid);
     $sg->SaveToHtml();
-    ShowMsg("成功更新一个页面", $fileurl);
+    ShowMsg("成功更新一个单页", $fileurl);
     exit();
 } else if ($dopost == "mkall") {
     include_once(DEDEINC."/archive/sgpage.class.php");