栏目符号等等，经过背景，安装等等优化

src/admin/catalog_edit.php

@@ -46,7 +46,7 @@ if ($dopost == "save") {
     }
     //修改子栏目属性
     if (!empty($upnext)) {
-    $upquery = "UPDATE `#@__arctype` SETissend='$issend',defaultname='$defaultname',channeltype='$channeltype',tempindex='$tempindex',templist='$templist',temparticle='$temparticle',namerule='$namerule',namerule2='$namerule2',ishidden='$ishidden' WHERE 1=1 AND $slinks";
+    $upquery = "UPDATE `#@__arctype` SET issend='$issend',defaultname='$defaultname',channeltype='$channeltype',tempindex='$tempindex',templist='$templist',temparticle='$temparticle',namerule='$namerule',namerule2='$namerule2',ishidden='$ishidden' WHERE 1=1 AND $slinks";
         if (!$dsql->ExecuteNoneQuery($upquery)) {
             ShowMsg("修改栏目成功，但修改下级栏目属性时失败", "-1");
             exit();

src/admin/freelist_main.php

@@ -75,7 +75,7 @@ function GetTagList($dsql,$pageno,$pagesize,$orderby='aid')
     while($row = $dsql->GetArray())
     {
         $listurl = GetFreeListUrl($row['aid'],$row['namerule'],$row['listdir'],$row['defaultpage'],$row['nodefault']);
-        $line = "<tr align='center' onMouseMove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">
+        $line = "<tr align='center'>
         <td>{$row['aid']}</td>
         <td><a href='$listurl' target='_blank'>{$row['title']}</a></td>
         <td>{$row['templet']}</td>

src/admin/inc/inc_catalog_options.php

@@ -60,16 +60,16 @@ function GetOptionList($selid = 0, $userCatalog = 0, $channeltype = 0)
         $sonCats = '';
         LogicGetOptionArray($row->id, '─', $channeltype, $dsql, $sonCats);
         if ($sonCats != '') {
-            if ($row->ispart == 1) $OptionArrayList .= "<option value='".$row->id."' class='option1'>└─ ".$row->typename."(封面栏目)</option>";
-            else if ($row->ispart == 2) $OptionArrayList .= "<option value='".$row->id."' class='option1'>└─ ".$row->typename."(外部栏目)</option>";
-            else if (empty($channeltype) && $row->ispart != 0) $OptionArrayList .= "<option value='".$row->id."' class='option2'>└─ ".$row->typename."(".$channels[$row->channeltype].")</option>";
-            else $OptionArrayList .= "<option value='".$row->id."' class='option3'>└─ ".$row->typename."</option>";
+            if ($row->ispart == 1) $OptionArrayList .= "<option value='".$row->id."' class='option1'>".$row->typename."-封面栏目</option>";
+            else if ($row->ispart == 2) $OptionArrayList .= "<option value='".$row->id."' class='option1'>".$row->typename."-外部栏目-</option>";
+            else if (empty($channeltype) && $row->ispart != 0) $OptionArrayList .= "<option value='".$row->id."' class='option2'>".$row->typename."-".$channels[$row->channeltype]."</option>";
+            else $OptionArrayList .= "<option value='".$row->id."' class='option3'>".$row->typename."</option>";
             $OptionArrayList .= $sonCats;
         } else {
             if ($row->ispart == 0 && (!empty($channeltype) && $row->channeltype == $channeltype)) {
-                $OptionArrayList .= "<option value='".$row->id."' class='option3'>└─ ".$row->typename."</option>";
+                $OptionArrayList .= "<option value='".$row->id."' class='option3'>".$row->typename."</option>";
             } else if ($row->ispart == 0 && empty($channeltype)) {
-                $OptionArrayList .= "<option value='".$row->id."' class='option3'>└─ ".$row->typename."</option>";
+                $OptionArrayList .= "<option value='".$row->id."' class='option3'>".$row->typename."</option>";
             }
         }
     }
@@ -85,9 +85,9 @@ function LogicGetOptionArray($id, $step, $channeltype, &$dsql, &$sonCats)
             continue;
         }
         if ($row->channeltype == $channeltype && $row->ispart == 1) {
-            $sonCats .= "<option value='".$row->id."' class='option1'>└─$step ".$row->typename."</option>";
+            $sonCats .= "<option value='".$row->id."' class='option1'>└$step ".$row->typename."</option>";
         } else if (($row->channeltype == $channeltype && $row->ispart == 0) || empty($channeltype)) {
-            $sonCats .= "<option value='".$row->id."' class='option3'>└─$step ".$row->typename."</option>";
+            $sonCats .= "<option value='".$row->id."' class='option3'>└$step ".$row->typename."</option>";
         }
         LogicGetOptionArray($row->id, $step.'─', $channeltype, $dsql, $sonCats);
     }

src/admin/login.php

@@ -16,7 +16,7 @@ $gotopage = RemoveXSS($gotopage);
 //检测安装目录安全性
 if (is_dir(dirname(__FILE__).'/../install')) {
     if (!file_exists(dirname(__FILE__).'/../install/install_lock.txt')) {
-        $fp = fopen(dirname(__FILE__).'/../install/install_lock.txt', 'w') or die('安装目录无写入权限，无法进行写入锁定文件，请安装完毕删除安装目录');
+        $fp = fopen(dirname(__FILE__).'/../install/install_lock.txt', 'w') or die('安装目录无写入权限和写入锁定文件，请安装完成后删除安装目录');
         fwrite($fp, 'ok');
         fclose($fp);
     }
@@ -30,7 +30,7 @@ if (is_dir(dirname(__FILE__).'/../install')) {
 //检测后台目录是否更名
 $cururl = GetCurUrl();
 if (preg_match('/admin/', $cururl)) {
-    $redmsg = '<div class="alert alert-warning">安全提示：后台管理目录名称中包含默认名称admin，建议把它修改为其它名称</div>';
+    $redmsg = '<div class="alert alert-warning">安全提示：后台管理目录名称中包含名称admin，建议把后台管理目录修改为其它名称</div>';
 } else {
     $redmsg = '';
 }

src/admin/member_toadmin.php

@@ -92,11 +92,11 @@ $typeids = explode(',', $typeid);
 $dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid=0 AND (ispart=0 OR ispart=1)");
 $dsql->Execute('op');
 while ($nrow = $dsql->GetObject('op')) {
-    $typeOptions .= "<option value='{$nrow->id}'".(in_array($nrow->id, $typeids) ? ' selected' : '').">└─ {$nrow->typename}</option>\r\n";
+    $typeOptions .= "<option value='{$nrow->id}'".(in_array($nrow->id, $typeids) ? ' selected' : '').">{$nrow->typename}</option>\r\n";
     $dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid={$nrow->id} AND (ispart=0 OR ispart=1)");
     $dsql->Execute('s');
     while ($nrow = $dsql->GetObject('s')) {
-        $typeOptions .= "<option value='{$nrow->id}'".(in_array($nrow->id, $typeids) ? ' selected' : '').">└── {$nrow->typename}</option>\r\n";
+        $typeOptions .= "<option value='{$nrow->id}'".(in_array($nrow->id, $typeids) ? ' selected' : '').">└─ {$nrow->typename}</option>\r\n";
     }
 }
 $row = $dsql->GetOne("SELECT * FROM `#@__member` WHERE mid='$id'");

src/admin/search_keywords_main.php

@@ -80,7 +80,7 @@ function GetKeywordList($dsql, $pageno, $pagesize, $orderby = 'aid')
     $dsql->SetQuery("SELECT * FROM `#@__search_keywords` ORDER BY $orderby LIMIT $start,$pagesize ");
     $dsql->Execute();
     while ($row = $dsql->GetArray()) {
-        $line = "<tr align='center' onMouseMove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">
+        $line = "<tr align='center'>
       <td><input name=\"aids[]\" type=\"checkbox\" class=\"np\" value=\"{$row['aid']}\" /></td>
       <td>{$row['aid']}</td>
       <td><input name='keyword' type='text' id='keyword{$row['aid']}' value='{$row['keyword']}' style='width:93%;'></td>

src/admin/sys_admin_user_add.php

@@ -70,11 +70,11 @@ $dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid=0 AND (ispart=
 $dsql->Execute('op');
 while ($row = $dsql->GetObject('op')) {
     $topc = $row->id;
-    $typeOptions .= "<option value='{$row->id}'>└─ {$row->typename}</option>\r\n";
+    $typeOptions .= "<option value='{$row->id}'>{$row->typename}</option>\r\n";
     $dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid={$row->id} AND (ispart=0 OR ispart=1) ");
     $dsql->Execute('s');
     while ($row = $dsql->GetObject('s')) {
-        $typeOptions .= "<option value='{$row->id}'>└── {$row->typename}</option>\r\n";
+        $typeOptions .= "<option value='{$row->id}'>└─ {$row->typename}</option>\r\n";
     }
 }
 make_hash();

src/admin/sys_admin_user_edit.php

@@ -98,11 +98,11 @@ $typeids = explode(',', $row['typeid']);
 $dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid=0 AND (ispart=0 OR ispart=1)");
 $dsql->Execute('op');
 while ($nrow = $dsql->GetObject('op')) {
-    $typeOptions .= "<option value='{$nrow->id}' ".(in_array($nrow->id, $typeids) ? ' selected' : '').">└─ {$nrow->typename}</option>\r\n";
+    $typeOptions .= "<option value='{$nrow->id}' ".(in_array($nrow->id, $typeids) ? ' selected' : '').">{$nrow->typename}</option>\r\n";
     $dsql->SetQuery("SELECT id,typename FROM `#@__arctype` WHERE reid={$nrow->id} AND (ispart=0 OR ispart=1)");
     $dsql->Execute('s');
     while ($nrow = $dsql->GetObject('s')) {
-        $typeOptions .= "<option value='{$nrow->id}' ".(in_array($nrow->id, $typeids) ? ' selected' : '').">└── {$nrow->typename}</option>\r\n";
+        $typeOptions .= "<option value='{$nrow->id}' ".(in_array($nrow->id, $typeids) ? ' selected' : '').">└─ {$nrow->typename}</option>\r\n";
     }
 }
 make_hash();

src/admin/templets/ad_main.htm

@@ -43,7 +43,7 @@
 				<td>管理</td>
 			</tr>
 			{dede:datalist empty='<tr><td colspan="7" align="center">暂无文档</td></tr>'}
-			<tr align="center" onmousemove="javascript:this.bgColor='#e9ecef';" onmouseout="javascript:this.bgColor='#ffffff';">
+			<tr align="center">
 				<td>{dede:field.aid/}</td>
 				<td>{dede:field.clsname function='TestType(@me,1)'/}</td>
 				<td>{dede:field.adname/}</td>

src/admin/templets/article_keywords_main.htm

@@ -43,7 +43,7 @@
 			<form name="form3" action="article_keywords_main.php" method="post">
 				<input type="hidden" name="dopost" value="saveall">
 				{dede:datalist empty='<tr><td colspan="5" align="center">暂无文档</td></tr>'}
-				<tr align="center" onmousemove="javascript:this.bgColor='#e9ecef';" onmouseout="javascript:this.bgColor='#ffffff';">
+				<tr align="center">
 					<td><input type="checkbox" name="aids[]" value="{dede:field.aid/}" checked="1"></td>
 					<td><input type="hidden" name="keyword_{dede:field.aid/}" class="admin-input-md" value="{dede:field.keyword/}">{dede:field.keyword/}</td>
 					<td>

src/admin/templets/article_result_same.htm

@@ -65,7 +65,7 @@
 				{
 				   if ($row['dd']==1 ) break;
 				?>
-				<tr align="center" onMouseMove="javascript:this.bgColor='#EFEFEF';" onmousemove="javascript:this.bgColor='#e9ecef';" onmouseout="javascript:this.bgColor='#ffffff';">
+				<tr align="center">
 					<td><input type="checkbox" name="arcTitles" id="arcTitle" value="<?php echo urlencode($row['title'])?>"></td>
 					<td>
 						<?php

src/admin/templets/cards_manmage.htm

@@ -68,7 +68,7 @@
 			</tr>
 			<form name="form1">
 				{dede:datalist empty='<tr><td colspan="7" align="center">暂无文档</td></tr>'}
-				<tr align="center" onmousemove="javascript:this.bgColor='#e9ecef';" onmouseout="javascript:this.bgColor='#ffffff';">
+				<tr align="center">
 					<td><input type="checkbox" name="aids" value="{dede:field.aid/}"></td>
 					<td>{dede:field.cardid/}</td>
 					<td><?php echo $TypeNames[$fields['ctid']]?></td>

src/admin/templets/catalog_add.htm

@@ -8,7 +8,6 @@
 		<link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="../static/web/css/admin.css">
 		<script src="../static/web/js/jquery.min.js"></script>
-		<script src="js/main.js"></script>
 		<script>
 			var channelArray = new Array();
 			<?php
@@ -299,9 +298,9 @@
 							<tr>
 								<td>栏目属性：</td>
 								<td>
-									<label><input type="radio" name="ispart" value="0" checked="checked"> 列表栏目（允许在本栏目发布文档，并生成文档列表）</label><br>
-									<label><input type="radio" name="ispart" value="1"> 封面栏目（栏目本身不允许发布文档）</label> <br>
-									<label><input type="radio" name="ispart" id="ispart2" value="2"> 外部栏目（在"文件保存目录"处填写网址）</label>
+									<label><input type="radio" name="ispart" value="0" checked="checked"> 列表栏目（允许发布文档）</label>
+									<label><input type="radio" name="ispart" value="1"> 封面栏目（不允许发布文档）</label>
+									<label><input type="radio" name="ispart" id="ispart2" value="2"> 外部栏目（文件保存目录处填写链接）</label>
 								</td>
 							</tr>
 							<tr>
@@ -324,13 +323,13 @@
 										while($arr = $dsql->GetArray('s'))
 										{
 											if ($arr['evalue']%500==0) {
-												echo "<option value='{$arr['evalue']}'>└─ {$arr['ename']}</option>";
+												echo "<option value='{$arr['evalue']}'>{$arr['ename']}</option>";
 											}
 											else if (preg_match("#\.#", $arr['evalue']))
 											{
-												echo "<option value='{$arr['evalue']}'>└── {$arr['ename']}</option>";
-											} else {
 												echo "<option value='{$arr['evalue']}'>└─ {$arr['ename']}</option>";
+											} else {
+												echo "<option value='{$arr['evalue']}'>{$arr['ename']}</option>";
 											}
 										}
 										?>
@@ -352,6 +351,13 @@
 								<td><input type="text" name="siteurl" id="siteurl" onChange="CheckPathSet();" class="admin-input-md">（需要加http开头的链接）</td>
 							</tr>
 							<?php }?>
+							<tr>
+								<td>列表模板：</td>
+								<td>
+									<input type="text" name="templist" value="{style}/list_<?php echo $nid?>.htm" class="admin-input-md">
+									<button type="button" name="set3" class="btn btn-success btn-sm" onClick="SelectTemplets('form1.templist')">浏览</button>
+								</td>
+							</tr>
 							<tr>
 								<td>封面模板：</td>
 								<td>
@@ -365,17 +371,23 @@
 								</td>
 							</tr>
 							<tr>
-								<td>列表模板：</td>
+								<td>文档模板：</td>
 								<td>
-									<input type="text" name="templist" value="{style}/list_<?php echo $nid?>.htm" class="admin-input-md">
-									<button type="button" name="set3" class="btn btn-success btn-sm" onClick="SelectTemplets('form1.templist')">浏览</button>
+									<input type="text" name="temparticle" value="{style}/article_<?php echo $nid?>.htm" class="admin-input-md">
+									<button type="button" name="set4" class="btn btn-success btn-sm" onClick="SelectTemplets('form1.temparticle')">浏览</button>
 								</td>
 							</tr>
 							<tr>
-								<td>文档模板：</td>
+								<td>列表命名规则：</td>
 								<td>
-									<input type="text" name="temparticle" value="{style}/article_<?php echo $nid?>.htm" class="admin-input-md">
-									<button type="button" name="set4" class="btn btn-success btn-sm" onClick="SelectTemplets('form1.temparticle')">浏览</button>
+									<input type="text" name="namerule2" id="namerule2" value="{typedir}/{tid}-{page}.html" class="admin-input-md">
+									<i onClick="ShowHide('helpvar3')" class="fa fa-question-circle" title="帮助"></i>
+									<div id="helpvar3" class="alert alert-warning my-2" style="display:none">
+										{page} 列表的页码<br>
+										Nginx伪静态默认规则<br>
+										rewrite ^/list-([0-9]+)$ /apps/list.php?tid=$1;<br>
+										rewrite ^/list-([0-9]+)-([0-9]+)$ /apps/list.php?tid=$1&PageNo=$2;
+									</div>
 								</td>
 							</tr>
 							<tr>
@@ -397,19 +409,6 @@
 									</div>
 								</td>
 							</tr>
-							<tr>
-								<td>列表命名规则：</td>
-								<td>
-									<input type="text" name="namerule2" id="namerule2" value="{typedir}/{tid}-{page}.html" class="admin-input-md">
-									<i onClick="ShowHide('helpvar3')" class="fa fa-question-circle" title="帮助"></i>
-									<div id="helpvar3" class="alert alert-warning my-2" style="display:none">
-										{page} 列表的页码<br>
-										Nginx伪静态默认规则<br>
-										rewrite ^/list-([0-9]+)$ /apps/list.php?tid=$1;<br>
-										rewrite ^/list-([0-9]+)-([0-9]+)$ /apps/list.php?tid=$1&PageNo=$2;
-									</div>
-								</td>
-							</tr>
 							<tr>
 								<td>SEO标题：</td>
 								<td><input type="text" name="seotitle" id="seotitle" class="admin-input-md">（标签“{dede:field.seotitle/}”进行调用）</td>

src/admin/templets/catalog_add_quick.htm

@@ -151,8 +151,17 @@
 								</td>
 							</tr>
 							<tr>
-								<td>默认页的名称：</td>
-								<td><input type="text" name="defaultname" value="index.html" class="admin-input-md"></td>
+								<td>列表命名规则：</td>
+								<td>
+									<input type="text" name="namerule2" id="namerule2" value="{typedir}/{tid}-{page}.html" class="admin-input-md">
+									<i onClick="ShowHide('helpvar3')" class="fa fa-question-circle" title="帮助"></i>
+									<div id="helpvar3" class="alert alert-warning my-2" style="display:none">
+										{page} 列表的页码<br>
+										Nginx伪静态默认规则<br>
+										rewrite ^/list-([0-9]+)$ /apps/list.php?tid=$1;<br>
+										rewrite ^/list-([0-9]+)-([0-9]+)$ /apps/list.php?tid=$1&PageNo=$2;
+									</div>
+								</td>
 							</tr>
 							<tr>
 								<td>文档命名规则：</td>
@@ -174,17 +183,8 @@
 								</td>
 							</tr>
 							<tr>
-								<td>列表命名规则：</td>
-								<td>
-									<input type="text" name="namerule2" id="namerule2" value="{typedir}/{tid}-{page}.html" class="admin-input-md">
-									<i onClick="ShowHide('helpvar3')" class="fa fa-question-circle" title="帮助"></i>
-									<div id="helpvar3" class="alert alert-warning my-2" style="display:none">
-										{page} 列表的页码<br>
-										Nginx伪静态默认规则<br>
-										rewrite ^/list-([0-9]+)$ /apps/list.php?tid=$1;<br>
-										rewrite ^/list-([0-9]+)-([0-9]+)$ /apps/list.php?tid=$1&PageNo=$2;
-									</div>
-								</td>
+								<td>默认页的名称：</td>
+								<td><input type="text" name="defaultname" value="index.html" class="admin-input-md"></td>
 							</tr>
 							<tr>
 								<td colspan="2">

src/admin/templets/catalog_edit.htm

@@ -8,7 +8,6 @@
 		<link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="../static/web/css/admin.css">
 		<script src="../static/web/js/jquery.min.js"></script>
-		<script src="js/main.js"></script>
 		<script>
 			var channelArray = new Array();
 			<?php    
@@ -231,7 +230,7 @@
 							</tr>
 							<tr>
 								<td>文件保存目录：</td>
-								<td><input type="text" name="typedir" id="typedir" value="<?php echo $myrow['typedir']?>" class="admin-input-md">（标签“{cmspath}”必填，请勿删除）</td>
+								<td><input type="text" name="typedir" id="typedir" value="<?php echo $myrow['typedir']?>" class="admin-input-md">（标签“{cmspath}”请勿删除）</td>
 							</tr>
 							<tr>
 								<td>栏目列表选项：</td>
@@ -248,9 +247,9 @@
 							<tr>
 								<td>栏目属性：</td>
 								<td>
-									<label><input type="radio" name="ispart" value="0" <?php if ($myrow['ispart']==0) echo "checked='1'";?>> 列表栏目（允许在本栏目发布文档，并生成文档列表）</label><br>
-									<label><input type="radio" name="ispart" value="1" <?php if ($myrow['ispart']==1) echo "checked='1'";?>> 封面栏目（栏目本身不允许发布文档）</label><br>
-									<label><input type="radio" name="ispart" value="2" <?php if ($myrow['ispart']==2) echo "checked='1'";?>> 外部栏目（在"文件保存目录"处填写网址）</label>
+									<label><input type="radio" name="ispart" value="0" <?php if ($myrow['ispart']==0) echo "checked='1'";?>> 列表栏目（允许发布文档）</label>
+									<label><input type="radio" name="ispart" value="1" <?php if ($myrow['ispart']==1) echo "checked='1'";?>> 封面栏目（不允许发布文档）</label>
+									<label><input type="radio" name="ispart" value="2" <?php if ($myrow['ispart']==2) echo "checked='1'";?>> 外部栏目（文件保存目录处填写链接）</label>
 								</td>
 							</tr>
 							<tr>
@@ -279,13 +278,13 @@
 												$selstr = '';
 											}
 											if ($arr['evalue']%500==0) {
-												echo "<option value='{$arr['evalue']}'{$selstr}>└─ {$arr['ename']}</option>";
+												echo "<option value='{$arr['evalue']}'{$selstr}>{$arr['ename']}</option>";
 											}
 											else if (preg_match("#\.#", $arr['evalue']))
 											{
-												echo "<option value='{$arr['evalue']}'{$selstr}>└── {$arr['ename']}</option>";
-											} else {
 												echo "<option value='{$arr['evalue']}'{$selstr}>└─ {$arr['ename']}</option>";
+											} else {
+												echo "<option value='{$arr['evalue']}'{$selstr}>{$arr['ename']}</option>";
 											}
 										}
 										?>
@@ -305,6 +304,13 @@
 								<td>绑定域名：</td>
 								<td><input type="text" name="siteurl" id="siteurl" value="<?php echo $myrow['siteurl']?>" class="admin-input-md">（需要加http开头的链接）</td>
 							</tr>
+							<tr>
+								<td>列表模板：</td>
+								<td>
+									<input type="text" name="templist" value="<?php echo $myrow['templist']?>" class="admin-input-md">
+									<button type="button" name="set3" class="btn btn-success btn-sm" onClick="SelectTemplets('form1.templist')">浏览</button>
+								</td>
+							</tr>
 							<tr>
 								<td>封面模板：</td>
 								<td>
@@ -318,17 +324,23 @@
 								</td>
 							</tr>
 							<tr>
-								<td>列表模板：</td>
+								<td>文档模板：</td>
 								<td>
-									<input type="text" name="templist" value="<?php echo $myrow['templist']?>" class="admin-input-md">
-									<button type="button" name="set3" class="btn btn-success btn-sm" onClick="SelectTemplets('form1.templist')">浏览</button>
+									<input type="text" name="temparticle" value="<?php echo $myrow['temparticle']?>" class="admin-input-md">
+									<button type="button" name="set4" class="btn btn-success btn-sm" onClick="SelectTemplets('form1.temparticle')">浏览</button>
 								</td>
 							</tr>
 							<tr>
-								<td>文档模板：</td>
+								<td>列表命名规则：</td>
 								<td>
-									<input type="text" name="temparticle" value="<?php echo $myrow['temparticle']?>" class="admin-input-md">
-									<button type="button" name="set4" class="btn btn-success btn-sm" onClick="SelectTemplets('form1.temparticle')">浏览</button>
+									<input type="text" name="namerule2" id="namerule2" value="<?php echo $myrow['namerule2']?>" class="admin-input-md">
+									<i onClick="ShowHide('helpvar3')" class="fa fa-question-circle" title="帮助"></i>
+									<div id="helpvar3" class="alert alert-warning my-2" style="display:none">
+										{page} 列表的页码<br>
+										Nginx伪静态默认规则<br>
+										rewrite ^/list-([0-9]+)$ /apps/list.php?tid=$1;<br>
+										rewrite ^/list-([0-9]+)-([0-9]+)$ /apps/list.php?tid=$1&PageNo=$2;
+									</div>
 								</td>
 							</tr>
 							<tr>
@@ -350,19 +362,6 @@
 									</div>
 								</td>
 							</tr>
-							<tr>
-								<td>列表命名规则：</td>
-								<td>
-									<input type="text" name="namerule2" id="namerule2" value="<?php echo $myrow['namerule2']?>" class="admin-input-md">
-									<i onClick="ShowHide('helpvar3')" class="fa fa-question-circle" title="帮助"></i>
-									<div id="helpvar3" class="alert alert-warning my-2" style="display:none">
-										{page} 列表的页码<br>
-										Nginx伪静态默认规则<br>
-										rewrite ^/list-([0-9]+)$ /apps/list.php?tid=$1;<br>
-										rewrite ^/list-([0-9]+)-([0-9]+)$ /apps/list.php?tid=$1&PageNo=$2;
-									</div>
-								</td>
-							</tr>
 							<tr>
 								<td>SEO标题：</td>
 								<td><input type="text" name="seotitle" id="seotitle" value="<?php echo $myrow['seotitle']?>" class="admin-input-md">（标签“{dede:field.seotitle/}”进行调用）</td>

src/admin/templets/catalog_main.htm

@@ -3,7 +3,7 @@
 	<head>
 		<meta charset="utf-8">
 		<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
-		<title>栏目管理</title>
+		<title>网站栏目管理</title>
 		<link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
 		<link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="../static/web/css/admin.css">
@@ -34,11 +34,11 @@
 	<body>
 		<table cellpadding="3" cellspacing="1" align="center" class="maintable my-3">
 			<tr>
-		      	<td bgcolor="#f5f5f5" style="border-bottom:1px solid #dee2e6">
-		        	<table cellspacing="0" cellpadding="0" class="table table-borderless w-100">
-		          		<tr>
-		            		<td width="30%">网站栏目管理</td>
-		            		<td width="70%" align="right">
+				<td bgcolor="#f5f5f5" style="border-bottom:1px solid #dee2e6">
+					<table cellspacing="0" cellpadding="0" class="table table-borderless w-100">
+						<tr>
+							<td width="30%">网站栏目管理</td>
+							<td width="70%" align="right">
 								<a href="catalog_add.php?listtype=all" class="btn btn-success btn-sm">增加顶级栏目</a>
 								<a href="catalog_add.php?dopost=quick" class="btn btn-success btn-sm">批量添加栏目</a>
 								<a href="catalog_do.php?dopost=upcatcache" class="btn btn-success btn-sm">更新栏目缓存</a>
@@ -47,11 +47,11 @@
 								<?php } else {?>
 								<a href="catalog_main.php" class="btn btn-success btn-sm">收缩栏目</a>
 								<?php }?>
-		            		</td>
-		          		</tr>
-		        	</table>
-		      	</td>
-		    </tr>
+							</td>
+				  		</tr>
+					</table>
+			  	</td>
+			</tr>
 			<form name="form1" method="post" action="catalog_do.php?dopost=upRankAll">
 				<tr>
 					<td>

src/admin/templets/content_list.htm

@@ -80,7 +80,7 @@
 					<td>操作</td>
 				</tr>
 				{dede:datalist empty='<tr><td colspan="10" align="center">暂无文档</td></tr>'}
-				<tr align="center" onmousemove="javascript:this.bgColor='#e9ecef';"	onmouseout="javascript:this.bgColor='#ffffff';">
+				<tr align="center">
 					<td><input type="checkbox" name="arcID" id="arcID" value="{dede:field.id/}"></td>
 					<td>{dede:field.id/}</td>
 					<td align="left"><span id="arc{dede:field.id/}"><a href="archives_do.php?aid={dede:field.id/}&dopost=editArchives">{dede:field.title/}</a></span>{dede:field.flag function='IsCommendArchives(@me)'/}</td>

src/admin/templets/content_s_list.htm

@@ -52,7 +52,7 @@
 					<td>属性</td>
 				</tr>
 				{dede:datalist empty='<tr><td colspan="9" align="center">暂无文档</td></tr>'}
-				<tr align="center" onmousemove="javascript:this.bgColor='#e9ecef';" onmouseout="javascript:this.bgColor='#ffffff';">
+				<tr align="center">
 					<td><input type="checkbox" name="arcID" id="arcID" value="{dede:field.id/}"></td>
 					<td>{dede:field.id/}</td>
 					<td align="left"><a href="archives_do.php?aid={dede:field.id/}&dopost=editArchives">{dede:field.title/}</a></td>

src/admin/templets/content_select_list.htm

@@ -80,7 +80,7 @@
 					<td>属性</td>
 				</tr>
 				{dede:datalist empty='<tr><td colspan="9" align="center">暂无文档</td></tr>'}
-				<tr align="center" onmousemove="javascript:this.bgColor='#e9ecef';" onmouseout="javascript:this.bgColor='#ffffff';">
+				<tr align="center">
 					<td><input type="checkbox" name="arcID" id="arcID" value="{dede:field.id/}"></td>
 					<td>{dede:field.id/}</td>
 					<td align="left"><a href="archives_do.php?aid={dede:field.id/}&dopost=editArchives">{dede:field.title/}</a></td>

src/admin/templets/content_sg_list.htm

@@ -62,7 +62,7 @@
 					<td>操作</td>
 				</tr>
 				{dede:datalist empty='<tr><td colspan="9" align="center">暂无文档</td></tr>'}
-				<tr align="center" onmousemove="javascript:this.bgColor='#e9ecef';" onmouseout="javascript:this.bgColor='#ffffff';">
+				<tr align="center">
 					<td><input type="checkbox" name="arcID" id="arcID" value="{dede:field.aid/}"></td>
 					<td>{dede:field.id/}</td>
 					<td align="left"><a href="archives_do.php?aid={dede:field.aid/}&dopost=editArchives">{dede:field.title/}{dede:field.flag function='IsCommendArchives(@me)'/}</a></td>

src/admin/templets/diy_main.htm

@@ -21,7 +21,7 @@
 				<td>管理</td>
 			</tr>
 			{dede:datalist empty='<tr><td colspan="4" align="center">暂无文档</td></tr>'}
-			<tr align="center" onmousemove="javascript:this.bgColor='#e9ecef';" onmouseout="javascript:this.bgColor='#ffffff';">
+			<tr align="center">
 				<td>{dede:field.diyid/}</td>
 				<td><a href="diy_list.php?action=list&diyid={dede:field.diyid/}">{dede:field.name/}</a></td>
 				<td>{dede:field.table/}</td>

src/admin/templets/erradd.htm

@@ -70,7 +70,7 @@
 					<td width="15%">修改建议</td>
 				</tr>
 				{dede:datalist empty='<tr><td colspan="8" align="center">暂无文档</td></tr>'}
-				<tr align="center" onmousemove="javascript:this.bgColor='#e9ecef';" onmouseout="javascript:this.bgColor='#ffffff';">
+				<tr align="center">
 					<td><input type="checkbox" name="id" id="id" value="{dede:field.id/}"></td>
 					<td>{dede:field.id/}</td>
 					<td>{dede:field.mid function='username(@me)'/}</td>

src/admin/templets/file_manage_main.htm

@@ -55,7 +55,7 @@
             {
                 if (preg_match("#^_(.*)$#i",$file)) continue;
                 if (preg_match("#^\.(.*)$#i",$file)) continue;
-                $line = "\n<tr onMouseMove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">
+                $line = "\n<tr>
                     <td><a href='file_manage_main.php?activepath=".urlencode("$activepath/$file")."'><img src='../static/web/img/icon_dir.png'>$file</a></td>
                     <td></td>
                     <td></td>
@@ -68,7 +68,7 @@
             }
             else if (preg_match("#\.(gif|png)#i",$file))
             {
-                $line = "\n<tr onMouseMove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">
+                $line = "\n<tr>
                     <td><a href='$activeurl/$file' target='_blank'><img src='$activeurl/$file'>$file</a></td>
                     <td>$filesize KB</td>
                     <td align='center'>$filetime</td>
@@ -82,7 +82,7 @@
             }
             else if (preg_match("#\.(jpg)#i",$file))
             {
-                $line = "\n<tr onMouseMove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">
+                $line = "\n<tr>
                     <td><a href='$activeurl/$file' target='_blank'><img src='$activeurl/$file'>$file</a></td>
                     <td>$filesize KB</td>
                     <td align='center' class='admin-td'>$filetime</td>
@@ -96,7 +96,7 @@
             }
             else if (preg_match("#\.(swf|fla|fly)#i",$file))
             {
-                $line = "\n<tr onMouseMove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">
+                $line = "\n<tr>
                     <td><a href='$activeurl/$file' target='_blank'><img src='../static/web/img/icon_flash.png'>$file</a></td>
                     <td>$filesize KB</td>
                     <td align='center'>$filetime</td>
@@ -110,7 +110,7 @@
             }
             else if (preg_match("#\.(zip|rar|tar.gz)#i",$file))
              {
-                $line = "\n<tr onMouseMove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">
+                $line = "\n<tr>
                     <td><a href='$activeurl/$file' target='_blank'><img src='../static/web/img/icon_zip.png'>$file</a></td>
                     <td>$filesize KB</td>
                     <td align='center'>$filetime</td>
@@ -124,7 +124,7 @@
             }
             else if (preg_match("#\.(exe)#i",$file))
             {
-                $line = "\n<tr onMouseMove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">
+                $line = "\n<tr>
                     <td><a href='$activeurl/$file' target='_blank'><img src='../static/web/img/icon_exe.png'>$file</a></td>
                     <td>$filesize KB</td>
                     <td align='center'>$filetime</td>
@@ -138,7 +138,7 @@
             }
             else if (preg_match("#\.(mp3|wma)#i",$file))
             {
-                $line = "\n<tr  onmousemove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">
+                $line = "\n<tr >
                     <td><a href='$activeurl/$file' target='_blank'><img src='../static/web/img/icon_music.png'>$file</a></td>
                     <td>$filesize KB</td>
                     <td align='center'>$filetime</td>
@@ -152,7 +152,7 @@
             }
             else if (preg_match("#\.(wmv|api)#i",$file))
             {
-                $line = "\n<tr onMouseMove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">
+                $line = "\n<tr>
                     <td><a href='$activeurl/$file' target='_blank'><img src='../static/web/img/icon_video.png'>$file</a></td>
                     <td>$filesize KB</td>
                     <td align='center'>$filetime</td>
@@ -166,7 +166,7 @@
             }
             else if (preg_match("#\.(rm|rmvb)#i",$file))
             {
-                $line = "\n<tr onMouseMove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">
+                $line = "\n<tr>
                     <td><a href='$activeurl/$file' target='_blank'><img src='../static/web/img/icon_rm.png'>$file</a></td>
                     <td>$filesize KB</td>
                     <td align='center' class='admin-td'>$filetime</td>
@@ -181,7 +181,7 @@
             else if (preg_match("#\.(txt|inc|pl|cgi|asp|xml|xsl|aspx|cfm)#",$file))
             {
                 $edurl = "file_manage_view.php?fmdo=edit&filename=".urlencode($file)."&activepath=".urlencode($activepath);
-                $line = "\n<tr onMouseMove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">
+                $line = "\n<tr>
                     <td><a href='$activeurl/$file' target='_blank'><img src='../static/web/img/icon_text.png'>$file</a></td>
                     <td>$filesize KB</td>
                     <td align='center'>$filetime</td>
@@ -197,7 +197,7 @@
             else if (preg_match("#\.(htm|html)#i",$file))
             {
                 $edurl = "file_manage_view.php?fmdo=edit&filename=".urlencode($file)."&activepath=".urlencode($activepath);
-                $line = "\n<tr onMouseMove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">
+                $line = "\n<tr>
                     <td><a href='$activeurl/$file' target='_blank'><img src='../static/web/img/icon_htm.png'>$file</a></td>
                     <td>$filesize KB</td>
                     <td align='center'>$filetime</td>
@@ -213,7 +213,7 @@
             else if (preg_match("#\.(php)#i",$file))
             {
                 $edurl = "file_manage_view.php?fmdo=edit&filename=".urlencode($file)."&activepath=".urlencode($activepath);
-                $line = "\n<tr onMouseMove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">
+                $line = "\n<tr>
                     <td><a href='$activeurl/$file' target='_blank'><img src='../static/web/img/icon_php.png'>$file</a></td>
                     <td>$filesize KB</td>
                     <td align='center'>$filetime</td>
@@ -229,7 +229,7 @@
             else if (preg_match("#\.(js)#i",$file))
             {
                 $edurl = "file_manage_view.php?fmdo=edit&filename=".urlencode($file)."&activepath=".urlencode($activepath);
-                $line = "\n<tr onMouseMove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">
+                $line = "\n<tr>
                     <td><a href='$activeurl/$file' target='_blank'><img src='../static/web/img/icon_js.png'>$file</a></td>
                     <td>$filesize KB</td>
                     <td align='center'>$filetime</td>
@@ -245,7 +245,7 @@
             else if (preg_match("#\.(css)#i",$file))
             {
                 $edurl = "file_manage_view.php?fmdo=edit&filename=".urlencode($file)."&activepath=".urlencode($activepath);
-                $line = "\n<tr onMouseMove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">
+                $line = "\n<tr>
                     <td><a href='$activeurl/$file' target='_blank'><img src='../static/web/img/icon_css.png'>$file</a></td>
                     <td>$filesize KB</td>
                     <td align='center'>$filetime</td>
@@ -258,7 +258,7 @@
                 </tr>";
                 $files[] = $line;
             } else {
-                $line = "\n<tr onMouseMove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">
+                $line = "\n<tr>
                     <td><a href='$activeurl/$file' target='_blank'>$file</td>
                     <td>$filesize KB</td>
                     <td align='center'>$filetime</td>

src/admin/templets/friendlink_main.htm

@@ -78,7 +78,7 @@
 					<td>管理</td>
 				</tr>
 				{dede:datalist empty='<tr><td colspan="8" align="center">暂无文档</td></tr>'}
-				<tr align="center" onmousemove="javascript:this.bgColor='#e9ecef';" onmouseout="javascript:this.bgColor='#ffffff';">
+				<tr align="center">
 					<td><input type='checkbox' name='aids' value='{dede:field.id/}'></td>
 					<td>{dede:field.webname function='dede_htmlspecialchars(@me)'/} 地址：{dede:field.url/}</td>
 					<td>{dede:field.logo function="GetPic(@me)"/}</td>

src/admin/templets/log_list.htm

@@ -80,7 +80,7 @@
 			</tr>
 			<form name="form1">
 				{dede:datalist empty='<tr><td colspan="7" align="center">暂无文档</td></tr>'}
-				<tr align="center" onmousemove="javascript:this.bgColor='#e9ecef';" onmouseout="javascript:this.bgColor='#ffffff';">
+				<tr align="center">
 					<td><input type="checkbox" name="logs" id="logs" value="{dede:field.lid/}"></td>
 					<td>{dede:field.userid/}</td>
 					<td><input type="text" name="t0" value="{dede:field.filename/}" class="admin-input-md"></td>

src/admin/templets/login.htm

@@ -33,18 +33,18 @@
 					<div class="login-from">
 						<?php echo $redmsg;?>
 						<div class="login-box shadow-sm">
-							<h2 class="text-center mb-3">管理登录</h2>
+							<h2 class="text-center mb-3">后台登录</h2>
 							<form name="form1" method="post" action="login.php">
 								<input type="hidden" name="gotopage" value="<?php if (!empty($gotopage)) echo RemoveXSS($gotopage);?>">
 								<input type="hidden" name="dopost" value="login">
 								<input type="hidden" name="adminstyle" value="newDedeBIZ">
 								<div class="form-group">
-									<label for="iptUserid">账号</label>
-									<input type="text" name="userid" id="iptUserid" class="form-control" placeholder="请输入管理员账号">
+									<label for="iptUserid">管理员账号</label>
+									<input type="text" name="userid" id="iptUserid" class="form-control" placeholder="请输入账号">
 								</div>
 								<div class="form-group">
-									<label for="iptPassword">密码</label>
-									<input type="password" name="pwd" id="iptPassword" class="form-control" placeholder="请输入管理员密码">
+									<label for="iptPassword">管理员密码</label>
+									<input type="password" name="pwd" id="iptPassword" class="form-control" placeholder="请输入密码">
 								</div>
 								<div id="vdimgck" class="form-group" style="display:none">
 									<label for="iptValidate">验证码</label>

src/admin/templets/media_main.htm

@@ -86,7 +86,7 @@
 			</tr>
 			<form name="form1">
 				{dede:datalist empty='<tr><td colspan="7" align="center">暂无文档</td></tr>'}
-				<tr align="center" onmousemove="javascript:this.bgColor='#e9ecef';" onmouseout="javascript:this.bgColor='#ffffff';">
+				<tr align="center">
 					<td><input type="checkbox" name="aids" id="aids{dede:field.aid/}" value="{dede:field.aid/}"></td>
 					<td><a href="{dede:field.url/}" title="{dede:field.url/}" target="_blank">{dede:field.title/}</a>
 					</td>

src/admin/templets/member_main.htm

@@ -74,7 +74,7 @@
 					<td>操作</td>
 				</tr>
 				{dede:datalist empty='<tr><td colspan="11" align="center">暂无文档</td></tr>'}
-				<tr align="center" onmousemove="javascript:this.bgColor='#e9ecef';" onmouseout="javascript:this.bgColor='#ffffff';">
+				<tr align="center">
 					<td><input type="checkbox" name="mid" id="mid" value="{dede:field.mid/}"></td>
 					<td>{dede:field.mid/}</td>
 					<td align="left">

src/admin/templets/member_operations.htm

@@ -85,7 +85,7 @@
 			</tr>
 			<form name="form1">
 				{dede:datalist empty='<tr><td colspan="8" align="center">暂无文档</td></tr>'}
-				<tr align="center" onmousemove="javascript:this.bgColor='#e9ecef';" onmouseout="javascript:this.bgColor='#ffffff';">
+				<tr align="center">
 					<td align="center"><input type="checkbox" name="aids" value="<?php echo $fields['aid']?>"></td>
 					<td align="center"><?php echo $fields['buyid']?></td>
 					<td align="center"><?php echo $fields['pname'].'('.$fields['oldinfo'].')';?></td>

src/admin/templets/member_pm.htm

@@ -43,7 +43,7 @@
 				<td width="10%" align="center">操作</td>
 			</tr>
 			{dede:datalist empty='<tr><td colspan="7" align="center">暂无文档</td></tr>'}
-			<tr align="center" onmousemove="javascript:this.bgColor='#e9ecef';" onmouseout="javascript:this.bgColor='#ffffff';">
+			<tr align="center">
 				<td>{dede:field.sendtime function='GetDateMk(@me)'/}</td>
 				<td>{dede:field.subject function='dede_htmlspecialchars(@me)'/}</td>
 				<td>{dede:field.hasview function='IsReader(@me)'/}</td>

src/admin/templets/member_scores.htm

@@ -36,7 +36,7 @@
 					<td width="30%" align="center">是否默认</td>
 				</tr>
 				<?php foreach($Scores as $v) {?>
-				<tr onmousemove="javascript:this.bgColor='#e9ecef';" onmouseout="javascript:this.bgColor='#ffffff';">
+				<tr>
 					<td align="center"><input type="checkbox" name="Ids-<?php echo $v['id']?>" id="Ids-<?php echo $v['id']?>" value="1"></td>
 					<td align="center"><input type="text" name="integral-<?php echo $v['id']?>" id="integral-<?php echo $v['id']?>" value="<?php echo $v['integral']?>" class="admin-input-sm"></td>
 					<td align="center"><input type="text" name="icon-<?php echo $v['id']?>" id="icon-<?php echo $v['id']?>" value="<?php echo $v['icon']?>" class="admin-input-sm"></td>

src/admin/templets/module_main.htm

@@ -55,7 +55,7 @@
 					<td>管理</td>
 				</tr>
 				<?php if (count($modules) > 0) foreach($modules as $k => $v) {?>
-				<tr align="center" onmousemove="javascript:this.bgColor='#e9ecef';" onmouseout="javascript:this.bgColor='#ffffff';">
+				<tr align="center">
 					<td><?php echo $v['name'];?></td>
 					<td><?php echo $v['time'];?></td>
 					<td>

src/admin/templets/mychannel_edit.htm

@@ -225,7 +225,7 @@
 								foreach($dtp->CTags as $ctag)
 								{
 							?>
-							<tr align="center" onmousemove="javascript:this.bgColor='#e9ecef';" onmouseout="javascript:this.bgColor='#ffffff';">
+							<tr align="center">
 								<td>
 									<?php
 									$itname = $ctag->GetAtt('itemname');

src/admin/templets/mychannel_main.htm

@@ -35,7 +35,7 @@
 				<td>管理</td>
 			</tr>
 			{dede:datalist empty='<tr><td colspan="7" align="center">暂无文档</td></tr>'}
-			<tr align="center" onmousemove="javascript:this.bgColor='#e9ecef';" onmouseout="javascript:this.bgColor='#ffffff';">
+			<tr align="center">
 				<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>

src/admin/templets/mytag_main.htm

@@ -23,7 +23,7 @@
 				<td width="20%">管理</td>
 			</tr>
 			{dede:datalist empty='<tr><td colspan="6" align="center">暂无文档</td></tr>'}
-			<tr align="center" onmousemove="javascript:this.bgColor='#e9ecef';" onmouseout="javascript:this.bgColor='#ffffff';">
+			<tr align="center">
 				<td>{dede:field.aid/}</td>
 				<td>{dede:field.tagname/}</td>
 				<td>{dede:field.typename function='TestType(@me)'/}</td>

src/admin/templets/plus_main.htm

@@ -21,7 +21,7 @@
 				<td>管理</td>
 			</tr>
 			{dede:datalist empty='<tr><td colspan="4" align="center">暂无文档</td></tr>'}
-			<tr align="center" onmousemove="javascript:this.bgColor='#e9ecef';" onmouseout="javascript:this.bgColor='#ffffff';">
+			<tr align="center">
 				<td>{dede:field.aid/}</td>
 				<td>{dede:field.plusname/}</td>
 				<td>{dede:field.writer/}</td>

src/admin/templets/recycling.htm

@@ -82,7 +82,7 @@
 					<td>操作</td>
 				</tr>
 				{dede:datalist empty='<tr><td colspan="7" align="center">暂无文档</td></tr>'}
-				<tr align="center" onmousemove="javascript:this.bgColor='#e9ecef';" onmouseout="javascript:this.bgColor='#ffffff';">
+				<tr align="center">
 					<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>

src/admin/templets/stepselect_main.htm

@@ -250,7 +250,7 @@
         <form name="form1" action="stepselect_main.php" method="post">
             <input type="hidden" name="action" value="delenumAllSel">
             {dede:datalist empty='<tr><td colspan="8" align="center">暂无文档</td></tr>'}
-            <tr align="center" onMouseMove="javascript:this.bgColor='#e9ecef';" onMouseOut="javascript:this.bgColor='#FFFFFF';">
+            <tr align="center">
                 <td><input type="checkbox" name="ids[]" value="{dede:field.id/}"></td>
                 <td>{dede:field.id/}</td>
                 <td>
@@ -323,7 +323,7 @@
             <td>操作</td>
         </tr>
         {dede:datalist}
-        <tr align="center" onMouseMove="javascript:this.bgColor='#e9ecef';" onMouseOut="javascript:this.bgColor='#FFFFFF';">
+        <tr align="center">
             <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>

src/admin/templets/sys_info.htm

@@ -152,7 +152,7 @@
 								$dls = explode(',',$dl);
 								$n++;
 							?>
-							<table cellspacing="1" cellpadding="1" id="td<?php echo $n?>" class="table w-100" style="<?php if ($n!=$gp) echo 'display:none';?>">
+							<table cellspacing="1" cellpadding="1" id="td<?php echo $n?>" class="w-100" style="<?php if ($n!=$gp) echo 'display:none';?>">
 								<tr bgcolor="#e9ecef" align="center">
 									<td width="360" class="border-top-0">变量说明</td>
 									<td class="border-top-0">变量值</td>
@@ -163,14 +163,9 @@
 								$dsql->Execute();
 								$i = 1;
 								while($row = $dsql->GetArray()) {
-								if ($i%2==0) {
-									$bgcolor = "#e9ecef";
-								} else {
-									$bgcolor = "#ffffff";
-								}
 								$i++;
 								?>
-								<tr align="center" bgcolor="<?php echo $bgcolor?>">
+								<tr align="center">
 									<td><?php echo $row['info'];?></td>
 									<td align="left">
 										<?php

src/admin/templets/tags_main.htm

@@ -107,7 +107,7 @@
 				$fields['uptime'] = GetDateMk($fields['uptime']);
 				$fields['tag'] = dede_htmlspecialchars($fields['tag']);
 				?>
-				<tr align="center" onmousemove="javascript:this.bgColor='#e9ecef';" onmouseout="javascript:this.bgColor='#ffffff';">
+				<tr align="center">
 					<td><input type="checkbox" name="ids[]" value="<?php echo $fields['id'];?>"></td>
 					<td>{dede:field.id/}</td>
 					<td><a href="../apps/tags.php?/<?php echo $fields['id'];?>/" target="_blank">{dede:field.tag/}</a></td>

src/admin/templets/templets_default.htm

@@ -43,7 +43,7 @@
 				$filetime = MyDate("Y-m-d H:i",$filetime);
 				$fileinfo = (isset($fileinfos[$filename]) ? $fileinfos[$filename]:'未知模板');
 			?>
-			<tr onMouseMove="javascript:this.bgColor='#e9ecef';" onmouseout="javascript:this.bgColor='#ffffff';">
+			<tr>
 				<td><a href="<?php echo $templeturld.'/'.$filename;?>" target="_blank"><img src="../static/web/img/icon_htm.png"><?php echo $filename;?></a></td>
 				<td><?php echo $fileinfo;?></td>
 				<td align="center"><?php echo $filetime;?></td>

src/admin/templets/templets_one.htm

@@ -53,7 +53,7 @@
 			<form name="form1" action="templets_one_edit.php">
 				<input type="hidden" name="dopost" value="mksel">
 				{dede:datalist empty='<tr><td colspan="7" align="center">暂无文档</td></tr>'}
-				<tr align="center" onmousemove="javascript:this.bgColor='#e9ecef';" onmouseout="javascript:this.bgColor='#ffffff';">
+				<tr align="center">
 					<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>

src/admin/templets/templets_tagsource.htm

@@ -33,7 +33,7 @@
 				$filetime = MyDate("Y-m-d H:i",$filetime);
 				$fileinfo = GetHelpInfo(str_replace('.lib.php','',$filename));
 			?>
-			<tr onMouseMove="javascript:this.bgColor='#e9ecef';" onmouseout="javascript:this.bgColor='#ffffff';">
+			<tr>
 				<td><img src="../static/web/img/icon_htm.png"><?php echo $filename;?></td>
 				<td><?php echo $fileinfo;?></td>
 				<td align="center"><?php echo $filetime;?></td>

src/admin/templets/vote_main.htm

@@ -24,7 +24,7 @@
 				<td>管理</td>
 			</tr>
 			{dede:datalist empty='<tr><td colspan="7" align="center">暂无文档</td></tr>'}
-			<tr align="center" onmousemove="javascript:this.bgColor='#e9ecef';" onmouseout="javascript:this.bgColor='#ffffff';">
+			<tr align="center">
 				<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>

src/install/install.html

@@ -3,14 +3,14 @@
 <head>
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
-	<title>安装DedeV6程序</title>
+	<title>安装DedeV<?php echo $cfg_version_detail;?></title>
 	<link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
 	<link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
 	<link rel="shortcut icon" href="../static/web/img/favicon.ico">
 	<script src="../static/web/js/jquery.min.js"></script>
 	<script src="../static/web/js/bootstrap.min.js"></script>
 	<script src="../static/web/js/style.js"></script>
-	<style>*{margin:0;padding:0;letter-spacing:.6px;box-sizing:border-box}body{line-height:1.5;font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#545b62}input,select,.btn{font-size:14px!important}.install-box{margin:0 auto;width:860px}.admin-head{padding:1rem 0;background:#fff}.logo{height:36px}.admin-nav{height:36px;line-height:36px}.admin-nav-a{padding-right:30px}.admin-btn{color:#545b62}.dropdown-menu{min-width:8rem;font-size:14px}.dropdown-item{padding:0 1rem;height:36px;line-height:36px;font-size:14px;color:#545b62!important}@media (max-width:760px){.install-box{width:100%}.admin-head{padding:1rem 15px}.admin-nav-a{display:none!important}}</style>
+	<style>*{margin:0;padding:0;letter-spacing:.6px;box-sizing:border-box}body{line-height:1.5;font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#545b62}h2,legend{font-size:18px;font-weight:600}input,select,.btn{font-size:14px!important}.install-box{margin:0 auto;width:860px}.admin-head{padding:1rem 0;background:#fff}.logo{height:36px}.admin-nav{height:36px;line-height:36px}.admin-nav-a{padding-right:30px}.admin-btn{color:#545b62}.dropdown-menu{min-width:8rem;font-size:14px}.dropdown-item{padding:0 1rem;height:36px;line-height:36px;font-size:14px;color:#545b62!important}@media (max-width:760px){.install-box{width:100%}.admin-head{padding:1rem 15px}.admin-nav-a{display:none!important}}</style>
 </head>
 <body>
 	<div class="d-flex flex-md-row align-items-center shadow-sm admin-head mb-5">
@@ -36,12 +36,12 @@
 			<div class="alert alert-warning">请先阅读<a href="https://www.dedebiz.com/license?from=install" target="_blank" class="text-primary">《站点授权协议》</a></div>
 			<div class="card shadow-sm mb-3">
 				<div class="card-header bg-success text-white">
-					<h4 class="text-center my-0">欢迎使用DedeV<?php echo $cfg_version_detail;?></h4>
+					<h2 class="text-center my-0">欢迎使用DedeV<?php echo $cfg_version_detail;?></h2>
 				</div>
 				<div class="card-body">
 					<form action="../install/index.php" method="post" name="form1">
-						<input type="hidden" name="step" value="2" />
-						<input type="hidden" name="cookieencode" value="<?php echo $rnd_cookieEncode; ?>">
+						<input type="hidden" name="step" value="2">
+						<input type="hidden" name="cookieencode" value="<?php echo $rnd_cookieEncode;?>">
 						<input type="hidden" name="adminmail" value="admin@dedebiz.com">
 						<legend>数据库设置</legend>
 						<hr>
@@ -49,12 +49,12 @@
 							<label for="dbtype" class="form-label">数据库类型</label>
 							<select id="dbtype" name="dbtype" class="form-control form-select">
 								<option value="mysql" selected>MySQL</option>
-								<?php if(extension_loaded("sqlite3")) {;?><option value="sqlite">SQLite</option><?php } ?>
+								<?php if(extension_loaded("sqlite3")) {;?><option value="sqlite">SQLite</option><?php }?>
 							</select>
-							<div class="form-text text-danger">数据库类型一般为MySQL，SQLite仅用于开发调试，不建议生产中使用</div>
+							<div class="form-text text-danger">数据库类型一般为MySQL，类型SQLite用于开发调试，不建议生产中使用</div>
 						</div>
 						<div class="form-group server">
-							<label for="dbhost" class="form-label">数据库主机</label>
+							<label for="dbhost" class="form-label">数据库地址</label>
 							<input type="text" name="dbhost" id="dbhost" class="form-control" placeholder="localhost">
 						</div>
 						<div class="form-group server">
@@ -68,13 +68,13 @@
 						<div class="form-group">
 							<label for="dbprefix" class="form-label">数据表前缀</label>
 							<input type="text" name="dbprefix" id="dbprefix" class="form-control" placeholder="biz_">
-							<div class="form-text text-danger">请注意数据库名称默认为biz_</div>
+							<div class="form-text text-danger">请注意DedeV6数据表前缀默认为biz_</div>
 						</div>
 						<div class="form-group">
 							<label for="dbname" class="form-label">数据库名称</label>
 							<div class="input-group">
 								<input id="dbname" name="dbname" type="text" class="form-control" placeholder="DedeBIZ">
-								<div class="input-group-append"><button type="button" id="btnCheckConnect" class="btn btn-success">检查连接</button></div>
+								<div class="input-group-append"><button type="button" id="btnCheckConnect" class="btn btn-success">检查</button></div>
 							</div>
 						</div>
 						<div id="alertConnect"></div>
@@ -82,25 +82,25 @@
 						<hr>
 						<div class="form-group">
 							<label for="baseurl" class="form-label">网站网址</label>
-							<input type="text" name="baseurl" id="baseurl" class="form-control" placeholder="<?php echo $baseurl; ?>">
+							<input type="text" name="baseurl" id="baseurl" class="form-control" placeholder="<?php echo $baseurl;?>">
 						</div>
 						<div class="form-group">
 							<label for="webname" class="form-label">网站名称</label>
 							<input type="text" name="webname" id="webname" class="form-control" placeholder="某某公司">
 						</div>
 						<div class="form-group">
-							<label for="adminuser" class="form-label">用户名</label>
+							<label for="adminuser" class="form-label">管理员账号</label>
 							<input type="text" name="adminuser" id="adminuser" class="form-control" placeholder="admin">
-							<div class="form-text text-dark">只能用[0-9a-zA-Z_@!.-]以内范围的字符</div>
+							<div class="form-text text-dark">请使用[0-9a-zA-Z_@!.-]以内范围字符</div>
 						</div>
 						<div class="form-group">
-							<label for="adminpwd" class="form-label">密码</label>
+							<label for="adminpwd" class="form-label">管理员密码</label>
 							<input type="text" name="adminpwd" id="adminpwd" class="form-control" placeholder="admin">
 						</div>
 						<div class="form-group">
 							<label for="cmspath" class="form-label">安装目录</label>
-							<input type="text" name="cmspath" id="cmspath" class="form-control" value="<?php echo $basepath; ?>" placeholder="<?php echo $basepath; ?>">
-							<div class="form-text text-danger">在根目录安装时不必理会</div>
+							<input type="text" name="cmspath" id="cmspath" class="form-control" value="<?php echo $basepath;?>" placeholder="<?php echo $basepath;?>">
+							<div class="form-text text-danger">根目录安装时不必理会</div>
 						</div>
 						<div class="text-right"><button type="submit" class="btn btn-success">立即安装</button></div>
 					</form>
@@ -112,29 +112,29 @@
 		</div>
 	</div>
 	<script>
-	$("#btnCheckConnect").click(function() {
-		let dbhost = $('#dbhost').val();
-		let dbuser = $('#dbuser').val();
-		let dbpwd = $('#dbpwd').val();
-		if (!dbhost) dbhost = "localhost";
-		if (!dbuser) dbuser = "root";
-		$.get('index.php?step=10&dbhost=' + dbhost + '&dbuser=' + dbuser + '&dbpwd=' + dbpwd,function(rs){
-			console.log(rs);
-			let result = JSON.parse(rs);
-			if (result.code === 200) {
-				ShowAlert("#alertConnect", result.data, "success", 5000);
+		$("#btnCheckConnect").click(function() {
+			let dbhost = $('#dbhost').val();
+			let dbuser = $('#dbuser').val();
+			let dbpwd = $('#dbpwd').val();
+			if (!dbhost) dbhost = "localhost";
+			if (!dbuser) dbuser = "root";
+			$.get('index.php?step=10&dbhost=' + dbhost + '&dbuser=' + dbuser + '&dbpwd=' + dbpwd,function(rs){
+				console.log(rs);
+				let result = JSON.parse(rs);
+				if (result.code === 200) {
+					ShowAlert("#alertConnect", result.data, "success", 5000);
+				} else {
+					ShowAlert("#alertConnect", result.data, "danger", 5000);
+				}
+			})
+		})
+		$("#dbtype").change(function () {
+			if ($(this).val() === 'sqlite') {
+				$(".form-group.server").hide();
 			} else {
-				ShowAlert("#alertConnect", result.data, "danger", 5000);
+				$(".form-group.server").show();
 			}
 		})
-	})
-	$("#dbtype").change(function () {
-		if ($(this).val() === 'sqlite') {
-			$(".form-group.server").hide();
-		} else {
-			$(".form-group.server").show();
-		}
-	})
 	</script>
 </body>
 </html>

src/static/web/css/admin.css

@@ -114,6 +114,159 @@ body.hidemenu .body-right {
 	left:0;
 	transition:all .3s
 }
+.coolbg {
+	padding:.25rem .65rem;
+	background:#f5f5f5;
+	border-bottom:1px solid #dee2e6;
+	border-radius:.2rem;
+	border:0;
+	cursor:pointer
+}
+.coolbg2 {
+	height:28px;
+	background:#dfddd2;
+	border:1px solid #dee2e6
+}
+.coolbt {
+	background:#e4f7d7;
+	border-left:1px solid #efefef;
+	border-top:1px solid #efefef;
+	border-bottom:1px solid #acacac;
+	cursor:pointer
+}
+.coolbt2 {
+	background:#f7fcda;
+	border-left:1px solid #efefef;
+	border-top:1px solid #efefef;
+	border-bottom:1px solid #acacac
+}
+.coolbg3 {
+	width:140px;
+	height:28px;
+	background:#dfddd2;
+	border:1px solid #bdc5b4;
+	text-align:right
+}
+.coolbg61 {
+	width:390px;
+	height:28px;
+	line-height:28px;
+	background:#e7f3b1;
+	border-top:1px solid #bdc5b4;
+	border-left:1px solid #bdc5b4;
+	border-right:1px solid #bdc5b4;
+	text-align:right
+}
+.coolbg62 {
+	padding:.6rem;
+	width:390px;
+	height:300px;
+	background:#F8FDF0;
+	border:1px solid #bdc5b4
+}
+.coolbg4 {
+	width:160px;
+	background:#fff;
+	border-bottom:1px solid #dee2e6;
+	text-align:right
+}
+.wsselect {
+	padding:.65rem 0;
+	background:#fff;
+	overflow:auto
+}
+.pubdlg {
+	background:#fff;
+	border:2px solid #1eb867;
+	border-radius:.2rem;
+	z-index:8888
+}
+.pubdlg .title {
+	padding-left:.65rem;
+	line-height:30px;
+	font-weight:600;
+	color:#545b62;
+	background:#f5f5f5;
+	border-bottom:1px solid #dee2e6;
+	cursor:move
+}
+.fullpagediv {
+	position:absolute;
+	top:0;
+	left:0;
+	width:100%;
+	height:100%;
+	background:#cdcdcd;
+	opacity:.6;
+	z-index:1999
+}
+.quicksel {
+	margin-left:10px;
+	margin-top:10px;
+	width:680px;
+	height:420px;
+	overflow:auto;
+	z-index:10005
+}
+.quickselfoot {
+	padding:.65rem 0;
+	border-top:1px solid #dee2e6
+}
+.quickselItem {
+	display:block;
+	line-height:28px
+}
+.quickselItem .topcat {
+	padding:0 10px;
+	background:#e9ecef;
+	clear:both
+}
+.quickselItem .soncat {
+	padding:0 10px
+}
+.quickselItem .item {
+	display:inline-block;
+	padding-left:10px
+}
+.mysource,.mywriter {
+	width:300px;
+	background:#fff;
+	border:2px solid #1eb867;
+	z-index:10001
+}
+.dlgws div {
+	padding:.65rem;
+	width:100%
+}
+#uploadfield {
+	float:left
+}
+#uploadwait {
+	z-index:19999
+}
+.option1 {
+	background:#e9ecef
+}
+.option2 {
+	background:#adb5bd
+}
+.option3 {
+	background:#fff
+}
+.divpre img {
+	max-width:150px;
+	max-height:100px
+}
+.divpre {
+	overflow:hidden
+}
+.colordlg {
+	padding:.6rem;
+	width:120px;
+	background:#fff;
+	border:2px solid #1eb867;
+	z-index:10005
+}
 .body-left {
 	position:absolute;
 	top:60px;
@@ -437,159 +590,6 @@ span.page-link {
 .btn+.btn,.btn-text+.btn-text {
 	margin-left:1rem
 }
-.coolbg {
-	padding:.25rem .65rem;
-	background:#f5f5f5;
-	border-bottom:1px solid #dee2e6;
-	border-radius:.2rem;
-	border:0;
-	cursor:pointer
-}
-.coolbg2 {
-	height:28px;
-	background:#dfddd2;
-	border:1px solid #dee2e6
-}
-.coolbt {
-	background:#e4f7d7;
-	border-left:1px solid #efefef;
-	border-top:1px solid #efefef;
-	border-bottom:1px solid #acacac;
-	cursor:pointer
-}
-.coolbt2 {
-	background:#f7fcda;
-	border-left:1px solid #efefef;
-	border-top:1px solid #efefef;
-	border-bottom:1px solid #acacac
-}
-.coolbg3 {
-	width:140px;
-	height:28px;
-	background:#dfddd2;
-	border:1px solid #bdc5b4;
-	text-align:right
-}
-.coolbg61 {
-	width:390px;
-	height:28px;
-	line-height:28px;
-	background:#e7f3b1;
-	border-top:1px solid #bdc5b4;
-	border-left:1px solid #bdc5b4;
-	border-right:1px solid #bdc5b4;
-	text-align:right
-}
-.coolbg62 {
-	padding:.6rem;
-	width:390px;
-	height:300px;
-	background:#F8FDF0;
-	border:1px solid #bdc5b4
-}
-.coolbg4 {
-	width:160px;
-	background:#fff;
-	border-bottom:1px solid #dee2e6;
-	text-align:right
-}
-.wsselect {
-	padding:.65rem 0;
-	background:#fff;
-	overflow:auto
-}
-.pubdlg {
-	background:#fff;
-	border:2px solid #1eb867;
-	border-radius:.2rem;
-	z-index:8888
-}
-.pubdlg .title {
-	padding-left:.65rem;
-	line-height:30px;
-	font-weight:600;
-	color:#545b62;
-	background:#f5f5f5;
-	border-bottom:1px solid #dee2e6;
-	cursor:move
-}
-.fullpagediv {
-	position:absolute;
-	top:0;
-	left:0;
-	width:100%;
-	height:100%;
-	background:#cdcdcd;
-	opacity:.6;
-	z-index:1999
-}
-.quicksel {
-	margin-left:10px;
-	margin-top:10px;
-	width:680px;
-	height:420px;
-	overflow:auto;
-	z-index:10005
-}
-.quickselfoot {
-	padding:.65rem 0;
-	border-top:1px solid #dee2e6
-}
-.quickselItem {
-	display:block;
-	line-height:28px
-}
-.quickselItem .topcat {
-	padding:0 10px;
-	background:#e9ecef;
-	clear:both
-}
-.quickselItem .soncat {
-	padding:0 10px
-}
-.quickselItem .item {
-	display:inline-block;
-	padding-left:10px
-}
-.mysource,.mywriter {
-	width:300px;
-	background:#fff;
-	border:2px solid #1eb867;
-	z-index:10001
-}
-.dlgws div {
-	padding:.65rem;
-	width:100%
-}
-#uploadfield {
-	float:left
-}
-#uploadwait {
-	z-index:19999
-}
-.option1 {
-	background:#e9ecef
-}
-.option2 {
-	background:#adb5bd
-}
-.option3 {
-	background:#fff
-}
-.divpre img {
-	max-width:150px;
-	max-height:100px
-}
-.divpre {
-	overflow:hidden
-}
-.colordlg {
-	padding:.6rem;
-	width:120px;
-	background:#fff;
-	border:2px solid #1eb867;
-	z-index:10005
-}
 #browsehappy {
 	padding:20px 30px;
 	font-size:14px;

src/system/enums.func.php

@@ -124,7 +124,7 @@ function getTopData($egroup)
     return $data;
 }
 /**
- *  获取数据的JS代码(二级联动)
+ *  获取数据的js二级联动代码
  *
  * @access    public
  * @param     string    $egroup   联动组

src/system/typelink/typelink.class.php

@@ -171,9 +171,9 @@ class TypeLink
             $row = $this->dsql->GetOne("SELECT id,typename,ispart,channeltype FROM `#@__arctype` WHERE id='$hid'");
             $channeltype = $row['channeltype'];
             if ($row['ispart'] == 1) {
-                $this->OptionArrayList .= "<option value='".$row['id']."' style='background:#e9ecef;color:#545b62' selected>└─ ".$row['typename']."</option>\r\n";
+                $this->OptionArrayList .= "<option value='".$row['id']."' style='background:#e9ecef;color:#545b62' selected>".$row['typename']."</option>\r\n";
             } else {
-                $this->OptionArrayList .= "<option value='".$row['id']."' selected>└─ ".$row['typename']."</option>\r\n";
+                $this->OptionArrayList .= "<option value='".$row['id']."' selected>".$row['typename']."</option>\r\n";
             }
         }
         if ($channeltype == 0) $ctsql = '';
@@ -205,9 +205,9 @@ class TypeLink
         while ($row = $this->dsql->GetObject()) {
             if ($row->id != $hid) {
                 if ($row->ispart == 1) {
-                    $this->OptionArrayList .= "<option value='".$row->id."' style='background:#e9ecef;color:#545b62'>└─ ".$row->typename."</option>\r\n";
+                    $this->OptionArrayList .= "<option value='".$row->id."' style='background:#e9ecef;color:#545b62'>".$row->typename."</option>\r\n";
                 } else {
-                    $this->OptionArrayList .= "<option value='".$row->id."'>└─ ".$row->typename."</option>\r\n";
+                    $this->OptionArrayList .= "<option value='".$row->id."'>".$row->typename."</option>\r\n";
                 }
             }
             $this->LogicGetOptionArray($row->id, "─", $oper);
@@ -234,9 +234,9 @@ class TypeLink
                 if (!in_array($row->id, $oper)) continue;
             }
             if ($row->ispart == 1) {
-                $this->OptionArrayList .= "<option value='".$row->id."' style='background:#e9ecef;color:#545b62'>└─$step ".$row->typename."</option>\r\n";
+                $this->OptionArrayList .= "<option value='".$row->id."' style='background:#e9ecef;color:#545b62'>└$step ".$row->typename."</option>\r\n";
             } else {
-                $this->OptionArrayList .= "<option value='".$row->id."'>└─$step ".$row->typename."</option>\r\n";
+                $this->OptionArrayList .= "<option value='".$row->id."'>└$step ".$row->typename."</option>\r\n";
             }
             $this->LogicGetOptionArray($row->id, $step."─", $oper);
         }

src/system/typelink/typeunit.class.admin.php

@@ -109,7 +109,7 @@ class TypeUnit
             echo "<table width='100%' cellspacing='0' cellpadding='2'>";
             //普通列表
             if ($ispart == 0) {
-                echo "<tr onMouseMove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">";
+                echo "<tr>";
                 echo "<td class='admin-td'><table width='98%' cellspacing='0' cellpadding='0'><tr><td width='50%'><i id='img".$id."' onClick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square-o'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-success btn-xs'>列表</span>{$nss}<a href='catalog_do.php?cid=".$id."&dopost=listArchives' class='mr-3 ml-3'>".$typeName."</a>[id：".$id."]（文档数：".$this->GetTotalArc($id)."）";
                 echo "</td><td align='right'>";
                 echo "<a href='{$GLOBALS['cfg_phpurl']}/list.php?tid={$id}' target='_blank' title='预览'><i class='btn btn-sm fa fa-eye'></i></a>";
@@ -122,7 +122,7 @@ class TypeUnit
             }
             //带封面的栏目
             else if ($ispart == 1) {
-                echo "<tr onMouseMove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">";
+                echo "<tr>";
                 echo "<td class='admin-td'><table width='98%' cellspacing='0' cellpadding='0'><tr><td width='50%'><i id='img".$id."' onClick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square-o'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-warning btn-xs'>封面</span>{$nss}<a href='catalog_do.php?cid=".$id."&dopost=listArchives' class='mr-3 ml-3'>".$typeName."</a>[id：".$id."]";
                 echo "</td><td align='right'>";
                 echo "<a href='{$GLOBALS['cfg_phpurl']}/list.php?tid={$id}' target='_blank' title='预览'><i class='btn btn-sm fa fa-eye'></i></a>";
@@ -135,7 +135,7 @@ class TypeUnit
             }
             //独立页面
             else if ($ispart == 2) {
-                echo "<tr onMouseMove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">";
+                echo "<tr>";
                 echo "<td class='admin-td'><table width='98%' cellspacing='0' cellpadding='0'><tr><td width='50%'><i id='img".$id."' onClick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square-o'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-primary btn-xs'>外部</span>{$nss}<a href='catalog_edit.php?id=".$id."' class='mr-3 ml-3'>".$typeName."</a>[id：".$id."]";
                 echo "</td><td align='right'>";
                 echo "<a href='{$typeDir}' target='_blank' title='预览'><i class='btn btn-sm fa fa-eye'></i></a>";
@@ -191,7 +191,7 @@ class TypeUnit
                 }
                 //普通列表
                 if ($ispart == 0) {
-                    echo "<tr onMouseMove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">";
+                    echo "<tr>";
                     echo "<td class='admin-td'><table width='98%' cellspacing='0' cellpadding='0'><tr><td width='50%'>";
                     echo "$step<i id='img".$id."' onClick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square-o'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-success btn-xs'>列表</span>{$nss}<a href='catalog_do.php?cid=".$id."&dopost=listArchives' class='mr-3 ml-3'>".$typeName."</a>[id：".$id."]（文档数：".$this->GetTotalArc($id)."）";
                     echo "</td><td align='right'>";
@@ -205,7 +205,7 @@ class TypeUnit
                 }
                 //封面栏目
                 else if ($ispart == 1) {
-                    echo "<tr onMouseMove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">";
+                    echo "<tr>";
                     echo "<td class='admin-td'><table width='98%' cellspacing='0' cellpadding='0'><tr><td width='50%'>";
                     echo "$step<i id='img".$id."' onClick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square-o'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-warning btn-xs'>封面</span>{$nss}<a href='catalog_do.php?cid=".$id."&dopost=listArchives' class='mr-3 ml-3'>".$typeName."</a>[id：".$id."]";
                     echo "</td><td align='right'>";
@@ -219,7 +219,7 @@ class TypeUnit
                 }
                 //独立页面
                 else if ($ispart == 2) {
-                    echo "<tr onMouseMove=\"javascript:this.bgColor='#e9ecef';\" onMouseOut=\"javascript:this.bgColor='#ffffff';\">";
+                    echo "<tr>";
                     echo "<td class='admin-td'><table width='98%' cellspacing='0' cellpadding='0'><tr><td width='50%'>";
                     echo "$step<i id='img".$id."' onClick=\"LoadSuns('suns".$id."',$id);\" class='fa fa-plus-square-o'></i><input type='checkbox' name='tids[]' value='{$id}' class='mr-3 ml-3'><span class='btn btn-primary btn-xs'>外部</span>{$nss}<a href='catalog_do.php?cid=".$id."&dopost=listArchives' class='mr-3 ml-3'>".$typeName."</a>[id：".$id."]";
                     echo "</td><td align='right'>";

src/user/inc/inc_catalog_options.php

@@ -36,9 +36,9 @@ function GetOptionList($selid = 0, $channeltype = 0)
         }
         if ($row->channeltype == $channeltype && $row->issend == 1) {
             if ($row->ispart == 0) {
-                $OptionArrayList .= "<option value='".$row->id."' {$selected}>└─ ".$row->typename."</option>\r\n";
+                $OptionArrayList .= "<option value='".$row->id."' {$selected}>".$row->typename."</option>\r\n";
             } else if ($row->ispart == 1) {
-                $OptionArrayList .= "<option disabled value='".$row->id."' {$selected}>└──".$row->typename."</option>\r\n";
+                $OptionArrayList .= "<option disabled value='".$row->id."' {$selected}>└─ ".$row->typename."</option>\r\n";
             }
         }
         $selected = '';
@@ -68,9 +68,9 @@ function LogicGetOptionArray($id, $step, $channeltype, $selid = 0)
         }
         if ($row->channeltype == $channeltype && $row->issend == 1) {
             if ($row->ispart == 0) {
-                $OptionArrayList .= "<option value='".$row->id."' {$selected}>└─$step ".$row->typename."</option>\r\n";
+                $OptionArrayList .= "<option value='".$row->id."' {$selected}>└$step ".$row->typename."</option>\r\n";
             } else if ($row->ispart == 1) {
-                $OptionArrayList .= "<option disabled value='".$row->id."' {$selected}>└─$step ".$row->typename."</option>\r\n";
+                $OptionArrayList .= "<option disabled value='".$row->id."' {$selected}>└$step ".$row->typename."</option>\r\n";
             }
         }
         $selected = '';
@@ -98,7 +98,7 @@ function classification($mid, $mtypeid = 0, $channelid = 1)
                 $selected = " selected";
             }
         }
-        $list .= "<option value='".$row['mtypeid']."' {$selected}>└─ ".$row['mtypename']."</option>\r\n";
+        $list .= "<option value='".$row['mtypeid']."' {$selected}>".$row['mtypename']."</option>\r\n";
         $selected = '';
     }
     return $list;

src/user/templets/buy_action_payment.htm

@@ -54,7 +54,7 @@
 										<td>
 											<table cellpadding="0" cellspacing="0" class="table table-borderless">
 												{dede:array.payment_list}
-												<tr onMouseMove="javascript:this.bgColor='#f5f5f5';" onMouseOut="javascript:this.bgColor='#ffffff';">
+												<tr>
 													<td width="10%" align="right">
 														{dede:if value.code=="cod" || value.code=="bank"}
 														<input type="radio" name="paytype" value="{dede:value.id/}" disabled="disabled" />