From 3dd045c44d874f125554270e559950a9e55dc37a Mon Sep 17 00:00:00 2001
From: xushubieli <xushubieli@qq.com>
Date: Fri, 7 Jan 2022 14:01:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BA=95=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/dede/templets/article_add.htm      |  2 +-
 src/dede/templets/article_edit.htm     |  2 +-
 src/dede/templets/content_list.htm     |  2 +-
 src/dede/templets/diy_list.htm         |  4 +-
 src/dede/templets/diy_main.htm         |  2 +-
 src/dede/templets/sys_info.htm         | 54 +++++++++++++-------------
 src/dede/templets/templets_default.htm | 22 +++++------
 7 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/src/dede/templets/article_add.htm b/src/dede/templets/article_add.htm
index 4016fdd1..77d472d9 100755
--- a/src/dede/templets/article_add.htm
+++ b/src/dede/templets/article_add.htm
@@ -31,7 +31,7 @@
     }
   </script>
   <style>
-body{background-image:#ffffff}
+body{background:#ffffff}
 table{border-collapse:separate}
 img{vertical-align:baseline}
 .albCt img{cursor:pointer}
diff --git a/src/dede/templets/article_edit.htm b/src/dede/templets/article_edit.htm
index aad5736f..e7180741 100755
--- a/src/dede/templets/article_edit.htm
+++ b/src/dede/templets/article_edit.htm
@@ -29,7 +29,7 @@
     }
   </script>
   <style>
-body{background-image:#ffffff}
+body{background:#ffffff}
 table{border-collapse:separate}
 img{vertical-align:baseline}
 .albCt img{cursor:pointer}
diff --git a/src/dede/templets/content_list.htm b/src/dede/templets/content_list.htm
index 03c8fd2d..33fbabd3 100755
--- a/src/dede/templets/content_list.htm
+++ b/src/dede/templets/content_list.htm
@@ -128,7 +128,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td height="36" colspan="10" align="center" style="background:#f2f2f2">{dede:pagelist listsize=6/}</td>
+				<td height="36" colspan="10" align="center" style="background:#f2f2f2">{dede:pagelist listsize='6'/}</td>
 			</tr>
 		</table>
 	</form>
diff --git a/src/dede/templets/diy_list.htm b/src/dede/templets/diy_list.htm
index af6b2396..3c11cddb 100755
--- a/src/dede/templets/diy_list.htm
+++ b/src/dede/templets/diy_list.htm
@@ -26,7 +26,7 @@
 			if(!empty($fields))
 			{
 				$allowhtml = array('htmltext');
-				$fields['sta'] = $fields['ifcheck'] == 1 ?'已审核':'未审核';
+				$fields['sta'] = $fields['ifcheck'] == 1 ? '已审核':'未审核';
 				echo '<tr bgcolor="#F8FDE3" height="26"><td width="18%"><input type="checkbox" name="id[]" value="'.$fields['id'].'" class="np"></td><td><a href="diy_list.php?action=edit&diyid='.$diy->diyid.'&id='.$fields['id'].'">'.$fields['id'].'</a> '.$fields['sta'].'</td><td width="12%" align="center"><a href="diy_list.php?action=edit&diyid='.$diy->diyid.'&id='.$fields['id'].'"><img src="images/feedback-edit.gif" border="0" width="46" height="18"></a></td></tr>';
 				foreach($fieldlist as $field=>$fielddata)
 				{
@@ -52,7 +52,7 @@
 				<td colspan="3" bgcolor="#fff">{dede:pagelist listsize='6'/}</td>
 			</tr>
 			<tr>
-				<td colspan="3" height="36" bgcolor="#F8FCF1">
+				<td colspan="3" height="36" bgcolor="#f2f2f2">
 					<label><input type="button" name="select" onClick="selAll()" value="全选"></label>
 					<label><input type="button" name="select" onClick="noSelAll()" value="取消"></label>
 					<label><input type="radio" name="action" class="btn btn-success btn-sm" value="check">&nbsp;审核</label>
diff --git a/src/dede/templets/diy_main.htm b/src/dede/templets/diy_main.htm
index 55e7b916..b32d358d 100755
--- a/src/dede/templets/diy_main.htm
+++ b/src/dede/templets/diy_main.htm
@@ -48,7 +48,7 @@
 	</table>
 	<table class="mb-3" width="98%" border="0" cellpadding="5" cellspacing="1" align="center" style="margin:auto;border:1px solid #CFCFCF">
 		<tr>
-			<td height="36" align="center" style="background:#F9FCEF">{dede:pagelist listsize='6'/}</td>
+			<td height="36" align="center" style="background:#f2f2f2">{dede:pagelist listsize='6'/}</td>
 		</tr>
 	</table>
 </body>
diff --git a/src/dede/templets/sys_info.htm b/src/dede/templets/sys_info.htm
index 3b24c5eb..615a397f 100755
--- a/src/dede/templets/sys_info.htm
+++ b/src/dede/templets/sys_info.htm
@@ -50,6 +50,7 @@
   <link rel="stylesheet" href="../static/font-awesome/css/font-awesome.min.css">
   <link rel="stylesheet" href="css/base.css">
 <style>
+.table{margin-bottom:0}
 .btn+.btn{margin-left:10px}
 </style>
 </head>
@@ -57,7 +58,7 @@
   <div style="min-width:780px">
     <table width="98%" border="0" cellpadding="2" cellspacing="1" bgcolor="#D6D6D6" align="center" class="table maintable table-bordered mt-3">
       <tr>
-        <td height="30" background="images/tbg.gif" style="padding-left:10px"><b>系统配置参数：</b></td>
+        <td height="30" background="images/tbg.gif" style="padding-left:10px"><b>系统配置参数</b></td>
       </tr>
       <tr>
         <td height="30" bgcolor="#ffffff" align="left">
@@ -84,39 +85,39 @@
         <td height="26" bgcolor="#ffffff" align="center">
           <form name="fadd" action="sys_info.php" method="post">
             <input type='hidden' name='dopost' value='add'>
-            <input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>" />
+            <input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">
             <table width="100%" border="0" cellspacing="0" cellpadding="0">
               <tr>
-                <td width="12%" height="26">变量名称：</td>
-                <td width="38%" align="left"><input name="nvarname" type="text" id="nvarname" class="npvar" style="width:80%" /></td>
-                <td width="12%" align="center">变量值：</td>
-                <td width="38%" align="left"><input name="nvarvalue" type="text" id="nvarvalue" class="npvar" style="width:80%" /></td>
+                <td width="12%" height="26">变量名称</td>
+                <td width="38%" align="left"><input name="nvarname" type="text" id="nvarname" class="npvar" style="width:80%"></td>
+                <td width="12%" align="center">变量值</td>
+                <td width="38%" align="left"><input name="nvarvalue" type="text" id="nvarvalue" class="npvar" style="width:80%"></td>
               </tr>
               <tr>
-                <td width="10%" height="26">变量类型：</td>
-                <td colspan='3' align="left"><input name="vartype" type="radio" value="string" class='np' checked='checked' />
+                <td width="10%" height="26">变量类型</td>
+                <td colspan='3' align="left"><input name="vartype" type="radio" value="string" class='np' checked='checked'>
                   文本
-                  <input name="vartype" type="radio" value="number" class='np' />
+                  <input name="vartype" type="radio" value="number" class='np'>
                   数字
-                  <input type="radio" name="vartype" value="bool" class='np' />
+                  <input type="radio" name="vartype" value="bool" class='np'>
                   布尔(Y/N)
-                  <input type="radio" name="vartype" value="bstring" class='np' />
+                  <input type="radio" name="vartype" value="bstring" class='np'>
                   多行文本 </td>
               </tr>
               <tr>
-                <td height="26">参数说明：</td>
-                <td align="left"><input type="text" name="varmsg" id="varmsg" class="npvar" style="width:80%" /></td>
-                <td align="center">所属组：</td>
+                <td height="26">参数说明</td>
+                <td align="left"><input type="text" name="varmsg" id="varmsg" class="npvar" style="width:80%"></td>
+                <td align="center">所属组</td>
                 <td align="left">
                 <?php
-                echo "<select name='vargroup' class='npvar'>\r\n";
+                echo "<select name='vargroup' class='npvar'>";
                 foreach($ds as $dl){
                   $dl = trim($dl);
                   if(empty($dl)) continue;
                   $dls = explode(',',$dl);
-                  echo "<option value='{$dls[0]}'>{$dls[1]}</option>\r\n";
+                  echo "<option value='{$dls[0]}'>{$dls[1]}</option>";
                 }
-                echo "</select>\r\n";
+                echo "</select>";
                 ?>
                 <button type="submit" class="btn btn-success btn-sm">保存变量</button>
                 </td>
@@ -129,16 +130,15 @@
     <table width="98%" border="0" cellpadding="0" cellspacing="0" style="margin-top:10px" bgcolor="#D6D6D6" align="center" class="table maintable table-bordered mt-3">
       <tr>
         <td height="28" align="right" background="images/tbg.gif" style="border:1px solid #cfcfcf;border-bottom:none">
-          &nbsp;配置搜索：
-          <input type="text" name="keywds" id="keywds" />
+          配置搜索：<input type="text" name="keywds" id="keywds">
           <button type="button" onclick="getSearch()" class="btn btn-success btn-sm">搜索</button>
-          &nbsp;<span id="_searchback"></span>
+          <span id="_searchback"></span>
         </td>
       </tr>
       <tr>
         <td bgcolor="#FFFFFF" width="100%">
           <form action="sys_info.php" method="post" name="form1">
-            <input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>" />
+            <input type="hidden" name="_csrf_token" value="<?php echo $GLOBALS['csrf_token'];?>">
             <input type="hidden" name="dopost" value="save">
             <div id="_search"></div>
             <div id="_mainsearch">
@@ -173,7 +173,7 @@
                 $i++;
               ?>
               <tr align="center" bgcolor="<?php echo $bgcolor?>">
-                <td width="300"><?php echo $row['info']; ?>：</td>
+                <td width="300"><?php echo $row['info']; ?></td>
                 <td align="left">
                 <?php
                 if($row['type']=='bool')
@@ -181,10 +181,10 @@
                   $c1='';
                   $c2 = '';
                   $row['value']=='Y' ? $c1=" checked" : $c2=" checked";
-                  echo "<label><input type='radio' class='np' name='edit___{$row['varname']}' value='Y'$c1> 是 </label> ";
-                  echo "<label><input type='radio' class='np' name='edit___{$row['varname']}' value='N'$c2> 否 </label> ";
+                  echo "<label><input type='radio' name='edit___{$row['varname']}' class='np' value='Y'$c1> 是 </label> ";
+                  echo "<label><input type='radio' name='edit___{$row['varname']}' class='np' value='N'$c2> 否 </label> ";
                 } else if($row['type']=='bstring') {
-                  echo "<textarea name='edit___{$row['varname']}' row='4' id='edit___{$row['varname']}' class='textarea_info' style='width:98%;height:50px'>".dede_htmlspecialchars($row['value'])."</textarea>";
+                  echo "<textarea name='edit___{$row['varname']}' row='4' id='edit___{$row['varname']}' class='textarea_info' style='width:100%;height:40px'>".dede_htmlspecialchars($row['value'])."</textarea>";
                 } else if($row['type']=='number') {
                   echo "<input type='text' name='edit___{$row['varname']}' id='edit___{$row['varname']}' value='{$row['value']}' style='width:30%'>";
                 } else {
@@ -196,7 +196,7 @@
                 }
                 ?>
                 </td>
-                <td><?php echo $row['varname']?></td>
+                <td>{dede:field.<?php echo $row['varname']?>/}</td>
               </tr>
               <?php
               }
@@ -207,7 +207,7 @@
             ?>
             </div>
             <table width="100%" border="0" cellspacing="1" cellpadding="1" style="border:1px solid #cfcfcf;border-top:none" class="table table-borderless">
-              <tr bgcolor="#F9FCEF">
+              <tr bgcolor="#f2f2f2">
                 <td width="4%"></td>
                 <td width="96%">
                   <button type="submit" class="btn btn-success">确定</button>&nbsp;
diff --git a/src/dede/templets/templets_default.htm b/src/dede/templets/templets_default.htm
index 99def99e..43161973 100755
--- a/src/dede/templets/templets_default.htm
+++ b/src/dede/templets/templets_default.htm
@@ -17,16 +17,15 @@ function DelTpl(filename) {
 }
 </script>
 </head>
-<body background='images/allbg.gif' leftmargin='8' topmargin='8'>
-	<table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" bgcolor="#D6D6D6"
-		class="table maintable table-bordered mt-3">
+<body background="images/allbg.gif" leftmargin="8" topmargin="8">
+	<table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" bgcolor="#D6D6D6" class="table maintable table-bordered mt-3">
 		<tr>
 			<td height="30" background="images/tbg.gif" colspan="7">
 				<b>模板管理</b>
 			</td>
 		</tr>
 	</table>
-	<table width='98%' border='0' cellspacing='1' cellpadding='0' align="center" bgcolor="#cfcfcf" class="table maintable table-bordered">
+	<table width="98%" border="0" cellspacing="1" cellpadding="0" align="center" bgcolor="#cfcfcf" class="table maintable table-bordered">
 		<tr height="30" align="center">
 			<td width="25%" background="images/wbg.gif"><strong>文件名</strong></td>
 			<td width="30%" background="images/wbg.gif"><strong>文件描述</strong></td>
@@ -35,18 +34,18 @@ function DelTpl(filename) {
 		</tr>
 		<tr>
 			<td colspan="4" height="30" bgcolor="#F9FCEF">
-				<div style="float:left;line-height:30px">
+				<span style="float:left;line-height:30px">
 				当前位置：
 				<?php
       			if($acdir=='plus') echo '插件模板';
       			else if($acdir=='system') echo '底层模板';
       			else echo '核心模板 &gt; '.$acdir;
       			?>
-				</div>
-				<div style="float:right;padding-right:10px">
+				</span>
+				<span style="float:right;padding-right:10px">
 					<a class="btn btn-success btn-sm" href="templets_main.php">默认模板目录</a>
 					<a class="btn btn-success btn-sm" href="templets_main.php?acdir=plus">插件模板目录</a>
-				</div>
+				</span>
 			</td>
 		</tr>
 		<?php
@@ -56,7 +55,7 @@ function DelTpl(filename) {
 			continue;
 			$filetime = filemtime($templetdird.'/'.$filename);
 			$filetime = MyDate("Y-m-d H:i",$filetime);
-			$fileinfo = (isset($fileinfos[$filename]) ? $fileinfos[$filename] : '未知模板');
+			$fileinfo = (isset($fileinfos[$filename]) ? $fileinfos[$filename]:'未知模板');
 		?>
 		<tr height="26" bgcolor="#FFFFFF" onMouseMove="javascript:this.bgColor='#FCFDEE';" onMouseOut="javascript:this.bgColor='#FFFFFF';">
 			<td><a href="<?php echo $templeturld.'/'.$filename; ?>" target="_blank"><img src="images/htm.gif"><?php echo $filename; ?></a></td>
@@ -65,8 +64,7 @@ function DelTpl(filename) {
 			<td align="center">
 				<a href="tpl.php?action=edit&acdir=<?php echo $acdir; ?>&filename=<?php echo $filename; ?>" title="编辑" class="btn btn-success btn-sm"><i class="fa fa-pencil-square-o" aria-hidden="true"></i></a>&nbsp;
 				<?php
-				if(!isset($fileinfos[$filename]))
-				{
+				if(!isset($fileinfos[$filename])){
 				?>
 				<a href="javascript:;" class="btn btn-success btn-sm" onClick="javascript:DelTpl('<?php echo $filename; ?>');" title="删除"><i class="fa fa-trash" aria-hidden="true"></i></a>
 				<?php
@@ -78,7 +76,7 @@ function DelTpl(filename) {
 		}
 		?>
 		<tr>
-			<td colspan="4" height="36" bgcolor="#F9FCEF">
+			<td colspan="4" height="36" bgcolor="#f2f2f2">
 				<a class="btn btn-success" href="tpl.php?action=newfile&acdir=<?php echo $acdir; ?>">新建模板</a>&nbsp;
 				<a class="btn btn-success" href="tpl.php?action=upload&acdir=<?php echo $acdir; ?>">上传模板</a>
 			</td>