统一标签格式

src/admin/js/album.js

@@ -95,7 +95,7 @@ function seePicNewAlb(f, imgdid, frname, hpos, acname) {
 		newobj.style.top = hpos;
 		newobj.style.left = 100;
 		document.body.appendChild(newobj);
-		newobj.innerHTML = '<img src="../../static/web/img/loadinglit.gif" alit="" />上传中...';
+		newobj.innerHTML = '<img src="../../static/web/img/loadinglit.gif"> 正在上传';
 	}
 	newobj.style.display = 'block';
 	//提交后还原form的action等参数

src/admin/js/base.js

@@ -1,139 +1,139 @@
-	$(function(){
-		//文本框Style
-		$(".txt").mouseover(function(){
-			$(this).addClass("txt_o");
+$(function(){
+	//文本框Style
+	$(".txt").mouseover(function(){
+		$(this).addClass("txt_o");
+	}).mouseout(function(){
+		$(this).removeClass("txt_o");
+	}).focus(function(){
+		$(this).addClass("txt_s");
+	}).blur(function(){
+		$(this).removeClass("txt_s");
+	});
+	//表格折叠
+	$(".tform").find("tbody tr th[_show]").each(function(i){
+		//加入折叠提示
+		if ($(this).attr("_show")=="no"){
+			$(this).append(" <button type=\"button\" class=\"tbody_up\"></button>");
+		} else {
+			$(this).append(" <button type=\"button\" class=\"tbody_down\"></button>");
+		}
+		//折叠动作
+		$(this).click(function(){
+			if ($(this).find("button[class^='tbody_']").attr("class")=="tbody_up"){
+				$(this).find("button[class^='tbody_']").attr("class","tbody_down");
+				$(this).parent("tr").parent("tbody").find("tr").not($(this).parent("tr")).hide();
+			} else if ($(this).find("button[class^='tbody_']").attr("class")=="tbody_down"){
+				$(this).find("button[class^='tbody_']").attr("class","tbody_up");
+				$(this).parent("tr").parent("tbody").find("tr").not($(this).parent("tr")).show();
+			}
+		}).mouseover(function(){
+			$(this).addClass("mouseon");
 		}).mouseout(function(){
-			$(this).removeClass("txt_o");
-		}).focus(function(){
-			$(this).addClass("txt_s");
-		}).blur(function(){
-			$(this).removeClass("txt_s");
-		});
-		//表格折叠
-		$(".tform").find("tbody tr th[_show]").each(function(i){
-			//加入折叠提示
-			if ($(this).attr("_show")=="no"){
-				$(this).append(" <button type=\"button\" class=\"tbody_up\"></button>");
+			$(this).removeClass("mouseon");
+		}).click();			
+	});
+	//列表行高亮
+	$("table[_dlist*='light']").children("tbody").children("tr").mouseover(function(){
+		if ($(this).attr("_nolight")!="yes")$(this).addClass("t_on");
+	}).mouseout(function(){
+		$(this).removeClass("t_on");
+	});
+	//列表行整行选择
+	$("table[_dlist*='check']").each(function(){
+		//处理行点击
+		$(this).find("tbody tr").click(function(){
+			checkbox = $(this).find("td input[type='checkbox']");
+			tr = $(this);
+			if (checkbox.attr("checked")===false){
+				checkbox.attr("checked","checked");
+				tr.addClass("t_sl");
 			} else {
-				$(this).append(" <button type=\"button\" class=\"tbody_down\"></button>");
+				checkbox.removeAttr("checked");
+				tr.removeClass("t_sl");		
 			}
-			//折叠动作
-			$(this).click(function(){
-				if ($(this).find("button[class^='tbody_']").attr("class")=="tbody_up"){
-					$(this).find("button[class^='tbody_']").attr("class","tbody_down");
-					$(this).parent("tr").parent("tbody").find("tr").not($(this).parent("tr")).hide();
-				} else if ($(this).find("button[class^='tbody_']").attr("class")=="tbody_down"){
-					$(this).find("button[class^='tbody_']").attr("class","tbody_up");
-					$(this).parent("tr").parent("tbody").find("tr").not($(this).parent("tr")).show();
-				}
-			}).mouseover(function(){
-				$(this).addClass("mouseon");
-			}).mouseout(function(){
-				$(this).removeClass("mouseon");
-			}).click();			
-		});
-		//列表行高亮
-		$("table[_dlist*='light']").children("tbody").children("tr").mouseover(function(){
-			if ($(this).attr("_nolight")!="yes")$(this).addClass("t_on");
-		}).mouseout(function(){
-			$(this).removeClass("t_on");
 		});
-		//列表行整行选择
-		$("table[_dlist*='check']").each(function(){
-			//处理行点击
-			$(this).find("tbody tr").click(function(){
-				checkbox = $(this).find("td input[type='checkbox']");
-				tr = $(this);
-				if (checkbox.attr("checked")===false){
-					checkbox.attr("checked","checked");
-					tr.addClass("t_sl");
-				} else {
-					checkbox.removeAttr("checked");
-					tr.removeClass("t_sl");		
-				}
-			});
-			//处理checkbox点击
-			$(this).find("td input[type='checkbox']").click(function(){
-				tr = $(this).parent("td").parent("tr");
-				if ($(this).attr("checked")===false){
-					$(this).attr("checked","checked");
-					tr.removeClass("t_sl");
-				} else {
-					$(this).removeAttr("checked");
-					tr.addClass("t_sl");
-				}
-			});
-			//排除链接及按钮点击
-			$(this).find("tbody tr td a,tbody tr td button,tbody tr td table").click(function(){
-				tr = $(this).parent("td").parent("tr");
-				checkbox = tr.find("td input[type='checkbox']");
-				if (checkbox.attr("checked")===false){
-					checkbox.attr("checked","checked");
-					tr.removeClass("t_sl");
-				} else {
-					checkbox.removeAttr("checked");
-					tr.addClass("t_sl");
-				}
-			});
-		});
-		//高亮初始化
-		setChecklight();
-		//全选按钮
-		$("button[_click='allSelect']").click(function(){
-			ckbox = $(this).parent("td").parent("tr").parent("tbody").find("td input[type='checkbox']");
-			ckbox.attr("checked","checked");
-			setChecklight();
-		});
-		//反选按钮
-		$("button[_click='unSelect']").click(function(){
-			ckbox = $(this).parent("td").parent("tr").parent("tbody").find("td input[type='checkbox']");
-			ckbox.each(function(){
-				$(this).attr("checked") === false ? $(this).attr("checked","checked") : $(this).removeAttr("checked");
-			});
-			setChecklight();
-		});
-		//自定义提交
-		$("button[_submit]").click(function(){
-			url = $(this).attr("_submit");
-			if (/\[new\].*/.test(url)){
-				url = url.replace(/\[new\]/,"");
+		//处理checkbox点击
+		$(this).find("td input[type='checkbox']").click(function(){
+			tr = $(this).parent("td").parent("tr");
+			if ($(this).attr("checked")===false){
+				$(this).attr("checked","checked");
+				tr.removeClass("t_sl");
 			} else {
-				url = $(this).parents("form").attr("action")+url;
+				$(this).removeAttr("checked");
+				tr.addClass("t_sl");
 			}
-			$(this).parents("form").attr("action",url).submit();
 		});
-	});
-	//高亮初始化
-	function setChecklight(){
-		$(".tlist[_dlist*='check']").find("tbody tr td input[type='checkbox']").each(function(i){
+		//排除链接及按钮点击
+		$(this).find("tbody tr td a,tbody tr td button,tbody tr td table").click(function(){
 			tr = $(this).parent("td").parent("tr");
-			if ($(this).attr("checked")){
-				tr.addClass("t_sl");
-			} else {
+			checkbox = tr.find("td input[type='checkbox']");
+			if (checkbox.attr("checked")===false){
+				checkbox.attr("checked","checked");
 				tr.removeClass("t_sl");
+			} else {
+				checkbox.removeAttr("checked");
+				tr.addClass("t_sl");
 			}
 		});
-	}
-	//栏目跳转
-	function AC(mid){
-		f = $(window.parent.document);
-		mlink = f.find("a[id='"+mid+"']");
-		if (mlink.size()>0){
-			box = mlink.parents("div[id^='menu_']");
-			boxid = box.attr("id").substring(5,128);
-			if ($("body").attr("class")!="showmenu")$("#togglemenu").click();
-			if (mlink.attr("_url")){
-				$("#menu").find("div[id^=menu]").hide();
-				box.show();
-				mlink.addClass("thisclass").blur().parents("#menu").find("ul li a").not(mlink).removeClass("thisclass");
-				if ($("#mod_"+boxid).attr("class")==""){
-					$("#nav").find("a").removeClass("thisclass");
-					$("#nav").find("a[id='mod_"+boxid+"']").addClass("thisclass").blur();
-				}
-				window.location.href = mlink.attr("_url");
-			} else if (mlink.attr("_open") && mlink.attr("_open")!=undefined){
-				window.open(mlink.attr("_open"));
+	});
+	//高亮初始化
+	setChecklight();
+	//全选按钮
+	$("button[_click='allSelect']").click(function(){
+		ckbox = $(this).parent("td").parent("tr").parent("tbody").find("td input[type='checkbox']");
+		ckbox.attr("checked","checked");
+		setChecklight();
+	});
+	//反选按钮
+	$("button[_click='unSelect']").click(function(){
+		ckbox = $(this).parent("td").parent("tr").parent("tbody").find("td input[type='checkbox']");
+		ckbox.each(function(){
+			$(this).attr("checked") === false ? $(this).attr("checked","checked") : $(this).removeAttr("checked");
+		});
+		setChecklight();
+	});
+	//自定义提交
+	$("button[_submit]").click(function(){
+		url = $(this).attr("_submit");
+		if (/\[new\].*/.test(url)){
+			url = url.replace(/\[new\]/,"");
+		} else {
+			url = $(this).parents("form").attr("action")+url;
+		}
+		$(this).parents("form").attr("action",url).submit();
+	});
+});
+//高亮初始化
+function setChecklight(){
+	$(".tlist[_dlist*='check']").find("tbody tr td input[type='checkbox']").each(function(i){
+		tr = $(this).parent("td").parent("tr");
+		if ($(this).attr("checked")){
+			tr.addClass("t_sl");
+		} else {
+			tr.removeClass("t_sl");
+		}
+	});
+}
+//栏目跳转
+function AC(mid){
+	f = $(window.parent.document);
+	mlink = f.find("a[id='"+mid+"']");
+	if (mlink.size()>0){
+		box = mlink.parents("div[id^='menu_']");
+		boxid = box.attr("id").substring(5,128);
+		if ($("body").attr("class")!="showmenu")$("#togglemenu").click();
+		if (mlink.attr("_url")){
+			$("#menu").find("div[id^=menu]").hide();
+			box.show();
+			mlink.addClass("thisclass").blur().parents("#menu").find("ul li a").not(mlink).removeClass("thisclass");
+			if ($("#mod_"+boxid).attr("class")==""){
+				$("#nav").find("a").removeClass("thisclass");
+				$("#nav").find("a[id='mod_"+boxid+"']").addClass("thisclass").blur();
 			}
+			window.location.href = mlink.attr("_url");
+		} else if (mlink.attr("_open") && mlink.attr("_open")!=undefined){
+			window.open(mlink.attr("_open"));
 		}
-	
-	}
+	}
+
+}

src/admin/js/dialog.js

@@ -18,20 +18,20 @@ function AlertMsg(title, id) {
 	var msgw, msgh, msgbg, msgcolor, titlecolor, titlebg, content;
 	//弹出窗口设置
 	msgw = 600;//窗口宽度 
-	msgbg = "#FFF";//内容背景
-	msgcolor = "#333";//内容颜色
+	msgbg = "#fff";//内容背景
+	msgcolor = "#545b62";//内容颜色
 	titlecolor = "#254015";//标题颜色
 	titlebg = "#f8f8f8";
-	//遮罩背景设置  	
-	content = "<div id=show_news>对不起，载入失败</div>";
+	//遮罩背景设置
+	content = "<div id=show_news>载入失败</div>";
 	var sWidth, sHeight;
 	sWidth = screen.availWidth;
 	if (screen.availHeight > document.body.scrollHeight) {
 		sHeight = screen.availHeight;//少于一屏
 	} else {
-		sHeight = document.body.scrollHeight;//多于一屏 
+		sHeight = document.body.scrollHeight;//多于一屏
 	}
-	//创建遮罩背景 
+	//创建遮罩背景
 	var maskObj = document.createElement("div");
 	maskObj.setAttribute('id', 'maskdiv');
 	maskObj.style.position = "absolute";

src/admin/js/handlers.js

@@ -14,7 +14,7 @@ function addImage(src, pid) {
 	albImg++;
 	if (pid != 0) {
 		albImg = 'ok' + pid;
-		delstr = '<a class="btn btn-success btn-sm" href="javascript:delAlbPic(' + pid + ')">删除</a>';
+		delstr = '<a href="javascript:delAlbPic(' + pid + ')" class="btn btn-success btn-sm">删除</a>';
 	} else {
 		albImg = 'err' + albImg;
 	}

src/admin/templets/ad_main.htm

@@ -44,16 +44,16 @@
     </tr>
     {dede:datalist empty='<tr><td colspan="7"><center>暂无内容</center></td></tr>'}
     <tr align="center" onmousemove="javascript:this.bgColor='#F8FCF1';" onmouseout="javascript:this.bgColor='#ffffff';">
-      <td>{dede:field.aid /}</td>
+      <td>{dede:field.aid/}</td>
       <td>{dede:field.clsname function='TestType(@me,1)'/}</td>
-      <td>{dede:field.adname /}</td>
+      <td>{dede:field.adname/}</td>
       <td>{dede:field.typename function='TestType(@me)'/}</td>
       <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-success btn-sm">删除</a>
+        <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-success btn-sm">删除</a>
       </td>
     </tr>
     {/dede:datalist}

src/admin/templets/adtype_main.htm

@@ -12,7 +12,7 @@
 <table width="98%" cellpadding="3" cellspacing="1" align="center" class="table maintable mt-3 mb-3">
   <form name="form1" action="adtype_main.php" method="post">
     <tr>
-      <td bgcolor="#f8f8f8" colspan="7"><input type="hidden" name="dopost" value="save"/>广告分类管理<a href="ad_main.php" class="btn btn-success btn-sm ml-3">广告管理</a></td>
+      <td bgcolor="#f8f8f8" colspan="7"><input type="hidden" name="dopost" value="save">广告分类管理<a href="ad_main.php" class="btn btn-success btn-sm ml-3">广告管理</a></td>
     </tr>
     <tr bgcolor="#F8FCF1">
       <td width="9%" align="center">类型ID</td>

src/admin/templets/album_add.htm

@@ -73,8 +73,8 @@ table{border-collapse:separate}
         <td colspan="2">
           <table width="168" cellpadding="0" cellspacing="0">
             <tr>
-              <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">常规内容</td>
-              <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">高级参数</a></td>
+              <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">常规内容</td>
+              <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">高级参数</a></td>
             </tr>
           </table>
         </td>
@@ -85,8 +85,8 @@ table{border-collapse:separate}
         <td colspan="2">
           <table width="168"  cellpadding="0" cellspacing="0">
             <tr>
-              <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">常规内容</a></td>
-              <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">高级参数</td>
+              <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">常规内容</a></td>
+              <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">高级参数</td>
             </tr>
           </table>
         </td>
@@ -280,7 +280,7 @@ table{border-collapse:separate}
               </td>
             </tr>
             <tr>
-              <td width="86" ></td>
+              <td width="84" ></td>
               <td>（系统仅是每页输出&quot;行x列&quot;张图片，实现需自行控制样式表）</td>
             </tr>
           </table>

src/admin/templets/album_edit.htm

@@ -73,8 +73,8 @@ table{border-collapse:separate}
       <td colspan="2">
         <table width="168" cellpadding="0" cellspacing="0">
           <tr>
-            <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">常规内容</td>
-            <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">图集图片</a></td>
+            <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">常规内容</td>
+            <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">图集图片</a></td>
           </tr>
         </table>
       </td>
@@ -85,8 +85,8 @@ table{border-collapse:separate}
       <td colspan="2">
         <table width="168"  cellpadding="0" cellspacing="0">
           <tr>
-            <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">常规内容</a></td>
-            <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">图集图片</td>
+            <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">常规内容</a></td>
+            <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">图集图片</td>
           </tr>
         </table>
       </td>
@@ -380,7 +380,7 @@ table{border-collapse:separate}
             </td>
           </tr>
           <tr>
-            <td width="86" ></td>
+            <td width="84" ></td>
             <td>（系统仅是每页输出&quot;行x列&quot;张图片，实现需自行控制样式表）</td>
           </tr>
         </table>

src/admin/templets/archives_add.htm

@@ -49,8 +49,8 @@ table{border-collapse:separate}
       <td colspan="2">
         <table width="900" cellpadding="0" cellspacing="0">
           <tr>
-            <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">常规信息</td>
-            <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">高级参数</a></td>
+            <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">常规信息</td>
+            <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">高级参数</a></td>
             <td></td>
           </tr>
         </table>
@@ -62,8 +62,8 @@ table{border-collapse:separate}
       <td colspan="2">
         <table  cellpadding="0" cellspacing="0">
           <tr>
-            <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">常规信息</a></td>
-            <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">高级参数</td>
+            <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">常规信息</a></td>
+            <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">高级参数</td>
           </tr>
         </table>
       </td>

src/admin/templets/archives_edit.htm

@@ -46,8 +46,8 @@ table{border-collapse:separate}
       <td colspan="2">
         <table cellpadding="0" cellspacing="0">
           <tr>
-            <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">常规信息</td>
-            <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">高级参数</a></td>
+            <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">常规信息</td>
+            <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">高级参数</a></td>
           </tr>
         </table>
       </td>
@@ -58,8 +58,8 @@ table{border-collapse:separate}
       <td colspan="2">
         <table  cellpadding="0" cellspacing="0">
           <tr>
-            <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">常规信息</a></td>
-            <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">高级参数</td>
+            <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">常规信息</a></td>
+            <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">高级参数</td>
           </tr>
         </table>
       </td>

src/admin/templets/archives_sg_add.htm

@@ -50,7 +50,7 @@ table{border-collapse:separate}
       <td colspan="2">
         <table width="900" cellpadding="0" cellspacing="0">
           <tr>
-            <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">常规信息</td>
+            <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">常规信息</td>
             <td></td>
           </tr>
         </table>

src/admin/templets/archives_sg_edit.htm

@@ -47,8 +47,8 @@ table{border-collapse:separate}
       <td colspan="2">
         <table cellpadding="0" cellspacing="0">
           <tr>
-            <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">常规信息</td>
-            <td width="86"></td>
+            <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">常规信息</td>
+            <td width="84"></td>
           </tr>
         </table>
       </td>

src/admin/templets/article_add.htm

@@ -53,7 +53,7 @@ table{border-collapse:separate}
       <td colspan="2">
         <table width="900" cellpadding="0" cellspacing="0">
           <tr>
-            <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">常规信息</td>
+            <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">常规信息</td>
             <td><a href="javascript:;" class="btn btn-success btn-sm" onClick="ShowHide('getone')">单页采集</a></td>
           </tr>
         </table>
@@ -288,7 +288,7 @@ table{border-collapse:separate}
         <td>
           <table cellpadding="0" cellspacing="0">
             <tr>
-              <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif"><a href='javascript:ShowHideT("adset")'>高级参数</a></td>
+              <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif"><a href='javascript:ShowHideT("adset")'>高级参数</a></td>
             </tr>
           </table>
         </td>

src/admin/templets/article_edit.htm

@@ -51,8 +51,8 @@ table{border-collapse:separate}
       <td colspan="2">
         <table cellpadding="0" cellspacing="0">
           <tr>
-            <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">常规信息</td>
-            <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">高级参数</a></td>
+            <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">常规信息</td>
+            <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">高级参数</a></td>
           </tr>
         </table>
       </td>
@@ -63,8 +63,8 @@ table{border-collapse:separate}
       <td colspan="2">
         <table  cellpadding="0" cellspacing="0">
           <tr>
-            <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">常规信息</a></td>
-            <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">高级参数</td>
+            <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">常规信息</a></td>
+            <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">高级参数</td>
           </tr>
         </table>
       </td>

src/admin/templets/catalog_add.htm

@@ -145,9 +145,9 @@
               <td colspan="2" bgcolor="#fff" align="left">
                 <table cellpadding="0" cellspacing="0">
                   <tr>
-                    <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">常规选项</td>
-                    <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">高级选项</a></td>
-                    <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem3()">栏目内容</a></td>
+                    <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">常规选项</td>
+                    <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">高级选项</a></td>
+                    <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem3()">栏目内容</a></td>
                   </tr>
                 </table>
               </td>
@@ -158,9 +158,9 @@
               <td colspan="2" bgcolor="#fff" style="text-align:left">
                 <table  cellpadding="0" cellspacing="0">
                   <tr>
-                    <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">常规选项</a></td>
-                    <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">高级选项</td>
-                    <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem3()">栏目内容</a></td>
+                    <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">常规选项</a></td>
+                    <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">高级选项</td>
+                    <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem3()">栏目内容</a></td>
                   </tr>
                 </table>
               </td>
@@ -171,9 +171,9 @@
               <td colspan="2" bgcolor="#fff" style="text-align:left">
                 <table  cellpadding="0" cellspacing="0">
                   <tr>
-                    <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">常规选项</a></td>
-                    <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">高级选项</td>
-                    <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">栏目内容</td>
+                    <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">常规选项</a></td>
+                    <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">高级选项</td>
+                    <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">栏目内容</td>
                   </tr>
                 </table>
               </td>
@@ -460,7 +460,7 @@
             </tr>
             <tr>
               <td height="60">SEO标题：</td>
-              <td><input type="text" name="seotitle" id="seotitle" style="width:260px">（栏目模板里用{dede:field.seotitle /}调用）</td>
+              <td><input type="text" name="seotitle" id="seotitle" style="width:260px">（栏目模板里用{dede:field.seotitle/}调用）</td>
             </tr>
             <tr>
               <td height="60">关键词：</td>

src/admin/templets/catalog_add_quick.htm

@@ -105,9 +105,9 @@
           <table width="100%" cellspacing="0" id="head1" cellpadding="0">
             <tr>
               <td colspan="2">
-                <table width="86" cellpadding="0" cellspacing="0">
+                <table width="84" cellpadding="0" cellspacing="0">
                   <tr>
-                    <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">常规选项</td>
+                    <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">常规选项</td>
                   </tr>
                 </table>
               </td>

src/admin/templets/catalog_edit.htm

@@ -126,9 +126,9 @@
               <td colspan="2" bgcolor="#fff" align="left">
                 <table cellpadding="0" cellspacing="0">
                   <tr>
-                    <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">常规选项</td>
-                    <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">高级选项</a></td>
-                    <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem3()">栏目内容</a></td>
+                    <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">常规选项</td>
+                    <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">高级选项</a></td>
+                    <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem3()">栏目内容</a></td>
                   </tr>
                 </table>
               </td>
@@ -139,9 +139,9 @@
               <td colspan="2" bgcolor="#fff" style="text-align:left">
                 <table  cellpadding="0" cellspacing="0">
                   <tr>
-                    <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">常规选项</a></td>
-                    <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">高级选项</td>
-                    <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem3()">栏目内容</a></td>
+                    <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">常规选项</a></td>
+                    <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">高级选项</td>
+                    <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem3()">栏目内容</a></td>
                   </tr>
                 </table>
               </td>
@@ -152,9 +152,9 @@
               <td colspan="2" bgcolor="#fff" style="text-align:left">
                 <table  cellpadding="0" cellspacing="0">
                   <tr>
-                    <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">常规选项</a></td>
-                    <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">高级选项</td>
-                    <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">栏目内容</td>
+                    <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">常规选项</a></td>
+                    <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">高级选项</td>
+                    <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">栏目内容</td>
                   </tr>
                 </table>
               </td>
@@ -400,7 +400,7 @@
             </tr>
             <tr>
               <td height="60">SEO标题：</td>
-              <td><input type="text" name="seotitle" id="seotitle" value="<?php echo $myrow['seotitle']?>" style="width:260px">（栏目模板里用{dede:field.seotitle /}调用）</td>
+              <td><input type="text" name="seotitle" id="seotitle" value="<?php echo $myrow['seotitle']?>" style="width:260px">（栏目模板里用{dede:field.seotitle/}调用）</td>
             </tr>
             <tr>
               <td height="60">关键词：</td>

src/admin/templets/content_select_list.htm

@@ -69,12 +69,12 @@
 				<td>{dede:field.id/}</td>
 				<td><input type="checkbox" name="arcID" id="arcID" value="{dede:field.id/}"></td>
 				<td align="left"><a href="archives_do.php?aid={dede:field.id/}&dopost=editArchives">{dede:field.title/}</a></td>
-				<td>{dede:field.senddate function="GetDateMk(@me)" /}</td>
+				<td>{dede:field.senddate function="GetDateMk(@me)"/}</td>
 				<td>{dede:field.typeid function='GetTypename(@me)'/}</td>
 				<td>{dede:field.click/}</td>
-				<td>{dede:field.ismake function="IsHtmlArchives(@me)" /}</td>
-				<td>{dede:field.arcrank function="GetRankName(@me)" /}</td>
-				<td>{dede:field.flag function="IsCommendArchives(@me)" /}</td>
+				<td>{dede:field.ismake function="IsHtmlArchives(@me)"/}</td>
+				<td>{dede:field.arcrank function="GetRankName(@me)"/}</td>
+				<td>{dede:field.flag function="IsCommendArchives(@me)"/}</td>
 			</tr>
 			{/dede:datalist}
 			<tr bgcolor="#F8FCF1">

src/admin/templets/erradd.htm

@@ -72,13 +72,13 @@
 			{dede:datalist empty='<tr><td colspan="8"><center>暂无内容</center></td></tr>'}
 			<tr align="center" onMouseMove="javascript:this.bgColor='#F8FCF1';" onmousemove="javascript:this.bgColor='#F8FCF1';" onmouseout="javascript:this.bgColor='#ffffff';">
 				<td><input type="checkbox" name="id" id="id" value="{dede:field.id/}"></td>
-				<td>{dede:field.id /}</td>
+				<td>{dede:field.id/}</td>
 				<td>{dede:field.mid function='username(@me)'/}</td>
-				<td><a href='archives_do.php?dopost=editArchives&aid={dede:field.aid/}'>{dede:field.title /}</a></td>
+				<td><a href='archives_do.php?dopost=editArchives&aid={dede:field.aid/}'>{dede:field.title/}</a></td>
 				<td>{dede:field.type function='typename(@me)'/}</td>
 				<td>{dede:field.sendtime function='GetDateMk(@me)'/}</td>
-				<td>{dede:field.errtxt /}</td>
-				<td>{dede:field.oktxt /}</td>
+				<td>{dede:field.errtxt/}</td>
+				<td>{dede:field.oktxt/}</td>
 			</tr>
 			{/dede:datalist}
 			<tr align="left" >

src/admin/templets/feedback_main.htm

@@ -76,7 +76,7 @@
 						<input type="text" name="keyword" placeholder="请输入关键词" style="width:160px">
 						<select name="typeid" style="margin-left:10px;width:160px">
 							<option value="0">请选择</option>
-							{dede:global.openarray /}
+							{dede:global.openarray/}
 						</select>
 						<button type="submit" class="btn btn-success btn-sm">搜索</button>
 					</form>
@@ -100,7 +100,7 @@
 											<?php } ?>
 										</td>
 										<td width="12%" align="center">IP地址：<a href='feedback_main.php?ip={dede:field.ip/}'>{dede:field.ip/}</a></td>
-										<td width="12%">时间：{dede:field.dtime function="GetDateTimeMK(@me)" /}</td>
+										<td width="12%">时间：{dede:field.dtime function="GetDateTimeMK(@me)"/}</td>
 										<td align="center">
 											<a class="btn btn-success btn-sm" href='feedback_edit.php?id={dede:field.id/}'>编辑评论</a>
 											<a class="btn btn-success btn-sm" href='feedback_edit.php?id={dede:field.id/}&dopost=makehtml'>更新评论</a>

src/admin/templets/friendlink_main.htm

@@ -43,7 +43,7 @@
         <div style="float:right;padding-right:10px">
           <a href="friendlink_add.php" class="btn btn-success btn-sm">增加链接</a>
           <a href="friendlink_type.php" class="btn btn-success btn-sm">网站类型管理</a>
-          <a href="{dede:global name=' cfg_phpurl' /}/flink.php" target="_blank" class="btn btn-success btn-sm">友情链接预览</a>
+          <a href="{dede:global name=' cfg_phpurl'/}/flink.php" target="_blank" class="btn btn-success btn-sm">友情链接预览</a>
         </div>
       </td>
     </tr>

src/admin/templets/log_list.htm

@@ -97,7 +97,7 @@
         <td><input type="text" value="{dede:field.filename/}" name="t0" style="width:100px"></td>
         <td>{dede:field.method/}</td>
         <td>{dede:field.cip/}</td>
-        <td>{dede:field.dtime function="MyDate('y/m/d H:i:s',@me)" /}</td>
+        <td>{dede:field.dtime function="MyDate('y/m/d H:i:s',@me)"/}</td>
         <td><input type="text" value="{dede:field.query/}" name="t1" style="width:280px"></td>
       </tr>
       {/dede:datalist}

src/admin/templets/member_main.htm

@@ -92,7 +92,7 @@
           <?php
           echo ''.$fields['userid'].'';
           if($fields['spacesta']==-2) echo "<span class='text-danger'>[禁言]</span>";
-          if($fields['spacesta']==-1) echo "<span style='color:#e74d58'>[未审核]</span>";
+          if($fields['spacesta']==-1) echo "<span class='text-danger'>[未审核]</span>";
           if(!empty($fields['face'])) {
             echo "<br><img src='{$fields['face']}' title='浏览会员空间' style='max-width:80px;height:auto'>";
           }
@@ -100,12 +100,12 @@
         </td>
         <td>{dede:field.email/}<br>
           昵称：{dede:field.uname/}</td>
-        <td>{dede:field.sex /}</td>
+        <td>{dede:field.sex/}</td>
         <td><a href="member_main.php?rank={dede:field.rank/}">{dede:field.rank function="GetMemberName(@me,'限制会员')"/}</a></td>
-        <td>{dede:field.mtype /} 用户 {dede:field.matt function="GetMAtt(@me)" /}<br>
-          金币：{dede:field.money /} 积分：{dede:field.scores /}</td>
-        <td>{dede:field.logintime function="MyDate('y-m-d H:i',@me)" /}<br>
-          {dede:field.loginip /}</td>
+        <td>{dede:field.mtype/} 用户 {dede:field.matt function="GetMAtt(@me)"/}<br>
+          金币：{dede:field.money/} 积分：{dede:field.scores/}</td>
+        <td>{dede:field.logintime function="MyDate('y-m-d H:i',@me)"/}<br>
+          {dede:field.loginip/}</td>
         <td align="center">
           <a href="member_view.php?id={dede:field.mid/}" class="btn btn-success btn-sm">修改</a>
           <a href="member_do.php?id={dede:field.mid/}&dopost=delmember" class="btn btn-success btn-sm">删除</a>

src/admin/templets/member_toadmin.htm

@@ -35,7 +35,7 @@
         <?php
         if($row['matt']==10) 
         {
-          echo "<span style='color:#e74d58'>已经是管理员了，不要再提升了</span>";
+          echo "<span class='text-danger'>已经是管理员了，不要再提升了</span>";
         } else {
         ?>
         <table width="98%" cellspacing="0" cellpadding="6" class="table table-borderless">
@@ -99,7 +99,7 @@
               <td class="bline">验证安全码：</td>
               <td class="bline">
                 <input type="text" name="safecode" id="safecode" size="16" style="width:260px"> 
-                <input type="hidden" name="randcode" value="<?php echo $randcode; ?>">（安全码：<span style='color:#e74d58'><?php echo $safecode; ?></span>）</td>
+                <input type="hidden" name="randcode" value="<?php echo $randcode; ?>">（安全码：<span class='text-danger'><?php echo $safecode; ?></span>）</td>
             </tr>
             <tr>
               <td colspan="2" align="center" class="py-3">

src/admin/templets/mychannel_edit.htm

@@ -76,8 +76,8 @@
         <td colspan="2">
           <table cellpadding="0" cellspacing="0">
             <tr>
-              <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">基本设置</td>
-              <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">字段管理</a></td>
+              <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">基本设置</td>
+              <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">字段管理</a></td>
             </tr>
           </table>
         </td>
@@ -88,8 +88,8 @@
         <td colspan="2">
           <table cellpadding="0" cellspacing="0">
             <tr>
-              <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">基本设置</a></td>
-              <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">字段管理</td>
+              <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">基本设置</a></td>
+              <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">字段管理</td>
             </tr>
           </table>
         </td>

src/admin/templets/mychannel_main.htm

@@ -55,16 +55,16 @@
 				</td>
 			</tr>'}
 			<tr align="center" onmousemove="javascript:this.bgColor='#F8FCF1';" onmouseout="javascript:this.bgColor='#ffffff';">
-				<td>{dede:field.id /}</td>
-				<td><a href="mychannel_edit.php?id={dede:field.id/}&dopost=edit">{dede:field.typename /}</a></td>
-				<td>{dede:field.nid /}</td>
-				<td>{dede:field.addtable function="str_replace('#@__',$cfg_dbprefix,@me)" /}</td>
-				<td>{dede:field.isshow function="GetSta(@me,$fields['id'])" /}</td>
+				<td>{dede:field.id/}</td>
+				<td><a href="mychannel_edit.php?id={dede:field.id/}&dopost=edit">{dede:field.typename/}</a></td>
+				<td>{dede:field.nid/}</td>
+				<td>{dede:field.addtable function="str_replace('#@__',$cfg_dbprefix,@me)"/}</td>
+				<td>{dede:field.isshow function="GetSta(@me,$fields['id'])"/}</td>
 				<td>{dede:field.issystem function='IsSystem(@me)'/}</td>
 				<td>
 					<a href="mychannel_edit.php?id={dede:field.id/}&dopost=copystart"><i class="btn btn-sm fa fa-clone" title="复制"></i></a>
 					<a href="mychannel_edit.php?id={dede:field.id/}&dopost=gettemplets"><i class="btn btn-sm fa fa-file-text-o" title="模板"></i></a>
-					<a href="mychannel_edit.php?id={dede:field.id /}&dopost=export"><i class="btn btn-sm fa fa-download" title="导出"></i></a>
+					<a href="mychannel_edit.php?id={dede:field.id/}&dopost=export"><i class="btn btn-sm fa fa-download" title="导出"></i></a>
 					<a href="mychannel_edit.php?id={dede:field.id/}&dopost=edit"><i class="btn btn-sm fa fa-pencil-square-o" title="修改"></i></a>
 					<a href="mychannel_edit.php?mid={dede:field.id/}&dopost=modifysearch"><i class="btn btn-sm fa fa-search" title="自定义搜索"></i></a>
 					<a href="mychannel_edit.php?id={dede:field.id/}&dopost=delete"><i class="btn btn-sm fa fa-trash" title="删除"></i></a>

src/admin/templets/mytag_main.htm

@@ -24,15 +24,15 @@
     </tr>
     {dede:datalist empty='<tr><td colspan="6"><center>暂无内容</center></td></tr>'}
     <tr align="center" onmousemove="javascript:this.bgColor='#F8FCF1';" onmouseout="javascript:this.bgColor='#ffffff';">
-      <td>{dede:field.aid /}</td>
-      <td>{dede:field.tagname /}</td>
+      <td>{dede:field.aid/}</td>
+      <td>{dede:field.tagname/}</td>
       <td>{dede:field.typename function='TestType(@me)'/}</td>
       <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">修改</a> |
-        <a href="mytag_edit.php?aid={dede:field.aid /}&dopost=delete">删除</a> |
-        <a href="mytag_edit.php?aid={dede:field.aid /}&dopost=getjs">JS调用</a>
+        <a href="mytag_edit.php?aid={dede:field.aid/}&dopost=edit">修改</a> |
+        <a href="mytag_edit.php?aid={dede:field.aid/}&dopost=delete">删除</a> |
+        <a href="mytag_edit.php?aid={dede:field.aid/}&dopost=getjs">JS调用</a>
       </td>
     </tr>
     {/dede:datalist}

src/admin/templets/plus_main.htm

@@ -23,9 +23,9 @@
     </tr>
     {dede:datalist empty='<tr><td colspan="4"><center>暂无内容</center></td></tr>'}
     <tr align="center" onmousemove="javascript:this.bgColor='#F8FCF1';" onmouseout="javascript:this.bgColor='#ffffff';">
-      <td>{dede:field.aid /}</td>
-      <td>{dede:field.plusname /}</td>
-      <td>{dede:field.writer /}</td>
+      <td>{dede:field.aid/}</td>
+      <td>{dede:field.plusname/}</td>
+      <td>{dede:field.writer/}</td>
       <td>{dede:field.isshow function="GetSta(@me,$fields['aid'],$fields['plusname'])"/}</td>
     </tr>
     {/dede:datalist}

src/admin/templets/soft_add.htm

@@ -68,8 +68,8 @@ table{border-collapse:separate}
         <td colspan="2">
           <table cellpadding="0" cellspacing="0">
             <tr>
-              <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">常规信息</td>
-              <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">高级参数</a></td>
+              <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">常规信息</td>
+              <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">高级参数</a></td>
             </tr>
           </table>
         </td>
@@ -80,8 +80,8 @@ table{border-collapse:separate}
         <td colspan="2">
           <table  cellpadding="0" cellspacing="0">
             <tr>
-              <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">常规信息</a></td>
-              <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">高级参数</td>
+              <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">常规信息</a></td>
+              <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">高级参数</td>
             </tr>
           </table>
         </td>

src/admin/templets/soft_edit.htm

@@ -62,8 +62,8 @@ table{border-collapse:separate}
         <td colspan="2">
           <table width="168" cellpadding="0" cellspacing="0">
             <tr>
-              <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">常规参数</td>
-              <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">高级参数</a></td>
+              <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">常规参数</td>
+              <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">高级参数</a></td>
             </tr>
           </table>
         </td>
@@ -74,8 +74,8 @@ table{border-collapse:separate}
         <td colspan="2">
           <table width="168"  cellpadding="0" cellspacing="0">
             <tr>
-              <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">常规参数</a></td>
-              <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">高级参数</td>
+              <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">常规参数</a></td>
+              <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">高级参数</td>
             </tr>
           </table>
         </td>

src/admin/templets/spec_add.htm

@@ -78,8 +78,8 @@ table{border-collapse:separate}
         <td colspan="2">
           <table width="168" cellpadding="0" cellspacing="0">
             <tr>
-              <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">常规参数</td>
-              <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">专题文档</a></td>
+              <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">常规参数</td>
+              <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">专题文档</a></td>
             </tr>
           </table>
         </td>
@@ -90,8 +90,8 @@ table{border-collapse:separate}
         <td colspan="2">
           <table width="168"  cellpadding="0" cellspacing="0">
             <tr>
-              <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">常规参数</a></td>
-              <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">专题文档</td>
+              <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">常规参数</a></td>
+              <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">专题文档</td>
             </tr>
           </table>
         </td>
@@ -281,7 +281,7 @@ table{border-collapse:separate}
       <tr>
         <td class="bline2">专题节点列表： <br>
           1、文章列表用ID1,ID2,ID3这样形式分开，系统会自动排除不同节点的相同文章；<br>
-          2、关于单条记录模板里的[field:fieldname /]标记的使用，请参考关于系统帮助关于 arclist 标记的说明；<br>
+          2、关于单条记录模板里的[field:fieldname/]标记的使用，请参考关于系统帮助关于 arclist 标记的说明；<br>
           3、节点ID是节点的唯一标识，专题模板中用{dede:field.note noteid='标识'/}这样来表示单个节点，不指定noteid时为所有节点列表<br>
           4、正常的情况下，每个节点显示的是“节点文章列表”里的文档，如果您指定为“自动获取模式”，那么必须指定关键词和栏目ID </td>
       </tr>

src/admin/templets/spec_edit.htm

@@ -76,8 +76,8 @@ table{border-collapse:separate}
         <td colspan="2">
           <table width="168" cellpadding="0" cellspacing="0">
             <tr>
-              <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">常规参数</td>
-              <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">专题文档</a></td>
+              <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">常规参数</td>
+              <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem2()">专题文档</a></td>
             </tr>
           </table>
         </td>
@@ -88,8 +88,8 @@ table{border-collapse:separate}
         <td colspan="2">
           <table width="168"  cellpadding="0" cellspacing="0">
             <tr>
-              <td width="86" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">常规参数</a></td>
-              <td width="86" height="28" align="center" background="../static/web/img/itemnote1.gif">专题文档</td>
+              <td width="84" align="center" background="../static/web/img/itemnote2.gif"><a href="javascript:;" onClick="ShowItem1()">常规参数</a></td>
+              <td width="84" height="28" align="center" background="../static/web/img/itemnote1.gif">专题文档</td>
             </tr>
           </table>
         </td>
@@ -295,7 +295,7 @@ table{border-collapse:separate}
     </table>
     <table width="98%" align="center" cellpadding="2" cellspacing="2" id="adset" style="display:none;border:1px solid #dee2e6">
       <tr>
-        <td class="bline2"> 专题节点列表：（文章列表用ID1,ID2,ID3这样形式分开，系统会自动排除不同节点的相同文章）<br>关于单条记录模板里的[field:fieldname /]标记的使用，请参考关于系统帮助关于 arclist 标记的说明</td>
+        <td class="bline2"> 专题节点列表：（文章列表用ID1,ID2,ID3这样形式分开，系统会自动排除不同节点的相同文章）<br>关于单条记录模板里的[field:fieldname/]标记的使用，请参考关于系统帮助关于 arclist 标记的说明</td>
       </tr>
       <tr>
         <td>

src/admin/templets/stepselect_main.htm

@@ -258,8 +258,8 @@ li{float:left;padding-right:10px;line-height:26px}
             <input type="hidden" name="action" value="delenumAllSel">
             {dede:datalist empty='<tr><td colspan="8"><center>暂无内容</center></td></tr>'}
             <tr align="center" onMouseMove="javascript:this.bgColor='#F8FCF1';" onMouseOut="javascript:this.bgColor='#FFFFFF';">
-                <td><input type="checkbox" name="ids[]" value="{dede:field.id /}"></td>
-                <td>{dede:field.id /}</td>
+                <td><input type="checkbox" name="ids[]" value="{dede:field.id/}"></td>
+                <td>{dede:field.id/}</td>
                 <td>
                     <?php 
                     if(!preg_match("#\.#", $fields['evalue']))
@@ -269,9 +269,9 @@ li{float:left;padding-right:10px;line-height:26px}
                         $fields['ename'] = " └───".$fields['ename'];
                     }
                     ?>
-                    <input type='text' id='ename{dede:field.id/}' value='{dede:field.ename /}' class='abt'>
+                    <input type='text' id='ename{dede:field.id/}' value='{dede:field.ename/}' class='abt'>
                 </td>
-                <td>{dede:field.egroup /}</td>
+                <td>{dede:field.egroup/}</td>
                 <td>
                     <?php
                     if(!preg_match("#\.#", $fields['evalue']))
@@ -283,8 +283,8 @@ li{float:left;padding-right:10px;line-height:26px}
                     }
                     ?>
                 </td>
-                <td>{dede:field.evalue /}</td>
-                <td><input type='text' id='disorder{dede:field.id/}' value='{dede:field.disorder /}' class='abt'></td>
+                <td>{dede:field.evalue/}</td>
+                <td><input type='text' id='disorder{dede:field.id/}' value='{dede:field.disorder/}' class='abt'></td>
                 <td>
                     <?php
                     if(!empty($egroup))
@@ -332,9 +332,9 @@ li{float:left;padding-right:10px;line-height:26px}
         </tr>
         {dede:datalist}
         <tr align="center" onMouseMove="javascript:this.bgColor='#F8FCF1';" onMouseOut="javascript:this.bgColor='#FFFFFF';">
-            <td><input type="checkbox" name="ids[]" value="{dede:field.id /}"></td>
-            <td>{dede:field.id /}</td>
-            <td><a href="stepselect_main.php?egroup={dede:field.egroup /}">{dede:field.itemname /}</a></td>
+            <td><input type="checkbox" name="ids[]" value="{dede:field.id/}"></td>
+            <td>{dede:field.id/}</td>
+            <td><a href="stepselect_main.php?egroup={dede:field.egroup/}">{dede:field.itemname/}</a></td>
             <td>
                 <?php
                 switch ($fields['issign']) {
@@ -350,8 +350,8 @@ li{float:left;padding-right:10px;line-height:26px}
                 }
                 ?>
             </td>
-            <td> {dede:field.issystem function="@me==1 ? '是' : '否'" /} </td>
-            <td>{dede:field.egroup /}</td>
+            <td> {dede:field.issystem function="@me==1 ? '是' : '否'"/} </td>
+            <td>{dede:field.egroup/}</td>
             <td>
                 <a href="stepselect_main.php?action=upallcache&egroup={dede:field.egroup/}" class="btn btn-success btn-sm"><i class="fa fa-refresh"></i> 更新缓存</a>
                 <a href="stepselect_main.php?egroup={dede:field.egroup/}" class="btn btn-success btn-sm"><i class="fa fa-bars-ul"></i> 查看子分类</a>

src/admin/templets/sys_admin_user.htm

@@ -39,8 +39,8 @@
     </tr>
     {dede:datalist empty='<tr><td colspan="5"><center>暂无内容</center></td></tr>'}
     <tr align="center">
-      <td rowspan="2">{dede:field.userid /}</td>
-      <td rowspan="2">{dede:field.uname /}<br> </td>
+      <td rowspan="2">{dede:field.userid/}</td>
+      <td rowspan="2">{dede:field.uname/}<br> </td>
       <td>{dede:field.usertype function="GetUserType(@me)"/}</td>
       <td>{dede:field.typename function="GetChannel(@me)"/}</td>
       <td rowspan="2">
@@ -51,7 +51,7 @@
     </tr>
     <tr>
       <td colspan="2" align="center">
-        登录时间：{dede:field.logintime function="GetDateTimeMk(@me)" /}
+        登录时间：{dede:field.logintime function="GetDateTimeMk(@me)"/}
         登录IP：{dede:field.loginip/}
       </td>
     </tr>

src/admin/templets/sys_admin_user_add.htm

@@ -98,7 +98,7 @@
               <td class="bline">验证安全码：</td>
               <td class="bline">
                 <input type="text" name="safecode" id="safecode" style="width:260px">
-                <input type="hidden" name="randcode" value="<?php echo $randcode; ?>">（安全码：<span style='color:#e74d58'><?php echo $safecode;  ?></span>）
+                <input type="hidden" name="randcode" value="<?php echo $randcode; ?>">（安全码：<span class='text-danger'><?php echo $safecode;  ?></span>）
               </td>
             </tr>
             <tr>

src/admin/templets/sys_admin_user_edit.htm

@@ -76,7 +76,7 @@
               <td class="bline">验证安全码：</td>
               <td class="bline">
                 <input type="text" name="safecode" id="safecode" style="width:260px">
-                <input type="hidden" name="randcode" value="<?php echo $randcode; ?>">（安全码：<span style='color:#e74d58'><?php echo $safecode;  ?></span>）
+                <input type="hidden" name="randcode" value="<?php echo $randcode; ?>">（安全码：<span class='text-danger'><?php echo $safecode;  ?></span>）
               </td>
             </tr>
             <tr>

src/admin/templets/sys_payment.htm

@@ -34,20 +34,20 @@
       </tr>
       {dede:datalist empty='<tr><td colspan="4"><center>暂无内容</center></td></tr>'}
       <tr align="center" onmousemove="javascript:this.bgColor='#F8FCF1';" onmouseout="javascript:this.bgColor='#ffffff';">
-        <td>{dede:field.name /}</td>
-        <td align="left">{dede:field.description /}</td>
-        <td>{dede:field.rank /}</td>
+        <td>{dede:field.name/}</td>
+        <td align="left">{dede:field.description/}</td>
+        <td>{dede:field.rank/}</td>
         <td>
           <?php
           if($fields['enabled'] == 0) {
           ?>
-          <a class='btn btn-success btn-sm' href='sys_payment.php?dopost=install&pid={dede:field.id /}'>安装</a>
+          <a class='btn btn-success btn-sm' href='sys_payment.php?dopost=install&pid={dede:field.id/}'>安装</a>
           <?php
           }
           if($fields['enabled'] == 1) {
           ?>
-          <a class='btn btn-success btn-sm' href='sys_payment.php?dopost=install&pid={dede:field.id /}&pm=edit'>修改</a>
-          <a class='btn btn-success btn-sm' href='sys_payment.php?dopost=uninstall&pid={dede:field.id /}'>删除</a>
+          <a class='btn btn-success btn-sm' href='sys_payment.php?dopost=install&pid={dede:field.id/}&pm=edit'>修改</a>
+          <a class='btn btn-success btn-sm' href='sys_payment.php?dopost=uninstall&pid={dede:field.id/}'>删除</a>
           <?php
           }
           ?>

src/admin/templets/templets_one.htm

@@ -69,16 +69,16 @@
          <input type="hidden" name="dopost" value="mksel">
          {dede:datalist empty='<tr><td colspan="7"><center>暂无内容</center></td></tr>'}
          <tr align="center" onmousemove="javascript:this.bgColor='#F8FCF1';" onmouseout="javascript:this.bgColor='#ffffff';">
-            <td><input type="checkbox" name="ids[]" value="{dede:field.aid /}"></td>
-            <td>{dede:field.aid /}</td>
-            <td><a href="templets_one_edit.php?aid={dede:field.aid /}&dopost=edit">{dede:field.title /}</a></td>
+            <td><input type="checkbox" name="ids[]" value="{dede:field.aid/}"></td>
+            <td>{dede:field.aid/}</td>
+            <td><a href="templets_one_edit.php?aid={dede:field.aid/}&dopost=edit">{dede:field.title/}</a></td>
             <td>{dede:field.ismake function='GetIsMake(@me)'/}</td>
-            <td>{dede:field.likeid /}</td>
+            <td>{dede:field.likeid/}</td>
             <td>{dede:field.uptime function='GetDateMk(@me)'/}</td>
             <td>
-               <a href="templets_one_edit.php?aid={dede:field.aid /}&dopost=edit" class="btn btn-success btn-sm"><i class="fa fa-pencil-square-o"></i> 修改</a>
-               <a href="templets_one_edit.php?aid={dede:field.aid /}&dopost=view" target="_blank" class="btn btn-success btn-sm"><i class="fa fa-globe"></i> 预览</a>
-               <a href="templets_one_edit.php?aid={dede:field.aid /}&dopost=delete" class="btn btn-success btn-sm"><i class="fa fa-trash"></i> 删除</a>
+               <a href="templets_one_edit.php?aid={dede:field.aid/}&dopost=edit" class="btn btn-success btn-sm"><i class="fa fa-pencil-square-o"></i> 修改</a>
+               <a href="templets_one_edit.php?aid={dede:field.aid/}&dopost=view" target="_blank" class="btn btn-success btn-sm"><i class="fa fa-globe"></i> 预览</a>
+               <a href="templets_one_edit.php?aid={dede:field.aid/}&dopost=delete" class="btn btn-success btn-sm"><i class="fa fa-trash"></i> 删除</a>
             </td>
          </tr>
          {/dede:datalist}

src/admin/templets/vote_main.htm

@@ -25,20 +25,16 @@
     </tr>
     {dede:datalist empty='<tr><td colspan="7"><center>暂无内容</center></td></tr>'}
     <tr align="center" onmousemove="javascript:this.bgColor='#F8FCF1';" onmouseout="javascript:this.bgColor='#ffffff';">
-      <td>{dede:field.aid /}</td>
+      <td>{dede:field.aid/}</td>
+      <td><a href="{dede:global name='cfg_phpurl'/}/vote.php?aid={dede:field.aid/}&dopost=view" target="_blank"> {dede:field.votename/}</a></td>
+      <td>{dede:field.starttime function="GetDateMk(@me)"/}</td>
+      <td>{dede:field.endtime function="GetDateMk(@me)"/}</td>
+      <td>{dede:field.totalcount/}</td>
+      <td><?php if($fields['isenable'] == 1){echo "<span class='text-danger'>未启用</span>";} else {echo "<span class='text-dark'>启用</span>";} ?></td>
       <td>
-        <a href="{dede:global name='cfg_phpurl' /}/vote.php?aid={dede:field.aid/}&dopost=view" target="_blank">
-          {dede:field.votename /}
-        </a>
-      </td>
-      <td>{dede:field.starttime function="GetDateMk(@me)" /}</td>
-      <td>{dede:field.endtime function="GetDateMk(@me)" /}</td>
-      <td>{dede:field.totalcount /}</td>
-      <td><?php if($fields['isenable'] == 1){echo "<span style='color:#e74d58'>未启用</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-success btn-sm">删除</a>
+        <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-success btn-sm">删除</a>
       </td>
     </tr>
     {/dede:datalist}

src/apps/diy.php

@@ -13,7 +13,7 @@ $diyid = isset($diyid) && is_numeric($diyid) ? $diyid : 0;
 $action = isset($action) && in_array($action, array('post', 'list', 'view')) ? $action : 'post';
 $id = isset($id) && is_numeric($id) ? $id : 0;
 if (empty($diyid)) {
-    showMsg('非法操作!', 'javascript:;');
+    showMsg('非法操作', 'javascript:;');
     exit();
 }
 require_once DEDEINC.'/diyform.class.php';

src/apps/download.php

@@ -17,7 +17,7 @@ if ($open == 0) {
     if ($aid == 0) exit('dedebiz');
     $arcRow = GetOneArchive($aid);
     if ($arcRow['aid'] == '') {
-        ShowMsg('无法获取未知文档的信息!', '-1');
+        ShowMsg('无法获取未知文档的信息', '-1');
         exit();
     }
     extract($arcRow, EXTR_SKIP);

src/apps/recommend.php

@@ -16,7 +16,7 @@ if (isset($arcID)) $aid = $arcID;
 $arcID = $aid = (isset($aid) && is_numeric($aid) ? $aid : 0);
 $type = (!isset($type) ? "" : $type);
 if (empty($aid)) {
-    ShowMsg("文档ID不能为空!", "-1");
+    ShowMsg("文档ID不能为空", "-1");
     exit();
 }
 //读取文档信息
@@ -24,7 +24,7 @@ if ($action == '') {
     //读取文档信息
     $arcRow = GetOneArchive($aid);
     if ($arcRow['aid'] == '') {
-        ShowMsg("无法把未知文档推荐给好友!", "-1");
+        ShowMsg("无法把未知文档推荐给好友", "-1");
         exit();
     }
     extract($arcRow, EXTR_OVERWRITE);
@@ -39,8 +39,7 @@ else if ($action == 'send') {
     $msg = RemoveXSS(dede_htmlspecialchars($msg));
     $mailtitle = "您的好友给您推荐了一篇文章";
     $mailbody .= "$msg \r\n\r\n";
-    $mailbody .= "Powered by https://www.dedebiz.com DedeBIZ内容管理系统";
-
+    $mailbody .= "Powered by DedeBIZ";
     $headers = "From: ".$cfg_adminemail."\r\nReply-To: ".$cfg_adminemail;
     if (!empty($cfg_bizcore_appid) && !empty($cfg_bizcore_key)) {
         $client = new DedeBizClient($cfg_bizcore_hostname, $cfg_bizcore_port);
@@ -59,13 +58,12 @@ else if ($action == 'send') {
             @mail($email, $mailtitle, $mailbody, $headers);
         }
     }
-
-    ShowMsg("成功推荐一篇文章!", $arcurl);
+    ShowMsg("成功推荐一篇文章", $arcurl);
     exit();
 }
 $arcRow = GetOneArchive($aid);
 if ($arcRow['aid'] == '') {
-    ShowMsg("无法把未知文档推荐给好友!", "-1");
+    ShowMsg("无法把未知文档推荐给好友", "-1");
     exit();
 }
 extract($arcRow, EXTR_OVERWRITE);

src/apps/stow.php

@@ -12,7 +12,7 @@ require_once(dirname(__FILE__)."/../system/common.inc.php");
 $aid = (isset($aid) && is_numeric($aid)) ? $aid : 0;
 $type = empty($type) ? "" : HtmlReplace($type, 1);
 if ($aid == 0) {
-    ShowMsg('文档id不能为空!', 'javascript:window.close();');
+    ShowMsg('文档id不能为空', 'javascript:window.close();');
     exit();
 }
 require_once(DEDEINC."/memberlogin.class.php");
@@ -25,7 +25,7 @@ if ($ml->M_ID == 0) {
 //读取文档信息
 $arcRow = GetOneArchive($aid);
 if ($arcRow['aid'] == '') {
-    ShowMsg("无法收藏未知文档!", "javascript:window.close();");
+    ShowMsg("无法收藏未知文档", "javascript:window.close();");
     exit();
 }
 extract($arcRow, EXTR_SKIP);

src/apps/vdimgck.php

@@ -12,14 +12,14 @@ require_once(dirname(__FILE__).'/../system/common.inc.php');
 require_once(DEDEDATA.'/config.cache.inc.php');
 //安全提示
 $config = array(
-    'font_size'   => 20,
-    'img_height'  => '36',
-    'word_type'  => 3,
-    'img_width'   => '80',
-    'use_boder'   => TRUE,
-    'font_file'   => DEDEINC.'/data/fonts/'.mt_rand(1, 6).'.ttf',
-    'wordlist_file'   => DEDEINC.'/data/words/words.txt',
-    'filter_type' => 5
+    'font_size'      => 20,
+    'img_height'     => '36',
+    'word_type'      => 3,
+    'img_width'      => '80',
+    'use_boder'      => TRUE,
+    'font_file'      => DEDEINC.'/data/fonts/'.mt_rand(1, 6).'.ttf',
+    'wordlist_file'  => DEDEINC.'/data/words/words.txt',
+    'filter_type'    => 5
 );
 $enkey = substr(md5(substr($cfg_cookie_encode, 0, 5)), 0, 10);
 $sessSavePath = DEDEDATA."/sessions_{$enkey}";

src/apps/view.php

@@ -47,7 +47,7 @@ if ($needMoney > 0 || $needRank > 1) {
         }
         $memberTypes[0] = "游客或没权限会员";
         $msgtitle = "您没有权限浏览文档：{$arctitle} ";
-        $moremsg = "这篇文档需要 <span class='text-danger'>".$memberTypes[$needRank]."</span> 才能访问，您目前是：<span class='text-danger'>".$memberTypes[$cfg_ml->M_Rank]."</span> ";
+        $moremsg = "这篇文档需要 <span class='text-danger'>".$memberTypes[$needRank]."</span> 才能访问，您目前是：<span class='text-danger'>".$memberTypes[$cfg_ml->M_Rank]."</span>";
         include_once(DEDETEMPLATE.'/plus/view_msg.htm');
         exit();
     }
@@ -59,7 +59,7 @@ if ($needMoney > 0 || $needRank > 1) {
         if (!is_array($row)) {
             if ($cfg_ml->M_Money == '' || $needMoney > $cfg_ml->M_Money) {
                 $msgtitle = "您没有权限浏览文档：{$arctitle} ";
-                $moremsg = "这篇文档需要 <span class='text-danger'>".$needMoney." 金币</span> 才能访问，您目前拥有金币：<span class='text-danger'>".$cfg_ml->M_Money." 个</span> ";
+                $moremsg = "这篇文档需要 <span class='text-danger'>".$needMoney." 金币</span> 才能访问，您目前拥有金币：<span class='text-danger'>".$cfg_ml->M_Money." 个</span>";
                 include_once(DEDETEMPLATE.'/plus/view_msg.htm');
                 $arc->Close();
                 exit();
@@ -76,7 +76,7 @@ if ($needMoney > 0 || $needRank > 1) {
                         showmsg('购买成功，购买扣点不会重扣金币，谢谢', '/plus/view.php?aid='.$aid);
                         exit;
                     } else {
-                        showmsg('购买失败, 请返回', -1);
+                        showmsg('购买失败，请返回', -1);
                         exit;
                     }
                 }

src/system/archive/archives.class.php

@@ -140,7 +140,7 @@ class Archives
      */
     function ParAddTable()
     {
-        //读取附加表信息，并把附加表的资料经过编译处理后导入到$this->Fields中，以方便在模板中用 {dede:field name='fieldname' /} 标记统一调用
+        //读取附加表信息，并把附加表的资料经过编译处理后导入到$this->Fields中，以方便在模板中用 {dede:field name='fieldname'/} 标记统一调用
         if ($this->ChannelUnit->ChannelInfos['addtable'] != '') {
             $row = $this->addTableRow;
             if ($this->ChannelUnit->ChannelInfos['issystem'] == -1) {

src/system/dedetag.class.php

@@ -718,7 +718,7 @@ class DedeTagParse
                 $e1 = strpos($this->SourceString, $eTagEndWord, $i);
                 $e2 = strpos($this->SourceString, $FullTagStartWord, $i);
                 $e3 = strpos($this->SourceString, $fullTagEndWordThis, $i);
-                //$eTagEndWord = /} $FullTagStartWord = {tag: $fullTagEndWordThis = {/tag:xxx]
+                //$eTagEndWord =/} $FullTagStartWord = {tag: $fullTagEndWordThis = {/tag:xxx]
                 $e1 = trim($e1);
                 $e2 = trim($e2);
                 $e3 = trim($e3);

src/system/filter.inc.php

@@ -26,7 +26,7 @@ function _FilterAll($fk, &$svar)
         }
     } else {
         if ($cfg_notallowstr != '' && preg_match("#".$cfg_notallowstr."#i", $svar)) {
-            ShowMsg("{$fk}字段中包含禁用词!", '-1');
+            ShowMsg("{$fk}字段中包含禁用词", '-1');
             exit();
         }
         if ($cfg_replacestr != '') {

src/system/taglib/flink.lib.php

@@ -34,7 +34,7 @@ function lib_flink(&$ctag, &$refObj)
         $wsql .= " And logo='' ";
     }
     $equery = "SELECT * FROM `#@__flink` $wsql order by sortrank asc limit 0,$totalrow";
-    if (trim($ctag->GetInnerText()) == '') $innertext = "[field:link /] ";
+    if (trim($ctag->GetInnerText()) == '') $innertext = "[field:link/] ";
     else $innertext = $ctag->GetInnerText();
     $dsql->SetQuery($equery);
     $dsql->Execute();

src/system/taglib/flinktype.lib.php

@@ -19,7 +19,7 @@ function lib_flinktype(&$ctag, &$refObj)
     $totalrow = $row;
     $revalue = '';
     $equery = "SELECT * FROM `#@__flinktype` order by id asc limit 0,$totalrow";
-    if (trim($ctag->GetInnerText()) == '') $innertext = "<li>[field:typename /]</li>";
+    if (trim($ctag->GetInnerText()) == '') $innertext = "<li>[field:typename/]</li>";
     else $innertext = $ctag->GetInnerText();
     if (!isset($type)) $type = '';
     $dtp = new DedeTagParse();

src/system/taglib/help/adminname.txt

@@ -1,4 +1,4 @@
 获得责任编辑名称
 >>dede>>
-{dede:adminname /}
+{dede:adminname/}
 >>dede>>

src/system/taglib/help/booklist.txt

@@ -1,7 +1,7 @@
 连载图书调用
 >>dede>>
 {dede:booklist row='12' booktype='-1' orderby='lastpost' author='' keyword=''}
-<a href='[field:bookurl /]'>[field:bookname /]</a><br>
+<a href='[field:bookurl/]'>[field:bookname/]</a><br>
 {/dede:booklist}
 >>dede>>
 这个标签和bookcontentlist实际是完全相同的，只是默认底层模板不同

src/system/taglib/help/channelartlist.txt

@@ -5,7 +5,7 @@
   <dt><a href='{dede:field name='typeurl'/}'>{dede:field name='typename'/}</a></dt>
   <dd>
   {dede:arclist titlelen='42' row='10'}    <ul class='autod'>  
-      <li><a href="[field:arcurl /]">[field:title /]</a></li>
+      <li><a href="[field:arcurl/]">[field:title/]</a></li>
       <li>([field:pubdate function="MyDate('m-d',@me)"/])</li>
     </ul>
 {/dede:arclist}

src/system/taglib/help/demotag.txt

@@ -1,5 +1,5 @@
 这仅是一个演示标签
 >>dede>>
-{dede:demotag /}
+{dede:demotag/}
 >>dede>>
 无属性信息

src/system/taglib/help/feedback.txt

@@ -3,7 +3,7 @@
 {dede:feedback}
 <ul>
 <li class='fbtitle'>[field:username function="(@me=='guest' ? '游客' : @me)"/] 对 [field:title/] 的评论：</li>
-<li class='fbmsg'> &nbsp;<a href="apps/feedback.php?aid=[field:aid/]" class='fbmsg'>[field:msg /]</a></li>
+<li class='fbmsg'> &nbsp;<a href="apps/feedback.php?aid=[field:aid/]" class='fbmsg'>[field:msg/]</a></li>
 </ul>
 {/dede:feedback}
 >>dede>>

src/system/taglib/help/hotwords.txt

@@ -1,6 +1,6 @@
 获取网站搜索的热门关键词
 >>dede>>
-{dede:hotwords /}
+{dede:hotwords/}
 >>dede>>
 num='6' 关键词数目
 subday='365' 天数

src/system/taglib/help/infoguide.txt

@@ -1,5 +1,5 @@
 分类信息的地区与小分类搜索
 >>dede>>
-{dede:infoguide /}
+{dede:infoguide/}
 >>dede>>
 无属性

src/system/taglib/help/infolink.txt

@@ -1,5 +1,5 @@
 分类信息地区与类型快捷链接
 >>dede>>
-{dede:infolink /}
+{dede:infolink/}
 >>dede>>
 无属性

src/system/taglib/help/memberlist.txt

@@ -1,8 +1,8 @@
 会员信息调用标签
 >>dede>>
 {dede:memberlist orderby='scores' row='20'}
-<a href="../user/index.php?uid={dede:field.userid /}">{dede:field.userid /}</a>
-<span>{dede:field.scores /}</span>
+<a href="../user/index.php?uid={dede:field.userid/}">{dede:field.userid/}</a>
+<span>{dede:field.scores/}</span>
 {/dede:memberlist}
 >>dede>>
 orderby = 'scores' 按积分排序

src/system/taglib/help/softmsg.txt

@@ -1,4 +1,4 @@
 下载说明标签
 >>dede>>
-{dede:softmsg /}
+{dede:softmsg/}
 >>dede>>

src/system/taglib/help/type.txt

@@ -1,7 +1,7 @@
 指定的单个栏目的链接标签
 >>dede>>
 {dede:type}
-<a href="[field:typelink /]">[field:typename /]</a>
+<a href="[field:typelink/]">[field:typename/]</a>
 {/dede:type}
 >>dede>>
 typeid='' 指定栏目ID

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/info_guide.htm

@@ -2,9 +2,9 @@
 	<tr>
 		<td>
 			<form name="infoguide" method="get" action="/apps/list.php">
-				[field:nativeplace /]
-				[field:infotype /]
-				<input type="hidden" name="typeid" value="[field:typeid /]">
+				[field:nativeplace/]
+				[field:infotype/]
+				<input type="hidden" name="typeid" value="[field:typeid/]">
 				<input type="hidden" name="channelid" value="-8">
 				<input type="text" name="keyword" value="" style="width:160px">
 				<input type="submit" value="搜索" class="bt">

src/theme/system/mynews.htm

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

src/theme/system/part_arclist.htm

@@ -1 +1 @@
-<a href="[field:filename /]">[field:title /]</a><br>
+<a href="[field:filename/]">[field:title/]</a><br>

src/theme/system/part_channelartlist.htm

@@ -6,10 +6,10 @@
 				<tr>
 					<td width="10%">▪</td>
 					<td width="60%">
-						<a href="[field:typelink /]">[field:typename /]</a>
+						<a href="[field:typelink/]">[field:typename/]</a>
 					</td>
 					<td width="30%" align="right">
-						<a href="[field:typelink /]">更多</a>
+						<a href="[field:typelink/]">更多</a>
 					</td>
 				</tr>
 			</table>
@@ -19,7 +19,7 @@
 	<tr>
 		<td height="100">
 			{dede:arclist}
-			·<a href="[field:arcurl /]">[field:title /]</a><br>
+			·<a href="[field:arcurl/]">[field:title/]</a><br>
 			{/dede:arclist}
 		</td>
 	</tr>

src/theme/system/spec_list.htm

@@ -7,12 +7,12 @@
 				</tr>
 			</table>
 		</td>
-		<td width="53%">[field:typelink /] [field:textlink /]</td>
-		<td width="24%">点击:[field:click /]</td>
+		<td width="53%">[field:typelink/] [field:textlink/]</td>
+		<td width="24%">点击:[field:click/]</td>
 	</tr>
 	<tr>
 		<td height="56" colspan="2">
-			[field:description /]<span>([field:stime /])</span>
+			[field:description/]<span>([field:stime/])</span>
 		</td>
 	</tr>
 </table>

src/theme/system/tag_arclist.htm

@@ -1 +1 @@
-<a href="[field:arcurl /]">[field:title /]</a><br>
+<a href="[field:arcurl/]">[field:title/]</a><br>

src/theme/templets/advancedsearch.htm

@@ -3,7 +3,7 @@
 	<head>
 		<meta charset="{dede:global.cfg_soft_lang/}">
 		<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
-		<title>搜索结果页-<?php echo $cfg_webname;?></title>
+		<title>搜索结果页-<?php echo $cfg_webname; ?></title>
 		<style>
 			* {
 				padding: 0;

src/theme/templets/article_article.htm

@@ -45,7 +45,7 @@
 						<ul class="pagination justify-content-center py-3">{dede:pagebreak/}</ul>
 					</nav>
 					<div class="clearfix"></div>
-					{dede:include comment='文档顶踩模块' filename="widget_article_digg.htm"/}
+					{dede:include comment='文档顶踩模块' filename='widget_article_digg.htm'/}
 					<div class="row">
 						<div class="col-md-4 prenext pt-2">
 							<div class="pagination-previous">{dede:prenext get='pre'/}</div>
@@ -74,16 +74,16 @@
 							</div>
 						</div>
 					</div>
-					{dede:include comment='文档评论模块' file='widget_article_feedback.htm' /}
+					{dede:include comment='文档评论模块' file='widget_article_feedback.htm'/}
 				</div>
 				<aside class="col-md-4 article-sidebar">
-					{dede:include comment='推荐内容' filename="widget_recommend.htm"/}
-					{dede:include comment='热点内容' filename="widget_hot.htm"/}
-					{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+					{dede:include comment='推荐内容' filename='widget_recommend.htm'/}
+					{dede:include comment='热点内容' filename='widget_hot.htm'/}
+					{dede:include comment='QR二维码' filename='widget_qrcode.htm'/}
 				</aside>
 			</div>
 		</main>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 		<script>
 			//页面加载触发
 			$(document).ready(function() {

src/theme/templets/article_default.htm

@@ -57,7 +57,7 @@
 					</div>
 					<div class="body py-2">{dede:field.body/}（责任编辑：{dede:adminname/}）</div>
 					<div class="clearfix"></div>
-					{dede:include comment='文档顶踩模块' filename="widget_article_digg.htm"/}
+					{dede:include comment='文档顶踩模块' filename='widget_article_digg.htm'/}
 					<div class="row">
 						<div class="col-md-4 prenext pt-2">
 							<div class="pagination-previous">{dede:prenext get='pre'/}</div>
@@ -86,16 +86,16 @@
 							</div>
 						</div>
 					</div>
-					{dede:include comment='文档评论模块' file='widget_article_feedback.htm' /}
+					{dede:include comment='文档评论模块' file='widget_article_feedback.htm'/}
 				</div>
 				<aside class="col-md-4 article-sidebar">
-					{dede:include comment='推荐内容' filename="widget_recommend.htm"/}
-					{dede:include comment='热点内容' filename="widget_hot.htm"/}
-					{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+					{dede:include comment='推荐内容' filename='widget_recommend.htm'/}
+					{dede:include comment='热点内容' filename='widget_hot.htm'/}
+					{dede:include comment='QR二维码' filename='widget_qrcode.htm'/}
 				</aside>
 			</div>
 		</main>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 		<script>
 			//页面加载触发
 			$(document).ready(function() {

src/theme/templets/article_default_sg.htm

@@ -60,7 +60,7 @@
 					</div>
 					<div class="body py-2">{dede:field.body/}（责任编辑：{dede:adminname/}）</div>
 					<div class="clearfix"></div>
-					{dede:include comment='文档顶踩模块' filename="widget_article_digg.htm"/}
+					{dede:include comment='文档顶踩模块' filename='widget_article_digg.htm'/}
 					<div class="row">
 						<div class="col-md-4 prenext pt-2">
 							<div class="pagination-previous">{dede:prenext get='pre'/}</div>
@@ -89,16 +89,16 @@
 							</div>
 						</div>
 					</div>
-					{dede:include comment='文档评论模块' file='widget_article_feedback.htm' /}
+					{dede:include comment='文档评论模块' file='widget_article_feedback.htm'/}
 				</div>
 				<aside class="col-md-4 article-sidebar">
-					{dede:include comment='推荐内容' filename="widget_recommend.htm"/}
-					{dede:include comment='热点内容' filename="widget_hot.htm"/}
-					{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+					{dede:include comment='推荐内容' filename='widget_recommend.htm'/}
+					{dede:include comment='热点内容' filename='widget_hot.htm'/}
+					{dede:include comment='QR二维码' filename='widget_qrcode.htm'/}
 				</aside>
 			</div>
 		</main>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 		<script>
 			//页面加载触发
 			$(document).ready(function() {

src/theme/templets/article_image.htm

@@ -112,10 +112,10 @@
 							{dede:field name='imgurls' alt='图片输出区'}
 								[field:pagestyle runphp='yes'] @me= (@me==3 ? '<li>' : '');[/field:pagestyle]
 								<a href='[field:linkurl/]' [field:pagestyle runphp='yes' ] @me=(@me==3 ? 'class="pic"' : '' ); [/field:pagestyle]>
-									<img src='[field:imgsrc/]' id='bigimg' [field:imgwidth /] alt='[field:alttext /]'>
+									<img src='[field:imgsrc/]' id='bigimg' [field:imgwidth/] alt='[field:alttext/]'>
 								</a>
 								<a href='[field:linkurl/]' [field:pagestyle runphp='yes' ]@me=(@me==3 ? 'class="title"' : '' );[/field:pagestyle]>
-									[field:title /]
+									[field:title/]
 								</a>
 								[field:pagestyle runphp='yes'] @me = (@me==3 ? '</li>' : ''); [/field:pagestyle]
 							{/dede:field}
@@ -136,7 +136,7 @@
 					</div>
 					<div class="body py-2">{dede:field.body/}（责任编辑：{dede:adminname/}）</div>
 					<div class="clearfix"></div>
-					{dede:include comment='文档顶踩模块' filename="widget_article_digg.htm"/}
+					{dede:include comment='文档顶踩模块' filename='widget_article_digg.htm'/}
 					<div class="row">
 						<div class="col-md-4 prenext pt-2">
 							<div class="pagination-previous">{dede:prenext get='pre'/}</div>
@@ -165,16 +165,16 @@
 							</div>
 						</div>
 					</div>
-					{dede:include comment='文档评论模块' file='widget_article_feedback.htm' /}
+					{dede:include comment='文档评论模块' file='widget_article_feedback.htm'/}
 				</div>
 				<aside class="col-md-4 article-sidebar">
-					{dede:include comment='推荐内容' filename="widget_recommend.htm"/}
-					{dede:include comment='热点内容' filename="widget_hot.htm"/}
-					{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+					{dede:include comment='推荐内容' filename='widget_recommend.htm'/}
+					{dede:include comment='热点内容' filename='widget_hot.htm'/}
+					{dede:include comment='QR二维码' filename='widget_qrcode.htm'/}
 				</aside>
 			</div>
 		</main>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 		<script>
 			//页面加载触发
 			$(document).ready(function() {

src/theme/templets/article_infos.htm

@@ -37,16 +37,16 @@
 						<p><small>信息类型：</small><span>{dede:field.infotype/}</span></p>
 						<p><small>点击数：</small><span id="_count">...</span></p>
 						<p><small>发布时间：</small><span>{dede:field.pubdate function="MyDate('y-m-d H:i',@me)"/} </span></p>
-						<p><small>截止日期：</small><span>{dede:field.endtime function="MyDate('Y-m-d H:m',@me)" /} </span></p>
-						<p><small>联系人：</small><span>{dede:field.linkman /}</span></p>
-						<p><small>联系电话：</small><span>{dede:field.tel /}</span></p>
+						<p><small>截止日期：</small><span>{dede:field.endtime function="MyDate('Y-m-d H:m',@me)"/} </span></p>
+						<p><small>联系人：</small><span>{dede:field.linkman/}</span></p>
+						<p><small>联系电话：</small><span>{dede:field.tel/}</span></p>
 						<p><small>电子邮箱：</small><span>{dede:field.email/}</span></p>
-						<p><small>地址：</small><span>{dede:field.address /}</span></p>
+						<p><small>地址：</small><span>{dede:field.address/}</span></p>
 						<p>信息描述</p>
 						<div>{dede:field.body/}</div>
 					</div>
 					<div class="clearfix"></div>
-					{dede:include comment='文档顶踩模块' filename="widget_article_digg.htm"/}
+					{dede:include comment='文档顶踩模块' filename='widget_article_digg.htm'/}
 					<div class="row">
 						<div class="col-md-4 prenext pt-2">
 							<div class="pagination-previous">{dede:prenext get='pre'/}</div>
@@ -75,16 +75,16 @@
 							</div>
 						</div>
 					</div>
-					{dede:include comment='文档评论模块' file='widget_article_feedback.htm' /}
+					{dede:include comment='文档评论模块' file='widget_article_feedback.htm'/}
 				</div>
 				<aside class="col-md-4 article-sidebar">
-					{dede:include comment='推荐内容' filename="widget_recommend_sg.htm"/}
-					{dede:include comment='热点内容' filename="widget_hot_sg.htm"/}
-					{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+					{dede:include comment='推荐内容' filename='widget_recommend_sg.htm'/}
+					{dede:include comment='热点内容' filename='widget_hot_sg.htm'/}
+					{dede:include comment='QR二维码' filename='widget_qrcode.htm'/}
 				</aside>
 			</div>
 		</main>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 		<script>
 			//页面加载触发
 			$(document).ready(function() {

src/theme/templets/article_shop.htm

@@ -52,7 +52,7 @@
 						</div>
 					</div>
 					<div class="clearfix"></div>
-					{dede:include comment='文档顶踩模块' filename="widget_article_digg.htm"/}
+					{dede:include comment='文档顶踩模块' filename='widget_article_digg.htm'/}
 					<div class="row">
 						<div class="col-md-4 prenext pt-2">
 							<div class="pagination-previous">{dede:prenext get='pre'/}</div>
@@ -81,16 +81,16 @@
 							</div>
 						</div>
 					</div>
-					{dede:include comment='文档评论模块' file='widget_article_feedback.htm' /}
+					{dede:include comment='文档评论模块' file='widget_article_feedback.htm'/}
 				</div>
 				<aside class="col-md-4 article-sidebar">
-					{dede:include comment='推荐内容' filename="widget_recommend.htm"/}
-					{dede:include comment='热点内容' filename="widget_hot.htm"/}
-					{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+					{dede:include comment='推荐内容' filename='widget_recommend.htm'/}
+					{dede:include comment='热点内容' filename='widget_hot.htm'/}
+					{dede:include comment='QR二维码' filename='widget_qrcode.htm'/}
 				</aside>
 			</div>
 		</main>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 		<script>
 			//页面加载触发
 			$(document).ready(function() {

src/theme/templets/article_soft.htm

@@ -59,7 +59,7 @@
 						</ul>
 					</div>
 					<div class="clearfix"></div>
-					{dede:include comment='文档顶踩模块' filename="widget_article_digg.htm"/}
+					{dede:include comment='文档顶踩模块' filename='widget_article_digg.htm'/}
 					<div class="row">
 						<div class="col-md-4 prenext pt-2">
 							<div class="pagination-previous">{dede:prenext get='pre'/}</div>
@@ -88,16 +88,16 @@
 							</div>
 						</div>
 					</div>
-					{dede:include comment='文档评论模块' file='widget_article_feedback.htm' /}
+					{dede:include comment='文档评论模块' file='widget_article_feedback.htm'/}
 				</div>
 				<aside class="col-md-4 article-sidebar">
-					{dede:include comment='推荐内容' filename="widget_recommend.htm"/}
-					{dede:include comment='热点内容' filename="widget_hot.htm"/}
-					{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+					{dede:include comment='推荐内容' filename='widget_recommend.htm'/}
+					{dede:include comment='热点内容' filename='widget_hot.htm'/}
+					{dede:include comment='QR二维码' filename='widget_qrcode.htm'/}
 				</aside>
 			</div>
 		</main>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 		<script>
 			//页面加载触发
 			$(document).ready(function() {

src/theme/templets/article_spec.htm

@@ -42,12 +42,12 @@
 					<div class="clearfix"></div>
 				</div>
 				<aside class="col-md-4 article-sidebar">
-					{dede:include comment='推荐内容' filename="widget_recommend.htm"/}
-					{dede:include comment='热点内容' filename="widget_hot.htm"/}
-					{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+					{dede:include comment='推荐内容' filename='widget_recommend.htm'/}
+					{dede:include comment='热点内容' filename='widget_hot.htm'/}
+					{dede:include comment='QR二维码' filename='widget_qrcode.htm'/}
 				</aside>
 			</div>
 		</main>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 	</body>
 </html>

src/theme/templets/index.htm

@@ -118,16 +118,16 @@
 					</div>
 				</div>
 				<aside class="col-12 col-lg-3">
-					{dede:include comment='推荐内容' filename="widget_recommend.htm"/}
-					{dede:include comment='热点内容' filename="widget_hot.htm"/}
-					{dede:include comment='投票' filename="widget_vote.htm"/}
-					{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+					{dede:include comment='推荐内容' filename='widget_recommend.htm'/}
+					{dede:include comment='热点内容' filename='widget_hot.htm'/}
+					{dede:include comment='投票' filename='widget_vote.htm'/}
+					{dede:include comment='QR二维码' filename='widget_qrcode.htm'/}
 				</aside>
 			</div>
 		</main>
 		<div class="container-fluid flink mt-3">
 			<div class="container py-3">友情连接：{dede:flink row='24'/}</div>
 		</div>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 	</body>
 </html>

src/theme/templets/index_article.htm

@@ -57,12 +57,12 @@
 					</div>
 				</div>
 				<aside class="col-12 col-lg-3">
-					{dede:include comment='推荐内容' filename="widget_recommend.htm"/}
-					{dede:include comment='热点内容' filename="widget_hot.htm"/}
-					{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+					{dede:include comment='推荐内容' filename='widget_recommend.htm'/}
+					{dede:include comment='热点内容' filename='widget_hot.htm'/}
+					{dede:include comment='QR二维码' filename='widget_qrcode.htm'/}
 				</aside>
 			</div>
 		</main>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 	</body>
 </html>

src/theme/templets/index_default.htm

@@ -57,12 +57,12 @@
 					</div>
 				</div>
 				<aside class="col-12 col-lg-3">
-					{dede:include comment='推荐内容' filename="widget_recommend.htm"/}
-					{dede:include comment='热点内容' filename="widget_hot.htm"/}
-					{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+					{dede:include comment='推荐内容' filename='widget_recommend.htm'/}
+					{dede:include comment='热点内容' filename='widget_hot.htm'/}
+					{dede:include comment='QR二维码' filename='widget_qrcode.htm'/}
 				</aside>
 			</div>
 		</main>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 	</body>
 </html>

src/theme/templets/index_default_sg.htm

@@ -57,12 +57,12 @@
 					</div>
 				</div>
 				<aside class="col-12 col-lg-3">
-					{dede:include comment='推荐内容' filename="widget_recommend_sg.htm"/}
-					{dede:include comment='热点内容' filename="widget_hot_sg.htm"/}
-					{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+					{dede:include comment='推荐内容' filename='widget_recommend_sg.htm'/}
+					{dede:include comment='热点内容' filename='widget_hot_sg.htm'/}
+					{dede:include comment='QR二维码' filename='widget_qrcode.htm'/}
 				</aside>
 			</div>
 		</main>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 	</body>
 </html>

src/theme/templets/index_image.htm

@@ -63,12 +63,12 @@
 					</div>
 				</div>
 				<aside class="col-12 col-lg-3">
-					{dede:include comment='推荐内容' filename="widget_recommend.htm"/}
-					{dede:include comment='热点内容' filename="widget_hot.htm"/}
-					{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+					{dede:include comment='推荐内容' filename='widget_recommend.htm'/}
+					{dede:include comment='热点内容' filename='widget_hot.htm'/}
+					{dede:include comment='QR二维码' filename='widget_qrcode.htm'/}
 				</aside>
 			</div>
 		</main>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 	</body>
 </html>

src/theme/templets/index_infos.htm

@@ -57,12 +57,12 @@
 					</div>
 				</div>
 				<aside class="col-12 col-lg-3">
-					{dede:include comment='推荐内容' filename="widget_recommend_sg.htm"/}
-					{dede:include comment='热点内容' filename="widget_hot_sg.htm"/}
-					{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+					{dede:include comment='推荐内容' filename='widget_recommend_sg.htm'/}
+					{dede:include comment='热点内容' filename='widget_hot_sg.htm'/}
+					{dede:include comment='QR二维码' filename='widget_qrcode.htm'/}
 				</aside>
 			</div>
 		</main>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 	</body>
 </html>

src/theme/templets/index_shop.htm

@@ -57,12 +57,12 @@
 					</div>
 				</div>
 				<aside class="col-12 col-lg-3">
-					{dede:include comment='推荐内容' filename="widget_recommend.htm"/}
-					{dede:include comment='热点内容' filename="widget_hot.htm"/}
-					{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+					{dede:include comment='推荐内容' filename='widget_recommend.htm'/}
+					{dede:include comment='热点内容' filename='widget_hot.htm'/}
+					{dede:include comment='QR二维码' filename='widget_qrcode.htm'/}
 				</aside>
 			</div>
 		</main>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 	</body>
 </html>

src/theme/templets/index_soft.htm

@@ -57,12 +57,12 @@
 					</div>
 				</div>
 				<aside class="col-12 col-lg-3">
-					{dede:include comment='推荐内容' filename="widget_recommend.htm"/}
-					{dede:include comment='热点内容' filename="widget_hot.htm"/}
-					{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+					{dede:include comment='推荐内容' filename='widget_recommend.htm'/}
+					{dede:include comment='热点内容' filename='widget_hot.htm'/}
+					{dede:include comment='QR二维码' filename='widget_qrcode.htm'/}
 				</aside>
 			</div>
 		</main>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 	</body>
 </html>

src/theme/templets/list_article.htm

@@ -53,13 +53,13 @@
 					</nav>
 				</div>
 				<aside class="col-md-4 article-sidebar">
-					{dede:include comment='栏目列表' filename="widget_channels.htm"/}
-					{dede:include comment='推荐内容' filename="widget_recommend.htm"/}
-					{dede:include comment='热点内容' filename="widget_hot.htm"/}
-					{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+					{dede:include comment='栏目列表' filename='widget_channels.htm'/}
+					{dede:include comment='推荐内容' filename='widget_recommend.htm'/}
+					{dede:include comment='热点内容' filename='widget_hot.htm'/}
+					{dede:include comment='QR二维码' filename='widget_qrcode.htm'/}
 				</aside>
 			</div>
 		</main>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 	</body>
 </html>

src/theme/templets/list_default.htm

@@ -53,13 +53,13 @@
 					</nav>
 				</div>
 				<aside class="col-md-4 article-sidebar">
-					{dede:include comment='栏目列表' filename="widget_channels.htm"/}
-					{dede:include comment='推荐内容' filename="widget_recommend.htm"/}
-					{dede:include comment='热点内容' filename="widget_hot.htm"/}
-					{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+					{dede:include comment='栏目列表' filename='widget_channels.htm'/}
+					{dede:include comment='推荐内容' filename='widget_recommend.htm'/}
+					{dede:include comment='热点内容' filename='widget_hot.htm'/}
+					{dede:include comment='QR二维码' filename='widget_qrcode.htm'/}
 				</aside>
 			</div>
 		</main>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 	</body>
 </html>

src/theme/templets/list_default_sg.htm

@@ -53,13 +53,13 @@
 					</nav>
 				</div>
 				<aside class="col-md-4 article-sidebar">
-					{dede:include comment='栏目列表' filename="widget_channels.htm"/}
-					{dede:include comment='推荐内容' filename="widget_recommend_sg.htm"/}
-					{dede:include comment='热点内容' filename="widget_hot_sg.htm"/}
-					{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+					{dede:include comment='栏目列表' filename='widget_channels.htm'/}
+					{dede:include comment='推荐内容' filename='widget_recommend_sg.htm'/}
+					{dede:include comment='热点内容' filename='widget_hot_sg.htm'/}
+					{dede:include comment='QR二维码' filename='widget_qrcode.htm'/}
 				</aside>
 			</div>
 		</main>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 	</body>
 </html>

src/theme/templets/list_free.htm

@@ -39,13 +39,13 @@
 					</nav>
 				</div>
 				<aside class="col-md-4 article-sidebar">
-					{dede:include comment='栏目列表' filename="widget_channels.htm"/}
-					{dede:include comment='推荐内容' filename="widget_recommend.htm"/}
-					{dede:include comment='热点内容' filename="widget_hot.htm"/}
-					{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+					{dede:include comment='栏目列表' filename='widget_channels.htm'/}
+					{dede:include comment='推荐内容' filename='widget_recommend.htm'/}
+					{dede:include comment='热点内容' filename='widget_hot.htm'/}
+					{dede:include comment='QR二维码' filename='widget_qrcode.htm'/}
 				</aside>
 			</div>
 		</main>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 	</body>
 </html>

src/theme/templets/list_image.htm

@@ -50,13 +50,13 @@
 					</nav>
 				</div>
 				<aside class="col-md-4 article-sidebar">
-					{dede:include comment='栏目列表' filename="widget_channels.htm"/}
-					{dede:include comment='推荐内容' filename="widget_recommend.htm"/}
-					{dede:include comment='热点内容' filename="widget_hot.htm"/}
-					{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+					{dede:include comment='栏目列表' filename='widget_channels.htm'/}
+					{dede:include comment='推荐内容' filename='widget_recommend.htm'/}
+					{dede:include comment='热点内容' filename='widget_hot.htm'/}
+					{dede:include comment='QR二维码' filename='widget_qrcode.htm'/}
 				</aside>
 			</div>
 		</main>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 	</body>
 </html>

src/theme/templets/list_infos.htm

@@ -48,14 +48,14 @@
 							<td align="center" nowrap="yes">
 								<div>[field:linkallplace/]</div>
 							</td>
-							<td>[field:nativeplace /]</td>
+							<td>[field:nativeplace/]</td>
 						</tr>
 						<tr>
 							<td>类型：</td>
 							<td align="center" nowrap="yes">
 								<div>[field:linkalltype/]</div>
 							</td>
-							<td>[field:infotype /]</td>
+							<td>[field:infotype/]</td>
 						</tr>
 					</table>
 					{/dede:infolink}
@@ -82,7 +82,7 @@
 					</nav>
 				</div>
 				<aside class="col-md-4 article-sidebar">
-					{dede:include comment='栏目列表' filename="widget_channels.htm"/}
+					{dede:include comment='栏目列表' filename='widget_channels.htm'/}
 					<div class="info-search card ddcard pt-3 mt-3">
 						<div class="card-header">
 							<div class="row">
@@ -106,12 +106,12 @@
 							{/dede:infoguide}
 						</div>
 					</div>
-					{dede:include comment='推荐内容' filename="widget_recommend_sg.htm"/}
-					{dede:include comment='热点内容' filename="widget_hot_sg.htm"/}
-					{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+					{dede:include comment='推荐内容' filename='widget_recommend_sg.htm'/}
+					{dede:include comment='热点内容' filename='widget_hot_sg.htm'/}
+					{dede:include comment='QR二维码' filename='widget_qrcode.htm'/}
 				</aside>
 			</div>
 		</main>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 	</body>
 </html>

src/theme/templets/list_shop.htm

@@ -52,18 +52,18 @@
 					</ul>
 					<nav>
 						<ul class="pagination justify-content-center py-3">
-							{dede:pagelist listitem="info,index,end,pre,next,pageno" listsize="1"/}
+							{dede:pagelist listitem='info,index,end,pre,next,pageno' listsize='1'/}
 						</ul>
 					</nav>
 				</div>
 				<aside class="col-md-4 article-sidebar">
-					{dede:include comment='栏目列表' filename="widget_channels.htm"/}
-					{dede:include comment='推荐内容' filename="widget_recommend.htm"/}
-					{dede:include comment='热点内容' filename="widget_hot.htm"/}
-					{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+					{dede:include comment='栏目列表' filename='widget_channels.htm'/}
+					{dede:include comment='推荐内容' filename='widget_recommend.htm'/}
+					{dede:include comment='热点内容' filename='widget_hot.htm'/}
+					{dede:include comment='QR二维码' filename='widget_qrcode.htm'/}
 				</aside>
 			</div>
 		</main>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 	</body>
 </html>

src/theme/templets/list_soft.htm

@@ -57,13 +57,13 @@
 					</nav>
 				</div>
 				<aside class="col-md-4 article-sidebar">
-					{dede:include comment='栏目列表' filename="widget_channels.htm"/}
-					{dede:include comment='推荐内容' filename="widget_recommend.htm"/}
-					{dede:include comment='热点内容' filename="widget_hot.htm"/}
-					{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+					{dede:include comment='栏目列表' filename='widget_channels.htm'/}
+					{dede:include comment='推荐内容' filename='widget_recommend.htm'/}
+					{dede:include comment='热点内容' filename='widget_hot.htm'/}
+					{dede:include comment='QR二维码' filename='widget_qrcode.htm'/}
 				</aside>
 			</div>
 		</main>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 	</body>
 </html>

src/theme/templets/list_spec.htm

@@ -55,13 +55,13 @@
 					</nav>
 				</div>
 				<aside class="col-md-4 article-sidebar">
-					{dede:include comment='栏目列表' filename="widget_channels.htm"/}
-					{dede:include comment='推荐内容' filename="widget_recommend.htm"/}
-					{dede:include comment='热点内容' filename="widget_hot.htm"/}
-					{dede:include comment='QR二维码' filename="widget_qrcode.htm"/}
+					{dede:include comment='栏目列表' filename='widget_channels.htm'/}
+					{dede:include comment='推荐内容' filename='widget_recommend.htm'/}
+					{dede:include comment='热点内容' filename='widget_hot.htm'/}
+					{dede:include comment='QR二维码' filename='widget_qrcode.htm'/}
 				</aside>
 			</div>
 		</main>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 	</body>
 </html>

src/theme/templets/search.htm

@@ -52,11 +52,11 @@
 					</nav>
 				</div>
 				<aside class="col-md-4 article-sidebar">
-					{dede:include comment='推荐内容' filename="widget_recommend.htm"/}
-					{dede:include comment='热点内容' filename="widget_hot.htm"/}
+					{dede:include comment='推荐内容' filename='widget_recommend.htm'/}
+					{dede:include comment='热点内容' filename='widget_hot.htm'/}
 				</aside>
 			</div>
 		</main>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 	</body>
 </html>

src/theme/templets/singlepage.htm

@@ -39,6 +39,6 @@
 				</div>
 			</div>
 		</main>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 	</body>
 </html>

src/theme/templets/tag.htm

@@ -105,6 +105,6 @@
 				</div>
 			</div>
 		</main>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 	</body>
 </html>

src/theme/templets/taglist.htm

@@ -23,7 +23,7 @@
 					<ol class="breadcrumb mt-3">
 						<li class="breadcrumb-item">当前位置</li>
 						<li class="breadcrumb-item"><a href='{dede:field.position/}'>TAG标签</a></li>
-						<li class="breadcrumb-item">{dede:field.title /}</li>
+						<li class="breadcrumb-item">{dede:field.title/}</li>
 					</ol>
 				</nav>
 			</div>
@@ -58,11 +58,11 @@
 					</nav>
 				</div>
 				<aside class="col-md-4 article-sidebar">
-					{dede:include comment='推荐内容' filename="widget_recommend.htm"/}
-					{dede:include comment='热点内容' filename="widget_hot.htm"/}
+					{dede:include comment='推荐内容' filename='widget_recommend.htm'/}
+					{dede:include comment='热点内容' filename='widget_hot.htm'/}
 				</aside>
 			</div>
 		</main>
-		{dede:include filename="footer.htm"/}
+		{dede:include filename='footer.htm'/}
 	</body>
 </html>

src/theme/templets/widget_article_digg.htm

@@ -1,4 +1,4 @@
-{dede:comment text="顶踩模块"/}
+{dede:comment text='顶踩模块'/}
 <div class="row justify-content-center digg">
     <div class="comment-container mb-3" onclick="javascript:PostDigg('good',{dede:field.id/})">
         <div class="comment-top">